Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Up to 3.9.12 #1908

Merged
merged 6 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# Remove previous sources #
# Yarn stuff #
###################
application/client.core
application/client.libs
application/node.libs
application/client.core/**
application/client.libs/**
application/node.libs/**
.yarn
**/.yarn
# Compiled source #
###################
*.com
Expand Down
3 changes: 2 additions & 1 deletion application/apps/rustcore/ts-bindings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"platform": "file:../../../platform",
"tslib": "^2.6.0",
"uuid": "^9.0.0"
}
},
"packageManager": "yarn@1.22.19"
}
3 changes: 2 additions & 1 deletion application/apps/webassembly/ansi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
}
},
"packageManager": "yarn@1.22.19"
}
3 changes: 2 additions & 1 deletion application/apps/webassembly/matcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
}
},
"packageManager": "yarn@1.22.19"
}
3 changes: 2 additions & 1 deletion application/apps/webassembly/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
}
},
"packageManager": "yarn@1.22.19"
}
5 changes: 3 additions & 2 deletions application/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chipmunk",
"version": "3.9.11",
"version": "3.9.12",
"description": "Logs analyzer tool",
"author": "Dmitry Astafyev",
"scripts": {
Expand Down Expand Up @@ -55,5 +55,6 @@
"fs": false,
"os": false,
"path": false
}
},
"packageManager": "yarn@1.22.19"
}
6 changes: 6 additions & 0 deletions application/client/src/app/schema/render/columns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ export class Columns {
.storage(this.hash)
.read()
.then((content: string) => {
if (typeof content !== 'string' || content.trim() === '') {
this.logger.debug(
`No columns data has been saved from previous sessions`,
);
return;
}
try {
const headers = JSON.parse(content);
if (!(headers instanceof Array)) {
Expand Down
2 changes: 2 additions & 0 deletions application/client/src/app/ui/env/entities/value.limited.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export class LimittedValue {
this.max = max;
this.min = min;
this.value = value;
this.min !== -1 && (this.value = this.value < this.min ? this.min : this.value);
this.max !== -1 && (this.value = this.value > this.max ? this.max : this.value);
this._prev = -1;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class State extends Base {
// );
this.stat = stat;
this.struct().build(this.filters());
this.ref.markChangesForCheck();
this.ref.detectChanges();
})
.catch((err: Error) => {
this.ref.log().error(`Fail to get DLT stat info: ${err.message}`);
Expand Down
5 changes: 3 additions & 2 deletions application/holder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chipmunk",
"version": "3.9.11",
"version": "3.9.12",
"chipmunk": {
"versions": {}
},
Expand Down Expand Up @@ -121,5 +121,6 @@
"build-linux": "node_modules/.bin/electron-builder --linux --dir",
"build-win": "node_modules/.bin/electron-builder --win --dir",
"lint": "node_modules/.bin/eslint . --ext .ts --max-warnings=0"
}
},
"packageManager": "yarn@1.22.19"
}
9 changes: 0 additions & 9 deletions application/platform/env/str.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@ export function serializeHtml(str: string): string {
return str.replace(/</gi, '&lt;').replace(/>/gi, '&gt;');
}

export function filename(filename: string): string {
const match = filename.match(/[^/]*$/gi);
return match === null ? '' : match[0];
}

export function basefolder(filename: string): string {
return filename.replace(/[^/]*$/gi, '');
}

export function serializeSpaces(str: string): string {
return str.replace(/\s/gi, '%20');
}
Expand Down
3 changes: 2 additions & 1 deletion application/platform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,6 @@
"./types/unity/mutable": "./dist/types/unity/mutable.js",
"./types/notification/index": "./dist/types/notification/index.js",
"./package.json": "./package.json"
}
},
"packageManager": "yarn@1.22.19"
}
4 changes: 2 additions & 2 deletions application/platform/types/observe/origin/concat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Configuration as Base, ConfigurationStaticDesc } from '../configuration
import { OriginDetails, IOriginDetails, IList, Job, IJob, OriginType } from '../description';
import { Configuration as ConfigurationFile } from './file';
import { Context, SourceUuid, IConfiguration as IOriginConfiguration } from './index';
import { basefolder } from '../../../env/str';
import { getParentFolder } from '../../files';
import { Statics } from '../../../env/decorators';
import { unique } from '../../../env/sequence';

Expand Down Expand Up @@ -120,7 +120,7 @@ export class Configuration
const first = this.configuration[0];
return {
major: `Concating ${this.configuration.length} files`,
minor: first !== undefined ? basefolder(first[2]) : '',
minor: first !== undefined ? getParentFolder(first[2]) : '',
icon: 'insert_drive_file',
type: OriginType.file,
action: 'Concat',
Expand Down
8 changes: 4 additions & 4 deletions application/platform/types/observe/origin/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { error } from '../../../log/utils';
import { Configuration as Base, ConfigurationStaticDesc } from '../configuration';
import { Context, SourceUuid } from './index';
import { OriginDetails, IOriginDetails, IList, Job, IJob, OriginType } from '../description';
import { filename, basefolder } from '../../../env/str';
import { getFileName, getParentFolder } from '../../files';
import { Statics } from '../../../env/decorators';
import { unique } from '../../../env/sequence';

Expand Down Expand Up @@ -95,8 +95,8 @@ export class Configuration

public desc(): IOriginDetails {
return {
major: filename(this.configuration[2]),
minor: basefolder(this.configuration[2]),
major: getFileName(this.configuration[2]),
minor: getParentFolder(this.configuration[2]),
icon: 'insert_drive_file',
type: OriginType.file,
action: 'Open',
Expand All @@ -110,7 +110,7 @@ export class Configuration
public asJob(): IJob {
return {
name: 'tail',
desc: filename(this.filename()),
desc: getFileName(this.filename()),
icon: 'insert_drive_file',
};
}
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 3.9.12

## Fixes
- Fix the path's parser (windows)
- Fix the default column's sizer
- Fix DLT statistic collector

# 3.9.11

## Features
Expand Down