valitydev/dashboard
14
0
Fork 0
mirror of https://github.com/valitydev/dashboard.git synced 2024-11-06 02:25:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TD-633, TD-634: Create USD shop by default (#125)

Browse Source
This commit is contained in:
Rinat Arsaev 2023-06-13 20:10:15 +04:00 committed by GitHub
parent 8e3b9e0652
commit 193f4bf436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
207 changed files with 1084 additions and 1285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
angular.json
View File

@ -18,8 +18,11 @@
"prefix": "app",
"architect": {
"build": {
"builder": "ngx-build-plus:browser",
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {
"path": "./extra-webpack.config.ts"
},
"allowedCommonJsDependencies": [
"uuid",
"keycloak-js",
@ -115,7 +118,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "ngx-build-plus:dev-server",
"builder": "@angular-builders/custom-webpack:dev-server",
"configurations": {
"production": {
"browserTarget": "dashboard:build:production"
@ -130,7 +133,7 @@
"defaultConfiguration": "development"
},
"test": {
"builder": "ngx-build-plus:karma",
"builder": "@angular-builders/custom-webpack:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",

10
extra-webpack.config.ts Normal file
View File

@ -0,0 +1,10 @@
import { IgnorePlugin, Configuration } from 'webpack';
export default {
plugins: [
new IgnorePlugin({
resourceRegExp: /^\.\/locale$/,
contextRegExp: /moment$/,
}),
],
} as Configuration;

1540
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -7,9 +7,8 @@
"start": "ng serve --proxy-config proxy.conf.js --port 8000",
"stage": "cross-env NODE_ENV=stage ng serve --proxy-config proxy.conf.js --port 8001 --configuration=stage",
"fix": "npm run lint-fix && npm run prettier-fix",
"build": "ng build --extra-webpack-config webpack.extra.js && npm run transloco:optimize",
"build": "ng build && transloco-optimize dist/assets/i18n",
"test": "ng test",
"transloco:optimize": "transloco-optimize dist/assets/i18n",
"i18n:extract": "transloco-keys-manager extract",
"i18n:check": "transloco-keys-manager find --emit-error-on-extra-keys",
"coverage": "npx http-server -c-1 -o -p 9875 ./coverage",
@ -46,13 +45,13 @@
"@s-libs/micro-dash": "15.2.0",
"@s-libs/ng-core": "15.2.0",
"@s-libs/rxjs-core": "15.2.0",
"@sentry/angular": "7.7.0",
"@sentry/integrations": "7.7.0",
"@sentry/tracing": "7.7.0",
"@vality/ng-core": "^0.3.0",
"@sentry/angular": "7.54.0",
"@sentry/integrations": "7.54.0",
"@sentry/tracing": "7.54.0",
"@vality/ng-core": "0.7.1-2a1b72f.0",
"@vality/swag-anapi-v2": "2.0.1-38f360b.0",
"@vality/swag-api-keys": "1.0.1-55db9ab.0",
"@vality/swag-claim-management": "0.1.1-bfc2e6c.0",
"@vality/swag-claim-management": "0.1.1-29260c7.0",
"@vality/swag-organizations": "1.0.1-cd6cc10.0",
"@vality/swag-payments": "0.1.1-01da4bb.0",
"@vality/swag-questionary-aggr-proxy": "0.1.1-ed41741.0",
@ -81,6 +80,7 @@
"zone.js": "0.11.7"
},
"devDependencies": {
"@angular-builders/custom-webpack": "15.0.0",
"@angular-devkit/build-angular": "15.2.4",
"@angular-eslint/builder": "15.2.1",
"@angular-eslint/eslint-plugin": "15.2.1",
@ -92,7 +92,6 @@
"@angular/language-service": "15.2.4",
"@ngneat/transloco-keys-manager": "^3.4.1",
"@ngneat/transloco-optimize": "^3.0.2",
"@sentry/webpack-plugin": "1.19.0",
"@types/d3": "^5.7.0",
"@types/glob": "^7.1.3",
"@types/humanize-duration": "^3.18.0",
@ -124,7 +123,6 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-spec-reporter": "0.0.32",
"ngx-build-plus": "15.0.0",
"prettier": "2.5.1",
"ts-mockito": "^2.6.1",
"ts-node": "10.9.1",

2
src/app/api/anapi/anapi-dictionary.service.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { TranslocoService } from '@ngneat/transloco';
import { InvoiceStatus, Report, RefundStatus, PaymentSearchResult } from '@vality/swag-anapi-v2';
import { PaymentSystem, TokenProvider } from '@dsh/api/payments';
import { PaymentSystem, TokenProvider } from '@dsh/app/api/payments';
import { DictionaryService } from '../utils';

46
src/app/api/claim-management/utils/create-test-shop-claim-changeset.ts
View File

@ -1,22 +1,24 @@
import { Modification, ShopModification, ShopAccountCreationModification } from '@vality/swag-claim-management';
import {
Modification,
ShopModification,
ShopAccountCreationModification,
PayoutToolInfo,
InternationalBankAccount,
} from '@vality/swag-claim-management';
import {
createRussianLegalEntityModification,
createRussianBankAccountModification,
createContractCreationModification,
createRussianContractPayoutToolCreationModification,
createShopCreationModification,
makeShopLocation,
createInternationalLegalEntityModification,
createContractPayoutToolCreationModification,
} from './claim-party-modification';
import { createBaseShopModification } from './claim-party-modification/claim-shop-modification/create-base-shop-modification';
import ShopModificationTypeEnum = ShopModification.ShopModificationTypeEnum;
const RUSSIAN_BANK_ACCOUNT = {
account: '00000000000000000000',
bankName: 'Test bank name',
bankPostAccount: '00000000000000000000',
bankBik: '000000000',
const CURRENCY = {
symbolicCode: 'USD',
};
export const createTestShopClaimChangeset = (
@ -26,25 +28,29 @@ export const createTestShopClaimChangeset = (
testContractorID: string
): Modification[] => {
return [
createRussianLegalEntityModification(testContractorID, {
createInternationalLegalEntityModification(testContractorID, {
legalName: 'Test legal name',
actualAddress: 'Test actual address',
russianBankAccount: createRussianBankAccountModification(RUSSIAN_BANK_ACCOUNT),
inn: '0000000000',
postAddress: 'Test post address',
registeredName: 'Test registered name',
registeredAddress: 'Test registered address',
registeredNumber: '0000000000000',
representativeDocument: 'Test representative document',
representativeFullName: 'Test representative full name',
representativePosition: 'Test representative position',
tradingName: 'Test trading name',
}),
createContractCreationModification(testContractID, {
contractorID: testContractorID,
paymentInstitution: { id: 1 },
}),
createRussianContractPayoutToolCreationModification(testContractID, testPayoutToolID, RUSSIAN_BANK_ACCOUNT),
createContractPayoutToolCreationModification(testContractID, testPayoutToolID, {
currency: CURRENCY,
toolInfo: {
payoutToolType: PayoutToolInfo.PayoutToolTypeEnum.InternationalBankAccount,
iban: '00000000000000',
bic: '00000000',
number: '00000000000000',
} as InternationalBankAccount,
}),
createShopCreationModification(testShopID, {
category: { categoryID: 1 },
location: makeShopLocation({ url: 'http://test.url' }),
location: makeShopLocation({ url: 'https://test-url.local' }),
details: { name: 'Test shop' },
contractID: testContractID,
payoutToolID: testPayoutToolID,
@ -53,7 +59,7 @@ export const createTestShopClaimChangeset = (
id: testShopID,
modification: {
shopModificationType: ShopModificationTypeEnum.ShopAccountCreationModification,
currency: { symbolicCode: 'RUB' },
currency: CURRENCY,
} as ShopAccountCreationModification,
}),
];

2
src/app/api/payments/categories.service.ts
View File

@ -3,7 +3,7 @@ import { CategoriesService as ApiCategoriesService } from '@vality/swag-payments
import { BehaviorSubject, defer } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { shareReplayRefCount } from '@dsh/operators';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { createApi } from '../utils';

2
src/app/api/payments/contracts.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { ContractsService as ApiContractsService } from '@vality/swag-payments';
import { PartyIdExtension } from '@dsh/api/utils/extensions';
import { PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';

2
src/app/api/payments/countries.service.ts
View File

@ -4,8 +4,8 @@ import sortBy from 'lodash-es/sortBy';
import { Observable, of } from 'rxjs';
import { catchError, map, shareReplay } from 'rxjs/operators';
import { SHARE_REPLAY_CONF } from '@dsh/app/custom-operators';
import { ErrorService } from '@dsh/app/shared/services';
import { SHARE_REPLAY_CONF } from '@dsh/operators';
import { createApi } from '../utils';

2
src/app/api/payments/invoice-templates.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable, Injector } from '@angular/core';
import { InvoiceTemplatesService as ApiInvoiceTemplatesService } from '@vality/swag-payments';
import { PartyIdPatchMethodService } from '@dsh/api/utils/extensions';
import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';

2
src/app/api/payments/invoices.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable, Injector } from '@angular/core';
import { InvoicesService as ApiInvoicesService } from '@vality/swag-payments';
import { PartyIdPatchMethodService } from '@dsh/api/utils/extensions';
import { PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';

2
src/app/api/payments/payment-institutions.service.ts
View File

@ -3,7 +3,7 @@ import { PaymentInstitutionsService as ApiPaymentInstitutionsService } from '@va
import { BehaviorSubject, defer } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { shareReplayRefCount } from '@dsh/operators';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { createApi } from '../utils';

2
src/app/api/payments/payouts.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable, Injector } from '@angular/core';
import { PayoutsService as ApiPayoutsService } from '@vality/swag-payments';
import { PartyIdExtension, PartyIdPatchMethodService } from '@dsh/api/utils/extensions';
import { PartyIdExtension, PartyIdPatchMethodService } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';

2
src/app/api/payments/webhooks.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable, Injector } from '@angular/core';
import { WebhooksService as ApiWebhooksService } from '@vality/swag-payments';
import { PartyIdPatchMethodService, PartyIdExtension } from '@dsh/api/utils/extensions';
import { PartyIdPatchMethodService, PartyIdExtension } from '@dsh/app/api/utils/extensions';
import { createApi } from '../utils';

2
src/app/api/utils/dictionary.service.ts
View File

@ -3,7 +3,7 @@ import { TranslocoService } from '@ngneat/transloco';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { shareReplayRefCount } from '@dsh/operators';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
@Injectable({
providedIn: 'root',

2
src/app/api/wallet/identities.service.ts
View File

@ -3,7 +3,7 @@ import { IdentitiesService as ApiIdentitiesService, Identity } from '@vality/swa
import { Subject, defer, switchMap } from 'rxjs';
import { startWith, map } from 'rxjs/operators';
import { shareReplayRefCount } from '@dsh/operators';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { createApi } from '../utils';

2
src/app/api/wallet/wallets.service.ts
View File

@ -3,7 +3,7 @@ import { WalletsService as ApiWalletsService } from '@vality/swag-wallet';
import { of } from 'rxjs';
import { catchError, map, pluck, shareReplay } from 'rxjs/operators';
import { SHARE_REPLAY_CONF } from '@dsh/operators';
import { SHARE_REPLAY_CONF } from '@dsh/app/custom-operators';
import { createApi } from '../utils';
import { PartyIdExtension } from '../utils/extensions';

12
src/app/app.module.ts
View File

@ -16,12 +16,12 @@ import { Router } from '@angular/router';
import { TRANSLOCO_CONFIG, TRANSLOCO_LOADER, TranslocoModule, translocoConfig } from '@ngneat/transloco';
import * as Sentry from '@sentry/angular';
import { AnapiModule } from '@dsh/api/anapi';
import { ClaimManagementModule } from '@dsh/api/claim-management';
import { PaymentsModule } from '@dsh/api/payments';
import { QuestionaryAggrProxyModule } from '@dsh/api/questionary-aggr-proxy';
import { UrlShortenerModule } from '@dsh/api/url-shortener';
import { WalletModule } from '@dsh/api/wallet';
import { AnapiModule } from '@dsh/app/api/anapi';
import { ClaimManagementModule } from '@dsh/app/api/claim-management';
import { PaymentsModule } from '@dsh/app/api/payments';
import { QuestionaryAggrProxyModule } from '@dsh/app/api/questionary-aggr-proxy';
import { UrlShortenerModule } from '@dsh/app/api/url-shortener';
import { WalletModule } from '@dsh/app/api/wallet';
import { ErrorModule } from '@dsh/app/shared/services';
import { QUERY_PARAMS_SERIALIZERS } from '@dsh/app/shared/services/query-params/utils/query-params-serializers';
import { createDateRangeWithPresetSerializer } from '@dsh/components/date-range-filter';

1
src/app/auth/is-access-allowed.pipe.ts
View File

@ -6,6 +6,7 @@ import { RoleAccessName } from './types/role-access-name';
@Pipe({
name: 'isAccessAllowed',
pure: false,
})
export class IsAccessAllowedPipe implements PipeTransform, OnDestroy {
private asyncPipe: AsyncPipe;

8
src/app/bootstrap.service.spec.ts
View File

@ -4,10 +4,10 @@ import { cold } from 'jasmine-marbles';
import { of, throwError } from 'rxjs';
import { anyNumber, anything, instance, mock, verify, when } from 'ts-mockito';
import { ClaimsService } from '@dsh/api/claim-management';
import { OrgsService } from '@dsh/api/organizations';
import { PartiesService } from '@dsh/api/payments';
import { ApiShopsService } from '@dsh/api/shop';
import { ClaimsService } from '@dsh/app/api/claim-management';
import { OrgsService } from '@dsh/app/api/organizations';
import { PartiesService } from '@dsh/app/api/payments';
import { ApiShopsService } from '@dsh/app/api/shop';
import { ErrorService } from '@dsh/app/shared';
import { BootstrapService } from './bootstrap.service';

9
src/app/dadata/dadata.component.ts
View File

@ -14,8 +14,13 @@ import isEmpty from 'lodash-es/isEmpty';
import { interval, Observable } from 'rxjs';
import { debounce, filter, map, switchMap, take } from 'rxjs/operators';
import { ContentByRequestType, DaDataService, ParamsByRequestType, Suggestion } from '@dsh/api/questionary-aggr-proxy';
import { progress, shareReplayUntilDestroyed, takeError } from '@dsh/operators';
import {
ContentByRequestType,
DaDataService,
ParamsByRequestType,
Suggestion,
} from '@dsh/app/api/questionary-aggr-proxy';
import { progress, shareReplayUntilDestroyed, takeError } from '@dsh/app/custom-operators';
import { provideValueAccessor } from '@dsh/utils';
import { Type } from './type';

2
src/app/home/actionbar/actionbar.module.ts
View File

@ -9,7 +9,7 @@ import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy
import { RouterModule } from '@angular/router';
import { TranslocoModule } from '@ngneat/transloco';
import { ClaimsService } from '@dsh/api/claim-management';
import { ClaimsService } from '@dsh/app/api/claim-management';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { FetchOrganizationsModule } from '@dsh/app/shared/services/fetch-organizations';
import { ButtonModule } from '@dsh/components/buttons';

2
src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.ts
View File

@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { Claim } from '@vality/swag-claim-management';
import { ClaimManagementDictionaryService } from '@dsh/api/claim-management';
import { ClaimManagementDictionaryService } from '@dsh/app/api/claim-management';
@Component({
selector: 'dsh-claim-row',

2
src/app/sections/claim-section/claims/claims.module.ts
View File

@ -9,7 +9,7 @@ import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy
import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
import { TranslocoModule } from '@ngneat/transloco';
import { ClaimsService } from '@dsh/api/claim-management';
import { ClaimsService } from '@dsh/app/api/claim-management';
import { ShopCreationModule } from '@dsh/app/shared/components/shop-creation';
import { ButtonModule } from '@dsh/components/buttons';
import { IndicatorsModule } from '@dsh/components/indicators';

4
src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts
View File

@ -4,9 +4,9 @@ import { TranslocoService } from '@ngneat/transloco';
import { Claim } from '@vality/swag-claim-management';
import { Observable } from 'rxjs';
import { ClaimsService } from '@dsh/api/claim-management';
import { ClaimsService } from '@dsh/app/api/claim-management';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { FetchResult, PartialFetcher } from '@dsh/app/shared';
import { mapToTimestamp } from '@dsh/operators';
import { ClaimsSearchFiltersSearchParams } from '../../claims-search-filters/claims-search-filters-search-params';

2
src/app/sections/organization-section/accept-invitation/accept-invitation.component.spec.ts
View File

@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
import { of } from 'rxjs';
import { anything, deepEqual, mock, verify, when } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { ErrorService } from '@dsh/app/shared';
import { provideMockService } from '@dsh/app/shared/tests';

2
src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts
View File

@ -4,7 +4,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { BehaviorSubject, Subscription } from 'rxjs';
import { first, pluck, switchMap } from 'rxjs/operators';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { ErrorService } from '@dsh/app/shared';
import { inProgressTo } from '@dsh/utils';

2
src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts
View File

@ -5,7 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
import { By } from '@angular/platform-browser';
import { ApiShopsService } from '@dsh/api';
import { ApiShopsService } from '@dsh/app/api';
import { DialogConfig, DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { provideMockService, provideMockToken } from '@dsh/app/shared/tests';

2
src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts
View File

@ -7,7 +7,7 @@ import isNil from 'lodash-es/isNil';
import { BehaviorSubject, combineLatest, EMPTY, Observable, of } from 'rxjs';
import { first, map, switchMap, tap } from 'rxjs/operators';
import { OrganizationsDictionaryService } from '@dsh/api/organizations';
import { OrganizationsDictionaryService } from '@dsh/app/api/organizations';
import { DialogConfig, DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { ShopsDataService } from '@dsh/app/shared';
import { sortRoleIds } from '@dsh/app/shared/components/organization-roles/utils/sort-role-ids';

2
src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts
View File

@ -7,7 +7,7 @@ import {
import { FormBuilder } from '@ngneat/reactive-forms';
import { RoleId } from '@vality/swag-organizations';
import { OrganizationsDictionaryService } from '@dsh/api/organizations';
import { OrganizationsDictionaryService } from '@dsh/app/api/organizations';
import { RoleAccess, ROLE_ACCESS_GROUPS } from '@dsh/app/auth';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ROLE_PRIORITY_DESC } from '@dsh/app/shared/components/organization-roles/utils/sort-role-ids';

6
src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts
View File

@ -10,9 +10,9 @@ import { Shop } from '@vality/swag-payments';
import { of, throwError } from 'rxjs';
import { anyString, anything, deepEqual, mock, verify, when } from 'ts-mockito';
import { ApiShopsService, OrganizationsService } from '@dsh/api';
import { MOCK_INVITATION } from '@dsh/api/organizations/tests/mock-invitation';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { ApiShopsService, OrganizationsService } from '@dsh/app/api';
import { MOCK_INVITATION } from '@dsh/app/api/organizations/tests/mock-invitation';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services/error';
import { NotificationService } from '@dsh/app/shared/services/notification';

2
src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts
View File

@ -9,7 +9,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { InviteeContact, MemberRole } from '@vality/swag-organizations';
import { BehaviorSubject } from 'rxjs';
import { InvitationsService } from '@dsh/api/organizations';
import { InvitationsService } from '@dsh/app/api/organizations';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services/error';
import { NotificationService } from '@dsh/app/shared/services/notification';

2
src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts
View File

@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
import { By } from '@angular/platform-browser';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { ErrorService, NotificationService } from '@dsh/app/shared';
import { provideMockService } from '@dsh/app/shared/tests';

2
src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts
View File

@ -4,7 +4,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { InlineObject1, Invitation, Organization } from '@vality/swag-organizations';
import { filter, switchMap } from 'rxjs/operators';
import { InvitationsService } from '@dsh/api/organizations';
import { InvitationsService } from '@dsh/app/api/organizations';
import { ErrorService, NotificationService } from '@dsh/app/shared';
import { ConfirmActionDialogComponent, ConfirmActionDialogResult } from '@dsh/components/popups';
import { ignoreBeforeCompletion } from '@dsh/utils';

6
src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts
View File

@ -6,9 +6,9 @@ import { cold } from 'jasmine-marbles';
import { of } from 'rxjs';
import { anything, mock, verify, when, anyString } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { MOCK_INVITATION } from '@dsh/api/organizations/tests/mock-invitation';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { OrgsService } from '@dsh/app/api/organizations';
import { MOCK_INVITATION } from '@dsh/app/api/organizations/tests/mock-invitation';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { ErrorService } from '@dsh/app/shared';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';

2
src/app/sections/organization-section/organization-details/invitations/invitations.component.ts
View File

@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { filter, first, shareReplay, switchMap } from 'rxjs/operators';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { DialogConfig, DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ignoreBeforeCompletion } from '@dsh/utils';

4
src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts
View File

@ -5,9 +5,9 @@ import { Invitation, InvitationStatusName } from '@vality/swag-organizations';
import { BehaviorSubject, defer, of } from 'rxjs';
import { catchError, pluck, shareReplay, switchMap, switchMapTo } from 'rxjs/operators';
import { InvitationsService } from '@dsh/api/organizations';
import { InvitationsService } from '@dsh/app/api/organizations';
import { mapToTimestamp, progress } from '@dsh/app/custom-operators';
import { ErrorService } from '@dsh/app/shared';
import { mapToTimestamp, progress } from '@dsh/operators';
@UntilDestroy()
@Injectable()

2
src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts
View File

@ -4,7 +4,7 @@ import {
MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
} from '@angular/material/legacy-dialog';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { ErrorService } from '@dsh/app/shared';
import { provideMockService, provideMockToken } from '@dsh/app/shared/tests';

2
src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts
View File

@ -8,7 +8,7 @@ import { MemberRole } from '@vality/swag-organizations';
import { BehaviorSubject, defer, forkJoin, of, Subscription } from 'rxjs';
import { catchError, pluck, shareReplay, switchMap } from 'rxjs/operators';
import { MembersService } from '@dsh/api/organizations';
import { MembersService } from '@dsh/app/api/organizations';
import { ErrorService } from '@dsh/app/shared';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';

2
src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts
View File

@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
import { By } from '@angular/platform-browser';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { ErrorService, NotificationService } from '@dsh/app/shared';
import { OrganizationManagementService } from '@dsh/app/shared/services/organization-management/organization-management.service';

2
src/app/sections/organization-section/organization-details/members/components/member/member.component.ts
View File

@ -4,7 +4,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { Member, Organization } from '@vality/swag-organizations';
import { filter, switchMap } from 'rxjs/operators';
import { MembersService } from '@dsh/api/organizations';
import { MembersService } from '@dsh/app/api/organizations';
import { DialogConfig, DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { ErrorService, NotificationService } from '@dsh/app/shared';
import { OrganizationManagementService } from '@dsh/app/shared/services/organization-management/organization-management.service';

6
src/app/sections/organization-section/organization-details/members/members.component.spec.ts
View File

@ -7,9 +7,9 @@ import { cold } from 'jasmine-marbles';
import { of } from 'rxjs';
import { mock, verify, when } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { MOCK_MEMBER } from '@dsh/api/organizations/tests/mock-member';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { OrgsService } from '@dsh/app/api/organizations';
import { MOCK_MEMBER } from '@dsh/app/api/organizations/tests/mock-member';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { ErrorService } from '@dsh/app/shared';
import { provideMockService } from '@dsh/app/shared/tests';

2
src/app/sections/organization-section/organization-details/members/members.component.ts
View File

@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { shareReplay, switchMap } from 'rxjs/operators';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { FetchMembersService } from './services/fetch-members/fetch-members.service';
import { MembersExpandedIdManager } from './services/members-expanded-id-manager/members-expanded-id-manager.service';

2
src/app/sections/organization-section/organization-details/members/members.module.ts
View File

@ -9,7 +9,7 @@ import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy
import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
import { TranslocoModule } from '@ngneat/transloco';
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/api/organizations';
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/app/api/organizations';
import { ErrorModule, NotificationModule } from '@dsh/app/shared';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { ButtonModule } from '@dsh/components/buttons';

4
src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts
View File

@ -5,9 +5,9 @@ import { Member } from '@vality/swag-organizations';
import { BehaviorSubject, defer, of } from 'rxjs';
import { catchError, pluck, shareReplay, switchMap, switchMapTo } from 'rxjs/operators';
import { MembersService } from '@dsh/api/organizations';
import { MembersService } from '@dsh/app/api/organizations';
import { mapToTimestamp, progress } from '@dsh/app/custom-operators';
import { ErrorService } from '@dsh/app/shared';
import { mapToTimestamp, progress } from '@dsh/operators';
@UntilDestroy()
@Injectable()

2
src/app/sections/organization-section/organization-details/organization-details.component.ts
View File

@ -4,7 +4,7 @@ import { TranslocoService } from '@ngneat/transloco';
import { Observable } from 'rxjs';
import { shareReplay, switchMap } from 'rxjs/operators';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
@Component({
selector: 'dsh-organization-details',

4
src/app/sections/organization-section/organization-details/organization-details.spec.ts
View File

@ -5,8 +5,8 @@ import { cold } from 'jasmine-marbles';
import { of } from 'rxjs';
import { anyString, mock, verify, when } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { OrgsService } from '@dsh/app/api/organizations';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { provideMockService } from '@dsh/app/shared/tests';
import { OrganizationDetailsComponent } from './organization-details.component';

4
src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts
View File

@ -6,8 +6,8 @@ import { TranslocoTestingModule } from '@ngneat/transloco';
import { of, throwError } from 'rxjs';
import { anyString, anything, mock, objectContaining, verify, when } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { OrgsService } from '@dsh/app/api/organizations';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services/error';
import { NotificationService } from '@dsh/app/shared/services/notification';

2
src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts
View File

@ -5,7 +5,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { BehaviorSubject, switchMap } from 'rxjs';
import { first } from 'rxjs/operators';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { KeycloakTokenInfoService } from '@dsh/app/shared';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services/error';

6
src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts
View File

@ -13,9 +13,9 @@ import { TranslocoTestingModule } from '@ngneat/transloco';
import { of } from 'rxjs';
import { anyString, anything, mock, verify, when } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { MOCK_MEMBER } from '@dsh/api/organizations/tests/mock-member';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { OrgsService } from '@dsh/app/api/organizations';
import { MOCK_MEMBER } from '@dsh/app/api/organizations/tests/mock-member';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { DIALOG_CONFIG } from '@dsh/app/sections/tokens';
import { KeycloakTokenInfoService } from '@dsh/app/shared';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';

2
src/app/sections/organization-section/organizations/components/organization/organization.component.ts
View File

@ -5,7 +5,7 @@ import { Organization } from '@vality/swag-organizations';
import isNil from 'lodash-es/isNil';
import { filter, pluck, switchMap } from 'rxjs/operators';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService, NotificationService, ContextOrganizationService } from '@dsh/app/shared/services';
import { FetchOrganizationsService } from '@dsh/app/shared/services/fetch-organizations';

4
src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts
View File

@ -12,8 +12,8 @@ import { TranslocoTestingModule } from '@ngneat/transloco';
import { of, throwError } from 'rxjs';
import { anyString, anything, instance, mock, objectContaining, verify, when } from 'ts-mockito';
import { OrgsService } from '@dsh/api/organizations';
import { MOCK_ORG } from '@dsh/api/organizations/tests/mock-org';
import { OrgsService } from '@dsh/app/api/organizations';
import { MOCK_ORG } from '@dsh/app/api/organizations/tests/mock-org';
import { BaseDialogModule, BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService } from '@dsh/app/shared/services/error';
import { NotificationService } from '@dsh/app/shared/services/notification';

2
src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts
View File

@ -7,7 +7,7 @@ import { FormBuilder, FormGroup } from '@ngneat/reactive-forms';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { BehaviorSubject } from 'rxjs';
import { OrgsService } from '@dsh/api/organizations';
import { OrgsService } from '@dsh/app/api/organizations';
import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService, NotificationService } from '@dsh/app/shared/services';
import { inProgressTo } from '@dsh/utils';

2
src/app/sections/organization-section/organizations/organizations.module.ts
View File

@ -9,7 +9,7 @@ import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy
import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
import { TranslocoModule } from '@ngneat/transloco';
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/api/organizations';
import { OrganizationsModule as OrganizationsAPIModule } from '@dsh/app/api/organizations';
import { ErrorModule, NotificationModule } from '@dsh/app/shared';
import { DialogModule } from '@dsh/app/shared/components/dialog';
import { OrganizationRolesModule } from '@dsh/app/shared/components/organization-roles';

2
src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts
View File

@ -5,8 +5,8 @@ import { Shop } from '@vality/swag-payments';
import { combineLatest, defer, Observable } from 'rxjs';
import { first, map, pluck } from 'rxjs/operators';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { createDateRangeWithPreset, DateRangeWithPreset, Preset } from '@dsh/components/date-range-filter';
import { shareReplayRefCount } from '@dsh/operators';
import { ComponentChanges } from '@dsh/type-utils';
import { getFormValueChanges } from '@dsh/utils';

4
src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { forkJoin, defer, ReplaySubject, BehaviorSubject, combineLatest } from 'rxjs';
import { map, switchMap, distinctUntilChanged } from 'rxjs/operators';
import { AnalyticsService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { distinctUntilChangedDeep, inProgressFrom, attach, errorTo, progressTo } from '@dsh/utils';
import { SearchParams } from '../search-params';

4
src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { forkJoin, of, defer, ReplaySubject, BehaviorSubject, combineLatest } from 'rxjs';
import { map, switchMap, distinctUntilChanged } from 'rxjs/operators';
import { AnalyticsService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { errorTo, progressTo, attach, inProgressFrom, distinctUntilChangedDeep } from '@dsh/utils';
import { prepareSplitAmount } from './prepare-split-amount';

4
src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { forkJoin, of, defer, ReplaySubject, BehaviorSubject, combineLatest } from 'rxjs';
import { map, switchMap, withLatestFrom, distinctUntilChanged } from 'rxjs/operators';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { errorTo, progressTo, distinctUntilChangedDeep, inProgressFrom, attach } from '@dsh/utils';
import { prepareSplitCount } from './prepare-split-count';

4
src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { forkJoin, BehaviorSubject, defer, ReplaySubject, combineLatest } from 'rxjs';
import { map, switchMap, distinctUntilChanged } from 'rxjs/operators';
import { AnalyticsService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { errorTo, progressTo, inProgressFrom, attach, distinctUntilChangedDeep } from '@dsh/utils';
import { SearchParams } from '../search-params';

4
src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { forkJoin, ReplaySubject, BehaviorSubject, defer, combineLatest } from 'rxjs';
import { map, switchMap, distinctUntilChanged } from 'rxjs/operators';
import { AnalyticsService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { progressTo, errorTo, attach, inProgressFrom, distinctUntilChangedDeep } from '@dsh/utils';
import { countResultToStatData } from './count-result-to-stat-data';

4
src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { BehaviorSubject, ReplaySubject, defer, combineLatest } from 'rxjs';
import { map, pluck, switchMap } from 'rxjs/operators';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { errorTo, progressTo, distinctUntilChangedDeep, inProgressFrom, attach } from '@dsh/utils';
import { errorsDistributionToChartData } from './errors-distribution-to-chart-data';

4
src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { ReplaySubject, BehaviorSubject, defer } from 'rxjs';
import { map, switchMap, withLatestFrom } from 'rxjs/operators';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService, AnapiDictionaryService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { errorTo, progressTo, distinctUntilChangedDeep, inProgressFrom, attach } from '@dsh/utils';
import { paymentsToolDistributionToChartData } from './payments-tool-distribution-to-chart-data';

4
src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { forkJoin, ReplaySubject, BehaviorSubject, defer, combineLatest } from 'rxjs';
import { map, switchMap, distinctUntilChanged } from 'rxjs/operators';
import { AnalyticsService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { errorTo, progressTo, distinctUntilChangedDeep, inProgressFrom, attach } from '@dsh/utils';
import { SearchParams } from '../search-params';

4
src/app/sections/payment-section/balances/balances.service.ts
View File

@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
import { of, timer } from 'rxjs';
import { catchError, pluck, switchMap } from 'rxjs/operators';
import { AnalyticsService } from '@dsh/api/anapi';
import { shareReplayRefCount } from '@dsh/operators';
import { AnalyticsService } from '@dsh/app/api/anapi';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { PaymentInstitutionRealmService } from '../services';

2
src/app/sections/payment-section/integrations/api-keys/api-keys-list/components/api-key-delete-dialog/api-key-delete-dialog.component.ts
View File

@ -5,7 +5,7 @@ import { untilDestroyed, UntilDestroy } from '@ngneat/until-destroy';
import { DialogSuperclass } from '@vality/ng-core';
import { RequestRevokeApiKeyRequestParams } from '@vality/swag-api-keys';
import { ApiKeysService } from '@dsh/api/api-keys';
import { ApiKeysService } from '@dsh/app/api/api-keys';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService, NotificationService } from '@dsh/app/shared/services';
import { ButtonModule } from '@dsh/components/buttons';

2
src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts
View File

@ -8,7 +8,7 @@ import { TranslocoModule, TranslocoService } from '@ngneat/transloco';
import { untilDestroyed, UntilDestroy } from '@ngneat/until-destroy';
import { DialogSuperclass } from '@vality/ng-core';
import { ApiKeysService } from '@dsh/api/api-keys';
import { ApiKeysService } from '@dsh/app/api/api-keys';
import { BaseDialogModule } from '@dsh/app/shared/components/dialog/base-dialog';
import { ErrorService, NotificationService } from '@dsh/app/shared/services';
import { ButtonModule } from '@dsh/components/buttons';

2
src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts
View File

@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { TranslocoService } from '@ngneat/transloco';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { ApiKeysService } from '@dsh/api/api-keys';
import { ApiKeysService } from '@dsh/app/api/api-keys';
import { ErrorService, NotificationService } from '@dsh/app/shared/services';
@UntilDestroy()

4
src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts
View File

@ -3,9 +3,9 @@ import { ListApiKeysRequestParams } from '@vality/swag-api-keys';
import { BehaviorSubject, Observable, defer, of } from 'rxjs';
import { catchError, map, switchMap } from 'rxjs/operators';
import { ApiKeysService } from '@dsh/api/api-keys';
import { ApiKeysService } from '@dsh/app/api/api-keys';
import { mapToTimestamp, shareReplayRefCount } from '@dsh/app/custom-operators';
import { ErrorService } from '@dsh/app/shared/services';
import { mapToTimestamp, shareReplayRefCount } from '@dsh/operators';
import { inProgressFrom, progressTo } from '@dsh/utils';
@Injectable()

2
src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.component.ts
View File

@ -6,7 +6,7 @@ import moment from 'moment';
import { merge, Subject } from 'rxjs';
import { map, switchMap, take } from 'rxjs/operators';
import { InvoicesService } from '@dsh/api/payments';
import { InvoicesService } from '@dsh/app/api/payments';
import { CreateInvoiceOrInvoiceTemplateService } from './create-invoice-or-invoice-template.service';

2
src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.service.ts
View File

@ -4,9 +4,9 @@ import { ActivatedRoute } from '@angular/router';
import { FormControl } from '@ngneat/reactive-forms';
import { pluck, shareReplay } from 'rxjs/operators';
import { SHARE_REPLAY_CONF } from '@dsh/app/custom-operators';
import { ShopsDataService } from '@dsh/app/shared';
import { FormData } from '@dsh/app/shared/components/create-invoice-form';
import { SHARE_REPLAY_CONF } from '@dsh/operators';
import { filterShopsByRealm } from '../../../operations/operators';

2
src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.component.ts
View File

@ -5,7 +5,7 @@ import { TranslocoService } from '@ngneat/transloco';
import { InvoiceLineTaxVAT, InvoiceTemplateAndToken, Shop } from '@vality/swag-payments';
import moment from 'moment';
import { InvoiceTemplateType, InvoiceTemplateLineCostType } from '@dsh/api/payments';
import { InvoiceTemplateType, InvoiceTemplateLineCostType } from '@dsh/app/api/payments';
import { CreateInvoiceTemplateService, WITHOUT_VAT } from './create-invoice-template.service';

4
src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.service.ts
View File

@ -20,9 +20,9 @@ import * as moment from 'moment';
import { combineLatest, merge, Observable, Subject } from 'rxjs';
import { distinctUntilChanged, filter, map, share, shareReplay, startWith, switchMap, take } from 'rxjs/operators';
import { InvoiceTemplatesService, InvoiceTemplateType, InvoiceTemplateLineCostType } from '@dsh/api/payments';
import { InvoiceTemplatesService, InvoiceTemplateType, InvoiceTemplateLineCostType } from '@dsh/app/api/payments';
import { filterError, filterPayload, progress, replaceError, SHARE_REPLAY_CONF } from '@dsh/app/custom-operators';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
import { filterError, filterPayload, progress, replaceError, SHARE_REPLAY_CONF } from '@dsh/operators';
import { toMinor } from '@dsh/utils';
export const WITHOUT_VAT = Symbol('without VAT');

2
src/app/sections/payment-section/integrations/payment-link/payment-link.component.ts
View File

@ -5,7 +5,7 @@ import { PaymentMethod } from '@vality/swag-payments';
import { BehaviorSubject, defer, merge, ReplaySubject, Subject, Subscription, tap, EMPTY } from 'rxjs';
import { mapTo, shareReplay, switchMap, catchError, switchMapTo } from 'rxjs/operators';
import { InvoicesService, InvoiceTemplatesService } from '@dsh/api/payments';
import { InvoicesService, InvoiceTemplatesService } from '@dsh/app/api/payments';
import { NotificationService, ErrorService } from '@dsh/app/shared';
import { Controls } from '@dsh/app/shared/components/create-payment-link-form';
import { CreatePaymentLinkService } from '@dsh/app/shared/services/create-payment-link';

2
src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts
View File

@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms
import { BehaviorSubject, of, Subject } from 'rxjs';
import { catchError, filter, map, switchMap } from 'rxjs/operators';
import { WebhooksService } from '@dsh/api/payments';
import { WebhooksService } from '@dsh/app/api/payments';
import { oneMustBeSelected } from '@dsh/components/form-controls';
import { FormParams } from './form-params';

2
src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts
View File

@ -4,7 +4,7 @@ import { WebhookScope } from '@vality/swag-payments';
import { BehaviorSubject, combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
import { PaymentsDictionaryService } from '@dsh/api/payments';
import { PaymentsDictionaryService } from '@dsh/app/api/payments';
import { ShopsDataService } from '@dsh/app/shared';
import { oneMustBeSelected } from '@dsh/components/form-controls';

2
src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts
View File

@ -5,7 +5,7 @@ import { TranslocoService } from '@ngneat/transloco';
import { combineLatest, Observable, of, Subject } from 'rxjs';
import { catchError, filter, switchMap, takeUntil } from 'rxjs/operators';
import { WebhooksService } from '@dsh/api/payments';
import { WebhooksService } from '@dsh/app/api/payments';
import { ConfirmActionDialogComponent } from '@dsh/components/popups';
@Injectable()

4
src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts
View File

@ -6,8 +6,8 @@ import sortBy from 'lodash-es/sortBy';
import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
import { catchError, filter, map, shareReplay, switchMap } from 'rxjs/operators';
import { WebhooksService } from '@dsh/api/payments';
import { mapToTimestamp, SHARE_REPLAY_CONF, progress } from '@dsh/operators';
import { WebhooksService } from '@dsh/app/api/payments';
import { mapToTimestamp, SHARE_REPLAY_CONF, progress } from '@dsh/app/custom-operators';
@Injectable()
export class ReceiveWebhooksService {

2
src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts
View File

@ -3,7 +3,7 @@ import { CustomersTopic, InvoicesTopic, WebhookScope } from '@vality/swag-paymen
import { combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
import { PaymentsDictionaryService } from '@dsh/api/payments';
import { PaymentsDictionaryService } from '@dsh/app/api/payments';
@Component({
selector: 'dsh-webhook-events',

2
src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts
View File

@ -9,7 +9,7 @@ import { Shop } from '@vality/swag-payments';
import pick from 'lodash-es/pick';
import moment from 'moment';
import { InvoicesService } from '@dsh/api/payments';
import { InvoicesService } from '@dsh/app/api/payments';
import { FormData } from '@dsh/app/shared/components/create-invoice-form';
import { CreateInvoiceDialogResponse } from '../../types/create-invoice-dialog-response';

4
src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.spec.ts
View File

@ -7,8 +7,8 @@ import { cold } from 'jasmine-marbles';
import { of } from 'rxjs';
import { deepEqual, instance, mock, verify, when } from 'ts-mockito';
import { PaymentInstitutionRealm } from '@dsh/api/model';
import { ApiShopsService } from '@dsh/api/shop';
import { PaymentInstitutionRealm } from '@dsh/app/api/model';
import { ApiShopsService } from '@dsh/app/api/shop';
import { CreateInvoiceDialogComponent } from './components/create-invoice-dialog/create-invoice-dialog.component';
import { CreateInvoiceService } from './create-invoice.service';

2
src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts
View File

@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { Invoice } from '@vality/swag-anapi-v2';
import { AnapiDictionaryService } from '@dsh/api/anapi';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
@Component({
selector: 'dsh-invoice-row',

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.spec.ts
View File

@ -6,7 +6,7 @@ import { cold } from 'jasmine-marbles';
import { of } from 'rxjs';
import { deepEqual, instance, mock, verify, when } from 'ts-mockito';
import { InvoiceService } from '@dsh/api/invoice';
import { InvoiceService } from '@dsh/app/api/invoice';
import { CancelInvoiceService } from './cancel-invoice.service';
import { CancelInvoiceDialogComponent } from './components/cancel-invoice-dialog/cancel-invoice-dialog.component';

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts
View File

@ -5,7 +5,7 @@ import { TranslocoService } from '@ngneat/transloco';
import { Observable, ReplaySubject } from 'rxjs';
import { filter, switchMap, take } from 'rxjs/operators';
import { InvoicesService } from '@dsh/api/payments';
import { InvoicesService } from '@dsh/app/api/payments';
import { CancelInvoiceDialogComponent } from './components/cancel-invoice-dialog/cancel-invoice-dialog.component';

4
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/create-payment-link-dialog/create-payment-link-dialog.component.ts
View File

@ -7,10 +7,10 @@ import { FormControl } from '@ngneat/reactive-forms';
import { BehaviorSubject, defer, merge, Subject } from 'rxjs';
import { mapTo, switchMap } from 'rxjs/operators';
import { InvoicesService } from '@dsh/api/payments';
import { InvoicesService } from '@dsh/app/api/payments';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { Controls } from '@dsh/app/shared/components/create-payment-link-form';
import { CreatePaymentLinkService } from '@dsh/app/shared/services/create-payment-link/create-payment-link.service';
import { shareReplayRefCount } from '@dsh/operators';
import { CreatePaymentLinkDialogData } from './types/create-payment-link-dialog-data';

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.spec.ts
View File

@ -6,7 +6,7 @@ import { cold } from 'jasmine-marbles';
import { of } from 'rxjs';
import { deepEqual, instance, mock, verify, when } from 'ts-mockito';
import { InvoiceService } from '@dsh/api/invoice';
import { InvoiceService } from '@dsh/app/api/invoice';
import { FulfillInvoiceDialogComponent } from './components/cancel-invoice-dialog/fulfill-invoice-dialog.component';
import { FulfillInvoiceService } from './fulfill-invoice.service';

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts
View File

@ -5,7 +5,7 @@ import { TranslocoService } from '@ngneat/transloco';
import { Observable, ReplaySubject } from 'rxjs';
import { filter, switchMap, take } from 'rxjs/operators';
import { InvoicesService } from '@dsh/api/payments';
import { InvoicesService } from '@dsh/app/api/payments';
import { FulfillInvoiceDialogComponent } from './components/cancel-invoice-dialog/fulfill-invoice-dialog.component';

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.spec.ts
View File

@ -4,7 +4,7 @@ import { of, throwError } from 'rxjs';
import { take } from 'rxjs/operators';
import { instance, mock, when } from 'ts-mockito';
import { InvoiceService } from '@dsh/api/invoice';
import { InvoiceService } from '@dsh/app/api/invoice';
import { ReceiveInvoiceService } from './receive-invoice.service';
import { generateMockInvoice } from '../../../../tests/generate-mock-invoice';

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts
View File

@ -4,7 +4,7 @@ import { Invoice } from '@vality/swag-payments';
import { BehaviorSubject, Observable, of, ReplaySubject, Subject } from 'rxjs';
import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
import { InvoicesService } from '@dsh/api/payments';
import { InvoicesService } from '@dsh/app/api/payments';
@UntilDestroy()
@Injectable()

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.spec.ts
View File

@ -5,7 +5,7 @@ import { of, throwError } from 'rxjs';
import { take } from 'rxjs/operators';
import { instance, mock, when } from 'ts-mockito';
import { PaymentService } from '@dsh/api/payment';
import { PaymentService } from '@dsh/app/api/payment';
import { ReceivePaymentsService } from './receive-payments.service';
import { generateMockPaymentList } from '../../../../tests/generate-mock-payment-list';

2
src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts
View File

@ -5,7 +5,7 @@ import moment from 'moment';
import { BehaviorSubject, Observable, of, ReplaySubject, Subject } from 'rxjs';
import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
import { PaymentsService } from '@dsh/api/payments';
import { PaymentsService } from '@dsh/app/api/payments';
@UntilDestroy()
@Injectable()

2
src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
import { WrappedFormControlSuperclass } from '@s-libs/ng-core';
import { InvoiceStatus } from '@vality/swag-anapi-v2';
import { AnapiDictionaryService } from '@dsh/api/anapi';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { provideValueAccessor } from '@dsh/utils';
@Component({

2
src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts
View File

@ -12,9 +12,9 @@ import pick from 'lodash-es/pick';
import { defer, ReplaySubject, BehaviorSubject, combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
import { shareReplayRefCount } from '@dsh/app/custom-operators';
import { ShopsDataService } from '@dsh/app/shared';
import { createDateRangeWithPreset, Preset, DateRangeWithPreset } from '@dsh/components/date-range-filter';
import { shareReplayRefCount } from '@dsh/operators';
import { ComponentChanges } from '@dsh/type-utils';
import { getFormValueChanges } from '@dsh/utils';

2
src/app/sections/payment-section/operations/invoices/map-to-invoices-table-data.ts
View File

@ -2,7 +2,7 @@ import { Invoice, Shop } from '@vality/swag-anapi-v2';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { getShopNameById } from '@dsh/api/shop/utils';
import { getShopNameById } from '@dsh/app/api/shop/utils';
import { InvoicesTableData } from './table';

4
src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.spec.ts
View File

@ -5,8 +5,8 @@ import { of } from 'rxjs';
import { delay, take } from 'rxjs/operators';
import { deepEqual, instance, mock, when } from 'ts-mockito';
import { PaymentInstitutionRealm } from '@dsh/api/model';
import { InvoiceSearchService } from '@dsh/api/search';
import { PaymentInstitutionRealm } from '@dsh/app/api/model';
import { InvoiceSearchService } from '@dsh/app/api/search';
import { SEARCH_LIMIT } from '@dsh/app/sections/tokens';
import { FetchInvoicesService } from './fetch-invoices.service';

4
src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts
View File

@ -3,9 +3,9 @@ import { Invoice } from '@vality/swag-anapi-v2';
import { Observable } from 'rxjs';
import { shareReplay } from 'rxjs/operators';
import { SearchService } from '@dsh/api/anapi';
import { SearchService } from '@dsh/app/api/anapi';
import { mapToTimestamp } from '@dsh/app/custom-operators';
import { PartialFetcher } from '@dsh/app/shared';
import { mapToTimestamp } from '@dsh/operators';
import { SEARCH_LIMIT } from '../../../../../tokens';
import { SearchFiltersParams } from '../../invoices-search-filters';

2
src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts
View File

@ -2,7 +2,7 @@ import { PaymentInstitution, Shop } from '@vality/swag-payments';
import { Observable } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
import { toLiveShops, toTestShops } from '@dsh/api/payments';
import { toLiveShops, toTestShops } from '@dsh/app/api/payments';
import RealmEnum = PaymentInstitution.RealmEnum;

6
src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
import { WrappedFormControlSuperclass } from '@s-libs/ng-core';
import { PaymentStatus } from '@vality/swag-anapi-v2';
import { PaymentsDictionaryService } from '@dsh/api/payments';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { provideValueAccessor } from '@dsh/utils';
@Component({
@ -13,9 +13,9 @@ import { provideValueAccessor } from '@dsh/utils';
})
export class PaymentStatusFilterComponent extends WrappedFormControlSuperclass<PaymentStatus.StatusEnum> {
statuses = Object.values(PaymentStatus.StatusEnum);
paymentStatusDict$ = this.paymentsDictionaryService.paymentStatus$;
paymentStatusDict$ = this.anapiDictionaryService.paymentStatus$;
constructor(private paymentsDictionaryService: PaymentsDictionaryService) {
constructor(private anapiDictionaryService: AnapiDictionaryService) {
super();
}
}

4
src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts
View File

@ -2,8 +2,8 @@ import { Component } from '@angular/core';
import { WrappedFormControlSuperclass } from '@s-libs/ng-core';
import { SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
import { AnapiDictionaryService } from '@dsh/api/anapi';
import { PaymentSystem } from '@dsh/api/payments';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { PaymentSystem } from '@dsh/app/api/payments';
import { provideValueAccessor } from '@dsh/utils';
@Component({

4
src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts
View File

@ -2,8 +2,8 @@ import { Component } from '@angular/core';
import { WrappedFormControlSuperclass } from '@s-libs/ng-core';
import { SearchPaymentsRequestParams } from '@vality/swag-anapi-v2';
import { AnapiDictionaryService } from '@dsh/api/anapi';
import { TokenProvider } from '@dsh/api/payments';
import { AnapiDictionaryService } from '@dsh/app/api/anapi';
import { TokenProvider } from '@dsh/app/api/payments';
import { provideValueAccessor } from '@dsh/utils';
@Component({

2
src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.spec.ts
View File

@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { cold, getTestScheduler, hot } from 'jasmine-marbles';
import { deepEqual, instance, mock, verify, when } from 'ts-mockito';
import { PaymentService } from '@dsh/api/payment';
import { PaymentService } from '@dsh/app/api/payment';
import { BaseDialogModule, BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog';
import { MaxLengthInputModule } from '@dsh/app/shared/components/inputs/max-length-input/max-length-input.module';
import { ErrorService } from '@dsh/app/shared/services';

Some files were not shown because too many files have changed in this diff Show More