Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 16 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@
"@angular/router": "^19.1.6",
"@jsverse/transloco": "^7.5.0",
"@vality/matez": "19.0.1-pr-423-eca1120.0",
"@vality/swag-anapi-v2": "2.0.1-dc90399.0",
"@vality/swag-api-keys-v2": "0.1.2",
"@vality/swag-anapi-v2": "2.0.1-4c69a2f.0",
"@vality/swag-api-keys-v2": "0.1.3-eb0cff1.0",
"@vality/swag-organizations": "1.0.1-67dcada.0",
"@vality/swag-payments": "0.1.3-fd6802c.0",
"@vality/swag-url-shortener": "0.1.1-17b1e98.0",
"@vality/swag-wallets": "0.1.3",
"@vality/swag-payments": "0.1.3-9cbb3b3.0",
"@vality/swag-wallets": "0.1.4-20f6c0d.0",
"apexcharts": "^3.19.2",
"humanize-duration": "^3.19.0",
"jwt-decode": "^3.1.2",
Expand Down
11 changes: 0 additions & 11 deletions src/app/api/payments/contracts.service.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/app/api/payments/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ export * from './shops.service';
export * from './webhooks.service';
export * from './payments.service';
export * from './invoices.service';
export * from './contracts.service';
export * from './payments-dictionary.service';
35 changes: 1 addition & 34 deletions src/app/api/payments/payments-dictionary.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
import { CustomersTopic, InvoicesTopic, PaymentStatus } from '@vality/swag-payments';
import { InvoicesTopic, PaymentStatus } from '@vality/swag-payments';

import { DictionaryService } from '../utils';

Expand Down Expand Up @@ -86,39 +86,6 @@ export class PaymentsDictionaryService {
),
}));

customersTopicEventType$ = this.dictionaryService.create<CustomersTopic.EventTypesEnum>(() => ({
CustomerCreated: this.t.translate(
'payments.customersTopicEventType.CustomerCreated',
null,
'dictionary',
),
CustomerDeleted: this.t.translate(
'payments.customersTopicEventType.CustomerDeleted',
null,
'dictionary',
),
CustomerReady: this.t.translate(
'payments.customersTopicEventType.CustomerReady',
null,
'dictionary',
),
CustomerBindingStarted: this.t.translate(
'payments.customersTopicEventType.CustomerBindingStarted',
null,
'dictionary',
),
CustomerBindingSucceeded: this.t.translate(
'payments.customersTopicEventType.CustomerBindingSucceeded',
null,
'dictionary',
),
CustomerBindingFailed: this.t.translate(
'payments.customersTopicEventType.CustomerBindingFailed',
null,
'dictionary',
),
}));

