-
-
Party delegate rulesets
-
-
-
-
+
+
+
Party delegate rulesets
+
-
+
+
+
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 e64e5603..52729424 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
@@ -23,9 +23,9 @@ import { PartyDelegateRulesetsService } from './party-delegate-rulesets.service'
})
export class PartyDelegateRulesetsComponent {
displayedColumns = [
+ { key: 'partyDelegate', name: 'Party delegate' },
{ key: 'paymentInstitution', name: 'Payment institution' },
{ key: 'mainRuleset', name: 'Main ruleset' },
- { key: 'partyDelegate', name: 'Party delegate' },
];
isLoading$ = this.domainStoreService.isLoading$;
data$ = this.partyDelegateRulesetsService.getDelegatesWithPaymentInstitution().pipe(
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 f5e28b0a..1b538fde 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
@@ -5,7 +5,7 @@
!!r),
map(([ruleset, shops]) =>
ruleset.data.decisions.delegates
@@ -63,7 +66,7 @@ export class PartyRoutingRulesetComponent {
);
walletsData$ = combineLatest([
this.partyRuleset$,
- this.partyRoutingRulesetService.wallets$,
+ this.partyRoutingRulesetService.wallets$.pipe(startWith([])),
]).pipe(
filter(([r]) => !!r),
map(([ruleset, wallets]) =>
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 4cfd1ff4..066b3d53 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,70 +1 @@
-
-
-
-
- | {{ column.name }} |
-
-
- {{ element[column.key]?.text || ' ' }}
-
- {{ element[column.key]?.caption || ' ' }}
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
- |
-
- |
- |
-
-
-
-
-
-
-
-
- Routing rules not found
-
-
+
diff --git a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.spec.ts b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.spec.ts
deleted file mode 100644
index 82728a87..00000000
--- a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.component.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Component, DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-
-import { RoutingRulesListComponent } from './routing-rules-list.component';
-
-@Component({
- selector: 'cc-host',
- template: ``,
-})
-class HostComponent {}
-
-describe('RoutingRulesListComponent', () => {
- let fixture: ComponentFixture;
- let debugElement: DebugElement;
- let component: RoutingRulesListComponent;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [],
- declarations: [HostComponent, RoutingRulesListComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(HostComponent);
- debugElement = fixture.debugElement.query(By.directive(RoutingRulesListComponent));
- component = debugElement.componentInstance;
-
- fixture.detectChanges();
- });
-
- it('should be created', () => {
- expect(component).toBeTruthy();
- });
-});
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 c0ce2d99..c93e6efc 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,15 +4,20 @@ import {
EventEmitter,
Input,
Output,
- ViewChild,
+ OnChanges,
} from '@angular/core';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatTableDataSource } from '@angular/material/table';
import { ActivatedRoute } from '@angular/router';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { DialogResponseStatus, DialogService, ConfirmDialogComponent } from '@vality/ng-core';
-import { combineLatest, defer, ReplaySubject } from 'rxjs';
-import { filter, map, shareReplay, startWith, switchMap } from 'rxjs/operators';
+import {
+ DialogResponseStatus,
+ DialogService,
+ ConfirmDialogComponent,
+ Column,
+ createOperationColumn,
+ ComponentChanges,
+} from '@vality/ng-core';
+import { coerceBoolean } from 'coerce-property';
+import { filter, switchMap } from 'rxjs/operators';
import { NotificationErrorService } from '@cc/app/shared/services/notification-error';
@@ -36,47 +41,15 @@ export class RoutingRulesListComponent<
T extends { [N in PropertyKey]: unknown } & DelegateId = {
[N in PropertyKey]: unknown;
} & DelegateId,
-> {
+> implements OnChanges
+{
+ @Input() data: T[];
@Input() displayedColumns: { key: keyof T; name: string }[];
-
- @Input() set data(data: T[]) {
- this.data$.next(data);
- }
+ @Input() @coerceBoolean progress: boolean | '' = false;
@Output() toDetails = new EventEmitter();
- @ViewChild(MatPaginator) set paginator(paginator: MatPaginator) {
- this.paginator$.next(paginator);
- }
-
- dataSource$ = combineLatest([
- defer(() => this.data$),
- defer(() => this.paginator$).pipe(startWith(null)),
- ]).pipe(
- map(([d, paginator]) => {
- const data = new MatTableDataSource(d);
- data.paginator = paginator;
- return data;
- }),
- shareReplay(1),
- );
-
- get allDisplayedColumns() {
- if (!this.displayedColumns) {
- return [];
- }
- return this.displayedColumns
- .concat([
- {
- key: 'actions',
- name: 'Actions',
- },
- ])
- .map(({ key }) => key);
- }
-
- private data$ = new ReplaySubject(1);
- private paginator$ = new ReplaySubject(1);
+ columns: Column[] = [];
constructor(
private dialogService: DialogService,
@@ -85,6 +58,61 @@ export class RoutingRulesListComponent<
private route: ActivatedRoute,
) {}
+ 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([
+ {
+ label: 'Details',
+ click: (d) =>
+ this.toDetails.emit({
+ parentRefId: d?.parentRefId,
+ delegateIdx: d?.delegateIdx,
+ }),
+ },
+ {
+ label: 'Change delegate ruleset',
+ click: (d) => this.changeDelegateRuleset(d),
+ },
+ {
+ label: 'Change main ruleset',
+ click: (d) => this.changeTarget(d),
+ },
+ {
+ label: 'Clone delegate ruleset',
+ click: (d) => this.cloneDelegateRuleset(d),
+ },
+ {
+ label: 'Delete',
+ click: (d) => this.delete(d),
+ },
+ ]),
+ ];
+ }
+ }
+
changeDelegateRuleset(delegateId: DelegateId) {
this.dialogService
.open(ChangeDelegateRulesetDialogComponent, {
diff --git a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.module.ts b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.module.ts
index b5d68659..45049b12 100644
--- a/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.module.ts
+++ b/src/app/sections/routing-rules/routing-rules-list/routing-rules-list.module.ts
@@ -6,7 +6,7 @@ import { MatCardModule } from '@angular/material/card';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatPaginatorModule } from '@angular/material/paginator';
-import { MatTableModule } from '@angular/material/table';
+import { TableModule } from '@vality/ng-core';
import { RoutingRulesListComponent } from './routing-rules-list.component';
@@ -15,12 +15,11 @@ import { RoutingRulesListComponent } from './routing-rules-list.component';
CommonModule,
MatMenuModule,
MatCardModule,
- MatTableModule,
MatPaginatorModule,
- MatTableModule,
MatIconModule,
FlexLayoutModule,
MatButtonModule,
+ TableModule,
],
declarations: [RoutingRulesListComponent],
exports: [RoutingRulesListComponent],
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 58963973..e05220a7 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
@@ -57,7 +57,7 @@ export class RoutingRulesetComponent {
field: 'candidate',
description: 'description',
sortable: true,
- formatter: (d) => this.getCandidateIdx(d).pipe(map((idx) => `${idx + 1}`)),
+ formatter: (d) => this.getCandidateIdx(d).pipe(map((idx) => `#${idx + 1}`)),
click: (d) => {
this.getCandidateIdx(d)
.pipe(untilDestroyed(this))
@@ -129,6 +129,16 @@ export class RoutingRulesetComponent {
});
},
},
+ {
+ label: 'Duplicate',
+ click: (d) => {
+ this.getCandidateIdx(d)
+ .pipe(untilDestroyed(this))
+ .subscribe((idx) => {
+ void this.duplicateShopRule(idx);
+ });
+ },
+ },
{
label: 'Remove',
click: (d) => {
@@ -176,7 +186,7 @@ export class RoutingRulesetComponent {
next: (res) => {
if (res.status === DialogResponseStatus.Success) {
this.domainStoreService.forceReload();
- this.log.successOperation('update', 'Routing rule');
+ this.log.successOperation('create', 'Routing rule');
}
},
error: (err) => {
@@ -217,6 +227,38 @@ export class RoutingRulesetComponent {
});
}
+ duplicateShopRule(idx: number) {
+ this.routingRulesetService.refID$
+ .pipe(
+ first(),
+ switchMap((refId) => this.routingRulesService.getShopCandidate(refId, idx)),
+ withLatestFrom(this.routingRulesetService.refID$),
+ switchMap(([shopCandidate, refId]) =>
+ this.dialog
+ .open(DomainThriftFormDialogComponent, {
+ type: 'RoutingCandidate',
+ title: 'Add shop routing candidate',
+ object: shopCandidate,
+ actionType: 'create',
+ action: (params) => this.routingRulesService.addShopRule(refId, params),
+ })
+ .afterClosed(),
+ ),
+ )
+ .pipe(untilDestroyed(this))
+ .subscribe({
+ next: (res) => {
+ if (res.status === DialogResponseStatus.Success) {
+ this.domainStoreService.forceReload();
+ this.log.successOperation('create', 'Routing rule');
+ }
+ },
+ error: (err) => {
+ this.log.error(err);
+ },
+ });
+ }
+
removeShopRule(idx: number) {
this.routingRulesetService.removeShopRule(idx);
}
diff --git a/src/app/sections/search-parties/parties-table/index.ts b/src/app/sections/search-parties/parties-table/index.ts
deleted file mode 100644
index 7ba71b64..00000000
--- a/src/app/sections/search-parties/parties-table/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './parties-table.module';
diff --git a/src/app/sections/search-parties/parties-table/parties-table.component.html b/src/app/sections/search-parties/parties-table/parties-table.component.html
deleted file mode 100644
index 68782612..00000000
--- a/src/app/sections/search-parties/parties-table/parties-table.component.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- | Email |
-
- {{ party.email }}
- |
-
-
-
- ID |
-
- {{ party.id }}
- |
-
-
-
- |
-
-
-
-
-
- |
-
-
- |
- |
-
diff --git a/src/app/sections/search-parties/parties-table/parties-table.component.scss b/src/app/sections/search-parties/parties-table/parties-table.component.scss
deleted file mode 100644
index f7335e41..00000000
--- a/src/app/sections/search-parties/parties-table/parties-table.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-table {
- width: 100%;
-}
-
-.action-cell {
- width: 8px;
-}
diff --git a/src/app/sections/search-parties/parties-table/parties-table.component.ts b/src/app/sections/search-parties/parties-table/parties-table.component.ts
deleted file mode 100644
index c064c88e..00000000
--- a/src/app/sections/search-parties/parties-table/parties-table.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
-import { Party, PartyID } from '@vality/domain-proto/domain';
-
-import { PartyActions } from './party-actions';
-import { PartyMenuItemEvent } from './party-menu-item-event';
-
-@Component({
- selector: 'cc-parties-table',
- templateUrl: 'parties-table.component.html',
- styleUrls: ['parties-table.component.scss'],
- changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class PartiesTableComponent {
- @Input()
- parties: Party[];
-
- @Output()
- menuItemSelected$: EventEmitter = new EventEmitter();
-
- partyActions = Object.keys(PartyActions);
- displayedColumns = ['email', 'id', 'actions'];
-
- menuItemSelected(action: string, partyID: PartyID): void {
- switch (action) {
- case PartyActions.NavigateToParty:
- this.menuItemSelected$.emit({ action, partyID });
- break;
- default:
- console.error('Wrong party action type.');
- }
- }
-}
diff --git a/src/app/sections/search-parties/parties-table/parties-table.module.ts b/src/app/sections/search-parties/parties-table/parties-table.module.ts
deleted file mode 100644
index 48df3c8e..00000000
--- a/src/app/sections/search-parties/parties-table/parties-table.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatTableModule } from '@angular/material/table';
-
-import { PartiesTableComponent } from './parties-table.component';
-import { PartyActionsPipe } from './party-actions.pipe';
-
-@NgModule({
- exports: [PartiesTableComponent],
- declarations: [PartiesTableComponent, PartyActionsPipe],
- imports: [MatTableModule, MatMenuModule, MatButtonModule, MatIconModule, CommonModule],
-})
-export class PartiesTableModule {}
diff --git a/src/app/sections/search-parties/parties-table/party-actions.pipe.ts b/src/app/sections/search-parties/parties-table/party-actions.pipe.ts
deleted file mode 100644
index 6d0a83d2..00000000
--- a/src/app/sections/search-parties/parties-table/party-actions.pipe.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-
-import { PartyActions } from './party-actions';
-
-const PARTY_ACTION_NAMES: { [N in PartyActions]: string } = {
- [PartyActions.NavigateToParty]: 'Merchant details',
-};
-
-@Pipe({
- name: 'ccPartyActions',
-})
-export class PartyActionsPipe implements PipeTransform {
- transform(action: string): string {
- return PARTY_ACTION_NAMES[action] || action;
- }
-}
diff --git a/src/app/sections/search-parties/parties-table/party-actions.ts b/src/app/sections/search-parties/parties-table/party-actions.ts
deleted file mode 100644
index 31b8ebb2..00000000
--- a/src/app/sections/search-parties/parties-table/party-actions.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum PartyActions {
- NavigateToParty = 'NavigateToParty',
-}
diff --git a/src/app/sections/search-parties/parties-table/party-menu-item-event.ts b/src/app/sections/search-parties/parties-table/party-menu-item-event.ts
deleted file mode 100644
index cd1895d3..00000000
--- a/src/app/sections/search-parties/parties-table/party-menu-item-event.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { PartyID } from '@vality/domain-proto/domain';
-
-import { PartyActions } from './party-actions';
-
-export interface PartyMenuItemEvent {
- action: PartyActions;
- partyID: PartyID;
-}
diff --git a/src/app/sections/search-parties/search-parties.component.html b/src/app/sections/search-parties/search-parties.component.html
index 42d97896..13d440ee 100644
--- a/src/app/sections/search-parties/search-parties.component.html
+++ b/src/app/sections/search-parties/search-parties.component.html
@@ -6,18 +6,12 @@
(searchParamsChanged$)="searchParamsUpdated($event)"
>
-
-
-
-
-
-
-
-
-
+
diff --git a/src/app/sections/search-parties/search-parties.component.ts b/src/app/sections/search-parties/search-parties.component.ts
index b5956ed8..68a67d02 100644
--- a/src/app/sections/search-parties/search-parties.component.ts
+++ b/src/app/sections/search-parties/search-parties.component.ts
@@ -1,11 +1,14 @@
import { Component } from '@angular/core';
import { Router } from '@angular/router';
+import { Party } from '@vality/deanonimus-proto/deanonimus';
+import { Column, createOperationColumn } from '@vality/ng-core';
+import startCase from 'lodash-es/startCase';
import { FetchPartiesService } from '@cc/app/shared/services/fetch-parties.service';
+import { getUnionKey } from '../../../utils';
+
import { PartiesSearchFiltersParams } from './parties-search-filters';
-import { PartyActions } from './parties-table/party-actions';
-import { PartyMenuItemEvent } from './parties-table/party-menu-item-event';
import { SearchPartiesService } from './search-parties.service';
@Component({
@@ -17,6 +20,50 @@ export class SearchPartiesComponent {
initSearchParams$ = this.partiesService.data$;
inProgress$ = this.fetchPartiesService.inProgress$;
parties$ = this.fetchPartiesService.parties$;
+ columns: Column[] = [
+ {
+ field: 'email',
+ description: 'id',
+ pinned: 'left',
+ link: (party) => `/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' },
+ },
+ },
+ },
+ {
+ field: 'suspension',
+ type: 'tag',
+ formatter: (party) => getUnionKey(party.suspension),
+ typeParameters: {
+ label: (party) => startCase(getUnionKey(party.suspension)),
+ tags: {
+ suspended: { color: 'warn' },
+ active: { color: 'success' },
+ },
+ },
+ },
+ {
+ field: 'shops',
+ formatter: (party) => party.shops.size,
+ },
+ createOperationColumn([
+ {
+ label: 'Details',
+ click: (party) => {
+ this.router.navigate([`/party/${party.id}`]);
+ },
+ },
+ ]),
+ ];
constructor(
private partiesService: SearchPartiesService,
@@ -28,11 +75,4 @@ export class SearchPartiesComponent {
this.partiesService.preserve($event);
this.fetchPartiesService.searchParties($event.text);
}
-
- partyMenuItemSelected(event: PartyMenuItemEvent) {
- switch (event.action) {
- case PartyActions.NavigateToParty:
- void this.router.navigate([`/party/${event.partyID}`]);
- }
- }
}
diff --git a/src/app/sections/search-parties/search-parties.module.ts b/src/app/sections/search-parties/search-parties.module.ts
index b771589e..28039c3a 100644
--- a/src/app/sections/search-parties/search-parties.module.ts
+++ b/src/app/sections/search-parties/search-parties.module.ts
@@ -3,13 +3,13 @@ import { NgModule } from '@angular/core';
import { FlexModule } from '@angular/flex-layout';
import { MatCardModule } from '@angular/material/card';
import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { TableModule } from '@vality/ng-core';
import { EmptySearchResultModule } from '@cc/components/empty-search-result';
import { PageLayoutModule } from '../../shared';
import { PartiesSearchFiltersModule } from './parties-search-filters';
-import { PartiesTableModule } from './parties-table';
import { SearchPartiesRoutingModule } from './search-parties-routing.module';
import { SearchPartiesComponent } from './search-parties.component';
@@ -19,11 +19,11 @@ import { SearchPartiesComponent } from './search-parties.component';
FlexModule,
MatCardModule,
PartiesSearchFiltersModule,
- PartiesTableModule,
CommonModule,
EmptySearchResultModule,
MatProgressBarModule,
PageLayoutModule,
+ TableModule,
],
declarations: [SearchPartiesComponent],
})
diff --git a/src/app/sections/shop-details/index.ts b/src/app/sections/shop-details/index.ts
deleted file mode 100644
index 74e4f677..00000000
--- a/src/app/sections/shop-details/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './shop-details.module';
diff --git a/src/app/sections/shop-details/routing-config.ts b/src/app/sections/shop-details/routing-config.ts
deleted file mode 100644
index d558ec12..00000000
--- a/src/app/sections/shop-details/routing-config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Services, RoutingConfig } from '@cc/app/shared/services';
-
-export const ROUTING_CONFIG: RoutingConfig = {
- services: [Services.PartyManagement],
-};
diff --git a/src/app/sections/shop-details/services/fetch-shop.service.ts b/src/app/sections/shop-details/services/fetch-shop.service.ts
deleted file mode 100644
index fe5abef3..00000000
--- a/src/app/sections/shop-details/services/fetch-shop.service.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Shop } from '@vality/domain-proto/domain';
-import { PartyID, ShopID } from '@vality/domain-proto/payment_processing';
-import { BehaviorSubject, Observable, defer, EMPTY, merge } from 'rxjs';
-import { catchError, shareReplay, switchMap } from 'rxjs/operators';
-
-import { PartyManagementService } from '@cc/app/api/payment-processing';
-import { NotificationErrorService } from '@cc/app/shared/services/notification-error';
-import { inProgressFrom, progressTo } from '@cc/utils';
-
-@Injectable()
-export class FetchShopService {
- shop$: Observable = defer(() => this.getShop$).pipe(
- switchMap(({ partyID, shopID }) =>
- this.partyManagementService.GetShop(partyID, shopID).pipe(
- progressTo(this.progress$),
- catchError((err) => {
- this.notificationErrorService.error(
- err,
- 'An error occurred while fetching shop',
- );
- return EMPTY;
- }),
- ),
- ),
- shareReplay({ refCount: true, bufferSize: 1 }),
- );
- contract$ = defer(() => this.getShop$).pipe(
- switchMap(({ partyID, shopID }) =>
- this.partyManagementService.GetShopContract(partyID, shopID).pipe(
- progressTo(this.progress$),
- catchError((err) => {
- this.notificationErrorService.error(
- err,
- 'An error occurred while fetching shop contract',
- );
- return EMPTY;
- }),
- ),
- ),
- shareReplay({ refCount: true, bufferSize: 1 }),
- );
-
- inProgress$ = inProgressFrom(() => this.progress$, merge(this.shop$, this.contract$));
-
- private getShop$ = new BehaviorSubject<{ partyID: PartyID; shopID: ShopID }>(null);
- private progress$ = new BehaviorSubject(0);
-
- constructor(
- private partyManagementService: PartyManagementService,
- private notificationErrorService: NotificationErrorService,
- ) {}
-
- getShop(partyID: PartyID, shopID: ShopID) {
- this.getShop$.next({ shopID, partyID });
- }
-
- reload() {
- if (this.getShop$.value) this.getShop$.next(this.getShop$.value);
- }
-}
diff --git a/src/app/sections/shop-details/shop-details-routing.module.ts b/src/app/sections/shop-details/shop-details-routing.module.ts
deleted file mode 100644
index a4ce02f0..00000000
--- a/src/app/sections/shop-details/shop-details-routing.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { AppAuthGuardService } from '@cc/app/shared/services';
-
-import { ROUTING_CONFIG } from './routing-config';
-import { ShopDetailsComponent } from './shop-details.component';
-
-@NgModule({
- imports: [
- RouterModule.forChild([
- {
- path: '',
- component: ShopDetailsComponent,
- canActivate: [AppAuthGuardService],
- data: ROUTING_CONFIG,
- },
- ]),
- ],
-})
-export class ShopDetailsRoutingModule {}
diff --git a/src/app/sections/shop-details/shop-details.component.html b/src/app/sections/shop-details/shop-details.component.html
deleted file mode 100644
index 99db238b..00000000
--- a/src/app/sections/shop-details/shop-details.component.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
Shop details
-
-
-
-
-
-
-
-
-
- Contract
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/app/shared/components/thrift-viewer/thrift-viewer.component.ts b/src/app/shared/components/thrift-viewer/thrift-viewer.component.ts
index 15609534..734bd0e6 100644
--- a/src/app/shared/components/thrift-viewer/thrift-viewer.component.ts
+++ b/src/app/shared/components/thrift-viewer/thrift-viewer.component.ts
@@ -3,6 +3,7 @@ import { UntilDestroy } from '@ngneat/until-destroy';
import { ThriftAstMetadata } from '@vality/domain-proto';
import { ComponentChanges } from '@vality/ng-core';
import { ValueType } from '@vality/thrift-ts';
+import { coerceBoolean } from 'coerce-property';
import { ReplaySubject } from 'rxjs';
import { MetadataViewExtension } from '@cc/app/shared/components/json-viewer';
@@ -26,6 +27,7 @@ export class ThriftViewerComponent
implements OnChanges {
@Input() kind: ViewerKind = ViewerKind.Component;
@Input() value: T;
@Input() compared?: T;
+ @Input() @coerceBoolean progress: boolean | '' = false;
@Input() metadata: ThriftAstMetadata[];
@Input() namespace: string;
diff --git a/src/app/shared/components/thrift-viewer/thrift-viewer.module.ts b/src/app/shared/components/thrift-viewer/thrift-viewer.module.ts
index eb820e86..041d54f1 100644
--- a/src/app/shared/components/thrift-viewer/thrift-viewer.module.ts
+++ b/src/app/shared/components/thrift-viewer/thrift-viewer.module.ts
@@ -5,6 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { MatIconModule } from '@angular/material/icon';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MetadataFormModule } from '@cc/app/shared/components/metadata-form';
import { MonacoEditorModule } from '@cc/components/monaco-editor';
@@ -27,6 +28,7 @@ import { ThriftViewerComponent } from './thrift-viewer.component';
FlexModule,
JsonViewerModule,
GridModule,
+ MatProgressSpinnerModule,
],
})
export class ThriftViewerModule {}