From 04109ad673bb8fe75c88f24e9a43a62465889bba Mon Sep 17 00:00:00 2001
From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:37:44 +0700
Subject: [PATCH] EMP-55: Full move to new table2, remove old table code (#406)
---
package-lock.json | 8 +-
package.json | 2 +-
.../stores/parties-store.service.ts | 28 ++-
.../claims-table/claims-table.component.html | 4 +-
.../claims-table/claims-table.component.ts | 26 +--
.../reverts/reverts.component.html | 4 +-
.../reverts/reverts.component.ts | 6 +-
.../sections/deposits/deposits.component.html | 4 +-
.../sections/deposits/deposits.component.ts | 6 +-
.../domain-objects-table.component.html | 5 +-
.../domain-objects-table.component.ts | 5 +-
.../machine-status-history-card.component.ts | 6 +-
.../sections/machines/machines.component.html | 4 +-
.../sections/machines/machines.component.ts | 10 +-
.../payment-refunds.component.html | 2 +-
.../refunds-table/refunds-table.component.ts | 35 ++--
.../payments-table.component.html | 4 +-
.../payments-table.component.ts | 15 +-
.../party-delegate-rulesets.component.html | 3 +-
.../party-delegate-rulesets.component.ts | 57 +++---
.../party-routing-ruleset.component.html | 1 +
.../party-routing-ruleset.component.ts | 110 ++++++-----
.../routing-rules-list.component.html | 5 +-
.../routing-rules-list.component.ts | 90 ++++-----
.../routing-ruleset.component.html | 7 +-
.../routing-ruleset.component.ts | 181 ++++++++++--------
.../search-parties.component.html | 4 +-
.../search-parties.component.ts | 63 +++---
src/app/sections/shops/shops.component.ts | 3 +-
.../sections/sources/sources.component.html | 5 +-
src/app/sections/sources/sources.component.ts | 6 +-
.../terminals/terminals.component.html | 5 +-
.../sections/terminals/terminals.component.ts | 17 +-
...shops-term-set-history-card.component.html | 2 +-
.../shops-term-set-history-card.component.ts | 7 +-
.../shops-terms/shops-terms.component.html | 4 +-
.../shops-terms/shops-terms.component.ts | 16 +-
.../shops-terms/utils/shop-fees-columns.ts | 4 +-
...inals-term-set-history-card.component.html | 2 +-
...rminals-term-set-history-card.component.ts | 4 +-
.../terminals-terms.component.html | 4 +-
.../terminals-terms.component.ts | 7 +-
.../utils/terminal-fees-columns.ts | 4 +-
...llets-term-set-history-card.component.html | 2 +-
...wallets-term-set-history-card.component.ts | 7 +-
.../wallets-terms.component.html | 4 +-
.../wallets-terms/wallets-terms.component.ts | 15 +-
.../terms/utils/create-fees-columns.ts | 4 +-
.../sections/wallets/wallets.component.html | 8 +-
src/app/sections/wallets/wallets.component.ts | 8 +-
.../withdrawals/withdrawals.component.html | 4 +-
.../withdrawals/withdrawals.component.ts | 6 +-
.../chargebacks-table.component.html | 4 +-
.../chargebacks-table.component.ts | 7 +-
.../shops-table/shops-table.component.html | 5 +-
.../shops-table/shops-table.component.ts | 9 +-
.../terminal-balances-card.component.html | 2 +-
.../terminal-balances-card.component.ts | 9 +-
.../terminal-delegates-card.component.ts | 106 +++++-----
.../utils/table/create-contract-column.ts | 45 ++---
.../utils/table/create-currency-column.ts | 150 ++++++---------
.../table/create-domain-object-column.ts | 61 +++---
.../shared/utils/table/create-party-column.ts | 71 +++----
.../utils/table/create-predicate-column.ts | 47 ++---
.../shared/utils/table/create-shop-column.ts | 77 +++-----
.../utils/table/create-terminal-column.ts | 12 --
.../utils/table/create-wallet-column.ts | 62 +++---
src/app/shared/utils/table/index.ts | 13 +-
.../utils/table2/create-contract-column.ts | 18 --
.../utils/table2/create-currency-column.ts | 71 -------
.../table2/create-domain-object-column.ts | 37 ----
.../utils/table2/create-party-column.ts | 32 ----
.../utils/table2/create-predicate-column.ts | 18 --
.../shared/utils/table2/create-shop-column.ts | 37 ----
.../utils/table2/create-wallet-column.ts | 24 ---
src/app/shared/utils/table2/index.ts | 7 -
.../upload-csv/upload-csv.component.html | 2 +-
77 files changed, 721 insertions(+), 1048 deletions(-)
delete mode 100644 src/app/shared/utils/table/create-terminal-column.ts
delete mode 100644 src/app/shared/utils/table2/create-contract-column.ts
delete mode 100644 src/app/shared/utils/table2/create-currency-column.ts
delete mode 100644 src/app/shared/utils/table2/create-domain-object-column.ts
delete mode 100644 src/app/shared/utils/table2/create-party-column.ts
delete mode 100644 src/app/shared/utils/table2/create-predicate-column.ts
delete mode 100644 src/app/shared/utils/table2/create-shop-column.ts
delete mode 100644 src/app/shared/utils/table2/create-wallet-column.ts
delete mode 100644 src/app/shared/utils/table2/index.ts
diff --git a/package-lock.json b/package-lock.json
index 13bc0391..bdf6f95c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
"@vality/fistful-proto": "2.0.1-88e69a5.0",
"@vality/machinegun-proto": "1.0.1-3decc8f.0",
"@vality/magista-proto": "2.0.2-ec1bdb9.0",
- "@vality/ng-core": "18.4.1-pr-78-9131f9a.0",
+ "@vality/ng-core": "18.4.1-pr-79-ca9078d.0",
"@vality/ng-thrift": "18.0.1-pr-13-bdb6d51.0",
"@vality/repairer-proto": "2.0.2-07b73e9.0",
"@vality/scrooge-proto": "0.1.1-9ce7fc6.0",
@@ -5969,9 +5969,9 @@
"integrity": "sha512-XWF7qM/CARRAey0scGVhfGU6jNq+UdlGE2mg3jn4eIFDuIWQJqsT+Bah300RBUrl+XgFsmj95C6HWRfeA5Q8kw=="
},
"node_modules/@vality/ng-core": {
- "version": "18.4.1-pr-78-9131f9a.0",
- "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-18.4.1-pr-78-9131f9a.0.tgz",
- "integrity": "sha512-qmTGnGe+pBWlIQ+cX64pt2aLWdoLM6M2Apc180dQQrLca4VBHB4Oh8yo7vvv/sxws1DLXEzWutgNzi9/bRdtZQ==",
+ "version": "18.4.1-pr-79-ca9078d.0",
+ "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-18.4.1-pr-79-ca9078d.0.tgz",
+ "integrity": "sha512-/+GE2QUDUYj8hSZfZijBQAZcb1IBi6TLlTCCAxItDkAG2jVHhcDeW+8fgpchZZKbsFQFyhUHFsU+qttDuvnfDQ==",
"dependencies": {
"@angular/material-date-fns-adapter": "^18.2.2",
"@ng-matero/extensions": "^18.2.0",
diff --git a/package.json b/package.json
index 1f9a42e1..e60fc41d 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"@vality/fistful-proto": "2.0.1-88e69a5.0",
"@vality/machinegun-proto": "1.0.1-3decc8f.0",
"@vality/magista-proto": "2.0.2-ec1bdb9.0",
- "@vality/ng-core": "18.4.1-pr-78-9131f9a.0",
+ "@vality/ng-core": "18.4.1-pr-79-ca9078d.0",
"@vality/ng-thrift": "18.0.1-pr-13-bdb6d51.0",
"@vality/repairer-proto": "2.0.2-07b73e9.0",
"@vality/scrooge-proto": "0.1.1-9ce7fc6.0",
diff --git a/src/app/api/payment-processing/stores/parties-store.service.ts b/src/app/api/payment-processing/stores/parties-store.service.ts
index 030421c3..4b264ee8 100644
--- a/src/app/api/payment-processing/stores/parties-store.service.ts
+++ b/src/app/api/payment-processing/stores/parties-store.service.ts
@@ -8,13 +8,18 @@ import { MemoizeExpiring } from 'typescript-memoize';
import { PartyManagementService } from '@cc/app/api/payment-processing';
+import { createDsl, FistfulStatisticsService } from '../../fistful-stat';
+
@Injectable({
providedIn: 'root',
})
export class PartiesStoreService {
progress$ = new BehaviorSubject(0);
- constructor(private partyManagementService: PartyManagementService) {}
+ constructor(
+ private partyManagementService: PartyManagementService,
+ private fistfulStatisticsService: FistfulStatisticsService,
+ ) {}
@MemoizeExpiring(5 * 60_000)
get(partyId: PartyID) {
@@ -34,8 +39,14 @@ export class PartiesStoreService {
@MemoizeExpiring(5 * 60_000)
getWallet(walletId: WalletID, partyId: PartyID) {
- return this.get(partyId).pipe(
- map((p) => p.wallets.get(walletId)),
+ // return this.get(partyId).pipe(
+ // map((p) => p.wallets.get(walletId)),
+ // progressTo(this.progress$),
+ // shareReplay({ refCount: true, bufferSize: 1 }),
+ // );
+ // TODO: We get it from fistful because wallets are not returned in the party object
+ return this.getWallets(partyId).pipe(
+ map((wallets) => wallets.find((w) => w.id === walletId)),
progressTo(this.progress$),
shareReplay({ refCount: true, bufferSize: 1 }),
);
@@ -57,4 +68,15 @@ export class PartiesStoreService {
map(([party, shop]) => party.contracts.get(shop.contract_id)),
);
}
+
+ @MemoizeExpiring(5 * 60_000)
+ private getWallets(partyId: PartyID) {
+ return this.fistfulStatisticsService
+ .GetWallets({ dsl: createDsl({ wallets: { party_id: partyId } }) })
+ .pipe(
+ map(({ data }) => data.wallets),
+ progressTo(this.progress$),
+ shareReplay({ refCount: true, bufferSize: 1 }),
+ );
+ }
}
diff --git a/src/app/sections/claims/claims-table/claims-table.component.html b/src/app/sections/claims/claims-table/claims-table.component.html
index 524f7d90..4247718f 100644
--- a/src/app/sections/claims/claims-table/claims-table.component.html
+++ b/src/app/sections/claims/claims-table/claims-table.component.html
@@ -1,4 +1,4 @@
-
-
+
diff --git a/src/app/sections/claims/claims-table/claims-table.component.ts b/src/app/sections/claims/claims-table/claims-table.component.ts
index 13664d98..f8c6d966 100644
--- a/src/app/sections/claims/claims-table/claims-table.component.ts
+++ b/src/app/sections/claims/claims-table/claims-table.component.ts
@@ -1,11 +1,11 @@
import { Component, Input, Output, EventEmitter, booleanAttribute, input } from '@angular/core';
import { toObservable } from '@angular/core/rxjs-interop';
import { Claim } from '@vality/domain-proto/claim_management';
-import { Column2, LoadOptions, createMenuColumn } from '@vality/ng-core';
+import { Column, createMenuColumn, LoadOptions } from '@vality/ng-core';
import { getUnionKey } from '@vality/ng-thrift';
-import startCase from 'lodash-es/startCase';
+import { startCase } from 'lodash-es';
-import { createPartyColumn } from '@cc/app/shared/utils/table2';
+import { createPartyColumn } from '@cc/app/shared';
@Component({
selector: 'cc-claims-table',
@@ -21,21 +21,23 @@ export class ClaimsTableComponent {
@Output() update = new EventEmitter();
@Output() more = new EventEmitter();
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'id', cell: (d) => ({ link: () => `/party/${d.party_id}/claim/${d.id}` }) },
createPartyColumn((d) => ({ id: d.party_id }), { hidden: toObservable(this.noParty) }),
{
field: 'status',
cell: (d) => ({
value: startCase(getUnionKey(d.status)),
- tags: {
- pending: 'pending',
- review: 'pending',
- pending_acceptance: 'pending',
- accepted: 'success',
- denied: 'warn',
- revoked: 'neutral',
- },
+ color: (
+ {
+ pending: 'pending',
+ review: 'pending',
+ pending_acceptance: 'pending',
+ accepted: 'success',
+ denied: 'warn',
+ revoked: 'neutral',
+ } as const
+ )[getUnionKey(d.status)],
}),
},
{ field: 'revision' },
diff --git a/src/app/sections/deposit-details/reverts/reverts.component.html b/src/app/sections/deposit-details/reverts/reverts.component.html
index 85f628a2..370142c0 100644
--- a/src/app/sections/deposit-details/reverts/reverts.component.html
+++ b/src/app/sections/deposit-details/reverts/reverts.component.html
@@ -1,6 +1,6 @@
Reverts
-
-
+
diff --git a/src/app/sections/deposit-details/reverts/reverts.component.ts b/src/app/sections/deposit-details/reverts/reverts.component.ts
index 7bb58fbc..2fd7f5f0 100644
--- a/src/app/sections/deposit-details/reverts/reverts.component.ts
+++ b/src/app/sections/deposit-details/reverts/reverts.component.ts
@@ -1,11 +1,11 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { DepositStatus, StatDeposit, StatDepositRevert } from '@vality/fistful-proto/fistful_stat';
-import { DialogService, UpdateOptions, Column2 } from '@vality/ng-core';
+import { DialogService, UpdateOptions, Column } from '@vality/ng-core';
import { getUnionKey } from '@vality/ng-thrift';
import startCase from 'lodash-es/startCase';
import { filter } from 'rxjs/operators';
-import { createCurrencyColumn } from '@cc/app/shared/utils/table2';
+import { createCurrencyColumn } from '@cc/app/shared';
import { CreateRevertDialogComponent } from './create-revert-dialog/create-revert-dialog.component';
import { FetchRevertsService } from './services/fetch-reverts/fetch-reverts.service';
@@ -23,7 +23,7 @@ export class RevertsComponent implements OnInit {
reverts$ = this.fetchRevertsService.result$;
hasMore$ = this.fetchRevertsService.hasMore$;
isLoading$ = this.fetchRevertsService.isLoading$;
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'id' },
{
field: 'status',
diff --git a/src/app/sections/deposits/deposits.component.html b/src/app/sections/deposits/deposits.component.html
index 967ce329..0013d03b 100644
--- a/src/app/sections/deposits/deposits.component.html
+++ b/src/app/sections/deposits/deposits.component.html
@@ -22,7 +22,7 @@
- Create by file
-
+
diff --git a/src/app/sections/deposits/deposits.component.ts b/src/app/sections/deposits/deposits.component.ts
index 6c55fae5..faef6242 100644
--- a/src/app/sections/deposits/deposits.component.ts
+++ b/src/app/sections/deposits/deposits.component.ts
@@ -16,7 +16,7 @@ import {
debounceTimeWithFirst,
getValueChanges,
countChanged,
- Column2,
+ Column,
getEnumKey,
createMenuColumn,
} from '@vality/ng-core';
@@ -25,7 +25,7 @@ import { endOfDay } from 'date-fns';
import startCase from 'lodash-es/startCase';
import { filter, map, shareReplay } from 'rxjs/operators';
-import { createCurrencyColumn } from '@cc/app/shared/utils/table2';
+import { createCurrencyColumn } from '@cc/app/shared';
import { QueryDsl } from '../../api/fistful-stat';
import { DATE_RANGE_DAYS, DEBOUNCE_TIME_MS } from '../../tokens';
@@ -53,7 +53,7 @@ export class DepositsComponent implements OnInit {
deposits$ = this.fetchDepositsService.result$;
hasMore$ = this.fetchDepositsService.hasMore$;
isLoading$ = this.fetchDepositsService.isLoading$;
- columns: Column2[] = [
+ columns: Column[] = [
{
field: 'id',
cell: (d) => ({
diff --git a/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.html b/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.html
index 545b3c17..7ded6ede 100644
--- a/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.html
+++ b/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.html
@@ -1,5 +1,4 @@
-
-
+
diff --git a/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.ts b/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.ts
index 203cf4e3..754e2171 100644
--- a/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.ts
+++ b/src/app/sections/domain/domain-info/domain-objects-table/domain-objects-table.component.ts
@@ -11,7 +11,7 @@ import {
ActionsModule,
DialogService,
getValueChanges,
- Column2,
+ Column,
createMenuColumn,
} from '@vality/ng-core';
import sortBy from 'lodash-es/sortBy';
@@ -76,7 +76,7 @@ export class DomainObjectsTableComponent implements OnInit {
map(([objects, types]) => objects.filter((o) => types.includes(o.type))),
shareReplay({ refCount: true, bufferSize: 1 }),
);
- columns: Column2[] = [
+ columns: Column[] = [
{
field: 'id',
cell: (d) => ({ value: getDomainObjectDetails(d.obj).id }),
@@ -140,7 +140,6 @@ export class DomainObjectsTableComponent implements OnInit {
),
);
isLoading$ = this.domainStoreService.isLoading$;
- sort = { active: 'id', direction: 'asc' };
constructor(
private domainStoreService: DomainStoreService,
diff --git a/src/app/sections/machines/components/machine-status-history-card.component.ts b/src/app/sections/machines/components/machine-status-history-card.component.ts
index 9dfe25bb..e8c0b1a4 100644
--- a/src/app/sections/machines/components/machine-status-history-card.component.ts
+++ b/src/app/sections/machines/components/machine-status-history-card.component.ts
@@ -1,5 +1,5 @@
import { Component, input } from '@angular/core';
-import { Column2, getEnumKey, TableModule } from '@vality/ng-core';
+import { Column, getEnumKey, TableModule } from '@vality/ng-core';
import { repairer } from '@vality/repairer-proto';
import { StatusHistory } from '@vality/repairer-proto/repairer';
import { startCase } from 'lodash-es';
@@ -9,7 +9,7 @@ import { SidenavInfoModule } from '@cc/app/shared/components/sidenav-info';
@Component({
standalone: true,
template: ``,
imports: [TableModule, SidenavInfoModule],
})
@@ -17,7 +17,7 @@ export class MachineStatusHistoryCardComponent {
history = input([]);
id = input('');
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'changed_at', cell: { type: 'datetime' } },
{
field: 'status',
diff --git a/src/app/sections/machines/machines.component.html b/src/app/sections/machines/machines.component.html
index 69062304..fb2abeb3 100644
--- a/src/app/sections/machines/machines.component.html
+++ b/src/app/sections/machines/machines.component.html
@@ -33,7 +33,7 @@
-
-
+
diff --git a/src/app/sections/machines/machines.component.ts b/src/app/sections/machines/machines.component.ts
index 1fcd808d..83d72419 100644
--- a/src/app/sections/machines/machines.component.ts
+++ b/src/app/sections/machines/machines.component.ts
@@ -17,7 +17,7 @@ import {
debounceTimeWithFirst,
FetchOptions,
getEnumKey,
- Column2,
+ Column,
} from '@vality/ng-core';
import { repairer } from '@vality/repairer-proto';
import { Namespace, ProviderID, RepairStatus, Machine } from '@vality/repairer-proto/repairer';
@@ -27,8 +27,8 @@ import startCase from 'lodash-es/startCase';
import { BehaviorSubject } from 'rxjs';
import { filter, switchMap, map, shareReplay } from 'rxjs/operators';
+import { createDomainObjectColumn } from '@cc/app/shared';
import { SidenavInfoService } from '@cc/app/shared/components/sidenav-info';
-import { createDomainObjectColumn } from '@cc/app/shared/utils/table2';
import { RepairManagementService } from '../../api/repairer';
import { DATE_RANGE_DAYS, DEBOUNCE_TIME_MS } from '../../tokens';
@@ -65,12 +65,12 @@ export class MachinesComponent implements OnInit {
});
selected$ = new BehaviorSubject([]);
status = repairer.RepairStatus;
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'id', sticky: 'start' },
{ header: 'Namespace', field: 'ns' },
{ field: 'created_at', cell: { type: 'datetime' } },
- createDomainObjectColumn((d) => ({ ref: { terminal: { id: Number(d.provider_id) } } }), {
- header: 'Terminal',
+ createDomainObjectColumn((d) => ({ ref: { provider: { id: Number(d.provider_id) } } }), {
+ header: 'Provider',
}),
{
field: 'status',
diff --git a/src/app/sections/payment-details/components/payment-refunds/payment-refunds.component.html b/src/app/sections/payment-details/components/payment-refunds/payment-refunds.component.html
index 288795d4..68d45126 100644
--- a/src/app/sections/payment-details/components/payment-refunds/payment-refunds.component.html
+++ b/src/app/sections/payment-details/components/payment-refunds/payment-refunds.component.html
@@ -1,4 +1,4 @@
-
+
[] = [
- { field: 'created_at', type: 'datetime' },
+ { field: 'created_at', cell: { type: 'datetime' } },
{
field: 'status',
- type: 'tag',
- formatter: (d) => getUnionKey(d.status),
- typeParameters: {
- label: (d) => startCase(getUnionKey(d.status)),
- tags: {
- pending: { color: 'pending' },
- succeeded: { color: 'success' },
- failed: { color: 'warn' },
- },
- },
+ cell: (d) => ({
+ value: startCase(getUnionKey(d.status)),
+ color: (
+ {
+ pending: 'pending',
+ succeeded: 'success',
+ failed: 'warn',
+ } as const
+ )[getUnionKey(d.status)],
+ }),
},
- createCurrencyColumn(
- 'amount',
- (d) => d.amount,
- (d) => d.currency_symbolic_code,
- ),
- 'reason',
+ createCurrencyColumn((d) => ({ amount: d.amount, code: d.currency_symbolic_code }), {
+ header: 'Amount',
+ }),
+ { field: 'reason' },
];
constructor(private fetchRefundsService: FetchRefundsService) {}
diff --git a/src/app/sections/payments/components/payments-table/payments-table.component.html b/src/app/sections/payments/components/payments-table/payments-table.component.html
index bdb21e6e..3f6f87f5 100644
--- a/src/app/sections/payments/components/payments-table/payments-table.component.html
+++ b/src/app/sections/payments/components/payments-table/payments-table.component.html
@@ -1,4 +1,4 @@
-
-
+
diff --git a/src/app/sections/payments/components/payments-table/payments-table.component.ts b/src/app/sections/payments/components/payments-table/payments-table.component.ts
index 2a1dffd7..94118aa8 100644
--- a/src/app/sections/payments/components/payments-table/payments-table.component.ts
+++ b/src/app/sections/payments/components/payments-table/payments-table.component.ts
@@ -1,19 +1,17 @@
import { Component, Input, Output, EventEmitter } from '@angular/core';
import { Router } from '@angular/router';
import { StatPayment } from '@vality/magista-proto/magista';
-import { LoadOptions, Column2, createMenuColumn } from '@vality/ng-core';
+import { LoadOptions, Column, createMenuColumn } from '@vality/ng-core';
import { getUnionKey } from '@vality/ng-thrift';
import startCase from 'lodash-es/startCase';
-import { AmountCurrencyService } from '@cc/app/shared/services';
-
-import { createFailureColumn } from '../../../../shared';
import {
createPartyColumn,
createShopColumn,
createDomainObjectColumn,
createCurrencyColumn,
-} from '../../../../shared/utils/table2';
+ createFailureColumn,
+} from '@cc/app/shared';
@Component({
selector: 'cc-payments-table',
@@ -29,7 +27,7 @@ export class PaymentsTableComponent {
@Output() update = new EventEmitter();
@Output() more = new EventEmitter();
- columns: Column2[] = [
+ columns: Column[] = [
{
field: 'id',
cell: (d) => ({
@@ -89,10 +87,7 @@ export class PaymentsTableComponent {
})),
];
- constructor(
- private amountCurrencyService: AmountCurrencyService,
- private router: Router,
- ) {}
+ constructor(private router: Router) {}
private toDetails(data: StatPayment) {
return void this.router.navigate([
diff --git a/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.html b/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.html
index 9949a81f..292d6ea7 100644
--- a/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.html
+++ b/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.html
@@ -1,13 +1,14 @@
diff --git a/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.ts b/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.ts
index 25765b81..31a59188 100644
--- a/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.ts
+++ b/src/app/sections/routing-rules/party-delegate-rulesets/party-delegate-rulesets.component.ts
@@ -1,17 +1,22 @@
import { ChangeDetectionStrategy, Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router } from '@angular/router';
-import { DialogService, NotifyLogService } from '@vality/ng-core';
+import { Column, DialogService, NotifyLogService } from '@vality/ng-core';
import { first, map, catchError } from 'rxjs/operators';
import { DomainStoreService } from '@cc/app/api/domain-config';
import { RoutingRulesType } from '@cc/app/sections/routing-rules/types/routing-rules-type';
+import { createDomainObjectColumn } from '@cc/app/shared';
+import { RoutingRulesListItem } from '../routing-rules-list';
import { RoutingRulesTypeService } from '../routing-rules-type.service';
import { RoutingRulesService } from '../services/routing-rules';
import { AttachNewRulesetDialogComponent } from './attach-new-ruleset-dialog';
-import { PartyDelegateRulesetsService } from './party-delegate-rulesets.service';
+import {
+ DelegateWithPaymentInstitution,
+ PartyDelegateRulesetsService,
+} from './party-delegate-rulesets.service';
@Component({
selector: 'cc-party-delegate-rulesets',
@@ -20,31 +25,37 @@ import { PartyDelegateRulesetsService } from './party-delegate-rulesets.service'
providers: [PartyDelegateRulesetsService, RoutingRulesTypeService],
})
export class PartyDelegateRulesetsComponent {
- displayedColumns = [
- { key: 'partyDelegate', name: 'Party delegate' },
- { key: 'paymentInstitution', name: 'Payment institution' },
- { key: 'mainRuleset', name: 'Main ruleset' },
+ columns: Column>[] = [
+ {
+ field: 'partyDelegate',
+ cell: (d) => ({
+ value: d.item.partyDelegate?.description || `#${d.item.partyDelegate?.ruleset?.id}`,
+ description: d.item.partyDelegate?.ruleset?.id,
+ click: () => this.navigateToPartyRuleset(d.parentRefId, d.delegateIdx),
+ }),
+ },
+ createDomainObjectColumn(
+ (d) => ({
+ ref: { payment_institution: d.item.paymentInstitution.ref },
+ }),
+ { header: 'Payment Institution' },
+ ),
+ createDomainObjectColumn(
+ (d) => ({
+ ref: { routing_rules: d.item.mainRoutingRule.ref },
+ }),
+ { header: 'Main Ruleset' },
+ ),
];
isLoading$ = this.domainStoreService.isLoading$;
data$ = this.partyDelegateRulesetsService.getDelegatesWithPaymentInstitution().pipe(
- map((rules) =>
- rules.map(({ mainRoutingRule, partyDelegate, paymentInstitution }) => ({
- parentRefId: mainRoutingRule?.ref?.id,
- delegateIdx: mainRoutingRule?.data?.decisions?.delegates?.findIndex(
- (d) => d === partyDelegate,
+ map((rules): RoutingRulesListItem[] =>
+ rules.map((item) => ({
+ parentRefId: item.mainRoutingRule?.ref?.id,
+ delegateIdx: item.mainRoutingRule?.data?.decisions?.delegates?.findIndex(
+ (d) => d === item.partyDelegate,
),
- paymentInstitution: {
- text: paymentInstitution?.data?.name,
- caption: paymentInstitution?.ref?.id,
- },
- mainRuleset: {
- text: mainRoutingRule?.data?.name,
- caption: mainRoutingRule?.ref?.id,
- },
- partyDelegate: {
- text: partyDelegate?.description,
- caption: partyDelegate?.ruleset?.id,
- },
+ item,
})),
),
);
diff --git a/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.html b/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.html
index d2f29f81..25d281a6 100644
--- a/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.html
+++ b/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.html
@@ -7,6 +7,7 @@
'/routing-rules/' +
(routingRulesTypeService.routingRulesType$ | async)
]"
+ fullHeight
title="Party Routing Rules"
(idLinkClick)="openRefId()"
>
diff --git a/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.ts b/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.ts
index 533e7bfc..d5d1c366 100644
--- a/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.ts
+++ b/src/app/sections/routing-rules/party-routing-ruleset/party-routing-ruleset.component.ts
@@ -1,15 +1,23 @@
import { Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router } from '@angular/router';
-import { DialogService, DialogResponseStatus, compareDifferentTypes } from '@vality/ng-core';
+import { RoutingDelegate } from '@vality/domain-proto/domain';
+import {
+ DialogService,
+ DialogResponseStatus,
+ compareDifferentTypes,
+ Column,
+} from '@vality/ng-core';
import { combineLatest } from 'rxjs';
import { filter, map, shareReplay, startWith, switchMap, take } from 'rxjs/operators';
import { DomainStoreService } from '@cc/app/api/domain-config';
+import { createShopColumn, createWalletColumn } from '@cc/app/shared';
import { SidenavInfoService } from '../../../shared/components/sidenav-info';
import { DomainObjectCardComponent } from '../../../shared/components/thrift-api-crud';
import { PartyDelegateRulesetsService } from '../party-delegate-rulesets';
+import { RoutingRulesListItem } from '../routing-rules-list';
import { RoutingRulesTypeService } from '../routing-rules-type.service';
import { AddPartyRoutingRuleDialogComponent } from './add-party-routing-rule-dialog';
@@ -27,65 +35,69 @@ export class PartyRoutingRulesetComponent {
partyID$ = this.partyRoutingRulesetService.partyID$;
isLoading$ = this.domainStoreService.isLoading$;
- shopsDisplayedColumns = [
- { key: 'id', name: 'Delegate (Ruleset Ref ID)' },
- { key: 'shop', name: 'Shop' },
+ shopsDisplayedColumns: Column>[] = [
+ {
+ field: 'id',
+ header: 'Delegate (Ruleset Ref ID)',
+ cell: (d) => ({
+ value: d.item?.description || `#${d.item?.ruleset?.id}`,
+ description: d.item?.ruleset?.id,
+ click: () => this.navigateToDelegate(d.parentRefId, d.delegateIdx),
+ }),
+ },
+ createShopColumn((d) =>
+ this.partyRoutingRulesetService.partyID$.pipe(
+ map((partyId) => ({
+ shopId: d.item?.allowed?.condition?.party?.definition?.shop_is,
+ partyId,
+ })),
+ ),
+ ),
];
- walletsDisplayedColumns = [
- { key: 'id', name: 'Delegate (Ruleset Ref ID)' },
- { key: 'wallet', name: 'Wallet' },
+ walletsDisplayedColumns: Column>[] = [
+ {
+ field: 'id',
+ header: 'Delegate (Ruleset Ref ID)',
+ cell: (d) => ({
+ value: d.item?.description || `#${d.item?.ruleset?.id}`,
+ description: d.item?.ruleset?.id,
+ click: () => this.navigateToDelegate(d.parentRefId, d.delegateIdx),
+ }),
+ },
+ createWalletColumn((d) =>
+ this.partyRoutingRulesetService.partyID$.pipe(
+ map((partyId) => ({
+ id: d.item?.allowed?.condition?.party?.definition?.wallet_is,
+ partyId,
+ })),
+ ),
+ ),
];
- shopsData$ = combineLatest([
- this.partyRuleset$,
- this.partyRoutingRulesetService.shops$.pipe(startWith([])),
- ]).pipe(
- filter(([r]) => !!r),
- map(([ruleset, shops]) =>
+ shopsData$ = this.partyRuleset$.pipe(
+ filter(Boolean),
+ map((ruleset): RoutingRulesListItem[] =>
ruleset.data.decisions.delegates
.filter((d) => d?.allowed?.condition?.party?.definition?.shop_is)
- .map((delegate, delegateIdx) => {
- const shopId = delegate?.allowed?.condition?.party?.definition?.shop_is;
- return {
- parentRefId: ruleset.ref.id,
- delegateIdx,
- id: {
- text: delegate?.description,
- caption: delegate?.ruleset?.id,
- },
- shop: {
- text: shops?.find((s) => s?.id === shopId)?.details?.name,
- caption: shopId,
- },
- };
- }),
+ .map((delegate, delegateIdx) => ({
+ parentRefId: ruleset.ref.id,
+ delegateIdx,
+ item: delegate,
+ })),
),
startWith([]),
takeUntilDestroyed(this.destroyRef),
shareReplay(1),
);
- walletsData$ = combineLatest([
- this.partyRuleset$,
- this.partyRoutingRulesetService.wallets$.pipe(startWith([])),
- ]).pipe(
- filter(([r]) => !!r),
- map(([ruleset, wallets]) =>
+ walletsData$ = this.partyRuleset$.pipe(
+ filter(Boolean),
+ map((ruleset): RoutingRulesListItem[] =>
ruleset.data.decisions.delegates
.filter((d) => d?.allowed?.condition?.party?.definition?.wallet_is)
- .map((delegate, delegateIdx) => {
- const walletId = delegate?.allowed?.condition?.party?.definition?.wallet_is;
- return {
- parentRefId: ruleset.ref.id,
- delegateIdx,
- id: {
- text: delegate?.description,
- caption: delegate?.ruleset?.id,
- },
- wallet: {
- text: wallets?.find((w) => w?.id === walletId)?.name,
- caption: walletId,
- },
- };
- }),
+ .map((delegate, delegateIdx) => ({
+ parentRefId: ruleset.ref.id,
+ delegateIdx,
+ item: delegate,
+ })),
),
startWith([]),
takeUntilDestroyed(this.destroyRef),
diff --git a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.html b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.html
index 0cb4f051..ddb6448f 100644
--- a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.html
+++ b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.html
@@ -1,8 +1,7 @@
diff --git a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.ts b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.ts
index 05195454..cd37a7dc 100644
--- a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.ts
+++ b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.ts
@@ -4,9 +4,12 @@ import {
EventEmitter,
Input,
Output,
- OnChanges,
booleanAttribute,
DestroyRef,
+ input,
+ computed,
+ runInInjectionContext,
+ Injector,
} from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute } from '@angular/router';
@@ -14,10 +17,9 @@ import {
DialogResponseStatus,
DialogService,
ConfirmDialogComponent,
- Column,
- createOperationColumn,
- ComponentChanges,
NotifyLogService,
+ Column,
+ createMenuColumn,
} from '@vality/ng-core';
import { filter, switchMap, catchError } from 'rxjs/operators';
@@ -30,62 +32,27 @@ type DelegateId = {
delegateIdx: number;
};
+export type RoutingRulesListItem = DelegateId & { item: T };
+
@Component({
selector: 'cc-routing-rules-list',
templateUrl: 'routing-rules-list.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class RoutingRulesListComponent<
- T extends { [N in PropertyKey]: unknown } & DelegateId = {
- [N in PropertyKey]: unknown;
- } & DelegateId,
-> implements OnChanges
-{
+export class RoutingRulesListComponent {
@Input() data: T[];
- @Input() displayedColumns: { key: keyof T; name: string }[];
+ displayedColumns = input>[]>([]);
@Input({ transform: booleanAttribute }) progress: boolean = false;
-
@Output() toDetails = new EventEmitter();
- columns: Column[] = [];
-
- constructor(
- private dialogService: DialogService,
- private log: NotifyLogService,
- private routingRulesService: RoutingRulesService,
- private route: ActivatedRoute,
- private destroyRef: DestroyRef,
- ) {}
-
- ngOnChanges(changes: ComponentChanges>) {
- if (changes.displayedColumns) {
- this.columns = [
- ...this.displayedColumns.map(
- (c, idx): Column => ({
- field: `${c.key as string}.text`,
- formatter:
- idx === 0
- ? (d) => {
- const v = d?.[c.key] as { caption: string; text: string };
- return v?.text || `#${v?.caption}`;
- }
- : undefined,
- click:
- idx === 0
- ? (d) =>
- this.toDetails.emit({
- parentRefId: d?.parentRefId,
- delegateIdx: d?.delegateIdx,
- })
- : undefined,
- header: c.name,
- description: `${c.key as string}.caption`,
- }),
- ),
- createOperationColumn([
+ columns = computed>[]>(() =>
+ runInInjectionContext(this.injector, () => [
+ ...this.displayedColumns(),
+ createMenuColumn((d) => ({
+ items: [
{
label: 'Details',
- click: (d) =>
+ click: () =>
this.toDetails.emit({
parentRefId: d?.parentRefId,
delegateIdx: d?.delegateIdx,
@@ -93,24 +60,33 @@ export class RoutingRulesListComponent<
},
{
label: 'Change delegate ruleset',
- click: (d) => this.changeDelegateRuleset(d),
+ click: () => this.changeDelegateRuleset(d),
},
{
label: 'Change main ruleset',
- click: (d) => this.changeTarget(d),
+ click: () => this.changeTarget(d),
},
{
label: 'Clone delegate ruleset',
- click: (d) => this.cloneDelegateRuleset(d),
+ click: () => this.cloneDelegateRuleset(d),
},
{
label: 'Delete',
- click: (d) => this.delete(d),
+ click: () => this.delete(d),
},
- ]),
- ];
- }
- }
+ ],
+ })),
+ ]),
+ );
+
+ constructor(
+ private dialogService: DialogService,
+ private log: NotifyLogService,
+ private routingRulesService: RoutingRulesService,
+ private route: ActivatedRoute,
+ private destroyRef: DestroyRef,
+ private injector: Injector,
+ ) {}
changeDelegateRuleset(delegateId: DelegateId) {
this.dialogService
diff --git a/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.html b/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.html
index 342504d0..50acda68 100644
--- a/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.html
+++ b/src/app/sections/routing-rules/routing-ruleset/routing-ruleset.component.html
@@ -9,20 +9,19 @@
'/' +
(partyRulesetRefID$ | async)
]"
+ fullHeight
(idLinkClick)="openRefId()"
>
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 ea0c4266..ba2d329d 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
@@ -1,5 +1,6 @@
import { Component, DestroyRef } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Sort } from '@angular/material/sort';
import { ActivatedRoute } from '@angular/router';
import { RoutingCandidate } from '@vality/domain-proto/domain';
import { Predicate } from '@vality/domain-proto/internal/domain';
@@ -7,10 +8,10 @@ import {
DialogResponseStatus,
DialogService,
NotifyLogService,
- Column,
- createOperationColumn,
DragDrop,
correctPriorities,
+ Column,
+ createMenuColumn,
} from '@vality/ng-core';
import { toJson, getUnionKey } from '@vality/ng-thrift';
import cloneDeep from 'lodash-es/cloneDeep';
@@ -19,16 +20,15 @@ import { first, map, switchMap, withLatestFrom, take } from 'rxjs/operators';
import { DomainStoreService } from '@cc/app/api/domain-config';
import { RoutingRulesType } from '@cc/app/sections/routing-rules/types/routing-rules-type';
+import { createDomainObjectColumn, createPredicateColumn } from '@cc/app/shared';
import {
DomainThriftFormDialogComponent,
DomainObjectCardComponent,
UpdateThriftDialogComponent,
} from '@cc/app/shared/components/thrift-api-crud';
-import { createPredicateColumn } from '../../../shared';
import { CandidateCardComponent } from '../../../shared/components/candidate-card/candidate-card.component';
import { SidenavInfoService } from '../../../shared/components/sidenav-info';
-import { createTerminalColumn } from '../../../shared/utils/table/create-terminal-column';
import { RoutingRulesService } from '../services/routing-rules';
import { RoutingRulesetService } from './routing-ruleset.service';
@@ -60,95 +60,114 @@ export class RoutingRulesetComponent {
candidates$ = this.routingRulesetService.ruleset$.pipe(map((r) => r.data.decisions.candidates));
isLoading$ = this.domainStoreService.isLoading$;
columns: Column[] = [
- { field: 'priority', sortable: true },
+ { field: 'priority' },
{
field: 'candidate',
- description: 'description',
- sortable: true,
- formatter: (d) => this.getCandidateIdx(d).pipe(map((idx) => `#${idx + 1}`)),
- click: (d) => {
- combineLatest([this.getCandidateIdx(d), this.routingRulesetService.ruleset$])
- .pipe(takeUntilDestroyed(this.destroyRef))
- .subscribe(([idx, ruleset]) => {
- this.sidenavInfoService.toggle(CandidateCardComponent, {
- idx,
- ref: ruleset.ref,
- });
- });
- },
+ cell: (d) =>
+ this.getCandidateIdx(d).pipe(
+ map((idx) => ({
+ value: `#${idx + 1}`,
+ description: d.description,
+ click: () => {
+ this.routingRulesetService.ruleset$
+ .pipe(first())
+ .subscribe((ruleset) => {
+ this.sidenavInfoService.toggle(CandidateCardComponent, {
+ idx,
+ ref: ruleset.ref,
+ });
+ });
+ },
+ })),
+ ),
},
- createTerminalColumn((d) => d.terminal.id),
- createPredicateColumn('global_allow', (d) =>
- combineLatest([
- this.domainStoreService.getObjects('terminal'),
- this.routingRulesType$,
- ]).pipe(
- map(([terminals, type]) => {
- const terms = terminals.find((t) => t.ref.id === d.terminal.id).data?.terms;
- return type === RoutingRulesType.Payment
- ? terms?.payments?.global_allow
- : terms?.wallet?.withdrawals?.global_allow;
- }),
- ),
- ),
- createPredicateColumn('allowed', (d) => d.allowed, {
- click: (d) => {
- this.getCandidateIdx(d)
- .pipe(takeUntilDestroyed(this.destroyRef))
- .subscribe((idx) => {
- void this.toggleAllow(idx);
- });
- },
+ createDomainObjectColumn((d) => ({ ref: { terminal: d.terminal } }), {
+ header: 'Terminal',
}),
- { field: 'weight', sortable: true },
- {
- field: 'pin',
- formatter: (d) => JSON.stringify(toJson(d.pin?.features)),
- hide: true,
- },
- createOperationColumn([
- {
- label: 'Edit',
- click: (d) => {
- this.getCandidateIdx(d)
- .pipe(takeUntilDestroyed(this.destroyRef))
- .subscribe((idx) => {
- this.editRule(idx);
- });
- },
- },
- {
- label: 'Duplicate',
- click: (d) => {
- this.getCandidateIdx(d)
- .pipe(takeUntilDestroyed(this.destroyRef))
- .subscribe((idx) => {
- void this.duplicateRule(idx);
- });
- },
- },
- {
- label: (d) => (togglePredicate(d.allowed).prevAllowed ? 'Deny' : 'Allow'),
- click: (d) => {
+ createPredicateColumn(
+ (d) =>
+ combineLatest([
+ this.domainStoreService.getObjects('terminal'),
+ this.routingRulesType$,
+ ]).pipe(
+ map(([terminals, type]) => {
+ const terms = terminals.find((t) => t.ref.id === d.terminal.id).data?.terms;
+ return {
+ predicate:
+ type === RoutingRulesType.Payment
+ ? terms?.payments?.global_allow
+ : terms?.wallet?.withdrawals?.global_allow,
+ };
+ }),
+ ),
+ { header: 'Global Allow' },
+ ),
+ createPredicateColumn((d) => ({ predicate: d.allowed }), {
+ header: 'Allowed',
+ cell: (d) => ({
+ click: () => {
this.getCandidateIdx(d)
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((idx) => {
void this.toggleAllow(idx);
});
},
- },
- {
- label: 'Remove',
- click: (d) => {
- this.getCandidateIdx(d)
- .pipe(takeUntilDestroyed(this.destroyRef))
- .subscribe((idx) => {
- void this.removeRule(idx);
- });
+ }),
+ }),
+ { field: 'weight' },
+ {
+ field: 'pin',
+ cell: (d) => ({
+ value: JSON.stringify(toJson(d.pin?.features)),
+ }),
+ hidden: true,
+ },
+ createMenuColumn((d) => ({
+ items: [
+ {
+ label: 'Edit',
+ click: () => {
+ this.getCandidateIdx(d)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe((idx) => {
+ this.editRule(idx);
+ });
+ },
},
- },
- ]),
+ {
+ label: 'Duplicate',
+ click: () => {
+ this.getCandidateIdx(d)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe((idx) => {
+ void this.duplicateRule(idx);
+ });
+ },
+ },
+ {
+ label: togglePredicate(d.allowed).prevAllowed ? 'Deny' : 'Allow',
+ click: () => {
+ this.getCandidateIdx(d)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe((idx) => {
+ void this.toggleAllow(idx);
+ });
+ },
+ },
+ {
+ label: 'Remove',
+ click: () => {
+ this.getCandidateIdx(d)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe((idx) => {
+ void this.removeRule(idx);
+ });
+ },
+ },
+ ],
+ })),
];
+ sort: Sort = { active: 'priority', direction: 'desc' };
constructor(
private dialog: DialogService,
diff --git a/src/app/sections/search-parties/search-parties.component.html b/src/app/sections/search-parties/search-parties.component.html
index d22a457d..a9b12f36 100644
--- a/src/app/sections/search-parties/search-parties.component.html
+++ b/src/app/sections/search-parties/search-parties.component.html
@@ -1,11 +1,11 @@
-
+
diff --git a/src/app/sections/search-parties/search-parties.component.ts b/src/app/sections/search-parties/search-parties.component.ts
index 284541ef..f590f8ff 100644
--- a/src/app/sections/search-parties/search-parties.component.ts
+++ b/src/app/sections/search-parties/search-parties.component.ts
@@ -1,7 +1,13 @@
import { Component } from '@angular/core';
import { Router } from '@angular/router';
import { Party } from '@vality/deanonimus-proto/deanonimus';
-import { Column, createOperationColumn, QueryParamsService, UpdateOptions } from '@vality/ng-core';
+import {
+ Column,
+ createMenuColumn,
+ DebounceTime,
+ QueryParamsService,
+ UpdateOptions,
+} from '@vality/ng-core';
import { getUnionKey } from '@vality/ng-thrift';
import startCase from 'lodash-es/startCase';
import { map } from 'rxjs/operators';
@@ -21,44 +27,44 @@ export class SearchPartiesComponent {
{ field: 'id' },
{
field: 'email',
- link: (party) => `/party/${party.id}`,
+ cell: (party) => ({ link: () => `/party/${party.id}` }),
},
{
field: 'blocking',
- type: 'tag',
- formatter: (party) => getUnionKey(party.blocking),
- typeParameters: {
- label: (party) => startCase(getUnionKey(party.blocking)),
- tags: {
- blocked: { color: 'warn' },
- unblocked: { color: 'success' },
- },
- },
+ cell: (party) => ({
+ value: startCase(getUnionKey(party.blocking)),
+ color: (
+ {
+ blocked: 'warn',
+ unblocked: 'success',
+ } as const
+ )[getUnionKey(party.blocking)],
+ }),
},
{
field: 'suspension',
- type: 'tag',
- formatter: (party) => getUnionKey(party.suspension),
- typeParameters: {
- label: (party) => startCase(getUnionKey(party.suspension)),
- tags: {
- suspended: { color: 'warn' },
- active: { color: 'success' },
- },
- },
+ cell: (party) => ({
+ value: startCase(getUnionKey(party.suspension)),
+ color: (
+ {
+ suspended: 'warn',
+ active: 'success',
+ } as const
+ )[getUnionKey(party.suspension)],
+ }),
},
{
field: 'shops',
- formatter: (party) => party.shops.size,
+ cell: (party) => ({ value: party.shops.size }),
},
- createOperationColumn([
- {
- label: 'Details',
- click: (party) => {
- this.router.navigate([`/party/${party.id}`]);
+ createMenuColumn((party) => ({
+ items: [
+ {
+ label: 'Details',
+ click: () => this.router.navigate([`/party/${party.id}`]),
},
- },
- ]),
+ ],
+ })),
];
constructor(
@@ -67,6 +73,7 @@ export class SearchPartiesComponent {
private router: Router,
) {}
+ @DebounceTime()
searchParamsUpdated(filter: string) {
void this.qp.set({ text: filter });
this.fetchPartiesService.load(filter);
diff --git a/src/app/sections/shops/shops.component.ts b/src/app/sections/shops/shops.component.ts
index 4d0f4642..94e1d4b9 100644
--- a/src/app/sections/shops/shops.component.ts
+++ b/src/app/sections/shops/shops.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { SearchShopHit } from '@vality/deanonimus-proto/deanonimus';
-import { Column, progressTo, NotifyLogService } from '@vality/ng-core';
+import { progressTo, NotifyLogService } from '@vality/ng-core';
import { BehaviorSubject, defer, of, combineLatest, Subject, Observable } from 'rxjs';
import {
switchMap,
@@ -43,7 +43,6 @@ export class ShopsComponent {
),
shareReplay({ refCount: true, bufferSize: 1 }),
);
- columns: Column[] = [{ field: 'shop.details.name', description: 'shop.id' }];
progress$ = new BehaviorSubject(0);
private updateShops$ = new BehaviorSubject(undefined);
diff --git a/src/app/sections/sources/sources.component.html b/src/app/sections/sources/sources.component.html
index 3b6172bf..5b8fde7e 100644
--- a/src/app/sections/sources/sources.component.html
+++ b/src/app/sections/sources/sources.component.html
@@ -2,11 +2,10 @@
-
+ >
diff --git a/src/app/sections/sources/sources.component.ts b/src/app/sections/sources/sources.component.ts
index 5247fe0b..30f13b2a 100644
--- a/src/app/sections/sources/sources.component.ts
+++ b/src/app/sections/sources/sources.component.ts
@@ -1,7 +1,6 @@
import { Component } from '@angular/core';
-import { Sort } from '@angular/material/sort';
import { Source } from '@vality/fistful-proto/internal/source';
-import { DialogService, Column2 } from '@vality/ng-core';
+import { DialogService, Column } from '@vality/ng-core';
import { CreateSourceComponent } from './create-source/create-source.component';
import { FetchSourcesService } from './fetch-sources.service';
@@ -12,14 +11,13 @@ import { FetchSourcesService } from './fetch-sources.service';
export class SourcesComponent {
sources$ = this.fetchSourcesService.sources$;
progress$ = this.fetchSourcesService.progress$;
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'id' },
{ field: 'name' },
{ field: 'identity' },
{ field: 'currency_symbolic_code' },
{ field: 'created_at', cell: { type: 'datetime' } },
];
- sort: Sort = { direction: 'asc', active: 'name' };
constructor(
private fetchSourcesService: FetchSourcesService,
diff --git a/src/app/sections/terminals/terminals.component.html b/src/app/sections/terminals/terminals.component.html
index 2562b4d1..f7ab5464 100644
--- a/src/app/sections/terminals/terminals.component.html
+++ b/src/app/sections/terminals/terminals.component.html
@@ -2,13 +2,12 @@
-
+ >
diff --git a/src/app/sections/terminals/terminals.component.ts b/src/app/sections/terminals/terminals.component.ts
index ba77117c..bae96408 100644
--- a/src/app/sections/terminals/terminals.component.ts
+++ b/src/app/sections/terminals/terminals.component.ts
@@ -1,9 +1,14 @@
import { Component } from '@angular/core';
-import { Sort } from '@angular/material/sort';
import { TerminalObject } from '@vality/domain-proto/domain';
-import { DialogService, Column2 } from '@vality/ng-core';
+import { DialogService, Column } from '@vality/ng-core';
import { map } from 'rxjs/operators';
+import {
+ createCurrencyColumn,
+ createPredicateColumn,
+ createDomainObjectColumn,
+} from '@cc/app/shared';
+
import { DomainStoreService } from '../../api/domain-config';
import { AccountBalancesStoreService } from '../../api/terminal-balance';
import { SidenavInfoService } from '../../shared/components/sidenav-info';
@@ -14,11 +19,6 @@ import {
CreateDomainObjectDialogComponent,
getDomainObjectDetails,
} from '../../shared/components/thrift-api-crud';
-import {
- createCurrencyColumn,
- createPredicateColumn,
- createDomainObjectColumn,
-} from '../../shared/utils/table2';
import { getTerminalShopWalletDelegates } from './utils/get-terminal-shop-wallet-delegates';
@@ -27,7 +27,7 @@ import { getTerminalShopWalletDelegates } from './utils/get-terminal-shop-wallet
templateUrl: './terminals.component.html',
})
export class TerminalsComponent {
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'ref.id', sticky: 'start' },
{
field: 'data.name',
@@ -112,7 +112,6 @@ export class TerminalsComponent {
];
data$ = this.domainStoreService.getObjects('terminal');
progress$ = this.domainStoreService.isLoading$;
- sort: Sort = { active: 'data.name', direction: 'asc' };
constructor(
private domainStoreService: DomainStoreService,
diff --git a/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.html b/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.html
index b97857bd..4c475150 100644
--- a/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.html
+++ b/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.html
@@ -1,3 +1,3 @@
-
+
diff --git a/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.ts b/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.ts
index f2d4aebc..a7650cd8 100644
--- a/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.ts
+++ b/src/app/sections/terms/components/shops-term-set-history-card/shops-term-set-history-card.component.ts
@@ -1,12 +1,13 @@
import { CommonModule } from '@angular/common';
import { Component, input, computed } from '@angular/core';
import { MatTooltip } from '@angular/material/tooltip';
-import { TableModule, VSelectPipe, Column2 } from '@vality/ng-core';
+import { TableModule, VSelectPipe, Column } from '@vality/ng-core';
import type { TermSetHistory, ShopTermSet } from '@vality/dominator-proto/internal/dominator';
+import { createDomainObjectColumn } from '@cc/app/shared';
+
import { SidenavInfoModule } from '../../../../shared/components/sidenav-info';
-import { createDomainObjectColumn } from '../../../../shared/utils/table2';
import { getFlatDecisions } from '../../utils/get-flat-decisions';
import {
getShopCashFlowSelectors,
@@ -36,7 +37,7 @@ export class ShopsTermSetHistoryCardComponent {
})),
);
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'applied_at', cell: { type: 'datetime' } },
createDomainObjectColumn((d) => ({ ref: { term_set_hierarchy: d?.term_set?.ref } }), {
header: 'Term Set',
diff --git a/src/app/sections/terms/components/shops-terms/shops-terms.component.html b/src/app/sections/terms/components/shops-terms/shops-terms.component.html
index 23d603a9..a3d5a18b 100644
--- a/src/app/sections/terms/components/shops-terms/shops-terms.component.html
+++ b/src/app/sections/terms/components/shops-terms/shops-terms.component.html
@@ -16,7 +16,7 @@
-
+ >
diff --git a/src/app/sections/terms/components/shops-terms/shops-terms.component.ts b/src/app/sections/terms/components/shops-terms/shops-terms.component.ts
index db90a62f..6c0ad44e 100644
--- a/src/app/sections/terms/components/shops-terms/shops-terms.component.ts
+++ b/src/app/sections/terms/components/shops-terms/shops-terms.component.ts
@@ -23,24 +23,24 @@ import {
TableModule,
UpdateOptions,
VSelectPipe,
- Column2,
+ Column,
cachedHeadMap,
} from '@vality/ng-core';
import { map, shareReplay } from 'rxjs/operators';
import { Overwrite } from 'utility-types';
+import {
+ createShopColumn,
+ createPartyColumn,
+ createContractColumn,
+ createDomainObjectColumn,
+} from '@cc/app/shared';
import { CurrencyFieldComponent } from '@cc/app/shared/components/currency-field';
import { MerchantFieldModule } from '@cc/app/shared/components/merchant-field';
import { SidenavInfoService } from '@cc/app/shared/components/sidenav-info';
import { DEBOUNCE_TIME_MS } from '@cc/app/tokens';
import { PageLayoutModule, ShopFieldModule } from '../../../../shared';
-import {
- createShopColumn,
- createPartyColumn,
- createContractColumn,
- createDomainObjectColumn,
-} from '../../../../shared/utils/table2';
import { getFlatDecisions, FlatDecision } from '../../utils/get-flat-decisions';
import { ShopsTermSetHistoryCardComponent } from '../shops-term-set-history-card';
@@ -101,7 +101,7 @@ export class ShopsTermsComponent implements OnInit {
);
hasMore$ = this.shopsTermsService.hasMore$;
isLoading$ = this.shopsTermsService.isLoading$;
- columns: Column2[] = [
+ columns: Column[] = [
createShopColumn(
(d) => ({
shopId: d.shop_id,
diff --git a/src/app/sections/terms/components/shops-terms/utils/shop-fees-columns.ts b/src/app/sections/terms/components/shops-terms/utils/shop-fees-columns.ts
index 92c3d1c1..a5cdb46c 100644
--- a/src/app/sections/terms/components/shops-terms/utils/shop-fees-columns.ts
+++ b/src/app/sections/terms/components/shops-terms/utils/shop-fees-columns.ts
@@ -5,7 +5,7 @@ import {
ShopID,
TermSetHierarchyObject,
} from '@vality/domain-proto/internal/domain';
-import { Column2 } from '@vality/ng-core';
+import { Column } from '@vality/ng-core';
import { formatCashVolumes } from '../../../../../shared';
import { createFeesColumns } from '../../../utils/create-fees-columns';
@@ -57,4 +57,4 @@ export const SHOP_FEES_COLUMNS = [
}),
},
BASE_SHOP_FEES_COLUMNS.at(-1),
-] satisfies Column2[];
+] satisfies Column[];
diff --git a/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.html b/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.html
index b97857bd..4c475150 100644
--- a/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.html
+++ b/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.html
@@ -1,3 +1,3 @@
-
+
diff --git a/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.ts b/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.ts
index fdfa34df..44045177 100644
--- a/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.ts
+++ b/src/app/sections/terms/components/terminals-term-set-history-card/terminals-term-set-history-card.component.ts
@@ -1,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { Component, input, computed } from '@angular/core';
import { MatTooltip } from '@angular/material/tooltip';
-import { TableModule, VSelectPipe, Column2 } from '@vality/ng-core';
+import { TableModule, VSelectPipe, Column } from '@vality/ng-core';
import type {
TerminalTermSet,
@@ -29,7 +29,7 @@ export class TerminalsTermSetHistoryCardComponent {
),
);
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'applied_at', cell: { type: 'datetime' } },
...TERMINAL_FEES_COLUMNS,
];
diff --git a/src/app/sections/terms/components/terminals-terms/terminals-terms.component.html b/src/app/sections/terms/components/terminals-terms/terminals-terms.component.html
index 5728ead4..a21e21e6 100644
--- a/src/app/sections/terms/components/terminals-terms/terminals-terms.component.html
+++ b/src/app/sections/terms/components/terminals-terms/terminals-terms.component.html
@@ -10,12 +10,12 @@
-
+ >
diff --git a/src/app/sections/terms/components/terminals-terms/terminals-terms.component.ts b/src/app/sections/terms/components/terminals-terms/terminals-terms.component.ts
index c2f8ac8a..32d6abce 100644
--- a/src/app/sections/terms/components/terminals-terms/terminals-terms.component.ts
+++ b/src/app/sections/terms/components/terminals-terms/terminals-terms.component.ts
@@ -10,7 +10,7 @@ import {
} from '@vality/dominator-proto/internal/dominator';
import {
clean,
- Column2,
+ Column,
countChanged,
createControls,
debounceTimeWithFirst,
@@ -30,10 +30,9 @@ import { Overwrite } from 'utility-types';
import type { ProviderRef, TerminalRef } from '@vality/dominator-proto/internal/proto/domain';
-import { PageLayoutModule } from '@cc/app/shared';
+import { PageLayoutModule, createDomainObjectColumn } from '@cc/app/shared';
import { CurrencyFieldComponent } from '@cc/app/shared/components/currency-field';
import { MerchantFieldModule } from '@cc/app/shared/components/merchant-field';
-import { createDomainObjectColumn } from '@cc/app/shared/utils/table2/create-domain-object-column';
import { DEBOUNCE_TIME_MS } from '@cc/app/tokens';
import { SidenavInfoService } from '../../../../shared/components/sidenav-info';
@@ -80,7 +79,7 @@ export class TerminalsTermsComponent implements OnInit {
);
hasMore$ = this.terminalsTermsService.hasMore$;
isLoading$ = this.terminalsTermsService.isLoading$;
- columns: Column2[] = [
+ columns: Column[] = [
createDomainObjectColumn((d) => ({ ref: { terminal: d.terminal_id } }), {
header: 'Terminal',
sticky: 'start',
diff --git a/src/app/sections/terms/components/terminals-terms/utils/terminal-fees-columns.ts b/src/app/sections/terms/components/terminals-terms/utils/terminal-fees-columns.ts
index e3d84958..2edc30de 100644
--- a/src/app/sections/terms/components/terminals-terms/utils/terminal-fees-columns.ts
+++ b/src/app/sections/terms/components/terminals-terms/utils/terminal-fees-columns.ts
@@ -1,5 +1,5 @@
import { ProvisionTermSet, CashFlowPosting } from '@vality/domain-proto/internal/domain';
-import { Column2, TreeDataItem } from '@vality/ng-core';
+import { Column, TreeDataItem } from '@vality/ng-core';
import { createFeesColumns } from '../../../utils/create-fees-columns';
import { FlatDecision, getFlatDecisions } from '../../../utils/get-flat-decisions';
@@ -55,4 +55,4 @@ export const TERMINAL_FEES_COLUMNS = [
feeFilter: isWithdrawalFee,
selectFlatDecision: (d) => d.withdrawal,
}),
-] satisfies Column2[];
+] satisfies Column[];
diff --git a/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.html b/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.html
index b97857bd..4c475150 100644
--- a/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.html
+++ b/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.html
@@ -1,3 +1,3 @@
-
+
diff --git a/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.ts b/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.ts
index ce88631b..ac27ccc7 100644
--- a/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.ts
+++ b/src/app/sections/terms/components/wallets-term-set-history-card/wallets-term-set-history-card.component.ts
@@ -1,12 +1,13 @@
import { CommonModule } from '@angular/common';
import { Component, input, computed } from '@angular/core';
import { MatTooltip } from '@angular/material/tooltip';
-import { TableModule, VSelectPipe, Column2 } from '@vality/ng-core';
+import { TableModule, VSelectPipe, Column } from '@vality/ng-core';
import type { TermSetHistory, WalletTermSet } from '@vality/dominator-proto/internal/dominator';
+import { createDomainObjectColumn } from '@cc/app/shared';
+
import { SidenavInfoModule } from '../../../../shared/components/sidenav-info';
-import { createDomainObjectColumn } from '../../../../shared/utils/table2';
import { getFlatDecisions } from '../../utils/get-flat-decisions';
import {
WALLET_FEES_COLUMNS,
@@ -36,7 +37,7 @@ export class WalletsTermSetHistoryCardComponent {
})),
);
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'applied_at', cell: { type: 'datetime' } },
createDomainObjectColumn((d) => ({ ref: { term_set_hierarchy: d?.term_set?.ref } }), {
header: 'Term Set',
diff --git a/src/app/sections/terms/components/wallets-terms/wallets-terms.component.html b/src/app/sections/terms/components/wallets-terms/wallets-terms.component.html
index 924047af..ed2d2dc7 100644
--- a/src/app/sections/terms/components/wallets-terms/wallets-terms.component.html
+++ b/src/app/sections/terms/components/wallets-terms/wallets-terms.component.html
@@ -13,7 +13,7 @@
-
+ >
diff --git a/src/app/sections/terms/components/wallets-terms/wallets-terms.component.ts b/src/app/sections/terms/components/wallets-terms/wallets-terms.component.ts
index d4b4df59..de95127c 100644
--- a/src/app/sections/terms/components/wallets-terms/wallets-terms.component.ts
+++ b/src/app/sections/terms/components/wallets-terms/wallets-terms.component.ts
@@ -26,21 +26,22 @@ import {
TableModule,
UpdateOptions,
VSelectPipe,
- Column2,
+ Column,
cachedHeadMap,
} from '@vality/ng-core';
import { map, shareReplay } from 'rxjs/operators';
import { Overwrite } from 'utility-types';
-import { PageLayoutModule, WalletFieldModule } from '@cc/app/shared';
-import { CurrencyFieldComponent } from '@cc/app/shared/components/currency-field';
-import { MerchantFieldModule } from '@cc/app/shared/components/merchant-field';
-import { SidenavInfoService } from '@cc/app/shared/components/sidenav-info';
import {
+ PageLayoutModule,
+ WalletFieldModule,
createDomainObjectColumn,
createPartyColumn,
createWalletColumn,
-} from '@cc/app/shared/utils/table2';
+} from '@cc/app/shared';
+import { CurrencyFieldComponent } from '@cc/app/shared/components/currency-field';
+import { MerchantFieldModule } from '@cc/app/shared/components/merchant-field';
+import { SidenavInfoService } from '@cc/app/shared/components/sidenav-info';
import { DEBOUNCE_TIME_MS } from '@cc/app/tokens';
import { FlatDecision, getFlatDecisions } from '../../utils/get-flat-decisions';
@@ -104,7 +105,7 @@ export class WalletsTermsComponent implements OnInit {
);
hasMore$ = this.walletsTermsService.hasMore$;
isLoading$ = this.walletsTermsService.isLoading$;
- columns: Column2[] = [
+ columns: Column[] = [
createWalletColumn((d) => ({ id: d.wallet_id, name: d.wallet_name, partyId: d.owner_id }), {
sticky: 'start',
}),
diff --git a/src/app/sections/terms/utils/create-fees-columns.ts b/src/app/sections/terms/utils/create-fees-columns.ts
index cf6dd90d..eafa154a 100644
--- a/src/app/sections/terms/utils/create-fees-columns.ts
+++ b/src/app/sections/terms/utils/create-fees-columns.ts
@@ -1,5 +1,5 @@
import { CashFlowPosting } from '@vality/domain-proto/internal/domain';
-import { Column2 } from '@vality/ng-core';
+import { Column } from '@vality/ng-core';
import { getCashVolumeParts, formatCashVolumes } from '../../../shared';
@@ -20,7 +20,7 @@ export function createFeesColumns({
conditionLabel?: string;
feeFilter?: (v: CashFlowPosting) => boolean;
otherFilter?: (v: CashFlowPosting) => boolean;
-} = {}): Column2[] {
+} = {}): Column[] {
function getFeeCashVolumeParts(d: T) {
const decision = selectFlatDecision(d);
return decision
diff --git a/src/app/sections/wallets/wallets.component.html b/src/app/sections/wallets/wallets.component.html
index a25fe3de..36014f70 100644
--- a/src/app/sections/wallets/wallets.component.html
+++ b/src/app/sections/wallets/wallets.component.html
@@ -29,7 +29,7 @@
}
@if (isFilterTable$ | async) {
-
+ >
} @else {
-
+ >
}
diff --git a/src/app/sections/wallets/wallets.component.ts b/src/app/sections/wallets/wallets.component.ts
index 5b1a3ed5..642dcbab 100644
--- a/src/app/sections/wallets/wallets.component.ts
+++ b/src/app/sections/wallets/wallets.component.ts
@@ -13,7 +13,7 @@ import {
getValueChanges,
countChanged,
debounceTimeWithFirst,
- Column2,
+ Column,
DebounceTime,
} from '@vality/ng-core';
import isNil from 'lodash-es/isNil';
@@ -23,9 +23,9 @@ import { MemoizeExpiring } from 'typescript-memoize';
import { WalletParams } from '@cc/app/api/fistful-stat/query-dsl/types/wallet';
import { ManagementService } from '@cc/app/api/wallet';
+import { createCurrencyColumn, createPartyColumn } from '@cc/app/shared';
import { IdentityManagementService } from '../../api/identity';
-import { createCurrencyColumn, createPartyColumn } from '../../shared/utils/table2';
import { DEBOUNCE_TIME_MS } from '../../tokens';
import { PartyStoreService } from '../party';
@@ -47,7 +47,7 @@ export class WalletsComponent implements OnInit {
fullTextSearchWallets$ = this.fetchWalletsTextService.result$;
fullTextSearchLoading$ = this.fetchWalletsTextService.isLoading$;
- filterColumns: Column2[] = [
+ filterColumns: Column[] = [
{ field: 'id' },
{ field: 'name' },
{ field: 'currency_symbolic_code' },
@@ -92,7 +92,7 @@ export class WalletsComponent implements OnInit {
{ hidden: this.partyStoreService.party$.pipe(map((p) => !p)) },
),
];
- fullTextSearchColumns: Column2[] = [
+ fullTextSearchColumns: Column[] = [
{ field: 'wallet.id' },
{ field: 'wallet.name' },
createPartyColumn((d) => ({
diff --git a/src/app/sections/withdrawals/withdrawals.component.html b/src/app/sections/withdrawals/withdrawals.component.html
index 06b72c0a..7d3eb6be 100644
--- a/src/app/sections/withdrawals/withdrawals.component.html
+++ b/src/app/sections/withdrawals/withdrawals.component.html
@@ -24,7 +24,7 @@
-
-
+
diff --git a/src/app/sections/withdrawals/withdrawals.component.ts b/src/app/sections/withdrawals/withdrawals.component.ts
index 9d14a74c..948b8e81 100644
--- a/src/app/sections/withdrawals/withdrawals.component.ts
+++ b/src/app/sections/withdrawals/withdrawals.component.ts
@@ -17,7 +17,7 @@ import {
getValueChanges,
countChanged,
debounceTimeWithFirst,
- Column2,
+ Column,
} from '@vality/ng-core';
import { getUnionKey } from '@vality/ng-thrift';
import { endOfDay } from 'date-fns';
@@ -25,10 +25,10 @@ import startCase from 'lodash-es/startCase';
import { map, shareReplay } from 'rxjs/operators';
import { WithdrawalParams } from '@cc/app/api/fistful-stat';
+import { createDomainObjectColumn, createCurrencyColumn } from '@cc/app/shared';
import { createFailureColumn } from '../../shared';
import { FailMachinesDialogComponent, Type } from '../../shared/components/fail-machines-dialog';
-import { createDomainObjectColumn, createCurrencyColumn } from '../../shared/utils/table2';
import { DATE_RANGE_DAYS, DEBOUNCE_TIME_MS } from '../../tokens';
import { CreateAdjustmentDialogComponent } from './components/create-adjustment-dialog/create-adjustment-dialog.component';
@@ -70,7 +70,7 @@ export class WithdrawalsComponent implements OnInit {
withdrawals$ = this.fetchWithdrawalsService.result$;
inProgress$ = this.fetchWithdrawalsService.isLoading$;
hasMore$ = this.fetchWithdrawalsService.hasMore$;
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'id', sticky: 'start' },
{ field: 'external_id' },
{ field: 'created_at', cell: { type: 'datetime' } },
diff --git a/src/app/shared/components/chargebacks-table/chargebacks-table.component.html b/src/app/shared/components/chargebacks-table/chargebacks-table.component.html
index a9686268..ec248477 100644
--- a/src/app/shared/components/chargebacks-table/chargebacks-table.component.html
+++ b/src/app/shared/components/chargebacks-table/chargebacks-table.component.html
@@ -1,4 +1,4 @@
-
-
+
diff --git a/src/app/shared/components/chargebacks-table/chargebacks-table.component.ts b/src/app/shared/components/chargebacks-table/chargebacks-table.component.ts
index 0d8c8074..1e92f7ac 100644
--- a/src/app/shared/components/chargebacks-table/chargebacks-table.component.ts
+++ b/src/app/shared/components/chargebacks-table/chargebacks-table.component.ts
@@ -14,7 +14,7 @@ import { MatButtonModule } from '@angular/material/button';
import { StatChargeback } from '@vality/magista-proto/magista';
import {
LoadOptions,
- Column2,
+ Column,
TableModule,
DialogService,
createMenuColumn,
@@ -24,7 +24,8 @@ import { getUnionKey } from '@vality/ng-thrift';
import startCase from 'lodash-es/startCase';
import { filter } from 'rxjs';
-import { createCurrencyColumn, createPartyColumn, createShopColumn } from '../../utils/table2';
+import { createCurrencyColumn, createPartyColumn, createShopColumn } from '@cc/app/shared';
+
import { ChangeChargebacksStatusDialogComponent } from '../change-chargebacks-status-dialog';
@Component({
@@ -44,7 +45,7 @@ export class ChargebacksTableComponent {
@Output() update = new EventEmitter();
@Output() more = new EventEmitter();
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'chargeback_id', header: 'Id' },
{
field: 'chargeback_reason',
diff --git a/src/app/shared/components/shops-table/shops-table.component.html b/src/app/shared/components/shops-table/shops-table.component.html
index d9d63eb2..2f2de2d1 100644
--- a/src/app/shared/components/shops-table/shops-table.component.html
+++ b/src/app/shared/components/shops-table/shops-table.component.html
@@ -1,5 +1,4 @@
-
+>
diff --git a/src/app/shared/components/shops-table/shops-table.component.ts b/src/app/shared/components/shops-table/shops-table.component.ts
index ff7dd6af..193f078b 100644
--- a/src/app/shared/components/shops-table/shops-table.component.ts
+++ b/src/app/shared/components/shops-table/shops-table.component.ts
@@ -10,7 +10,6 @@ import {
} from '@angular/core';
import { toObservable } from '@angular/core/rxjs-interop';
import { MatCardModule } from '@angular/material/card';
-import { Sort } from '@angular/material/sort';
import { Router } from '@angular/router';
import { Shop, Party, PartyID, RoutingRulesetRef } from '@vality/domain-proto/domain';
import {
@@ -20,7 +19,7 @@ import {
NotifyLogService,
ConfirmDialogComponent,
DialogResponseStatus,
- Column2,
+ Column,
createMenuColumn,
} from '@vality/ng-core';
import { getUnionKey } from '@vality/ng-thrift';
@@ -30,6 +29,8 @@ import { map, switchMap, combineLatest, of } from 'rxjs';
import { filter, shareReplay, startWith, take, first } from 'rxjs/operators';
import { MemoizeExpiring } from 'typescript-memoize';
+import { createPartyColumn } from '@cc/app/shared';
+
import { DomainStoreService } from '../../../api/domain-config';
import { PartyManagementService } from '../../../api/payment-processing';
import {
@@ -37,7 +38,6 @@ import {
DelegateWithPaymentInstitution,
} from '../../../sections/routing-rules/party-delegate-rulesets';
import { RoutingRulesType } from '../../../sections/routing-rules/types/routing-rules-type';
-import { createPartyColumn } from '../../utils/table2';
import { ShopCardComponent } from '../shop-card/shop-card.component';
import { ShopContractCardComponent } from '../shop-contract-card/shop-contract-card.component';
import { SidenavInfoService } from '../sidenav-info';
@@ -76,7 +76,7 @@ export class ShopsTableComponent {
noPartyColumn = input(false, { transform: booleanAttribute });
- columns: Column2[] = [
+ columns: Column[] = [
{
field: 'shop.id',
},
@@ -201,7 +201,6 @@ export class ShopsTableComponent {
),
),
];
- sort: Sort = { active: 'shop.details.name', direction: 'asc' };
constructor(
private sidenavInfoService: SidenavInfoService,
diff --git a/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.html b/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.html
index d199ebf7..5f7ec7b5 100644
--- a/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.html
+++ b/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.html
@@ -1,3 +1,3 @@
-
+
diff --git a/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.ts b/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.ts
index f3c3a620..3f8a6bdc 100644
--- a/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.ts
+++ b/src/app/shared/components/terminal-balances-card/terminal-balances-card.component.ts
@@ -1,14 +1,14 @@
import { CommonModule } from '@angular/common';
import { Component, input } from '@angular/core';
import { toObservable } from '@angular/core/rxjs-interop';
-import { Sort } from '@angular/material/sort';
-import { TableModule, Column2 } from '@vality/ng-core';
+import { TableModule, Column } from '@vality/ng-core';
import { AccountBalance } from '@vality/scrooge-proto/internal/account_balance';
import { combineLatest } from 'rxjs';
import { switchMap, shareReplay } from 'rxjs/operators';
+import { createCurrencyColumn } from '@cc/app/shared';
+
import { AccountBalancesStoreService } from '../../../api/terminal-balance';
-import { createCurrencyColumn } from '../../utils/table2';
import { CardComponent } from '../sidenav-info/components/card/card.component';
import { DomainThriftViewerComponent } from '../thrift-api-crud';
@@ -21,7 +21,7 @@ import { DomainThriftViewerComponent } from '../thrift-api-crud';
export class TerminalBalancesCardComponent {
terminalId = input();
providerId = input();
- columns: Column2[] = [
+ columns: Column[] = [
{ field: 'account_id' },
createCurrencyColumn((d) => ({ code: d.balance.currency_code, amount: d.balance.amount }), {
header: 'Balance',
@@ -35,7 +35,6 @@ export class TerminalBalancesCardComponent {
),
shareReplay({ refCount: true, bufferSize: 1 }),
);
- sort: Sort = { active: 'account_id', direction: 'asc' };
constructor(private accountBalancesStoreService: AccountBalancesStoreService) {}
}
diff --git a/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts b/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts
index 07bf3d24..01c9d2c8 100644
--- a/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts
+++ b/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts
@@ -7,13 +7,14 @@ import startCase from 'lodash-es/startCase';
import { ReplaySubject, defer, switchMap } from 'rxjs';
import { map, shareReplay } from 'rxjs/operators';
+import { createPartyColumn, createPredicateColumn } from '@cc/app/shared';
+
import { DomainStoreService } from '../../../api/domain-config';
import { PartiesStoreService } from '../../../api/payment-processing';
import {
getTerminalShopWalletDelegates,
TerminalShopWalletDelegate,
} from '../../../sections/terminals/utils/get-terminal-shop-wallet-delegates';
-import { createPredicateColumn } from '../../utils';
import { SidenavInfoService } from '../sidenav-info';
import { CardComponent } from '../sidenav-info/components/card/card.component';
import { DomainThriftViewerComponent, DomainObjectCardComponent } from '../thrift-api-crud';
@@ -32,72 +33,69 @@ export class TerminalDelegatesCardComponent implements OnChanges {
{
header: 'Routing Rule',
field: 'terminalRule.data.name',
- description: 'terminalRule.ref.id',
- click: (d) => {
- this.sidenavInfoService.toggle(DomainObjectCardComponent, {
- ref: { routing_rules: { id: d.terminalRule.ref.id } },
- });
- },
+ cell: (d) => ({
+ description: d.terminalRule.ref.id,
+ click: () => {
+ this.sidenavInfoService.toggle(DomainObjectCardComponent, {
+ ref: { routing_rules: { id: d.terminalRule.ref.id } },
+ });
+ },
+ }),
},
{
header: 'Ruleset',
field: 'rule.data.name',
- description: 'rule.ref.id',
- click: (d) => {
- this.sidenavInfoService.toggle(DomainObjectCardComponent, {
- ref: { routing_rules: { id: d.rule.ref.id } },
- });
- },
- },
- createPredicateColumn('allowed', (d) => d.candidates[0].allowed),
- {
- field: 'party',
- formatter: (d) =>
- this.partiesStoreService
- .get(d.delegate.allowed.condition?.party?.id)
- .pipe(map((p) => p.contact_info.registration_email)),
- description: (d) => d.delegate.allowed.condition?.party?.id,
- link: (d) => `/party/${d.delegate.allowed.condition.party.id}`,
+ cell: (d) => ({
+ description: d.rule.ref.id,
+ click: () => {
+ this.sidenavInfoService.toggle(DomainObjectCardComponent, {
+ ref: { routing_rules: { id: d.rule.ref.id } },
+ });
+ },
+ }),
},
+ createPredicateColumn((d) => ({ predicate: d.candidates[0].allowed }), {
+ header: 'Allowed',
+ }),
+ createPartyColumn((d) => ({ id: d.delegate.allowed.condition?.party?.id })),
{
field: 'type',
- formatter: (d) =>
- startCase(
+ cell: (d) => ({
+ value: startCase(
getUnionKey(d.delegate.allowed.condition?.party?.definition).slice(0, -3),
),
+ }),
},
{
field: 'definition',
- formatter: (d) =>
- this.partiesStoreService
- .get(d.delegate.allowed.condition?.party?.id)
- .pipe(
- map(
- (p) =>
- (getUnionKey(d.delegate.allowed.condition?.party?.definition) ===
+ cell: (d) =>
+ this.partiesStoreService.get(d.delegate.allowed.condition?.party?.id).pipe(
+ map((p) => ({
+ value:
+ (getUnionKey(d.delegate.allowed.condition?.party?.definition) ===
+ 'shop_is'
+ ? p.shops.get(
+ getUnionValue(
+ d.delegate.allowed.condition?.party?.definition,
+ ),
+ )?.details?.name
+ : p.wallets.get(
+ getUnionValue(
+ d.delegate.allowed.condition?.party?.definition,
+ ),
+ )?.name) ??
+ `#${getUnionValue(d.delegate.allowed.condition?.party?.definition)}`,
+
+ description: getUnionValue(d.delegate.allowed.condition?.party?.definition),
+ link: () =>
+ `/party/${d.delegate.allowed.condition.party.id}/routing-rules/${
+ getUnionKey(d.delegate.allowed.condition?.party?.definition) ===
'shop_is'
- ? p.shops.get(
- getUnionValue(
- d.delegate.allowed.condition?.party?.definition,
- ),
- )?.details?.name
- : p.wallets.get(
- getUnionValue(
- d.delegate.allowed.condition?.party?.definition,
- ),
- )?.name) ??
- `#${getUnionValue(
- d.delegate.allowed.condition?.party?.definition,
- )}`,
- ),
- ),
- description: (d) => getUnionValue(d.delegate.allowed.condition?.party?.definition),
- link: (d) =>
- `/party/${d.delegate.allowed.condition.party.id}/routing-rules/${
- getUnionKey(d.delegate.allowed.condition?.party?.definition) === 'shop_is'
- ? 'payment'
- : 'withdrawal'
- }/${d.rule.ref.id}/delegate/${d.delegate.ruleset.id}`,
+ ? 'payment'
+ : 'withdrawal'
+ }/${d.rule.ref.id}/delegate/${d.delegate.ruleset.id}`,
+ })),
+ ),
},
];
terminalObj$ = defer(() => this.ref$).pipe(
diff --git a/src/app/shared/utils/table/create-contract-column.ts b/src/app/shared/utils/table/create-contract-column.ts
index 251b17cc..95caf0aa 100644
--- a/src/app/shared/utils/table/create-contract-column.ts
+++ b/src/app/shared/utils/table/create-contract-column.ts
@@ -1,35 +1,18 @@
import { inject } from '@angular/core';
-import { ContractID, PartyID, ShopID } from '@vality/domain-proto/domain';
-import { Column, PossiblyAsync, getPossiblyAsyncObservable } from '@vality/ng-core';
-import { combineLatest } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { createColumn } from '@vality/ng-core';
-import { ShopContractCardComponent } from '../../components/shop-contract-card/shop-contract-card.component';
+import { ContractCardComponent } from '../../components/contract-card/contract-card.component';
import { SidenavInfoService } from '../../components/sidenav-info';
-export function createContractColumn(
- selectContractId: (d: T) => PossiblyAsync,
- selectPartyId: (d: T) => PossiblyAsync,
- selectShopId: (d: T) => PossiblyAsync,
-): Column {
- const sidenavInfoService = inject(SidenavInfoService);
-
- return {
- field: 'contract',
- header: 'Contract',
- formatter: selectContractId,
- click: (d) => {
- combineLatest([
- getPossiblyAsyncObservable(selectPartyId(d)),
- getPossiblyAsyncObservable(selectShopId(d)),
- ])
- .pipe(take(1))
- .subscribe(([partyId, id]) => {
- sidenavInfoService.toggle(ShopContractCardComponent, {
- partyId,
- id,
- });
- });
- },
- };
-}
+export const createContractColumn = createColumn(
+ ({ id, partyId }: { id: string; partyId: string }) => {
+ const sidenavInfoService = inject(SidenavInfoService);
+ return {
+ value: id,
+ click: () => {
+ sidenavInfoService.toggle(ContractCardComponent, { id, partyId });
+ },
+ };
+ },
+ { header: 'Contract' },
+);
diff --git a/src/app/shared/utils/table/create-currency-column.ts b/src/app/shared/utils/table/create-currency-column.ts
index 8be4a215..b89ec7fd 100644
--- a/src/app/shared/utils/table/create-currency-column.ts
+++ b/src/app/shared/utils/table/create-currency-column.ts
@@ -1,95 +1,71 @@
+import { getCurrencySymbol } from '@angular/common';
import { inject, LOCALE_ID } from '@angular/core';
-import {
- CurrencyColumn,
- PossiblyAsync,
- getPossiblyAsyncObservable,
- Column,
- switchCombineWith,
- formatCurrency,
-} from '@vality/ng-core';
-import isNil from 'lodash-es/isNil';
-import { combineLatest, switchMap, of, forkJoin, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { createColumn, formatCurrency } from '@vality/ng-core';
+import { groupBy, uniq } from 'lodash-es';
+import { of, combineLatest } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+import { DomainStoreService } from '../../../api/domain-config';
import { AmountCurrencyService } from '../../services';
-export function createCurrencyColumn(
- field: CurrencyColumn['field'],
- selectAmount: (d: T) => PossiblyAsync,
- selectSymbolicCode: (d: T) => PossiblyAsync,
- params: Partial> = {},
-): CurrencyColumn {
- const amountCurrencyService = inject(AmountCurrencyService);
- return {
- field,
- type: 'currency',
- formatter: (d: T) =>
- combineLatest([
- getPossiblyAsyncObservable(selectAmount(d)),
- getPossiblyAsyncObservable(selectSymbolicCode(d)),
- ]).pipe(
- switchMap(([amount, code]) =>
- isNil(amount) ? of(undefined) : amountCurrencyService.toMajor(amount, code),
- ),
- ),
- typeParameters: {
- currencyCode: (d: T) => getPossiblyAsyncObservable(selectSymbolicCode(d)),
- exponent: (d: T) =>
- getPossiblyAsyncObservable(selectSymbolicCode(d)).pipe(
- switchMap((code) => amountCurrencyService.getCurrency(code)),
- map((c) => c?.exponent),
- ),
- },
- ...params,
- };
+interface CurrencyValue {
+ amount: number;
+ code: string;
}
-export function createCurrenciesColumn(
- field: CurrencyColumn['field'],
- selectAmountSymbolicCode: (d: T) => PossiblyAsync<{ amount: number; symbolicCode: string }[]>,
- params: Partial> = {},
-): Column {
+function formatCurrencyValue(value: CurrencyValue) {
const amountCurrencyService = inject(AmountCurrencyService);
- const localeId = inject(LOCALE_ID);
-
- function getBalancesList(amountCodes$: Observable<{ amount: number; symbolicCode: string }[]>) {
- return amountCodes$.pipe(
- switchCombineWith((amountCodes) =>
- !amountCodes?.length
- ? ([] as Observable[])
- : [
- forkJoin(
- amountCodes.map((a) =>
- amountCurrencyService.toMajor(a.amount, a.symbolicCode),
- ),
- ),
- ],
- ),
- map(([amountCodes, majorAmounts]) =>
- amountCodes
- .map((a, idx) =>
- formatCurrency(
- majorAmounts[idx],
- a.symbolicCode,
- undefined,
- localeId,
- undefined,
- true,
- ),
- )
- .join(' / '),
- ),
- );
- }
-
- const getAmountCodes = (d: T) =>
- getPossiblyAsyncObservable(selectAmountSymbolicCode(d)).pipe(
- map((amountCodes) => (amountCodes || []).sort((a, b) => b.amount - a.amount)),
- );
- return {
- field,
- formatter: (d: T) => getBalancesList(getAmountCodes(d).pipe(map((a) => a?.slice?.(0, 1)))),
- description: (d: T) => getBalancesList(getAmountCodes(d).pipe(map((a) => a?.slice?.(1)))),
- ...params,
- } as Column;
+ const locale = inject(LOCALE_ID);
+ return amountCurrencyService.getCurrency(value.code).pipe(
+ map((currencyObj) =>
+ formatCurrency(value.amount, value.code, 'long', locale, currencyObj?.exponent),
+ ),
+ startWith(
+ (value.amount === 0 ? '0' : '…') +
+ ' ' +
+ getCurrencySymbol(value.code, 'narrow', locale),
+ ),
+ );
}
+
+function formatCurrencyValues(values: CurrencyValue[], separator = ' | ') {
+ return combineLatest(values.map(formatCurrencyValue)).pipe(map((v) => v.join(separator)));
+}
+
+export const createCurrencyColumn = createColumn(
+ (currencyValue: CurrencyValue | { values: CurrencyValue[]; isSum?: boolean }) => {
+ const isSum = 'isSum' in currencyValue ? currencyValue.isSum : false;
+ const currencyValues = ('values' in currencyValue ? currencyValue.values : [currencyValue])
+ .filter(Boolean)
+ .sort((a, b) => b.amount - a.amount);
+ if (!currencyValues?.length) {
+ return of(undefined);
+ }
+ const currencyValuesByCode = groupBy(currencyValues, 'code');
+ let currencyValuesByCodeList = uniq(currencyValues.map((v) => v.code)).map(
+ (code) => currencyValuesByCode[code],
+ );
+ if (isSum) {
+ currencyValuesByCodeList = currencyValuesByCodeList.map((g) =>
+ g.reduce(
+ (sum, v) => {
+ sum[0].amount += v.amount;
+ return sum;
+ },
+ [{ code: g[0].code, amount: 0 }],
+ ),
+ );
+ }
+ const domainStoreService = inject(DomainStoreService);
+ return combineLatest([
+ combineLatest(currencyValuesByCodeList.map((g) => formatCurrencyValues(g))),
+ domainStoreService.isLoading$,
+ ]).pipe(
+ map(([currencyValueStrings, inProgress]) => ({
+ value: currencyValueStrings[0],
+ description: currencyValueStrings.slice(1).join('; '),
+ inProgress,
+ })),
+ );
+ },
+);
diff --git a/src/app/shared/utils/table/create-domain-object-column.ts b/src/app/shared/utils/table/create-domain-object-column.ts
index 9fa57998..18f2c594 100644
--- a/src/app/shared/utils/table/create-domain-object-column.ts
+++ b/src/app/shared/utils/table/create-domain-object-column.ts
@@ -1,42 +1,37 @@
import { inject } from '@angular/core';
-import { Reference } from '@vality/domain-proto/domain';
-import { PossiblyAsync, getPossiblyAsyncObservable, type ColumnObject } from '@vality/ng-core';
-import startCase from 'lodash-es/startCase';
-import { map, switchMap, first } from 'rxjs/operators';
-import { ValuesType } from 'utility-types';
+import { Reference } from '@vality/domain-proto/internal/domain';
+import { createColumn } from '@vality/ng-core';
+import { getUnionValue, getUnionKey } from '@vality/ng-thrift';
+import { map, startWith } from 'rxjs/operators';
import { DomainStoreService } from '../../../api/domain-config';
import { SidenavInfoService } from '../../components/sidenav-info';
import {
- getDomainObjectDetails,
DomainObjectCardComponent,
+ getDomainObjectDetails,
} from '../../components/thrift-api-crud';
-export function createDomainObjectColumn(
- objectKey: keyof Reference,
- selectDomainObjectRef: (d: T) => PossiblyAsync>,
- params: Partial> = {},
-): ColumnObject {
- const domainStoreService = inject(DomainStoreService);
- const sidenavInfoService = inject(SidenavInfoService);
- const getObjectRef = (d: T) =>
- getPossiblyAsyncObservable(selectDomainObjectRef(d)).pipe(
- map((ref): Reference => ({ [objectKey]: ref })),
+export const createDomainObjectColumn = createColumn(({ ref }: { ref: Reference }) => {
+ const sourceObj = {
+ [getUnionKey(ref)]: { ref: getUnionValue(ref), data: {} },
+ };
+ return inject(DomainStoreService)
+ .getObject(ref)
+ .pipe(
+ map((obj) => ({
+ value: getDomainObjectDetails(obj).label || '',
+ description: getDomainObjectDetails(obj).id || '',
+ click: () => {
+ inject(SidenavInfoService).toggle(DomainObjectCardComponent, { ref });
+ },
+ })),
+ startWith({
+ value: getDomainObjectDetails(sourceObj).label || '',
+ description: getDomainObjectDetails(sourceObj).id || '',
+ click: () => {
+ inject(SidenavInfoService).toggle(DomainObjectCardComponent, { ref });
+ },
+ inProgress: true,
+ }),
);
- const getObject = (d: T) =>
- getObjectRef(d).pipe(switchMap((ref) => domainStoreService.getObject(ref)));
- return {
- field: `domain_object_${objectKey}`,
- header: startCase(objectKey),
- description: (d) => getObject(d).pipe(map((o) => getDomainObjectDetails(o)?.id)),
- formatter: (d) => getObject(d).pipe(map((o) => getDomainObjectDetails(o)?.label)),
- click: (d) => {
- getObjectRef(d)
- .pipe(first())
- .subscribe((ref) => {
- sidenavInfoService.toggle(DomainObjectCardComponent, { ref });
- });
- },
- ...params,
- } as ColumnObject;
-}
+});
diff --git a/src/app/shared/utils/table/create-party-column.ts b/src/app/shared/utils/table/create-party-column.ts
index d585e1c9..fbacd6a9 100644
--- a/src/app/shared/utils/table/create-party-column.ts
+++ b/src/app/shared/utils/table/create-party-column.ts
@@ -1,49 +1,32 @@
import { inject } from '@angular/core';
-import { Router } from '@angular/router';
-import { PossiblyAsync, ColumnObject, getPossiblyAsyncObservable } from '@vality/ng-core';
-import get from 'lodash-es/get';
+import { createColumn } from '@vality/ng-core';
import { of } from 'rxjs';
-import { switchMap, map, take } from 'rxjs/operators';
+import { map, startWith } from 'rxjs/operators';
import { PartiesStoreService } from '../../../api/payment-processing';
-export function createPartyColumn(
- field: ColumnObject['field'],
- selectPartyId?: (d: T) => PossiblyAsync,
- selectPartyEmail?: (d: T) => PossiblyAsync,
- params: Partial> = {},
-): ColumnObject {
- const partiesStoreService = inject(PartiesStoreService);
- const router = inject(Router);
- if (!selectPartyId) {
- selectPartyId = (d) => get(d, field);
- }
- if (!selectPartyEmail) {
- selectPartyEmail = (d: T) =>
- getPossiblyAsyncObservable(selectPartyId(d)).pipe(
- switchMap((partyId) =>
- partyId
- ? partiesStoreService.get(partyId)
- : of({ contact_info: { registration_email: '' } }),
- ),
- map((p) => p.contact_info.registration_email),
- );
- }
- return {
- field,
- header: 'Party',
- description: selectPartyId,
- formatter: selectPartyEmail,
- click: (d) => {
- getPossiblyAsyncObservable(selectPartyId(d))
- .pipe(
- take(1),
- map((id) => `/party/${id}`),
- )
- .subscribe((url) => {
- void router.navigate([url]);
- });
- },
- ...params,
- } as ColumnObject;
-}
+export const createPartyColumn = createColumn(
+ ({ id, ...params }: { id: string; partyName?: string }) => {
+ const partyName$ =
+ 'partyName' in params
+ ? of(params.partyName)
+ : inject(PartiesStoreService)
+ .get(id)
+ .pipe(map((party) => party.contact_info.registration_email));
+ const partyCell = {
+ description: id,
+ link: () => `/party/${id}`,
+ };
+ return partyName$.pipe(
+ map((partyName) => ({
+ ...partyCell,
+ value: partyName,
+ })),
+ startWith({
+ ...partyCell,
+ inProgress: true,
+ }),
+ );
+ },
+ { header: 'Party' },
+);
diff --git a/src/app/shared/utils/table/create-predicate-column.ts b/src/app/shared/utils/table/create-predicate-column.ts
index 461b836d..20a97a97 100644
--- a/src/app/shared/utils/table/create-predicate-column.ts
+++ b/src/app/shared/utils/table/create-predicate-column.ts
@@ -1,35 +1,18 @@
import { Predicate } from '@vality/domain-proto/domain';
-import {
- ColumnObject,
- TagColumn,
- PossiblyAsync,
- getPossiblyAsyncObservable,
-} from '@vality/ng-core';
-import { map } from 'rxjs/operators';
+import { createColumn } from '@vality/ng-core';
-import { formatPredicate } from './format-predicate';
+import { formatPredicate } from '.';
-export function createPredicateColumn(
- field: ColumnObject['field'],
- select: (d: T) => PossiblyAsync,
- params: Partial> = {},
-): TagColumn {
- const formatter = (d: T) =>
- getPossiblyAsyncObservable(select(d)).pipe(map((predicate) => formatPredicate(predicate)));
- return {
- field,
- formatter,
- type: 'tag',
- sortable: true,
- typeParameters: {
- label: formatter,
- tags: {
- /* eslint-disable @typescript-eslint/naming-convention */
- True: { color: 'success' },
- False: { color: 'warn' },
- /* eslint-enable @typescript-eslint/naming-convention */
- },
- },
- ...params,
- } as TagColumn;
-}
+export const createPredicateColumn = createColumn(
+ ({ predicate }: { predicate: Predicate }) => {
+ const value = formatPredicate(predicate);
+ return {
+ value,
+ color: {
+ True: 'success',
+ False: 'warn',
+ }[value],
+ };
+ },
+ { header: 'Predicate' },
+);
diff --git a/src/app/shared/utils/table/create-shop-column.ts b/src/app/shared/utils/table/create-shop-column.ts
index 3a94778e..cd847984 100644
--- a/src/app/shared/utils/table/create-shop-column.ts
+++ b/src/app/shared/utils/table/create-shop-column.ts
@@ -1,52 +1,37 @@
import { inject } from '@angular/core';
-import { PossiblyAsync, ColumnObject, getPossiblyAsyncObservable } from '@vality/ng-core';
-import get from 'lodash-es/get';
-import { combineLatest } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import { createColumn } from '@vality/ng-core';
+import { of } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
import { PartiesStoreService } from '../../../api/payment-processing';
import { ShopCardComponent } from '../../components/shop-card/shop-card.component';
import { SidenavInfoService } from '../../components/sidenav-info';
-export function createShopColumn(
- field: ColumnObject['field'],
- selectPartyId: (d: T) => PossiblyAsync,
- selectShopId?: (d: T) => PossiblyAsync,
- selectShopName?: (d: T) => PossiblyAsync,
- params: Partial> = {},
-): ColumnObject {
- if (!selectShopId) {
- selectShopId = (d) => get(d, field);
- }
- if (!selectShopName) {
- const partiesStoreService = inject(PartiesStoreService);
- selectShopName = (d) =>
- getPossiblyAsyncObservable(selectPartyId(d)).pipe(
- switchMap((partyId) =>
- combineLatest([
- partiesStoreService.get(partyId),
- getPossiblyAsyncObservable(selectShopId(d)),
- ]),
- ),
- map(([party, shopId]) => party.shops.get(shopId).details.name),
- );
- }
- const sidenavInfoService = inject(SidenavInfoService);
- return {
- field,
- header: 'Shop',
- description: (d) => getPossiblyAsyncObservable(selectShopId(d)),
- formatter: (d) => getPossiblyAsyncObservable(selectShopName(d)),
- click: (d) => {
- combineLatest([
- getPossiblyAsyncObservable(selectPartyId(d)),
- getPossiblyAsyncObservable(selectShopId(d)),
- ])
- .pipe(take(1))
- .subscribe(([partyId, id]) => {
- sidenavInfoService.toggle(ShopCardComponent, { id, partyId });
- });
- },
- ...params,
- } as ColumnObject;
-}
+export const createShopColumn = createColumn(
+ ({ shopId, partyId, ...params }: { shopId: string; partyId: string; shopName?: string }) => {
+ const name$ =
+ 'shopName' in params
+ ? of(params.shopName)
+ : inject(PartiesStoreService)
+ .get(partyId)
+ .pipe(map((party) => party.shops.get(shopId).details.name));
+ const sidenavInfoService = inject(SidenavInfoService);
+ const shopCell = {
+ description: shopId,
+ click: () => {
+ sidenavInfoService.toggle(ShopCardComponent, { id: shopId, partyId });
+ },
+ };
+ return name$.pipe(
+ map((shopName) => ({
+ ...shopCell,
+ value: shopName,
+ })),
+ startWith({
+ ...shopCell,
+ inProgress: true,
+ }),
+ );
+ },
+ { header: 'Shop' },
+);
diff --git a/src/app/shared/utils/table/create-terminal-column.ts b/src/app/shared/utils/table/create-terminal-column.ts
deleted file mode 100644
index 19613080..00000000
--- a/src/app/shared/utils/table/create-terminal-column.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Column, PossiblyAsync, getPossiblyAsyncObservable } from '@vality/ng-core';
-import { map } from 'rxjs/operators';
-
-import { createDomainObjectColumn } from './create-domain-object-column';
-
-export function createTerminalColumn(
- selectTerminalId: (d: T) => PossiblyAsync,
-): Column {
- return createDomainObjectColumn('terminal', (d) =>
- getPossiblyAsyncObservable(selectTerminalId(d)).pipe(map((id) => ({ id }))),
- );
-}
diff --git a/src/app/shared/utils/table/create-wallet-column.ts b/src/app/shared/utils/table/create-wallet-column.ts
index d96c091f..d85fb449 100644
--- a/src/app/shared/utils/table/create-wallet-column.ts
+++ b/src/app/shared/utils/table/create-wallet-column.ts
@@ -1,39 +1,29 @@
import { inject } from '@angular/core';
-import { PossiblyAsync, ColumnObject, getPossiblyAsyncObservable } from '@vality/ng-core';
-import get from 'lodash-es/get';
-import { combineLatest } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { createColumn } from '@vality/ng-core';
+import { of } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
-import { PartiesStoreService } from '../../../api/payment-processing';
+import { PartiesStoreService } from '@cc/app/api/payment-processing';
-export function createWalletColumn(
- field: ColumnObject['field'],
- selectPartyId: (d: T) => PossiblyAsync,
- selectWalletId?: (d: T) => PossiblyAsync,
- selectWalletName?: (d: T) => PossiblyAsync,
- params: Partial> = {},
-): ColumnObject {
- if (!selectWalletId) {
- selectWalletId = (d) => get(d, field);
- }
- if (!selectWalletName) {
- const partiesStoreService = inject(PartiesStoreService);
- selectWalletName = (d) =>
- getPossiblyAsyncObservable(selectPartyId(d)).pipe(
- switchMap((partyId) =>
- combineLatest([
- partiesStoreService.get(partyId),
- getPossiblyAsyncObservable(selectWalletId(d)),
- ]),
- ),
- map(([party, walletId]) => party.wallets.get(walletId)?.name),
- );
- }
- return {
- field,
- header: 'Wallet',
- description: (d) => getPossiblyAsyncObservable(selectWalletId(d)),
- formatter: (d) => getPossiblyAsyncObservable(selectWalletName(d)),
- ...params,
- } as ColumnObject;
-}
+export const createWalletColumn = createColumn(
+ ({ id, partyId, ...params }: { id: string; partyId: string; name?: string }) => {
+ const name$ =
+ 'name' in params
+ ? of(params.name)
+ : inject(PartiesStoreService)
+ .getWallet(id, partyId)
+ .pipe(map((wallet) => wallet?.name));
+ const cell = { description: id };
+ return name$.pipe(
+ map((name) => ({
+ ...cell,
+ value: name,
+ })),
+ startWith({
+ ...cell,
+ inProgress: true,
+ }),
+ );
+ },
+ { header: 'Wallet' },
+);
diff --git a/src/app/shared/utils/table/index.ts b/src/app/shared/utils/table/index.ts
index 942e3896..58b9617a 100644
--- a/src/app/shared/utils/table/index.ts
+++ b/src/app/shared/utils/table/index.ts
@@ -1,11 +1,12 @@
-export * from './create-currency-column';
-export * from './create-party-column';
-export * from './create-shop-column';
-export * from './create-predicate-column';
export * from './create-failure-column';
-export * from './create-contract-column';
export * from './format-cash-volume';
export * from './format-rational';
export * from './format-predicate';
-export * from './create-wallet-column';
export * from './get-cash-volume-parts';
+export * from './create-contract-column';
+export * from './create-currency-column';
+export * from './create-domain-object-column';
+export * from './create-predicate-column';
+export * from './create-shop-column';
+export * from './create-wallet-column';
+export * from './create-party-column';
diff --git a/src/app/shared/utils/table2/create-contract-column.ts b/src/app/shared/utils/table2/create-contract-column.ts
deleted file mode 100644
index 95caf0aa..00000000
--- a/src/app/shared/utils/table2/create-contract-column.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { inject } from '@angular/core';
-import { createColumn } from '@vality/ng-core';
-
-import { ContractCardComponent } from '../../components/contract-card/contract-card.component';
-import { SidenavInfoService } from '../../components/sidenav-info';
-
-export const createContractColumn = createColumn(
- ({ id, partyId }: { id: string; partyId: string }) => {
- const sidenavInfoService = inject(SidenavInfoService);
- return {
- value: id,
- click: () => {
- sidenavInfoService.toggle(ContractCardComponent, { id, partyId });
- },
- };
- },
- { header: 'Contract' },
-);
diff --git a/src/app/shared/utils/table2/create-currency-column.ts b/src/app/shared/utils/table2/create-currency-column.ts
deleted file mode 100644
index b89ec7fd..00000000
--- a/src/app/shared/utils/table2/create-currency-column.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { getCurrencySymbol } from '@angular/common';
-import { inject, LOCALE_ID } from '@angular/core';
-import { createColumn, formatCurrency } from '@vality/ng-core';
-import { groupBy, uniq } from 'lodash-es';
-import { of, combineLatest } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-
-import { DomainStoreService } from '../../../api/domain-config';
-import { AmountCurrencyService } from '../../services';
-
-interface CurrencyValue {
- amount: number;
- code: string;
-}
-
-function formatCurrencyValue(value: CurrencyValue) {
- const amountCurrencyService = inject(AmountCurrencyService);
- const locale = inject(LOCALE_ID);
- return amountCurrencyService.getCurrency(value.code).pipe(
- map((currencyObj) =>
- formatCurrency(value.amount, value.code, 'long', locale, currencyObj?.exponent),
- ),
- startWith(
- (value.amount === 0 ? '0' : '…') +
- ' ' +
- getCurrencySymbol(value.code, 'narrow', locale),
- ),
- );
-}
-
-function formatCurrencyValues(values: CurrencyValue[], separator = ' | ') {
- return combineLatest(values.map(formatCurrencyValue)).pipe(map((v) => v.join(separator)));
-}
-
-export const createCurrencyColumn = createColumn(
- (currencyValue: CurrencyValue | { values: CurrencyValue[]; isSum?: boolean }) => {
- const isSum = 'isSum' in currencyValue ? currencyValue.isSum : false;
- const currencyValues = ('values' in currencyValue ? currencyValue.values : [currencyValue])
- .filter(Boolean)
- .sort((a, b) => b.amount - a.amount);
- if (!currencyValues?.length) {
- return of(undefined);
- }
- const currencyValuesByCode = groupBy(currencyValues, 'code');
- let currencyValuesByCodeList = uniq(currencyValues.map((v) => v.code)).map(
- (code) => currencyValuesByCode[code],
- );
- if (isSum) {
- currencyValuesByCodeList = currencyValuesByCodeList.map((g) =>
- g.reduce(
- (sum, v) => {
- sum[0].amount += v.amount;
- return sum;
- },
- [{ code: g[0].code, amount: 0 }],
- ),
- );
- }
- const domainStoreService = inject(DomainStoreService);
- return combineLatest([
- combineLatest(currencyValuesByCodeList.map((g) => formatCurrencyValues(g))),
- domainStoreService.isLoading$,
- ]).pipe(
- map(([currencyValueStrings, inProgress]) => ({
- value: currencyValueStrings[0],
- description: currencyValueStrings.slice(1).join('; '),
- inProgress,
- })),
- );
- },
-);
diff --git a/src/app/shared/utils/table2/create-domain-object-column.ts b/src/app/shared/utils/table2/create-domain-object-column.ts
deleted file mode 100644
index 18f2c594..00000000
--- a/src/app/shared/utils/table2/create-domain-object-column.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { inject } from '@angular/core';
-import { Reference } from '@vality/domain-proto/internal/domain';
-import { createColumn } from '@vality/ng-core';
-import { getUnionValue, getUnionKey } from '@vality/ng-thrift';
-import { map, startWith } from 'rxjs/operators';
-
-import { DomainStoreService } from '../../../api/domain-config';
-import { SidenavInfoService } from '../../components/sidenav-info';
-import {
- DomainObjectCardComponent,
- getDomainObjectDetails,
-} from '../../components/thrift-api-crud';
-
-export const createDomainObjectColumn = createColumn(({ ref }: { ref: Reference }) => {
- const sourceObj = {
- [getUnionKey(ref)]: { ref: getUnionValue(ref), data: {} },
- };
- return inject(DomainStoreService)
- .getObject(ref)
- .pipe(
- map((obj) => ({
- value: getDomainObjectDetails(obj).label || '',
- description: getDomainObjectDetails(obj).id || '',
- click: () => {
- inject(SidenavInfoService).toggle(DomainObjectCardComponent, { ref });
- },
- })),
- startWith({
- value: getDomainObjectDetails(sourceObj).label || '',
- description: getDomainObjectDetails(sourceObj).id || '',
- click: () => {
- inject(SidenavInfoService).toggle(DomainObjectCardComponent, { ref });
- },
- inProgress: true,
- }),
- );
-});
diff --git a/src/app/shared/utils/table2/create-party-column.ts b/src/app/shared/utils/table2/create-party-column.ts
deleted file mode 100644
index fbacd6a9..00000000
--- a/src/app/shared/utils/table2/create-party-column.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { inject } from '@angular/core';
-import { createColumn } from '@vality/ng-core';
-import { of } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-
-import { PartiesStoreService } from '../../../api/payment-processing';
-
-export const createPartyColumn = createColumn(
- ({ id, ...params }: { id: string; partyName?: string }) => {
- const partyName$ =
- 'partyName' in params
- ? of(params.partyName)
- : inject(PartiesStoreService)
- .get(id)
- .pipe(map((party) => party.contact_info.registration_email));
- const partyCell = {
- description: id,
- link: () => `/party/${id}`,
- };
- return partyName$.pipe(
- map((partyName) => ({
- ...partyCell,
- value: partyName,
- })),
- startWith({
- ...partyCell,
- inProgress: true,
- }),
- );
- },
- { header: 'Party' },
-);
diff --git a/src/app/shared/utils/table2/create-predicate-column.ts b/src/app/shared/utils/table2/create-predicate-column.ts
deleted file mode 100644
index 4297d27d..00000000
--- a/src/app/shared/utils/table2/create-predicate-column.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Predicate } from '@vality/domain-proto/domain';
-import { createColumn } from '@vality/ng-core';
-
-import { formatPredicate } from '../table';
-
-export const createPredicateColumn = createColumn(
- ({ predicate }: { predicate: Predicate }) => {
- const value = formatPredicate(predicate);
- return {
- value,
- color: {
- True: 'success',
- False: 'warn',
- }[value],
- };
- },
- { header: 'Predicate' },
-);
diff --git a/src/app/shared/utils/table2/create-shop-column.ts b/src/app/shared/utils/table2/create-shop-column.ts
deleted file mode 100644
index 8ae8c977..00000000
--- a/src/app/shared/utils/table2/create-shop-column.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { inject } from '@angular/core';
-import { createColumn } from '@vality/ng-core';
-import { of } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-
-import { PartiesStoreService } from '../../../api/payment-processing';
-import { ShopCardComponent } from '../../components/shop-card/shop-card.component';
-import { SidenavInfoService } from '../../components/sidenav-info';
-
-export const createShopColumn = createColumn(
- ({ shopId, partyId, ...params }: { shopId: string; partyId: string; shopName?: string }) => {
- const shopName$ =
- 'shopName' in params
- ? of(params.shopName)
- : inject(PartiesStoreService)
- .get(partyId)
- .pipe(map((party) => party.shops.get(shopId).details.name));
- const sidenavInfoService = inject(SidenavInfoService);
- const shopCell = {
- description: shopId,
- click: () => {
- sidenavInfoService.toggle(ShopCardComponent, { id: shopId, partyId });
- },
- };
- return shopName$.pipe(
- map((shopName) => ({
- ...shopCell,
- value: shopName,
- })),
- startWith({
- ...shopCell,
- inProgress: true,
- }),
- );
- },
- { header: 'Shop' },
-);
diff --git a/src/app/shared/utils/table2/create-wallet-column.ts b/src/app/shared/utils/table2/create-wallet-column.ts
deleted file mode 100644
index 9f2e1629..00000000
--- a/src/app/shared/utils/table2/create-wallet-column.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { inject } from '@angular/core';
-import { createColumn } from '@vality/ng-core';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { PartiesStoreService } from '../../../api/payment-processing';
-
-export const createWalletColumn = createColumn(
- ({ id, partyId, ...params }: { id: string; partyId: string; name?: string }) => {
- const shopName$ =
- 'name' in params
- ? of(params.name)
- : inject(PartiesStoreService)
- .get(partyId)
- .pipe(map((party) => party.wallets.get(id).name));
- return shopName$.pipe(
- map((name) => ({
- value: name,
- description: id,
- })),
- );
- },
- { header: 'Wallet' },
-);
diff --git a/src/app/shared/utils/table2/index.ts b/src/app/shared/utils/table2/index.ts
deleted file mode 100644
index fca3b99d..00000000
--- a/src/app/shared/utils/table2/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './create-shop-column';
-export * from './create-party-column';
-export * from './create-wallet-column';
-export * from './create-contract-column';
-export * from './create-domain-object-column';
-export * from './create-currency-column';
-export * from './create-predicate-column';
diff --git a/src/components/upload-csv/upload-csv.component.html b/src/components/upload-csv/upload-csv.component.html
index b8882438..ceb85f7e 100644
--- a/src/components/upload-csv/upload-csv.component.html
+++ b/src/components/upload-csv/upload-csv.component.html
@@ -40,7 +40,7 @@
[(rowSelected)]="selectedCsv"
[columns]="columns()"
[data]="data$ | async"
- noActions
+ noDownload
rowSelectable
>