From a9e5a4423004c94a3989ce663554e88f625b29e0 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Sat, 20 Dec 2025 00:54:35 +0700 Subject: [PATCH 1/4] fix hasmore --- src/app/shops/shops.component.html | 1 + src/app/shops/shops.component.ts | 1 + src/components/shops-table/shops-table.component.html | 2 ++ src/components/shops-table/shops-table.component.ts | 2 ++ 4 files changed, 6 insertions(+) diff --git a/src/app/shops/shops.component.html b/src/app/shops/shops.component.html index ddccc884d..80ec892a9 100644 --- a/src/app/shops/shops.component.html +++ b/src/app/shops/shops.component.html @@ -1,5 +1,6 @@ res.map((r) => ({ ...r.object.shop_config, info: r.info }))), ); progress$ = this.fetchDomainObjectsService.isLoading$; + hasMore$ = this.fetchDomainObjectsService.hasMore$; ngOnInit() { this.searchParamsUpdated(''); diff --git a/src/components/shops-table/shops-table.component.html b/src/components/shops-table/shops-table.component.html index 74c3e2786..7c5d4590c 100644 --- a/src/components/shops-table/shops-table.component.html +++ b/src/components/shops-table/shops-table.component.html @@ -2,9 +2,11 @@ [columns]="columns" [data]="shops()" [externalFilter]="filterChange.observed" + [hasMore]="hasMore" [progress]="progress" name="shops" standaloneFilter (filterChange)="filterChange.emit($event)" + (more)="more.emit()" (update)="update.emit($event)" > diff --git a/src/components/shops-table/shops-table.component.ts b/src/components/shops-table/shops-table.component.ts index 99966a052..55f30fedb 100644 --- a/src/components/shops-table/shops-table.component.ts +++ b/src/components/shops-table/shops-table.component.ts @@ -64,8 +64,10 @@ export class ShopsTableComponent { shops = input([]); @Input() progress: number | boolean = false; + @Input() hasMore: boolean = false; @Output() update = new EventEmitter(); @Output() filterChange = new EventEmitter(); + @Output() more = new EventEmitter(); noPartyColumn = input(false, { transform: booleanAttribute }); From 4844026d463eb66e13461f92484b5707cb80374e Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Sat, 20 Dec 2025 00:59:15 +0700 Subject: [PATCH 2/4] fix links --- src/components/shops-table/shops-table.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/shops-table/shops-table.component.ts b/src/components/shops-table/shops-table.component.ts index 55f30fedb..8f80de51e 100644 --- a/src/components/shops-table/shops-table.component.ts +++ b/src/components/shops-table/shops-table.component.ts @@ -237,6 +237,7 @@ export class ShopsTableComponent { partyId, 'routing-rules', 'payment', + rr.ref.id, ]), }, ...(delegates[idx].length @@ -250,6 +251,8 @@ export class ShopsTableComponent { partyId, 'routing-rules', 'payment', + rr.ref.id, + 'delegate', delegate.ruleset.id, ]), })) From 05829041d48a3c1d26ec1499d8b09a97e5fbd383 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 23 Dec 2025 01:37:05 +0700 Subject: [PATCH 3/4] add filter --- src/app/terminals/terminals.component.html | 1 + src/app/terminals/terminals.component.ts | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/app/terminals/terminals.component.html b/src/app/terminals/terminals.component.html index dc88dee06..fe5709903 100644 --- a/src/app/terminals/terminals.component.html +++ b/src/app/terminals/terminals.component.html @@ -9,6 +9,7 @@ [progress]="progress$ | async" name="terminals" standaloneFilter + (filterChange)="filter($event)" (more)="more()" (update)="update($event)" > diff --git a/src/app/terminals/terminals.component.ts b/src/app/terminals/terminals.component.ts index bfebfb9d8..b6a86eae8 100644 --- a/src/app/terminals/terminals.component.ts +++ b/src/app/terminals/terminals.component.ts @@ -139,6 +139,13 @@ export class TerminalsComponent implements OnInit { this.dialogService.open(CreateDomainObjectDialogComponent, { objectType: 'terminal' }); } + filter(search: string) { + this.fetchFullDomainObjectsService.load({ + type: DomainObjectType.terminal, + query: search, + }); + } + private getTerminalShopWalletDelegates(terminalObj: TerminalObject) { return this.routingRulesStoreService.routingRules$.pipe( map((rules) => getTerminalShopWalletDelegates(rules, terminalObj)), From 94d89af721fc4a75d140073cd9b5f6113584af32 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 23 Dec 2025 01:39:44 +0700 Subject: [PATCH 4/4] fix --- .../terminal-delegates-card.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/terminal-delegates-card/terminal-delegates-card.component.ts b/src/components/terminal-delegates-card/terminal-delegates-card.component.ts index e777f5ab6..c5dbc3c59 100644 --- a/src/components/terminal-delegates-card/terminal-delegates-card.component.ts +++ b/src/components/terminal-delegates-card/terminal-delegates-card.component.ts @@ -126,7 +126,7 @@ export class TerminalDelegatesCardComponent implements OnChanges { ); case 'wallet_is': return this.partiesStoreService - .getShop(party?.definition?.wallet_is) + .getWallet(party?.definition?.wallet_is) .value$.pipe( map((wallet) => ({ value: wallet.data.name,