paymentStatus$ = this.dictionaryService.create<PaymentStatus.StatusEnum>(() => ({
pending: this.t.translate('payments.paymentStatus.pending', null, 'dictionary'),
processed: this.t.translate('payments.paymentStatus.processed', null, 'dictionary'),
Expand Down
2 changes: 0 additions & 2 deletions src/app/api/url-shortener/index.ts

This file was deleted.

9 changes: 0 additions & 9 deletions src/app/api/url-shortener/shortener.service.ts

This file was deleted.

16 changes: 0 additions & 16 deletions src/app/api/url-shortener/url-shortener.module.ts

This file was deleted.

26 changes: 0 additions & 26 deletions src/app/api/wallet/identities.service.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/app/api/wallet/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export * from './wallet.module';
export * from './wallets.service';
export * from './webhooks.service';
export * from './withdrawals.service';
export * from './identities.service';
export * from './deposits.service';
export * from './wallet-dictionary.service';
export * from './reports.service';
Expand Down
7 changes: 0 additions & 7 deletions src/app/api/wallet/wallet-dictionary.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
import {
Deposit,
DepositRevert,
DestinationsTopic,
Report,
Withdrawal,
Expand Down Expand Up @@ -55,12 +54,6 @@ export class WalletDictionaryService {
}),
);

depositRevertStatus$ = this.dictionaryService.create<DepositRevert.StatusEnum>(() => ({
Pending: this.t.translate('wallet.depositRevertStatus.Pending', null, 'dictionary'),
Succeeded: this.t.translate('wallet.depositRevertStatus.Succeeded', null, 'dictionary'),
Failed: this.t.translate('wallet.depositRevertStatus.Failed', null, 'dictionary'),
}));

depositStatus$ = this.dictionaryService.create<Deposit.StatusEnum>(() => ({
Pending: this.t.translate('wallet.depositStatus.Pending', null, 'dictionary'),
Succeeded: this.t.translate('wallet.depositStatus.Succeeded', null, 'dictionary'),
Expand Down
2 changes: 0 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { FlexLayoutModule } from 'ng-flex-layout';

import { AnapiModule } from '@dsh/app/api/anapi';
import { PaymentsModule } from '@dsh/app/api/payments';
import { UrlShortenerModule } from '@dsh/app/api/url-shortener';
import { WalletModule } from '@dsh/app/api/wallet';
import { ErrorModule } from '@dsh/app/shared/services';
import { createDateRangeWithPresetSerializer } from '@dsh/components/date-range-filter';
Expand Down Expand Up @@ -64,7 +63,6 @@ import { TranslocoHttpLoaderService } from './transloco-http-loader.service';
AnapiModule,
PaymentsModule,
OrganizationsModule,
UrlShortenerModule,
WalletModule,
SpinnerModule,
ApiKeysModule,
Expand Down
4 changes: 0 additions & 4 deletions src/app/auth/role-access-groups.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ export const ROLE_ACCESS_GROUPS: RoleAccessGroup[] = [
name: RoleAccessName.CreateInvoice,
availableRoles: [RoleId.Administrator, RoleId.Manager],
},
{
name: RoleAccessName.PaymentLinks,
availableRoles: [RoleId.Administrator, RoleId.Manager],
},
{
name: RoleAccessName.CreateRefund,
availableRoles: [RoleId.Administrator, RoleId.Accountant],
Expand Down
1 change: 0 additions & 1 deletion src/app/auth/types/role-access-name.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export enum RoleAccessName {
Reports,
Webhooks,
ApiKeys,
PaymentLinks,

ViewAnalytics,
ViewPayments,
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/actionbar/components/user/user.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class UserComponent {
organization$ = this.contextOrganizationService.organization$;
username = this.keycloakService.getUsername();
activeOrg$ = this.contextOrganizationService.organization$;
keycloakAccountEndpoint = `${this.config.keycloakEndpoint}/auth/realms/external/account/#`;
keycloakAccountEndpoint = `${this.config.keycloakEndpoint}/realms/external/account/#`;
userLinksConfig$ = this.transloco.selectTranslation('components').pipe(
map(() => [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ export class RoleAccessesDictionaryService {
null,
'organization-section',
),
[RoleAccessName.PaymentLinks]: this.t.translate(
'roleAccessesDictionary.createPaymentLink',
null,
'organization-section',
),
[RoleAccessName.CreateRefund]: this.t.translate(
'roleAccessesDictionary.createRefund',
null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
>
<h1 class="mat-display-medium">{{ t('header') }}</h1>

<div fxLayout fxLayoutAlign="end">
<button mat-flat-button (click)="createOrganization()">
{{ t('createOrganization') }}
</button>
</div>
@if (isDev) {
<div fxLayout fxLayoutAlign="end">
<button mat-flat-button (click)="createOrganization()">
{{ t('createOrganization') }} (dev)
</button>
</div>
}

<div fxLayout="column" fxLayoutGap="16px">
<dsh-spinner *ngIf="isLoading$ | async; else loaded" fxFlexAlign="center"></dsh-spinner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit } from '@angular/core';
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit, isDevMode } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { MatDialog } from '@angular/material/dialog';
import { filter } from 'rxjs/operators';
Expand All @@ -21,6 +21,7 @@ export class OrganizationsComponent implements OnInit {
hasMore$ = this.fetchOrganizationsService.hasMore$;
isLoading$ = this.fetchOrganizationsService.doSearchAction$;
lastUpdated$ = this.fetchOrganizationsService.lastUpdated$;
isDev = isDevMode();

constructor(
private fetchOrganizationsService: FetchOrganizationsService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ const ROUTES: Routes = [
},
[RoleAccessName.Webhooks],
),
createPrivateRoute(
{
path: 'payment-link',
loadChildren: () => import('./payment-link').then((m) => m.PaymentLinkModule),
},
[RoleAccessName.PaymentLinks],
),
createPrivateRoute(
{
path: 'api-keys',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Component, isDevMode } from '@angular/core';
import { Component } from '@angular/core';
import { TranslocoService } from '@jsverse/transloco';
import { map } from 'rxjs';

import { RoleAccessName } from '@dsh/app/auth';

Expand All @@ -10,13 +9,6 @@ import { RoleAccessName } from '@dsh/app/auth';
})
export class IntegrationsComponent {
links = [
isDevMode() && {
path: 'payment-link',
label$: this.transloco
.selectTranslate('integrations.tabs.payment-link', null, 'payment-section')
.pipe(map((label) => `${label} (dev)`)),
roles: [RoleAccessName.PaymentLinks],
},
{
path: 'api-keys',
label$: this.transloco.selectTranslate(
Expand Down
Loading
Loading