IMP-99: New core table (#266)

This commit is contained in:
Rinat Arsaev 2023-10-09 21:26:42 +07:00 committed by GitHub
parent 824cf25929
commit 5c664d2ebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 48 deletions

6
.idea/.gitignore vendored
View File

@ -1,8 +1,8 @@
**/*
!*.iml
#!*.iml
!jsLinters
!inspectionProfiles
!modules.xml
#!modules.xml
!prettier.xml
!vcs.xml
#!vcs.xml

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/.angular" />
<excludeFolder url="file://$MODULE_DIR$/.idea" />
<excludeFolder url="file://$MODULE_DIR$/.eslintcache" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/cc.iml" filepath="$PROJECT_DIR$/.idea/cc.iml" />
</modules>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -147,6 +147,7 @@
}
},
"cli": {
"schematicCollections": ["@angular-eslint/schematics"]
"schematicCollections": ["@angular-eslint/schematics"],
"analytics": false
}
}

8
package-lock.json generated
View File

@ -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",

View File

@ -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",

View File

@ -41,7 +41,6 @@
[hasMore]="hasMore$ | async"
[progress]="(inProgress$ | async) && !!(columns$ | async)"
[rowSelected]="selected$ | async"
[trackBy]="trackById"
rowSelectable
(more)="fetchMore()"
(rowSelectionChange)="selected$.next($event)"

View File

@ -164,8 +164,4 @@ export class RepairingComponent implements OnInit {
.pipe(untilDestroyed(this))
.subscribe();
}
trackById(index: number, item: Machine) {
return item.id;
}
}

View File

@ -54,9 +54,9 @@ export class RoutingRulesetComponent {
columns: Column<RoutingCandidate>[] = [
{
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);
}
}

View File

@ -12,7 +12,7 @@ export class SourcesComponent {
sources$ = this.fetchSourcesService.sources$;
progress$ = this.fetchSourcesService.progress$;
columns: Column<Source>[] = [
{ field: 'name', description: 'id' },
{ field: 'name', description: 'id', pinned: 'left' },
'identity',
'currency_symbolic_code',
{ field: 'created_at', type: 'datetime' },