From 5c664d2ebb7e60676b72abde85a0f9a38831e5a7 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Mon, 9 Oct 2023 21:26:42 +0700 Subject: [PATCH] IMP-99: New core table (#266) --- .idea/.gitignore | 6 +++--- .idea/cc.iml | 16 ---------------- .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ angular.json | 3 ++- package-lock.json | 8 ++++---- package.json | 2 +- .../sections/repairing/repairing.component.html | 1 - .../sections/repairing/repairing.component.ts | 4 ---- .../routing-ruleset/routing-ruleset.component.ts | 7 ++++--- src/app/sections/sources/sources.component.ts | 2 +- 11 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 .idea/cc.iml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore index e5219585..29d10c06 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,8 +1,8 @@ **/* -!*.iml +#!*.iml !jsLinters !inspectionProfiles -!modules.xml +#!modules.xml !prettier.xml -!vcs.xml \ No newline at end of file +#!vcs.xml \ No newline at end of file diff --git a/.idea/cc.iml b/.idea/cc.iml deleted file mode 100644 index cf277d09..00000000 --- a/.idea/cc.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 0abad796..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/angular.json b/angular.json index cbe888c8..e54c3f10 100644 --- a/angular.json +++ b/angular.json @@ -147,6 +147,7 @@ } }, "cli": { - "schematicCollections": ["@angular-eslint/schematics"] + "schematicCollections": ["@angular-eslint/schematics"], + "analytics": false } } diff --git a/package-lock.json b/package-lock.json index 3a00f764..4d1c024d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "@vality/dominant-cache-proto": "2.0.1-99f38c9.0", "@vality/fistful-proto": "2.0.0", "@vality/magista-proto": "2.0.2-e46bba2.0", - "@vality/ng-core": "16.2.1-pr-40-71e416e.0", + "@vality/ng-core": "16.2.1-pr-40-5f4b5be.0", "@vality/payout-manager-proto": "2.0.1-b079679.0", "@vality/repairer-proto": "2.0.1-8f7973d.0", "@vality/thrift-ts": "2.4.1-8ad5123.0", @@ -6001,9 +6001,9 @@ "integrity": "sha512-2cPVToAJRdt1CFQ6G/C6ngw6hp94Jp7WFtPtNvtlcCSXRYRnppoi3KpK14tBH9SlLeqrpSy0IrIsCnAkj7tFfg==" }, "node_modules/@vality/ng-core": { - "version": "16.2.1-pr-40-71e416e.0", - "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-16.2.1-pr-40-71e416e.0.tgz", - "integrity": "sha512-+JiLzrWQ4tJ+J6/b1nbT/pxSbjWEb6cNowFGp7WVRd9ssL/QDQrFUj/chuO+qDU0+6nzIzI4y1ZYuyp0SZaIlw==", + "version": "16.2.1-pr-40-5f4b5be.0", + "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-16.2.1-pr-40-5f4b5be.0.tgz", + "integrity": "sha512-J64AfaPDmExYO3PxrI9PgxDgNy5EbNhRyTWb5rkYHMhb+hkjVseuAZCgiEeNfTlGJ8qCZW1RoCseuFhjUSZnhw==", "dependencies": { "@ng-matero/extensions": "^16.0.0", "@s-libs/js-core": "^16.0.0", diff --git a/package.json b/package.json index 14c11d80..29879b86 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@vality/dominant-cache-proto": "2.0.1-99f38c9.0", "@vality/fistful-proto": "2.0.0", "@vality/magista-proto": "2.0.2-e46bba2.0", - "@vality/ng-core": "16.2.1-pr-40-71e416e.0", + "@vality/ng-core": "16.2.1-pr-40-5f4b5be.0", "@vality/payout-manager-proto": "2.0.1-b079679.0", "@vality/repairer-proto": "2.0.1-8f7973d.0", "@vality/thrift-ts": "2.4.1-8ad5123.0", diff --git a/src/app/sections/repairing/repairing.component.html b/src/app/sections/repairing/repairing.component.html index 6cf37d3d..fd7b1477 100644 --- a/src/app/sections/repairing/repairing.component.html +++ b/src/app/sections/repairing/repairing.component.html @@ -41,7 +41,6 @@ [hasMore]="hasMore$ | async" [progress]="(inProgress$ | async) && !!(columns$ | async)" [rowSelected]="selected$ | async" - [trackBy]="trackById" rowSelectable (more)="fetchMore()" (rowSelectionChange)="selected$.next($event)" diff --git a/src/app/sections/repairing/repairing.component.ts b/src/app/sections/repairing/repairing.component.ts index 430f9738..d3266afa 100644 --- a/src/app/sections/repairing/repairing.component.ts +++ b/src/app/sections/repairing/repairing.component.ts @@ -164,8 +164,4 @@ export class RepairingComponent implements OnInit { .pipe(untilDestroyed(this)) .subscribe(); } - - trackById(index: number, item: Machine) { - return item.id; - } } diff --git a/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.ts b/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.ts index 1dda1919..58963973 100644 --- a/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.ts +++ b/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.ts @@ -54,9 +54,9 @@ export class RoutingRulesetComponent { columns: Column[] = [ { pinned: 'left', - field: 'index', - header: 'Candidate', + field: 'candidate', description: 'description', + sortable: true, formatter: (d) => this.getCandidateIdx(d).pipe(map((idx) => `${idx + 1}`)), click: (d) => { this.getCandidateIdx(d) @@ -229,9 +229,10 @@ export class RoutingRulesetComponent { } private formatPredicate(predicate: Predicate) { + if (!predicate) return ''; if (getUnionKey(predicate) === 'constant') { return JSON.stringify(predicate.constant); } - return JSON.stringify(objectToJSON(predicate)); + return getUnionKey(predicate); } } diff --git a/src/app/sections/sources/sources.component.ts b/src/app/sections/sources/sources.component.ts index e84dca4a..09ade093 100644 --- a/src/app/sections/sources/sources.component.ts +++ b/src/app/sections/sources/sources.component.ts @@ -12,7 +12,7 @@ export class SourcesComponent { sources$ = this.fetchSourcesService.sources$; progress$ = this.fetchSourcesService.progress$; columns: Column[] = [ - { field: 'name', description: 'id' }, + { field: 'name', description: 'id', pinned: 'left' }, 'identity', 'currency_symbolic_code', { field: 'created_at', type: 'datetime' },