From 193f4bf4364886f5c2fc9868ef99853442872021 Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 13 Jun 2023 20:10:15 +0400 Subject: [PATCH] TD-633, TD-634: Create USD shop by default (#125) --- angular.json | 9 +- extra-webpack.config.ts | 10 + package-lock.json | 1540 ++++++++--------- package.json | 16 +- src/app/api/anapi/anapi-dictionary.service.ts | 2 +- .../utils/create-test-shop-claim-changeset.ts | 46 +- src/app/api/payments/categories.service.ts | 2 +- src/app/api/payments/contracts.service.ts | 2 +- src/app/api/payments/countries.service.ts | 2 +- .../api/payments/invoice-templates.service.ts | 2 +- src/app/api/payments/invoices.service.ts | 2 +- .../payments/payment-institutions.service.ts | 2 +- src/app/api/payments/payouts.service.ts | 2 +- src/app/api/payments/webhooks.service.ts | 2 +- src/app/api/utils/dictionary.service.ts | 2 +- src/app/api/wallet/identities.service.ts | 2 +- src/app/api/wallet/wallets.service.ts | 2 +- src/app/app.module.ts | 12 +- src/app/auth/is-access-allowed.pipe.ts | 1 + src/app/bootstrap.service.spec.ts | 8 +- src/app/dadata/dadata.component.ts | 9 +- src/app/home/actionbar/actionbar.module.ts | 2 +- .../claim-row/claim-row.component.ts | 2 +- .../claim-section/claims/claims.module.ts | 2 +- .../fetch-claims/fetch-claims.service.ts | 4 +- .../accept-invitation.component.spec.ts | 2 +- .../accept-invitation.component.ts | 2 +- .../change-roles-table.component.spec.ts | 2 +- .../change-roles-table.component.ts | 2 +- .../select-role-dialog.component.ts | 2 +- ...create-invitation-dialog.component.spec.ts | 6 +- .../create-invitation-dialog.component.ts | 2 +- .../invitation/invitation.component.spec.ts | 2 +- .../invitation/invitation.component.ts | 2 +- .../invitations/invitations.component.spec.ts | 6 +- .../invitations/invitations.component.ts | 2 +- .../fetch-invitations.service.ts | 4 +- .../edit-roles-dialog.component.spec.ts | 2 +- .../edit-roles-dialog.component.ts | 2 +- .../member/member.component.spec.ts | 2 +- .../components/member/member.component.ts | 2 +- .../members/members.component.spec.ts | 6 +- .../members/members.component.ts | 2 +- .../members/members.module.ts | 2 +- .../fetch-members/fetch-members.service.ts | 4 +- .../organization-details.component.ts | 2 +- .../organization-details.spec.ts | 4 +- ...eate-organization-dialog.component.spec.ts | 4 +- .../create-organization-dialog.component.ts | 2 +- .../organization.component.spec.ts | 6 +- .../organization/organization.component.ts | 2 +- ...name-organization-dialog.component.spec.ts | 4 +- .../rename-organization-dialog.component.ts | 2 +- .../organizations/organizations.module.ts | 2 +- .../analytics-search-filters.component.ts | 2 +- .../average-payment.service.ts | 4 +- .../payment-split-amount.service.ts | 4 +- .../payment-split-count.service.ts | 4 +- .../payments-amount.service.ts | 4 +- .../payments-count/payments-count.service.ts | 4 +- .../payments-error-distribution.service.ts | 4 +- .../payments-tool-distribution.service.ts | 4 +- .../refunds-amount/refunds-amount.service.ts | 4 +- .../balances/balances.service.ts | 4 +- .../api-key-delete-dialog.component.ts | 2 +- .../api-key-create-dialog.component.ts | 2 +- .../api-key-revoke.component.ts | 2 +- .../api-keys/fetch-api-keys.service.ts | 4 +- ...e-invoice-or-invoice-template.component.ts | 2 +- ...ate-invoice-or-invoice-template.service.ts | 2 +- .../create-invoice-template.component.ts | 2 +- .../create-invoice-template.service.ts | 4 +- .../payment-link/payment-link.component.ts | 2 +- .../create-webhook-dialog.service.ts | 2 +- .../create-webhook-form.component.ts | 2 +- .../delete-webhook/delete-webhook.service.ts | 2 +- .../webhooks/receive-webhooks.service.ts | 4 +- .../webhook-events.component.ts | 2 +- .../create-invoice-dialog.component.ts | 2 +- .../create-invoice.service.spec.ts | 4 +- .../invoice-row/invoice-row.component.ts | 2 +- .../cancel-invoice.service.spec.ts | 2 +- .../cancel-invoice/cancel-invoice.service.ts | 2 +- .../create-payment-link-dialog.component.ts | 4 +- .../fulfill-invoice.service.spec.ts | 2 +- .../fulfill-invoice.service.ts | 2 +- .../receive-invoice.service.spec.ts | 2 +- .../receive-invoice.service.ts | 2 +- .../receive-payments.service.spec.ts | 2 +- .../receive-payments.service.ts | 2 +- .../invoice-status-filter.component.ts | 2 +- .../invoices-search-filters.component.ts | 2 +- .../invoices/map-to-invoices-table-data.ts | 2 +- .../fetch-invoices.service.spec.ts | 4 +- .../fetch-invoices/fetch-invoices.service.ts | 4 +- .../operators/filter-shops-by-realm.ts | 2 +- .../payment-status-filter.component.ts | 6 +- .../payment-system-filter.component.ts | 4 +- .../token-provider-filter.component.ts | 4 +- .../cancel-hold-dialog.component.spec.ts | 2 +- .../cancel-hold-dialog.component.ts | 2 +- .../create-hold-dialog.component.spec.ts | 2 +- .../create-hold-dialog.component.ts | 2 +- .../bank-card/bank-card.component.ts | 2 +- .../payment-tool/payment-tool.component.ts | 2 +- .../services/refunds/refunds.service.spec.ts | 2 +- .../services/refunds/refunds.service.ts | 2 +- .../fetch-refunds.service.spec.ts | 2 +- .../fetch-refunds/fetch-refunds.service.ts | 2 +- .../invoice-details.service.spec.ts | 2 +- .../invoice-details.service.ts | 2 +- .../payments/payments.component.spec.ts | 2 +- .../fetch-payments/fetch-payments.service.ts | 4 +- .../refund-row/refund-row.component.ts | 2 +- .../receive-invoice.service.ts | 2 +- .../receive-payment.service.ts | 2 +- .../refund-status-filter.component.ts | 2 +- .../fetch-refunds/fetch-refunds.service.ts | 4 +- .../create-payout-report-dialog.service.ts | 2 +- .../create-payout-dialog.service.ts | 2 +- .../payouts/fetch-payouts.service.ts | 4 +- .../cancel-report/cancel-report.service.ts | 2 +- .../create-report-dialog.service.ts | 2 +- .../reports/fetch-reports.service.ts | 4 +- .../report-main-info.component.ts | 2 +- .../report-files/report-files.service.ts | 2 +- .../report-row/report-row.component.ts | 2 +- .../payment-institution-realm.service.ts | 2 +- .../services/realm-shops.service.ts | 2 +- .../fetch-shops/fetch-shops.service.spec.ts | 6 +- .../fetch-shops/fetch-shops.service.ts | 16 +- .../shop-payout-tool-details.service.spec.ts | 2 +- .../shop-payout-tool-details.service.ts | 2 +- .../shops-balance.service.spec.ts | 2 +- .../shops-balance/shops-balance.service.ts | 2 +- .../category/category.service.spec.ts | 2 +- .../services/category/category.service.ts | 4 +- .../shop-actions/shop-actions.service.spec.ts | 2 +- .../shop-actions/shop-actions.service.ts | 2 +- .../shop-details.component.spec.ts | 4 +- .../deposit-row/deposit-row.component.ts | 2 +- .../deposit-details.component.ts | 2 +- .../services/fetch-deposit-reverts.service.ts | 2 +- .../deposit-status-filter.component.ts | 2 +- .../fetch-deposits/fetch-deposits.service.ts | 4 +- .../create-webhook-dialog.service.ts | 2 +- .../create-webhook-form.component.ts | 2 +- .../create-webhook/create-webhook.service.ts | 2 +- .../delete-webhook/delete-webhook.service.ts | 2 +- .../webhooks/receive-webhooks.service.ts | 2 +- .../webhook-events.component.ts | 2 +- .../webhook-row/webhook-row.component.ts | 2 +- .../fetch-wallets/fetch-wallets.service.ts | 4 +- .../fetch-wallet-account.service.ts | 4 +- .../wallet-deposit-details.component.ts | 2 +- .../fetch-wallet-deposits.service.ts | 2 +- .../wallet-withdrawal-details.component.ts | 2 +- .../fetch-wallet-withdrawals.service.ts | 2 +- .../fetch-withdrawals.service.ts | 4 +- .../withdrawal-status-filter.component.ts | 2 +- .../withdrawal-details.component.ts | 2 +- .../withdrawal-row.component.ts | 2 +- .../withdrawals/withdrawals.component.ts | 2 +- .../deposit-revert-details.component.ts | 2 +- .../invoice-details.component.ts | 2 +- .../refund-details.component.ts | 2 +- .../create-invoice-form.component.ts | 2 +- .../create-payment-link-form.component.ts | 2 +- .../create-payment-link-form.module.ts | 2 +- .../category-autocomplete-field.component.ts | 4 +- .../countries-autocomplete-field.component.ts | 2 +- .../pipes/invoce-status-label.pipe.ts | 2 +- .../payment-institution-field.component.ts | 2 +- .../pipes/refund-status-label.pipe.ts | 2 +- .../pipes/report-types-label.pipe.ts | 2 +- .../inputs/shop-field/shop-field.component.ts | 4 +- .../shops-field/shops-field.component.ts | 2 +- .../wallet-autocomplete-field.component.ts | 2 +- .../organization-roles.component.ts | 2 +- .../utils/group-roles.spec.ts | 4 +- .../payment-status.component.ts | 2 +- .../create-shop-dialog.component.html | 84 +- .../shop-form/shop-form.component.ts | 4 +- ...e-international-shop-entity.component.html | 2 +- ...ate-international-shop-entity.component.ts | 12 +- ...reate-international-shop-entity.service.ts | 2 +- .../new-contractor-form.component.ts | 2 +- .../create-russian-shop-entity.service.ts | 2 +- .../existing-bank-account.component.ts | 2 +- .../existing-contract-form.component.ts | 2 +- .../api-model-refs/identity-details.pipe.ts | 2 +- .../api-model-refs/wallet-details.pipe.ts | 2 +- .../context-organization.service.ts | 2 +- .../create-payment-link.service.ts | 4 +- .../fetch-organizations.service.spec.ts | 4 +- .../fetch-organizations.service.ts | 4 +- .../organization-management.service.spec.ts | 6 +- .../organization-management.service.ts | 4 +- .../sections-links/section-links.service.ts | 2 +- .../shop-contract-details.service.spec.ts | 2 +- .../shop-contract-details.service.ts | 2 +- .../services/shops-data/shops-data.service.ts | 66 +- src/assets/i18n/components/en.json | 6 - src/assets/i18n/components/ru.json | 6 - .../layout-management.service.ts | 2 +- tsconfig.json | 14 +- webpack.extra.js | 22 - 207 files changed, 1084 insertions(+), 1285 deletions(-) create mode 100644 extra-webpack.config.ts delete mode 100644 webpack.extra.js diff --git a/angular.json b/angular.json index e4b99124..80f0ce3f 100644 --- a/angular.json +++ b/angular.json @@ -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", diff --git a/extra-webpack.config.ts b/extra-webpack.config.ts new file mode 100644 index 00000000..6d696f65 --- /dev/null +++ b/extra-webpack.config.ts @@ -0,0 +1,10 @@ +import { IgnorePlugin, Configuration } from 'webpack'; + +export default { + plugins: [ + new IgnorePlugin({ + resourceRegExp: /^\.\/locale$/, + contextRegExp: /moment$/, + }), + ], +} as Configuration; diff --git a/package-lock.json b/package-lock.json index 49141d51..3473989e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,13 +28,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", @@ -63,6 +63,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", @@ -74,7 +75,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", @@ -106,7 +106,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", @@ -126,6 +125,41 @@ "node": ">=6.0.0" } }, + "node_modules/@angular-builders/custom-webpack": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-15.0.0.tgz", + "integrity": "sha512-i8ZQ7rJ+RTy73MivvIdNAa8sZpiDy9wHBetAEyYSlGtjaSB3lntEFtBw9edfyRkpbifw53QA/N5haOwox987/Q==", + "dev": true, + "dependencies": { + "@angular-devkit/architect": ">=0.1500.0 < 0.1600.0", + "@angular-devkit/build-angular": "^15.0.0", + "@angular-devkit/core": "^15.0.0", + "lodash": "^4.17.15", + "ts-node": "^10.0.0", + "tsconfig-paths": "^4.1.0", + "webpack-merge": "^5.7.3" + }, + "engines": { + "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + }, + "peerDependencies": { + "@angular/compiler-cli": "^15.0.0" + } + }, + "node_modules/@angular-builders/custom-webpack/node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@angular-devkit/architect": { "version": "0.1502.4", "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.4.tgz", @@ -336,12 +370,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "node_modules/@angular-devkit/build-angular/node_modules/loader-utils": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", @@ -482,12 +510,6 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, - "node_modules/@angular-devkit/core/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "node_modules/@angular-devkit/core/node_modules/rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -524,12 +546,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "node_modules/@angular-devkit/schematics/node_modules/magic-string": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz", @@ -892,12 +908,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/@angular/cli/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "node_modules/@angular/cli/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -1311,9 +1321,9 @@ "dev": true }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", + "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", "dependencies": { "@babel/highlight": "^7.18.6" }, @@ -1322,9 +1332,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz", - "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==", + "version": "7.22.3", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz", + "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1422,13 +1432,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "version": "7.22.1", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz", + "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", + "@babel/compat-data": "^7.22.0", + "@babel/helper-validator-option": "^7.21.0", "browserslist": "^4.21.3", "lru-cache": "^5.1.1", "semver": "^6.3.0" @@ -1529,9 +1539,9 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.22.1", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz", + "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1587,12 +1597,12 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz", + "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.21.4" }, "engines": { "node": ">=6.9.0" @@ -1710,9 +1720,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.21.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", + "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1727,9 +1737,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1778,9 +1788,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", - "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "version": "7.22.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz", + "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -2945,19 +2955,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz", - "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", + "version": "7.22.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.4.tgz", + "integrity": "sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.21.3", - "@babel/helper-environment-visitor": "^7.18.9", + "@babel/code-frame": "^7.21.4", + "@babel/generator": "^7.22.3", + "@babel/helper-environment-visitor": "^7.22.1", "@babel/helper-function-name": "^7.21.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.3", - "@babel/types": "^7.21.3", + "@babel/parser": "^7.22.4", + "@babel/types": "^7.22.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -2966,12 +2976,12 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz", - "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", + "version": "7.22.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.3.tgz", + "integrity": "sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==", "dev": true, "dependencies": { - "@babel/types": "^7.21.3", + "@babel/types": "^7.22.3", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -2981,9 +2991,9 @@ } }, "node_modules/@babel/traverse/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", @@ -2995,12 +3005,12 @@ } }, "node_modules/@babel/types": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz", - "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", + "version": "7.22.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz", + "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-string-parser": "^7.21.5", "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" }, @@ -3030,6 +3040,14 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@ctrl/tinycolor": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz", + "integrity": "sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/@dinero.js/calculator-number": { "version": "2.0.0-alpha.8", "resolved": "https://registry.npmjs.org/@dinero.js/calculator-number/-/calculator-number-2.0.0-alpha.8.tgz", @@ -3641,9 +3659,9 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz", + "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", @@ -4933,40 +4951,55 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@schematics/angular/node_modules/jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true + "node_modules/@sentry-internal/tracing": { + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.54.0.tgz", + "integrity": "sha512-JsyhZ0wWZ+VqbHJg+azqRGdYJDkcI5R9+pnkO6SzbzxrRewqMAIwzkpPee3oI7vG99uhMEkOkMjHu0nQGwkOQw==", + "dependencies": { + "@sentry/core": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry-internal/tracing/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@sentry/angular": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-7.7.0.tgz", - "integrity": "sha512-JoynImiFsECSvOLZnqNhWuD2OTrxLLcbmTJcLv+ylVkXWmVCwiKUJP+4GDQy1AmbWuXmgboq/v8880ocXi98Bw==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-7.54.0.tgz", + "integrity": "sha512-/c3mys0dE64GKk0jjmWG9a+rGQbEwX1pflayD1cjwCStb0D/RVp4mUOMmbj5n40TlqQQehxfbFSSAA53fD+jQQ==", "dependencies": { - "@sentry/browser": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry/browser": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "tslib": "^2.0.0" }, "engines": { "node": ">=8" }, "peerDependencies": { - "@angular/common": "10.x || 11.x || 12.x || 13.x || 14.x", - "@angular/core": "10.x || 11.x || 12.x || 13.x || 14.x", - "@angular/router": "10.x || 11.x || 12.x || 13.x || 14.x", + "@angular/common": ">= 10.x <= 15.x", + "@angular/core": ">= 10.x <= 15.x", + "@angular/router": ">= 10.x <= 15.x", "rxjs": "^6.5.5 || ^7.x" } }, "node_modules/@sentry/browser": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.7.0.tgz", - "integrity": "sha512-oyzpWcsjVZTaf14zAL89Ng1DUHlbjN+V8pl8dR9Y9anphbzL5BK9p0fSK4kPIrO4GukK+XrKnLJDPuE/o7WR3g==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.54.0.tgz", + "integrity": "sha512-EvLAw03N9WE2m1CMl2/1YMeIs1icw9IEOVJhWmf3uJEysNJOFWXu6ZzdtHEz1E6DiJYhc1HzDya0ExZeJxNARA==", "dependencies": { - "@sentry/core": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry-internal/tracing": "7.54.0", + "@sentry/core": "7.54.0", + "@sentry/replay": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "tslib": "^1.9.3" }, "engines": { @@ -4978,63 +5011,13 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@sentry/cli": { - "version": "1.74.5", - "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.74.5.tgz", - "integrity": "sha512-Ze1ec306ZWHtrxKypOJ8nhtFqkrx2f/6bRH+DcJzEQ3bBePQ0ZnqJTTe4BBHADYBtxFIaUWzCZ6DquLz2Zv/sw==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "https-proxy-agent": "^5.0.0", - "mkdirp": "^0.5.5", - "node-fetch": "^2.6.7", - "npmlog": "^4.1.2", - "progress": "^2.0.3", - "proxy-from-env": "^1.1.0", - "which": "^2.0.2" - }, - "bin": { - "sentry-cli": "bin/sentry-cli" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@sentry/cli/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/@sentry/cli/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@sentry/core": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.7.0.tgz", - "integrity": "sha512-Z15ACiuiFINFcK4gbMrnejLn4AVjKBPJOWKrrmpIe8mh+Y9diOuswt5mMUABs+jhpZvqht3PBLLGBL0WMsYMYA==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.54.0.tgz", + "integrity": "sha512-MAn0E2EwgNn1pFQn4qxhU+1kz6edullWg6VE5wCmtpXWOVw6sILBUsQpeIG5djBKMcneJCdOlz5jeqcKPrLvZQ==", "dependencies": { - "@sentry/hub": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "tslib": "^1.9.3" }, "engines": { @@ -5046,31 +5029,13 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@sentry/hub": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.7.0.tgz", - "integrity": "sha512-6gydK234+a0nKhBRDdIJ7Dp42CaiW2juTiHegUVDq+482balVzbZyEAmESCmuzKJhx5BhlCElVxs/cci1NjMpg==", - "dependencies": { - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/hub/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@sentry/integrations": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.7.0.tgz", - "integrity": "sha512-qHIw4JrluVfkcdA6v22KVumhuqdk9I0MxEaiHyP/uzx4xIoi9S4I86YbLHZUpjqreJIQkntsimJSepZJkxvG5g==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.54.0.tgz", + "integrity": "sha512-RolGsQzJChJzjHTJcCKSZ1HanmY33floc5o13WgU9NoDqJbLGLNcOIrAu+WynqPe8P5VTVrVb8NiwhLqWrKp4g==", "dependencies": { - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "localforage": "^1.8.1", "tslib": "^1.9.3" }, @@ -5082,38 +5047,44 @@ "version": "1.14.1", "license": "0BSD" }, - "node_modules/@sentry/tracing": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.7.0.tgz", - "integrity": "sha512-HNmvTwemuc21q/K6HXsSp9njkne6N1JQ71TB+QGqYU5VtxsVgYSUhhYqV6WcHz7LK4Hj6TvNFoeu69/rO0ysgw==", + "node_modules/@sentry/replay": { + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.54.0.tgz", + "integrity": "sha512-C0F0568ybphzGmKGe23duB6n5wJcgM7WLYhoeqW3o2bHeqpj1dGPSka/K3s9KzGaAgzn1zeOUYXJsOs+T/XdsA==", "dependencies": { - "@sentry/hub": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", - "tslib": "^1.9.3" + "@sentry/core": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@sentry/tracing": { + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.54.0.tgz", + "integrity": "sha512-IyflAAqOiKuNvhWXrJsXN8yfl8DbHRpfgtCEPo5TBvdkpcyxUyfE8W2a2MQ8MXDzgfJT1IixXEwleO+qPIi3Gg==", + "dependencies": { + "@sentry-internal/tracing": "7.54.0" }, "engines": { "node": ">=8" } }, - "node_modules/@sentry/tracing/node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" - }, "node_modules/@sentry/types": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.7.0.tgz", - "integrity": "sha512-4x8O7uerSGLnYC10krHl9t8h7xXHn5FextqKYbTCXCnx2hC8D+9lz8wcbQAFo0d97wiUYqI8opmEgFVGx7c5hQ==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.54.0.tgz", + "integrity": "sha512-D+i9xogBeawvQi2r0NOrM7zYcUaPuijeME4O9eOTrDF20tj71hWtJLilK+KTGLYFtpGg1h+9bPaz7OHEIyVopg==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.7.0.tgz", - "integrity": "sha512-fD+ROSFpeJlK7bEvUT2LOW7QqgjBpXJwVISKZ0P2fuzclRC3KoB2pbZgBM4PXMMTiSzRGWhvfRRjBiBvQJBBJQ==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.54.0.tgz", + "integrity": "sha512-3Yf5KlKjIcYLddOexSt2ovu2TWlR4Fi7M+aCK8yUTzwNzf/xwFSWOstHlD/WiDy9HvfhWAOB/ukNTuAeJmtasw==", "dependencies": { - "@sentry/types": "7.7.0", + "@sentry/types": "7.54.0", "tslib": "^1.9.3" }, "engines": { @@ -5125,18 +5096,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@sentry/webpack-plugin": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-1.19.0.tgz", - "integrity": "sha512-qSpdgdGMtdzagGveSWgo2b+t8PdPUscuOjbOyWCsJme9jlTFnNk0rX7JEA55OUozikKHM/+vVh08USLBnPboZw==", - "dev": true, - "dependencies": { - "@sentry/cli": "^1.74.4" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@sigstore/protobuf-specs": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", @@ -5598,14 +5557,12 @@ }, "node_modules/@types/lodash": { "version": "4.14.168", - "dev": true, "license": "MIT" }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", - "dev": true, "dependencies": { "@types/lodash": "*" } @@ -6051,20 +6008,96 @@ } }, "node_modules/@vality/ng-core": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-0.3.0.tgz", - "integrity": "sha512-uezgCzRGWTfe6PDnAqbFQ0nqCv+8auIGTd1tej8hV+h0fTOahAJybTrpYpzvegYdVJ1IwVAUqMAiLKo5RCtKhQ==", + "version": "0.7.1-2a1b72f.0", + "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-0.7.1-2a1b72f.0.tgz", + "integrity": "sha512-LhMLijiVuJ0cjZ7UPpCAc5s2svjFJI6+wGq0/zfLs5vBfM43D8BNiGfnD2dARtG6CEaHCuh7wvsTyzNMv+p9/w==", "dependencies": { + "@ng-matero/extensions": "^15.0.0", + "@s-libs/js-core": "^15.2.0", + "@s-libs/micro-dash": "^15.2.0", + "@s-libs/ng-core": "^15.2.0", + "@s-libs/rxjs-core": "^15.2.0", + "dinero.js": "^2.0.0-alpha.14", + "ng-let": "^15.0.2", "tslib": "^2.3.0" }, "peerDependencies": { + "@angular/cdk": "^15.0.0", + "@angular/common": "^15.0.0", + "@angular/core": "^15.0.0", + "@angular/material": "^15.0.0", + "@ngneat/until-destroy": "^9.0.0", + "@types/lodash-es": "^4.0.0", + "coerce-property": "^15.0.0", + "lodash-es": "^4.0.0", + "rxjs": "^7.0.0", + "utility-types": "^3.0.0" + } + }, + "node_modules/@vality/ng-core/node_modules/@dinero.js/calculator-number": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@dinero.js/calculator-number/-/calculator-number-2.0.0-alpha.14.tgz", + "integrity": "sha512-Vmlu6eXNtkFU2cqlrpqfq8KQP9onALf8Es2d34liVa3k3RHjuhizgFUU3V3/tsjOu5WekZq+gYPOr58XVTkB7A==", + "dependencies": { + "@dinero.js/core": "2.0.0-alpha.14" + } + }, + "node_modules/@vality/ng-core/node_modules/@dinero.js/core": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@dinero.js/core/-/core-2.0.0-alpha.14.tgz", + "integrity": "sha512-CtKELJ783joUbaU62fRM2xDXb4XYSy0MgOuIkPWgVOS3SYKKb6+2Ec9bNlvrW8lsPROz/RsvCuYVTphrZ79twg==", + "dependencies": { + "@dinero.js/currencies": "2.0.0-alpha.14" + } + }, + "node_modules/@vality/ng-core/node_modules/@dinero.js/currencies": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@dinero.js/currencies/-/currencies-2.0.0-alpha.14.tgz", + "integrity": "sha512-Ck5ZLjRI7Pl7Y4VkeOst4WEwiN5vZezv8GHcXWsVLUfTNsmkV37VeLYDRAuTUP4akEJyIry+1o1qHYNtLq3eNw==" + }, + "node_modules/@vality/ng-core/node_modules/@ng-matero/extensions": { + "version": "15.5.1", + "resolved": "https://registry.npmjs.org/@ng-matero/extensions/-/extensions-15.5.1.tgz", + "integrity": "sha512-PjPFevPRpd2vyZBEqdD9QUFaAQeOT8hQWi7uGdWm+gPyiZnDY3pJRHcxbUdZrYOfCA/WULmXr/TGV5fi7jAhhw==", + "dependencies": { + "@ng-select/ng-select": "^10.0.0", + "ngx-color": "^8.0.0", + "photoviewer": "^3.7.0", + "tslib": "^2.4.0" + }, + "peerDependencies": { + "@angular/animations": ">=15.0.0", "@angular/cdk": ">=15.0.0", "@angular/common": ">=15.0.0", "@angular/core": ">=15.0.0", - "@angular/material": ">=15.0.0", - "coerce-property": ">=0.3.2", - "lodash-es": "^4.0.0", - "utility-types": ">=3.0.0" + "@angular/material": ">=15.0.0" + } + }, + "node_modules/@vality/ng-core/node_modules/@ng-matero/extensions/node_modules/@ng-select/ng-select": { + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-10.0.4.tgz", + "integrity": "sha512-Vc/JIgcFkSgf47cX7+pQQo9HYhDktfqrY7o/ZPGMvu63P7E9d1MibVipqmcLbgms6Ac9lu621CDZPGHdxag7hA==", + "dependencies": { + "tslib": "^2.3.1" + }, + "engines": { + "node": ">= 12.20.0", + "npm": ">= 6.0.0" + }, + "peerDependencies": { + "@angular/common": "<16.0.0", + "@angular/core": "<16.0.0", + "@angular/forms": "<16.0.0" + } + }, + "node_modules/@vality/ng-core/node_modules/dinero.js": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/dinero.js/-/dinero.js-2.0.0-alpha.14.tgz", + "integrity": "sha512-dkURHd9P+2TjuSTMUAnvrB7SsL4GbBYG/WPtIBV8M+L7Xf80x84sJcUUTxIS33S4AlkIbVANlaL86w2g5zdrmg==", + "dependencies": { + "@dinero.js/calculator-number": "2.0.0-alpha.14", + "@dinero.js/core": "2.0.0-alpha.14", + "@dinero.js/currencies": "2.0.0-alpha.14" } }, "node_modules/@vality/swag-anapi-v2": { @@ -6092,9 +6125,9 @@ } }, "node_modules/@vality/swag-claim-management": { - "version": "0.1.1-bfc2e6c.0", - "resolved": "https://registry.npmjs.org/@vality/swag-claim-management/-/swag-claim-management-0.1.1-bfc2e6c.0.tgz", - "integrity": "sha512-dCO+J780f5NPLMv85Uw0Bpn6s0gjtYaWPPbMsav9GWLDDlls2a5wkIxt4ZsKGQI4jl5chzBrjTVdaEZJ9dsB8g==", + "version": "0.1.1-29260c7.0", + "resolved": "https://registry.npmjs.org/@vality/swag-claim-management/-/swag-claim-management-0.1.1-29260c7.0.tgz", + "integrity": "sha512-niyqbWZInfvmGcaJSur3M18E6kl0vDJE28Bd+GXLCmt9HB1chJ4QoRycqHsrKL4cmesmLJedP02S8UK4C+ly3w==", "dependencies": { "tslib": "^2.3.0" }, @@ -6336,9 +6369,9 @@ } }, "node_modules/acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -6606,40 +6639,6 @@ "dev": true, "license": "ISC" }, - "node_modules/are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "dev": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "node_modules/are-we-there-yet/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/are-we-there-yet/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, "node_modules/arg": { "version": "4.1.3", "dev": true, @@ -7570,15 +7569,6 @@ "node": ">=6" } }, - "node_modules/code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/coerce-property": { "version": "15.0.1", "resolved": "https://registry.npmjs.org/coerce-property/-/coerce-property-15.0.1.tgz", @@ -8729,6 +8719,11 @@ "url": "https://github.com/fb55/domhandler?sponsor=1" } }, + "node_modules/domq.js": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/domq.js/-/domq.js-0.6.7.tgz", + "integrity": "sha512-WwRGORo/eYGf7v7YXZ3M6x/PEoxCsP3D0my7pnAVwtbfsKRvW6qioSdlLsy1MFzfwN1TM9oO9QJcvkE8ERYmlg==" + }, "node_modules/domutils": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", @@ -8864,9 +8859,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.14.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz", + "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -10290,69 +10285,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", - "dev": true, - "dependencies": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "dev": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "dev": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "dev": true, @@ -11894,9 +11826,10 @@ } }, "node_modules/jest-worker": { - "version": "27.0.2", + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -11908,16 +11841,18 @@ }, "node_modules/jest-worker/node_modules/has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/jest-worker/node_modules/supports-color": { "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -12028,6 +11963,12 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + }, "node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -12894,6 +12835,11 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "node_modules/media-typer": { "version": "0.3.0", "dev": true, @@ -13262,10 +13208,16 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -13353,19 +13305,30 @@ "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/ngx-build-plus": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/ngx-build-plus/-/ngx-build-plus-15.0.0.tgz", - "integrity": "sha512-vcEJMsGETztb7fqXin9ecvsgfXkCzxvNceSHII0wrEcJ/nNyTp2cYrDlS5JWepj2H5jD5m9Gy1h9R0F4EMSUNw==", - "dev": true, + "node_modules/ng-let": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/ng-let/-/ng-let-15.0.2.tgz", + "integrity": "sha512-bOt8GOMCRtMPbJEgNrK2YLr8uEkhfQdw41UJziOQp2fCLxdmEP42ppUzr17Wcv0emsOo2bJ01Y7xfos7uJWczA==", "dependencies": { - "@angular-devkit/build-angular": ">=15.0.0", - "@schematics/angular": ">=15.0.0", - "webpack-merge": "^5.0.0" + "tslib": "^2.3.1" }, "peerDependencies": { - "@angular-devkit/build-angular": ">=15.0.0", - "rxjs": ">= 6.0.0" + "@angular/common": "^15.0.0", + "@angular/core": "^15.0.0" + } + }, + "node_modules/ngx-color": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/ngx-color/-/ngx-color-8.0.3.tgz", + "integrity": "sha512-tuLP+uIoDEu2m0bh711kb2P1M1bh/oIrOn8mJd9mb8xGL2v+OcokcxPmVvWRn0avMG1lXL53CjSlWXGkdV4CDA==", + "dependencies": { + "@ctrl/tinycolor": "^3.4.1", + "material-colors": "^1.2.6", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=14.0.0-0", + "@angular/core": ">=14.0.0-0" } }, "node_modules/ngx-mat-select-search": { @@ -13401,26 +13364,6 @@ "dev": true, "optional": true }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -13738,18 +13681,6 @@ "node": ">=8" } }, - "node_modules/npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, "node_modules/nth-check": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", @@ -13762,15 +13693,6 @@ "url": "https://github.com/fb55/nth-check?sponsor=1" } }, - "node_modules/number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/oauth-sign": { "version": "0.9.0", "dev": true, @@ -14286,13 +14208,13 @@ "license": "MIT" }, "node_modules/path-scurry": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.3.tgz", - "integrity": "sha512-RAmB+n30SlN+HnNx6EbcpoDy9nwdpcGPnEKrJnu6GZoDWBdIjo1UQMVtW2ybtC7LC2oKLcMq8y5g8WnKLiod9g==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz", + "integrity": "sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==", "dev": true, "dependencies": { - "lru-cache": "^7.14.1", - "minipass": "^4.0.2" + "lru-cache": "^9.1.1", + "minipass": "^5.0.0 || ^6.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -14302,12 +14224,21 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz", + "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==", "dev": true, "engines": { - "node": ">=12" + "node": "14 || >=16.14" + } + }, + "node_modules/path-scurry/node_modules/minipass": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", + "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" } }, "node_modules/path-to-regexp": { @@ -14330,15 +14261,24 @@ "optional": true, "peer": true }, + "node_modules/photoviewer": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/photoviewer/-/photoviewer-3.7.1.tgz", + "integrity": "sha512-lvOfIBCP+KXMHA6/CN2e4tLYorH5mqhwzvxiJWIkYb/OSjkEVgLHHyWGSmNkAHS7MNh5KBfoDTT4vsfiDAWnaw==", + "dependencies": { + "domq.js": "^0.6.7" + } + }, "node_modules/picocolors": { "version": "1.0.0", "dev": true, "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.0", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -14572,15 +14512,6 @@ "dev": true, "license": "MIT" }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -14913,12 +14844,6 @@ "node": ">= 0.10" } }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -15911,9 +15836,10 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.0", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -16834,16 +16760,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.1.4", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, - "license": "MIT", "dependencies": { - "jest-worker": "^27.0.2", - "p-limit": "^3.1.0", - "schema-utils": "^3.0.0", - "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", - "terser": "^5.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -16854,20 +16780,17 @@ }, "peerDependencies": { "webpack": "^5.1.0" - } - }, - "node_modules/terser-webpack-plugin/node_modules/p-limit": { - "version": "3.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { @@ -16887,12 +16810,22 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/terser-webpack-plugin/node_modules/source-map": { - "version": "0.6.1", + "node_modules/terser-webpack-plugin/node_modules/terser": { + "version": "5.17.7", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.7.tgz", + "integrity": "sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==", "dev": true, - "license": "BSD-3-Clause", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, "engines": { - "node": ">=0.10.0" + "node": ">=10" } }, "node_modules/test-exclude": { @@ -16984,12 +16917,6 @@ "node": ">=0.8" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, "node_modules/tree-kill": { "version": "1.2.2", "dev": true, @@ -17537,12 +17464,6 @@ "node": ">=6.9.x" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true - }, "node_modules/webpack": { "version": "5.76.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", @@ -17773,16 +17694,6 @@ "node": ">=0.8.0" } }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { "version": "1.3.1", "dev": true, @@ -18090,6 +18001,34 @@ "@jridgewell/trace-mapping": "^0.3.9" } }, + "@angular-builders/custom-webpack": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-15.0.0.tgz", + "integrity": "sha512-i8ZQ7rJ+RTy73MivvIdNAa8sZpiDy9wHBetAEyYSlGtjaSB3lntEFtBw9edfyRkpbifw53QA/N5haOwox987/Q==", + "dev": true, + "requires": { + "@angular-devkit/architect": ">=0.1500.0 < 0.1600.0", + "@angular-devkit/build-angular": "^15.0.0", + "@angular-devkit/core": "^15.0.0", + "lodash": "^4.17.15", + "ts-node": "^10.0.0", + "tsconfig-paths": "^4.1.0", + "webpack-merge": "^5.7.3" + }, + "dependencies": { + "tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "requires": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + } + } + }, "@angular-devkit/architect": { "version": "0.1502.4", "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.4.tgz", @@ -18239,12 +18178,6 @@ "once": "^1.3.0" } }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "loader-utils": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", @@ -18348,12 +18281,6 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -18384,12 +18311,6 @@ "rxjs": "6.6.7" }, "dependencies": { - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "magic-string": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz", @@ -18642,12 +18563,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true - }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -18921,17 +18836,17 @@ "dev": true }, "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", + "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", "requires": { "@babel/highlight": "^7.18.6" } }, "@babel/compat-data": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz", - "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==", + "version": "7.22.3", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.3.tgz", + "integrity": "sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==", "dev": true }, "@babel/core": { @@ -19007,13 +18922,13 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "version": "7.22.1", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz", + "integrity": "sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", + "@babel/compat-data": "^7.22.0", + "@babel/helper-validator-option": "^7.21.0", "browserslist": "^4.21.3", "lru-cache": "^5.1.1", "semver": "^6.3.0" @@ -19091,9 +19006,9 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.22.1", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz", + "integrity": "sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==", "dev": true }, "@babel/helper-explode-assignable-expression": { @@ -19134,12 +19049,12 @@ } }, "@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz", + "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.21.4" } }, "@babel/helper-module-transforms": { @@ -19227,9 +19142,9 @@ } }, "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.21.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", + "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", "dev": true }, "@babel/helper-validator-identifier": { @@ -19238,9 +19153,9 @@ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" }, "@babel/helper-validator-option": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", + "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", "dev": true }, "@babel/helper-wrap-function": { @@ -19277,9 +19192,9 @@ } }, "@babel/parser": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", - "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "version": "7.22.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.4.tgz", + "integrity": "sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -20064,39 +19979,39 @@ } }, "@babel/traverse": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz", - "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", + "version": "7.22.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.4.tgz", + "integrity": "sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.21.3", - "@babel/helper-environment-visitor": "^7.18.9", + "@babel/code-frame": "^7.21.4", + "@babel/generator": "^7.22.3", + "@babel/helper-environment-visitor": "^7.22.1", "@babel/helper-function-name": "^7.21.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.3", - "@babel/types": "^7.21.3", + "@babel/parser": "^7.22.4", + "@babel/types": "^7.22.4", "debug": "^4.1.0", "globals": "^11.1.0" }, "dependencies": { "@babel/generator": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz", - "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", + "version": "7.22.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.3.tgz", + "integrity": "sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==", "dev": true, "requires": { - "@babel/types": "^7.21.3", + "@babel/types": "^7.22.3", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" } }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", @@ -20107,12 +20022,12 @@ } }, "@babel/types": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz", - "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", + "version": "7.22.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.4.tgz", + "integrity": "sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-string-parser": "^7.21.5", "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" } @@ -20138,6 +20053,11 @@ } } }, + "@ctrl/tinycolor": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz", + "integrity": "sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==" + }, "@dinero.js/calculator-number": { "version": "2.0.0-alpha.8", "resolved": "https://registry.npmjs.org/@dinero.js/calculator-number/-/calculator-number-2.0.0-alpha.8.tgz", @@ -20481,9 +20401,9 @@ "dev": true }, "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz", + "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==", "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", @@ -21633,35 +21553,47 @@ "@angular-devkit/core": "15.2.4", "@angular-devkit/schematics": "15.2.4", "jsonc-parser": "3.2.0" + } + }, + "@sentry-internal/tracing": { + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.54.0.tgz", + "integrity": "sha512-JsyhZ0wWZ+VqbHJg+azqRGdYJDkcI5R9+pnkO6SzbzxrRewqMAIwzkpPee3oI7vG99uhMEkOkMjHu0nQGwkOQw==", + "requires": { + "@sentry/core": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", + "tslib": "^1.9.3" }, "dependencies": { - "jsonc-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "dev": true + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" } } }, "@sentry/angular": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-7.7.0.tgz", - "integrity": "sha512-JoynImiFsECSvOLZnqNhWuD2OTrxLLcbmTJcLv+ylVkXWmVCwiKUJP+4GDQy1AmbWuXmgboq/v8880ocXi98Bw==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-7.54.0.tgz", + "integrity": "sha512-/c3mys0dE64GKk0jjmWG9a+rGQbEwX1pflayD1cjwCStb0D/RVp4mUOMmbj5n40TlqQQehxfbFSSAA53fD+jQQ==", "requires": { - "@sentry/browser": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry/browser": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "tslib": "^2.0.0" } }, "@sentry/browser": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.7.0.tgz", - "integrity": "sha512-oyzpWcsjVZTaf14zAL89Ng1DUHlbjN+V8pl8dR9Y9anphbzL5BK9p0fSK4kPIrO4GukK+XrKnLJDPuE/o7WR3g==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.54.0.tgz", + "integrity": "sha512-EvLAw03N9WE2m1CMl2/1YMeIs1icw9IEOVJhWmf3uJEysNJOFWXu6ZzdtHEz1E6DiJYhc1HzDya0ExZeJxNARA==", "requires": { - "@sentry/core": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry-internal/tracing": "7.54.0", + "@sentry/core": "7.54.0", + "@sentry/replay": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "tslib": "^1.9.3" }, "dependencies": { @@ -21672,66 +21604,13 @@ } } }, - "@sentry/cli": { - "version": "1.74.5", - "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-1.74.5.tgz", - "integrity": "sha512-Ze1ec306ZWHtrxKypOJ8nhtFqkrx2f/6bRH+DcJzEQ3bBePQ0ZnqJTTe4BBHADYBtxFIaUWzCZ6DquLz2Zv/sw==", - "dev": true, - "requires": { - "https-proxy-agent": "^5.0.0", - "mkdirp": "^0.5.5", - "node-fetch": "^2.6.7", - "npmlog": "^4.1.2", - "progress": "^2.0.3", - "proxy-from-env": "^1.1.0", - "which": "^2.0.2" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, "@sentry/core": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.7.0.tgz", - "integrity": "sha512-Z15ACiuiFINFcK4gbMrnejLn4AVjKBPJOWKrrmpIe8mh+Y9diOuswt5mMUABs+jhpZvqht3PBLLGBL0WMsYMYA==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.54.0.tgz", + "integrity": "sha512-MAn0E2EwgNn1pFQn4qxhU+1kz6edullWg6VE5wCmtpXWOVw6sILBUsQpeIG5djBKMcneJCdOlz5jeqcKPrLvZQ==", "requires": { - "@sentry/hub": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, - "@sentry/hub": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.7.0.tgz", - "integrity": "sha512-6gydK234+a0nKhBRDdIJ7Dp42CaiW2juTiHegUVDq+482balVzbZyEAmESCmuzKJhx5BhlCElVxs/cci1NjMpg==", - "requires": { - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "tslib": "^1.9.3" }, "dependencies": { @@ -21743,12 +21622,12 @@ } }, "@sentry/integrations": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.7.0.tgz", - "integrity": "sha512-qHIw4JrluVfkcdA6v22KVumhuqdk9I0MxEaiHyP/uzx4xIoi9S4I86YbLHZUpjqreJIQkntsimJSepZJkxvG5g==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.54.0.tgz", + "integrity": "sha512-RolGsQzJChJzjHTJcCKSZ1HanmY33floc5o13WgU9NoDqJbLGLNcOIrAu+WynqPe8P5VTVrVb8NiwhLqWrKp4g==", "requires": { - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0", "localforage": "^1.8.1", "tslib": "^1.9.3" }, @@ -21758,33 +21637,35 @@ } } }, - "@sentry/tracing": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.7.0.tgz", - "integrity": "sha512-HNmvTwemuc21q/K6HXsSp9njkne6N1JQ71TB+QGqYU5VtxsVgYSUhhYqV6WcHz7LK4Hj6TvNFoeu69/rO0ysgw==", + "@sentry/replay": { + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.54.0.tgz", + "integrity": "sha512-C0F0568ybphzGmKGe23duB6n5wJcgM7WLYhoeqW3o2bHeqpj1dGPSka/K3s9KzGaAgzn1zeOUYXJsOs+T/XdsA==", "requires": { - "@sentry/hub": "7.7.0", - "@sentry/types": "7.7.0", - "@sentry/utils": "7.7.0", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1" - } + "@sentry/core": "7.54.0", + "@sentry/types": "7.54.0", + "@sentry/utils": "7.54.0" + } + }, + "@sentry/tracing": { + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.54.0.tgz", + "integrity": "sha512-IyflAAqOiKuNvhWXrJsXN8yfl8DbHRpfgtCEPo5TBvdkpcyxUyfE8W2a2MQ8MXDzgfJT1IixXEwleO+qPIi3Gg==", + "requires": { + "@sentry-internal/tracing": "7.54.0" } }, "@sentry/types": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.7.0.tgz", - "integrity": "sha512-4x8O7uerSGLnYC10krHl9t8h7xXHn5FextqKYbTCXCnx2hC8D+9lz8wcbQAFo0d97wiUYqI8opmEgFVGx7c5hQ==" + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.54.0.tgz", + "integrity": "sha512-D+i9xogBeawvQi2r0NOrM7zYcUaPuijeME4O9eOTrDF20tj71hWtJLilK+KTGLYFtpGg1h+9bPaz7OHEIyVopg==" }, "@sentry/utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.7.0.tgz", - "integrity": "sha512-fD+ROSFpeJlK7bEvUT2LOW7QqgjBpXJwVISKZ0P2fuzclRC3KoB2pbZgBM4PXMMTiSzRGWhvfRRjBiBvQJBBJQ==", + "version": "7.54.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.54.0.tgz", + "integrity": "sha512-3Yf5KlKjIcYLddOexSt2ovu2TWlR4Fi7M+aCK8yUTzwNzf/xwFSWOstHlD/WiDy9HvfhWAOB/ukNTuAeJmtasw==", "requires": { - "@sentry/types": "7.7.0", + "@sentry/types": "7.54.0", "tslib": "^1.9.3" }, "dependencies": { @@ -21795,15 +21676,6 @@ } } }, - "@sentry/webpack-plugin": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-1.19.0.tgz", - "integrity": "sha512-qSpdgdGMtdzagGveSWgo2b+t8PdPUscuOjbOyWCsJme9jlTFnNk0rX7JEA55OUozikKHM/+vVh08USLBnPboZw==", - "dev": true, - "requires": { - "@sentry/cli": "^1.74.4" - } - }, "@sigstore/protobuf-specs": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", @@ -22209,14 +22081,12 @@ } }, "@types/lodash": { - "version": "4.14.168", - "dev": true + "version": "4.14.168" }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", - "dev": true, "requires": { "@types/lodash": "*" } @@ -22511,11 +22381,72 @@ } }, "@vality/ng-core": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-0.3.0.tgz", - "integrity": "sha512-uezgCzRGWTfe6PDnAqbFQ0nqCv+8auIGTd1tej8hV+h0fTOahAJybTrpYpzvegYdVJ1IwVAUqMAiLKo5RCtKhQ==", + "version": "0.7.1-2a1b72f.0", + "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-0.7.1-2a1b72f.0.tgz", + "integrity": "sha512-LhMLijiVuJ0cjZ7UPpCAc5s2svjFJI6+wGq0/zfLs5vBfM43D8BNiGfnD2dARtG6CEaHCuh7wvsTyzNMv+p9/w==", "requires": { + "@ng-matero/extensions": "^15.0.0", + "@s-libs/js-core": "^15.2.0", + "@s-libs/micro-dash": "^15.2.0", + "@s-libs/ng-core": "^15.2.0", + "@s-libs/rxjs-core": "^15.2.0", + "dinero.js": "^2.0.0-alpha.14", + "ng-let": "^15.0.2", "tslib": "^2.3.0" + }, + "dependencies": { + "@dinero.js/calculator-number": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@dinero.js/calculator-number/-/calculator-number-2.0.0-alpha.14.tgz", + "integrity": "sha512-Vmlu6eXNtkFU2cqlrpqfq8KQP9onALf8Es2d34liVa3k3RHjuhizgFUU3V3/tsjOu5WekZq+gYPOr58XVTkB7A==", + "requires": { + "@dinero.js/core": "2.0.0-alpha.14" + } + }, + "@dinero.js/core": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@dinero.js/core/-/core-2.0.0-alpha.14.tgz", + "integrity": "sha512-CtKELJ783joUbaU62fRM2xDXb4XYSy0MgOuIkPWgVOS3SYKKb6+2Ec9bNlvrW8lsPROz/RsvCuYVTphrZ79twg==", + "requires": { + "@dinero.js/currencies": "2.0.0-alpha.14" + } + }, + "@dinero.js/currencies": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@dinero.js/currencies/-/currencies-2.0.0-alpha.14.tgz", + "integrity": "sha512-Ck5ZLjRI7Pl7Y4VkeOst4WEwiN5vZezv8GHcXWsVLUfTNsmkV37VeLYDRAuTUP4akEJyIry+1o1qHYNtLq3eNw==" + }, + "@ng-matero/extensions": { + "version": "15.5.1", + "resolved": "https://registry.npmjs.org/@ng-matero/extensions/-/extensions-15.5.1.tgz", + "integrity": "sha512-PjPFevPRpd2vyZBEqdD9QUFaAQeOT8hQWi7uGdWm+gPyiZnDY3pJRHcxbUdZrYOfCA/WULmXr/TGV5fi7jAhhw==", + "requires": { + "@ng-select/ng-select": "^10.0.0", + "ngx-color": "^8.0.0", + "photoviewer": "^3.7.0", + "tslib": "^2.4.0" + }, + "dependencies": { + "@ng-select/ng-select": { + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@ng-select/ng-select/-/ng-select-10.0.4.tgz", + "integrity": "sha512-Vc/JIgcFkSgf47cX7+pQQo9HYhDktfqrY7o/ZPGMvu63P7E9d1MibVipqmcLbgms6Ac9lu621CDZPGHdxag7hA==", + "requires": { + "tslib": "^2.3.1" + } + } + } + }, + "dinero.js": { + "version": "2.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/dinero.js/-/dinero.js-2.0.0-alpha.14.tgz", + "integrity": "sha512-dkURHd9P+2TjuSTMUAnvrB7SsL4GbBYG/WPtIBV8M+L7Xf80x84sJcUUTxIS33S4AlkIbVANlaL86w2g5zdrmg==", + "requires": { + "@dinero.js/calculator-number": "2.0.0-alpha.14", + "@dinero.js/core": "2.0.0-alpha.14", + "@dinero.js/currencies": "2.0.0-alpha.14" + } + } } }, "@vality/swag-anapi-v2": { @@ -22535,9 +22466,9 @@ } }, "@vality/swag-claim-management": { - "version": "0.1.1-bfc2e6c.0", - "resolved": "https://registry.npmjs.org/@vality/swag-claim-management/-/swag-claim-management-0.1.1-bfc2e6c.0.tgz", - "integrity": "sha512-dCO+J780f5NPLMv85Uw0Bpn6s0gjtYaWPPbMsav9GWLDDlls2a5wkIxt4ZsKGQI4jl5chzBrjTVdaEZJ9dsB8g==", + "version": "0.1.1-29260c7.0", + "resolved": "https://registry.npmjs.org/@vality/swag-claim-management/-/swag-claim-management-0.1.1-29260c7.0.tgz", + "integrity": "sha512-niyqbWZInfvmGcaJSur3M18E6kl0vDJE28Bd+GXLCmt9HB1chJ4QoRycqHsrKL4cmesmLJedP02S8UK4C+ly3w==", "requires": { "tslib": "^2.3.0" } @@ -22735,9 +22666,9 @@ } }, "acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true }, "acorn-import-assertions": { @@ -22923,42 +22854,6 @@ "version": "1.2.0", "dev": true }, - "are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "arg": { "version": "4.1.3", "dev": true @@ -23603,12 +23498,6 @@ "shallow-clone": "^3.0.0" } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", - "dev": true - }, "coerce-property": { "version": "15.0.1", "resolved": "https://registry.npmjs.org/coerce-property/-/coerce-property-15.0.1.tgz", @@ -24429,6 +24318,11 @@ "domelementtype": "^2.2.0" } }, + "domq.js": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/domq.js/-/domq.js-0.6.7.tgz", + "integrity": "sha512-WwRGORo/eYGf7v7YXZ3M6x/PEoxCsP3D0my7pnAVwtbfsKRvW6qioSdlLsy1MFzfwN1TM9oO9QJcvkE8ERYmlg==" + }, "domutils": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", @@ -24525,9 +24419,9 @@ } }, "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.14.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz", + "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -25528,59 +25422,6 @@ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", - "dev": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, "gensync": { "version": "1.0.0-beta.2", "dev": true @@ -26638,7 +26479,9 @@ "peer": true }, "jest-worker": { - "version": "27.0.2", + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, "requires": { "@types/node": "*", @@ -26648,10 +26491,14 @@ "dependencies": { "has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "supports-color": { "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -26730,6 +26577,12 @@ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, + "jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -27355,6 +27208,11 @@ } } }, + "material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "media-typer": { "version": "0.3.0", "dev": true @@ -27632,9 +27490,9 @@ "dev": true }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true }, "natural-compare": { @@ -27699,15 +27557,22 @@ "tslib": "^2.0.0" } }, - "ngx-build-plus": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/ngx-build-plus/-/ngx-build-plus-15.0.0.tgz", - "integrity": "sha512-vcEJMsGETztb7fqXin9ecvsgfXkCzxvNceSHII0wrEcJ/nNyTp2cYrDlS5JWepj2H5jD5m9Gy1h9R0F4EMSUNw==", - "dev": true, + "ng-let": { + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/ng-let/-/ng-let-15.0.2.tgz", + "integrity": "sha512-bOt8GOMCRtMPbJEgNrK2YLr8uEkhfQdw41UJziOQp2fCLxdmEP42ppUzr17Wcv0emsOo2bJ01Y7xfos7uJWczA==", "requires": { - "@angular-devkit/build-angular": ">=15.0.0", - "@schematics/angular": ">=15.0.0", - "webpack-merge": "^5.0.0" + "tslib": "^2.3.1" + } + }, + "ngx-color": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/ngx-color/-/ngx-color-8.0.3.tgz", + "integrity": "sha512-tuLP+uIoDEu2m0bh711kb2P1M1bh/oIrOn8mJd9mb8xGL2v+OcokcxPmVvWRn0avMG1lXL53CjSlWXGkdV4CDA==", + "requires": { + "@ctrl/tinycolor": "^3.4.1", + "material-colors": "^1.2.6", + "tslib": "^2.3.0" } }, "ngx-mat-select-search": { @@ -27736,15 +27601,6 @@ "dev": true, "optional": true }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } - }, "node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -27986,18 +27842,6 @@ "path-key": "^3.0.0" } }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, "nth-check": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", @@ -28007,12 +27851,6 @@ "boolbase": "^1.0.0" } }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "dev": true - }, "oauth-sign": { "version": "0.9.0", "dev": true, @@ -28355,19 +28193,25 @@ "dev": true }, "path-scurry": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.3.tgz", - "integrity": "sha512-RAmB+n30SlN+HnNx6EbcpoDy9nwdpcGPnEKrJnu6GZoDWBdIjo1UQMVtW2ybtC7LC2oKLcMq8y5g8WnKLiod9g==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz", + "integrity": "sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==", "dev": true, "requires": { - "lru-cache": "^7.14.1", - "minipass": "^4.0.2" + "lru-cache": "^9.1.1", + "minipass": "^5.0.0 || ^6.0.2" }, "dependencies": { "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz", + "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==", + "dev": true + }, + "minipass": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", + "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", "dev": true } } @@ -28387,12 +28231,22 @@ "optional": true, "peer": true }, + "photoviewer": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/photoviewer/-/photoviewer-3.7.1.tgz", + "integrity": "sha512-lvOfIBCP+KXMHA6/CN2e4tLYorH5mqhwzvxiJWIkYb/OSjkEVgLHHyWGSmNkAHS7MNh5KBfoDTT4vsfiDAWnaw==", + "requires": { + "domq.js": "^0.6.7" + } + }, "picocolors": { "version": "1.0.0", "dev": true }, "picomatch": { - "version": "2.3.0", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "pify": { @@ -28533,12 +28387,6 @@ "version": "2.0.1", "dev": true }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -28779,12 +28627,6 @@ } } }, - "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -29487,7 +29329,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -30161,24 +30005,18 @@ } }, "terser-webpack-plugin": { - "version": "5.1.4", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "requires": { - "jest-worker": "^27.0.2", - "p-limit": "^3.1.0", - "schema-utils": "^3.0.0", - "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", - "terser": "^5.7.0" + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "dependencies": { - "p-limit": { - "version": "3.1.0", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, "schema-utils": { "version": "3.1.1", "dev": true, @@ -30188,9 +30026,17 @@ "ajv-keywords": "^3.5.2" } }, - "source-map": { - "version": "0.6.1", - "dev": true + "terser": { + "version": "5.17.7", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.7.tgz", + "integrity": "sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==", + "dev": true, + "requires": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + } } } }, @@ -30260,12 +30106,6 @@ "punycode": "^2.1.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, "tree-kill": { "version": "1.2.2", "dev": true @@ -30639,12 +30479,6 @@ "selenium-webdriver": "^3.0.1" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true - }, "webpack": { "version": "5.76.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", @@ -30793,16 +30627,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "which": { "version": "1.3.1", "dev": true, diff --git a/package.json b/package.json index 2f67ec80..27834c8c 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/app/api/anapi/anapi-dictionary.service.ts b/src/app/api/anapi/anapi-dictionary.service.ts index ac754649..fe2e79f4 100644 --- a/src/app/api/anapi/anapi-dictionary.service.ts +++ b/src/app/api/anapi/anapi-dictionary.service.ts @@ -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'; diff --git a/src/app/api/claim-management/utils/create-test-shop-claim-changeset.ts b/src/app/api/claim-management/utils/create-test-shop-claim-changeset.ts index f1ab14d9..a4df8b9e 100644 --- a/src/app/api/claim-management/utils/create-test-shop-claim-changeset.ts +++ b/src/app/api/claim-management/utils/create-test-shop-claim-changeset.ts @@ -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, }), ]; diff --git a/src/app/api/payments/categories.service.ts b/src/app/api/payments/categories.service.ts index 2388320b..8c5f1e3c 100644 --- a/src/app/api/payments/categories.service.ts +++ b/src/app/api/payments/categories.service.ts @@ -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'; diff --git a/src/app/api/payments/contracts.service.ts b/src/app/api/payments/contracts.service.ts index 5a0c7e65..1bec2df1 100644 --- a/src/app/api/payments/contracts.service.ts +++ b/src/app/api/payments/contracts.service.ts @@ -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'; diff --git a/src/app/api/payments/countries.service.ts b/src/app/api/payments/countries.service.ts index 965ea843..7ac61dff 100644 --- a/src/app/api/payments/countries.service.ts +++ b/src/app/api/payments/countries.service.ts @@ -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'; diff --git a/src/app/api/payments/invoice-templates.service.ts b/src/app/api/payments/invoice-templates.service.ts index b81299ab..3e769145 100644 --- a/src/app/api/payments/invoice-templates.service.ts +++ b/src/app/api/payments/invoice-templates.service.ts @@ -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'; diff --git a/src/app/api/payments/invoices.service.ts b/src/app/api/payments/invoices.service.ts index a8e9d3ec..8ca89876 100644 --- a/src/app/api/payments/invoices.service.ts +++ b/src/app/api/payments/invoices.service.ts @@ -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'; diff --git a/src/app/api/payments/payment-institutions.service.ts b/src/app/api/payments/payment-institutions.service.ts index 1b385b7b..b2d61385 100644 --- a/src/app/api/payments/payment-institutions.service.ts +++ b/src/app/api/payments/payment-institutions.service.ts @@ -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'; diff --git a/src/app/api/payments/payouts.service.ts b/src/app/api/payments/payouts.service.ts index 28de70fa..ec650f4f 100644 --- a/src/app/api/payments/payouts.service.ts +++ b/src/app/api/payments/payouts.service.ts @@ -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'; diff --git a/src/app/api/payments/webhooks.service.ts b/src/app/api/payments/webhooks.service.ts index 85767112..f5857779 100644 --- a/src/app/api/payments/webhooks.service.ts +++ b/src/app/api/payments/webhooks.service.ts @@ -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'; diff --git a/src/app/api/utils/dictionary.service.ts b/src/app/api/utils/dictionary.service.ts index 1f45b3a0..6027ec9d 100644 --- a/src/app/api/utils/dictionary.service.ts +++ b/src/app/api/utils/dictionary.service.ts @@ -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', diff --git a/src/app/api/wallet/identities.service.ts b/src/app/api/wallet/identities.service.ts index 2a940566..b39bd359 100644 --- a/src/app/api/wallet/identities.service.ts +++ b/src/app/api/wallet/identities.service.ts @@ -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'; diff --git a/src/app/api/wallet/wallets.service.ts b/src/app/api/wallet/wallets.service.ts index cd37ff56..71221737 100644 --- a/src/app/api/wallet/wallets.service.ts +++ b/src/app/api/wallet/wallets.service.ts @@ -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'; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8e583ec2..716d5c22 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -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'; diff --git a/src/app/auth/is-access-allowed.pipe.ts b/src/app/auth/is-access-allowed.pipe.ts index 6a0191f9..022d2cba 100644 --- a/src/app/auth/is-access-allowed.pipe.ts +++ b/src/app/auth/is-access-allowed.pipe.ts @@ -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; diff --git a/src/app/bootstrap.service.spec.ts b/src/app/bootstrap.service.spec.ts index c00aefd4..a74b46e7 100644 --- a/src/app/bootstrap.service.spec.ts +++ b/src/app/bootstrap.service.spec.ts @@ -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'; diff --git a/src/app/dadata/dadata.component.ts b/src/app/dadata/dadata.component.ts index 0bd9fd38..46cf35e7 100644 --- a/src/app/dadata/dadata.component.ts +++ b/src/app/dadata/dadata.component.ts @@ -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'; diff --git a/src/app/home/actionbar/actionbar.module.ts b/src/app/home/actionbar/actionbar.module.ts index 098f3835..5e9162f5 100644 --- a/src/app/home/actionbar/actionbar.module.ts +++ b/src/app/home/actionbar/actionbar.module.ts @@ -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'; diff --git a/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.ts b/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.ts index a5fa2d4e..0f70d4c4 100644 --- a/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.ts +++ b/src/app/sections/claim-section/claims/claims-list/components/claim-row/claim-row.component.ts @@ -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', diff --git a/src/app/sections/claim-section/claims/claims.module.ts b/src/app/sections/claim-section/claims/claims.module.ts index 221ec1ce..22e2f3a3 100644 --- a/src/app/sections/claim-section/claims/claims.module.ts +++ b/src/app/sections/claim-section/claims/claims.module.ts @@ -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'; diff --git a/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts b/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts index 97d2bbd6..327b361b 100644 --- a/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts +++ b/src/app/sections/claim-section/claims/services/fetch-claims/fetch-claims.service.ts @@ -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'; diff --git a/src/app/sections/organization-section/accept-invitation/accept-invitation.component.spec.ts b/src/app/sections/organization-section/accept-invitation/accept-invitation.component.spec.ts index d2bbd08a..a40403f7 100644 --- a/src/app/sections/organization-section/accept-invitation/accept-invitation.component.spec.ts +++ b/src/app/sections/organization-section/accept-invitation/accept-invitation.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts b/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts index acda004a..90fb404c 100644 --- a/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts +++ b/src/app/sections/organization-section/accept-invitation/accept-invitation.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts index a2d5fbe9..7fd1178d 100644 --- a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts index 4bd9bce8..bc52fcff 100644 --- a/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts +++ b/src/app/sections/organization-section/organization-details/change-roles-table/change-roles-table.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts index fe4d4e9d..48ffe55d 100644 --- a/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts +++ b/src/app/sections/organization-section/organization-details/change-roles-table/components/select-role-dialog/select-role-dialog.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts index e2fbe185..df11f251 100644 --- a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts index 746424eb..f00a2622 100644 --- a/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts +++ b/src/app/sections/organization-section/organization-details/invitations/components/create-invitation-dialog/create-invitation-dialog.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts index 206dbacf..49261830 100644 --- a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts index cfb2f845..d10b5c75 100644 --- a/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts +++ b/src/app/sections/organization-section/organization-details/invitations/components/invitation/invitation.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts b/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts index a9a12e75..adb7b4cd 100644 --- a/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/invitations/invitations.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts b/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts index ab17f44c..e3b54129 100644 --- a/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts +++ b/src/app/sections/organization-section/organization-details/invitations/invitations.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts b/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts index 7391997f..244ef6e1 100644 --- a/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts +++ b/src/app/sections/organization-section/organization-details/invitations/services/fetch-invitations/fetch-invitations.service.ts @@ -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() diff --git a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts index a82b16db..b8c46226 100644 --- a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts index b711e33a..15d33c04 100644 --- a/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts +++ b/src/app/sections/organization-section/organization-details/members/components/edit-roles-dialog/edit-roles-dialog.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts b/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts index a42ab728..da72f828 100644 --- a/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/members/components/member/member.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts b/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts index 5a185204..a43e182d 100644 --- a/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts +++ b/src/app/sections/organization-section/organization-details/members/components/member/member.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/members.component.spec.ts b/src/app/sections/organization-section/organization-details/members/members.component.spec.ts index 81e28d3b..cc664fe4 100644 --- a/src/app/sections/organization-section/organization-details/members/members.component.spec.ts +++ b/src/app/sections/organization-section/organization-details/members/members.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/members.component.ts b/src/app/sections/organization-section/organization-details/members/members.component.ts index f72bfe58..85ffde0e 100644 --- a/src/app/sections/organization-section/organization-details/members/members.component.ts +++ b/src/app/sections/organization-section/organization-details/members/members.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/members.module.ts b/src/app/sections/organization-section/organization-details/members/members.module.ts index 216ed786..1ef32323 100644 --- a/src/app/sections/organization-section/organization-details/members/members.module.ts +++ b/src/app/sections/organization-section/organization-details/members/members.module.ts @@ -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'; diff --git a/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts b/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts index 98088e34..36c75d3b 100644 --- a/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts +++ b/src/app/sections/organization-section/organization-details/members/services/fetch-members/fetch-members.service.ts @@ -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() diff --git a/src/app/sections/organization-section/organization-details/organization-details.component.ts b/src/app/sections/organization-section/organization-details/organization-details.component.ts index c710c4dd..f71b4f7c 100644 --- a/src/app/sections/organization-section/organization-details/organization-details.component.ts +++ b/src/app/sections/organization-section/organization-details/organization-details.component.ts @@ -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', diff --git a/src/app/sections/organization-section/organization-details/organization-details.spec.ts b/src/app/sections/organization-section/organization-details/organization-details.spec.ts index 5b2f5748..0eb304b5 100644 --- a/src/app/sections/organization-section/organization-details/organization-details.spec.ts +++ b/src/app/sections/organization-section/organization-details/organization-details.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts index c845ef95..47091b11 100644 --- a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts +++ b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts index 50ada3fe..9ef145d1 100644 --- a/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts +++ b/src/app/sections/organization-section/organizations/components/create-organization-dialog/create-organization-dialog.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts b/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts index 4b531649..ca743fc0 100644 --- a/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts +++ b/src/app/sections/organization-section/organizations/components/organization/organization.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/components/organization/organization.component.ts b/src/app/sections/organization-section/organizations/components/organization/organization.component.ts index 986a8d4e..623dc3a0 100644 --- a/src/app/sections/organization-section/organizations/components/organization/organization.component.ts +++ b/src/app/sections/organization-section/organizations/components/organization/organization.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts index 353d7196..74c3bed1 100644 --- a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts +++ b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.spec.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts index b1b97447..66783800 100644 --- a/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts +++ b/src/app/sections/organization-section/organizations/components/rename-organization-dialog/rename-organization-dialog.component.ts @@ -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'; diff --git a/src/app/sections/organization-section/organizations/organizations.module.ts b/src/app/sections/organization-section/organizations/organizations.module.ts index 705851a1..b454573c 100644 --- a/src/app/sections/organization-section/organizations/organizations.module.ts +++ b/src/app/sections/organization-section/organizations/organizations.module.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts index bd5ac8e6..fecb3d93 100644 --- a/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts +++ b/src/app/sections/payment-section/analytics/analytics-search-filters/analytics-search-filters.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts b/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts index d2012dcf..a0303b26 100644 --- a/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts +++ b/src/app/sections/payment-section/analytics/average-payment/average-payment.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts index b3b8afed..262f8811 100644 --- a/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts +++ b/src/app/sections/payment-section/analytics/payment-split-amount/payment-split-amount.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts index 97425f7c..1170c17a 100644 --- a/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts +++ b/src/app/sections/payment-section/analytics/payment-split-count/payment-split-count.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts index 97b344e5..199d5161 100644 --- a/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts +++ b/src/app/sections/payment-section/analytics/payments-amount/payments-amount.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts b/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts index 4931eff2..b365c66e 100644 --- a/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts +++ b/src/app/sections/payment-section/analytics/payments-count/payments-count.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts index 9c3a2929..e1b47b34 100644 --- a/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts +++ b/src/app/sections/payment-section/analytics/payments-error-distribution/payments-error-distribution.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts index 5c135804..aa8f5cae 100644 --- a/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts +++ b/src/app/sections/payment-section/analytics/payments-tool-distribution/payments-tool-distribution.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts index 1c2cd8e2..9f3fdeb1 100644 --- a/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts +++ b/src/app/sections/payment-section/analytics/refunds-amount/refunds-amount.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/balances/balances.service.ts b/src/app/sections/payment-section/balances/balances.service.ts index 0fcb4dbe..2182f65a 100644 --- a/src/app/sections/payment-section/balances/balances.service.ts +++ b/src/app/sections/payment-section/balances/balances.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/api-keys/api-keys-list/components/api-key-delete-dialog/api-key-delete-dialog.component.ts b/src/app/sections/payment-section/integrations/api-keys/api-keys-list/components/api-key-delete-dialog/api-key-delete-dialog.component.ts index 5dce041e..1ad5b759 100644 --- a/src/app/sections/payment-section/integrations/api-keys/api-keys-list/components/api-key-delete-dialog/api-key-delete-dialog.component.ts +++ b/src/app/sections/payment-section/integrations/api-keys/api-keys-list/components/api-key-delete-dialog/api-key-delete-dialog.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts b/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts index 14179d62..c4d8b11a 100644 --- a/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts +++ b/src/app/sections/payment-section/integrations/api-keys/components/api-key-create-dialog/api-key-create-dialog.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts b/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts index 23fcafe5..e1fc8d46 100644 --- a/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts +++ b/src/app/sections/payment-section/integrations/api-keys/components/api-key-revoke/api-key-revoke.component.ts @@ -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() diff --git a/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts b/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts index 2d69fa20..b61c4d0f 100644 --- a/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts +++ b/src/app/sections/payment-section/integrations/api-keys/fetch-api-keys.service.ts @@ -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() diff --git a/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.component.ts b/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.component.ts index 852a640a..5f9acef1 100644 --- a/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.component.ts +++ b/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.service.ts b/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.service.ts index e1bb793e..149b15d0 100644 --- a/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.service.ts +++ b/src/app/sections/payment-section/integrations/payment-link/create-invoice-or-invoice-template/create-invoice-or-invoice-template.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.component.ts b/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.component.ts index adbdbdfc..d5dae520 100644 --- a/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.component.ts +++ b/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.service.ts b/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.service.ts index d94bf75a..84547c5f 100644 --- a/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.service.ts +++ b/src/app/sections/payment-section/integrations/payment-link/create-invoice-template/create-invoice-template.service.ts @@ -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'); diff --git a/src/app/sections/payment-section/integrations/payment-link/payment-link.component.ts b/src/app/sections/payment-section/integrations/payment-link/payment-link.component.ts index 23f0d3ff..ee96cd6f 100644 --- a/src/app/sections/payment-section/integrations/payment-link/payment-link.component.ts +++ b/src/app/sections/payment-section/integrations/payment-link/payment-link.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts index da87bdf5..49f72fed 100644 --- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts +++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts index 31e355b7..8bda5809 100644 --- a/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts +++ b/src/app/sections/payment-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts b/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts index 110fd07a..948c157a 100644 --- a/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts +++ b/src/app/sections/payment-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts @@ -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() diff --git a/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts b/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts index 99e22678..ab7242b5 100644 --- a/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts +++ b/src/app/sections/payment-section/integrations/webhooks/receive-webhooks.service.ts @@ -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 { diff --git a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts index d1fa3790..32367919 100644 --- a/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts +++ b/src/app/sections/payment-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts @@ -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', diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts index 7023ff83..2fe54a37 100644 --- a/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts +++ b/src/app/sections/payment-section/operations/invoices/create-invoice/components/create-invoice-dialog/create-invoice-dialog.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.spec.ts b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.spec.ts index ceec62ea..0327b3bd 100644 --- a/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.spec.ts +++ b/src/app/sections/payment-section/operations/invoices/create-invoice/create-invoice.service.spec.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts index f8690d73..f0750d78 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/components/invoice-row/invoice-row.component.ts @@ -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', diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.spec.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.spec.ts index 7e8e77d4..53144383 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.spec.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.spec.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts index fec6d62b..30a668e9 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/cancel-invoice/cancel-invoice.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/create-payment-link-dialog/create-payment-link-dialog.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/create-payment-link-dialog/create-payment-link-dialog.component.ts index 517deb4f..e0c56ccc 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/create-payment-link-dialog/create-payment-link-dialog.component.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/create-payment-link-dialog/create-payment-link-dialog.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.spec.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.spec.ts index 5a05497e..4b428df7 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.spec.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.spec.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts index aefa85f2..0dca2cdb 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/fulfill-invoice/fulfill-invoice.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.spec.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.spec.ts index a8b9ecd4..30349cf6 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.spec.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.spec.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts index 1800f3cc..54539483 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-invoice/receive-invoice.service.ts @@ -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() diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.spec.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.spec.ts index 26025ee8..1f23bc6a 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.spec.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.spec.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts index 3a08d3c2..bd17dec5 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-list/invoice-details/services/receive-payments/receive-payments.service.ts @@ -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() diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts index 5ebe5c32..ebcc52e0 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/additional-filters/invoice-status-filter/invoice-status-filter.component.ts @@ -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({ diff --git a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts index 43cdcbab..633717aa 100644 --- a/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts +++ b/src/app/sections/payment-section/operations/invoices/invoices-search-filters/invoices-search-filters.component.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/map-to-invoices-table-data.ts b/src/app/sections/payment-section/operations/invoices/map-to-invoices-table-data.ts index 0423f049..1ad901e0 100644 --- a/src/app/sections/payment-section/operations/invoices/map-to-invoices-table-data.ts +++ b/src/app/sections/payment-section/operations/invoices/map-to-invoices-table-data.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.spec.ts b/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.spec.ts index 5bf6ac1e..f6ef09ee 100644 --- a/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.spec.ts +++ b/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.spec.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts b/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts index 3bd4c0a4..d2b3f496 100644 --- a/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts +++ b/src/app/sections/payment-section/operations/invoices/services/fetch-invoices/fetch-invoices.service.ts @@ -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'; diff --git a/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts b/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts index a3f59afc..128bd98d 100644 --- a/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts +++ b/src/app/sections/payment-section/operations/operators/filter-shops-by-realm.ts @@ -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; diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts index 5c556cc1..eb1e1056 100644 --- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-status-filter/payment-status-filter.component.ts @@ -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 { statuses = Object.values(PaymentStatus.StatusEnum); - paymentStatusDict$ = this.paymentsDictionaryService.paymentStatus$; + paymentStatusDict$ = this.anapiDictionaryService.paymentStatus$; - constructor(private paymentsDictionaryService: PaymentsDictionaryService) { + constructor(private anapiDictionaryService: AnapiDictionaryService) { super(); } } diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts index 12c94eb2..39262802 100644 --- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/payment-system-filter/payment-system-filter.component.ts @@ -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({ diff --git a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts index 63769efa..a872e419 100644 --- a/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-filters/additional-filters/token-provider-filter/token-provider-filter.component.ts @@ -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({ diff --git a/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 b/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 index d66b4f45..dcb040e0 100644 --- a/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 +++ b/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 @@ -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'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts index 4c8bc9ca..0f96edbd 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/cancel-hold/components/cancel-hold-dialog/cancel-hold-dialog.component.ts @@ -6,7 +6,7 @@ import { } from '@angular/material/legacy-dialog'; import { FormBuilder, FormGroup } from '@ngneat/reactive-forms'; -import { PaymentsService } from '@dsh/api/payments'; +import { PaymentsService } from '@dsh/app/api/payments'; import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog'; import { ErrorService } from '@dsh/app/shared/services'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.spec.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.spec.ts index 4d26195c..5dc1ae86 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.spec.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.spec.ts @@ -12,7 +12,7 @@ import { FormControl } from '@ngneat/reactive-forms'; 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'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts index 3e3c50ce..68f8c587 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/hold-details/create-hold/components/create-hold-dialog/create-hold-dialog.component.ts @@ -9,7 +9,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { CaptureParams } from '@vality/swag-payments'; import isNil from 'lodash-es/isNil'; -import { PaymentsService } from '@dsh/api/payments'; +import { PaymentsService } from '@dsh/app/api/payments'; import { BaseDialogResponseStatus } from '@dsh/app/shared/components/dialog/base-dialog'; import { ErrorService } from '@dsh/app/shared/services'; import { amountValidator } from '@dsh/components/form-controls'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts index 15c08e98..760fd064 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/components/bank-card/bank-card.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { BankCardDetails } from '@vality/swag-payments'; -import { TokenProvider, PaymentSystem } from '@dsh/api/payments'; +import { TokenProvider, PaymentSystem } from '@dsh/app/api/payments'; interface BankCardIconConfig { iconName: string; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts index 4c42ecc4..a7888a91 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/payment-main-info/payment-tool/payment-tool.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { PaymentToolDetails } from '@vality/swag-payments'; -import { PaymentToolDetailsType } from '@dsh/api/payments'; +import { PaymentToolDetailsType } from '@dsh/app/api/payments'; @Component({ selector: 'dsh-payment-tool', diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.spec.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.spec.ts index 31d14ade..a6c9182f 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.spec.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.spec.ts @@ -4,7 +4,7 @@ import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; import { deepEqual, instance, mock, when } from 'ts-mockito'; -import { RefundService } from '@dsh/api/refund'; +import { RefundService } from '@dsh/app/api/refund'; import { RefundsService } from './refunds.service'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts index 84905bf7..b990ea8d 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/create-refund/services/refunds/refunds.service.ts @@ -3,7 +3,7 @@ import { Refund, RefundParams } from '@vality/swag-payments'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PaymentsService } from '@dsh/api/payments'; +import { PaymentsService } from '@dsh/app/api/payments'; @Injectable() export class RefundsService { diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.spec.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.spec.ts index 5da50119..fa5c5a71 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.spec.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { instance, mock } from 'ts-mockito'; -import { RefundSearchService } from '@dsh/api/search'; +import { RefundSearchService } from '@dsh/app/api/search'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME } from '@dsh/app/shared'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts index 385cdf38..74d0a182 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/refunds/services/fetch-refunds/fetch-refunds.service.ts @@ -4,7 +4,7 @@ import moment from 'moment'; import { Observable, switchMap } from 'rxjs'; import { shareReplay, first } from 'rxjs/operators'; -import { SearchService } from '@dsh/api/anapi'; +import { SearchService } from '@dsh/app/api/anapi'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.spec.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.spec.ts index d6bebe2c..2a1de4a3 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.spec.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.spec.ts @@ -5,7 +5,7 @@ import { of } from 'rxjs'; import { switchMap, take } from 'rxjs/operators'; import { deepEqual, instance, mock, verify, when } from 'ts-mockito'; -import { InvoiceSearchService } from '@dsh/api/search'; +import { InvoiceSearchService } from '@dsh/app/api/search'; import { ErrorService } from '@dsh/app/shared/services'; import { InvoiceDetailsService } from './invoice-details.service'; diff --git a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts index e7ef1c9f..f126ce8d 100644 --- a/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts +++ b/src/app/sections/payment-section/operations/payments/payments-panels/payments-details/services/invoice-details/invoice-details.service.ts @@ -5,7 +5,7 @@ import moment from 'moment'; import { Observable, ReplaySubject } from 'rxjs'; import { distinctUntilChanged, switchMap, tap, map, withLatestFrom } from 'rxjs/operators'; -import { SearchService } from '@dsh/api/anapi'; +import { SearchService } from '@dsh/app/api/anapi'; import { ErrorService } from '@dsh/app/shared/services'; import { PaymentInstitutionRealmService } from '../../../../../../services'; diff --git a/src/app/sections/payment-section/operations/payments/payments.component.spec.ts b/src/app/sections/payment-section/operations/payments/payments.component.spec.ts index 11a57f3b..88b06e80 100644 --- a/src/app/sections/payment-section/operations/payments/payments.component.spec.ts +++ b/src/app/sections/payment-section/operations/payments/payments.component.spec.ts @@ -8,7 +8,7 @@ import { PaymentSearchResult } from '@vality/swag-anapi-v2'; import { of } from 'rxjs'; import { instance, mock, verify, when } from 'ts-mockito'; -import { PaymentInstitutionRealm } from '@dsh/api/model'; +import { PaymentInstitutionRealm } from '@dsh/app/api/model'; import { QueryParamsService } from '@dsh/app/shared/services/query-params'; import { provideMockService } from '@dsh/app/shared/tests'; import { getTranslocoModule } from '@dsh/app/shared/tests/get-transloco-module'; diff --git a/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts b/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts index fb13ce8b..a67c7065 100644 --- a/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts +++ b/src/app/sections/payment-section/operations/payments/services/fetch-payments/fetch-payments.service.ts @@ -5,11 +5,11 @@ import { PaymentSearchResult } from '@vality/swag-anapi-v2'; import { Observable, of } from 'rxjs'; import { catchError, 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 { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared'; import { isNumber } from '@dsh/app/shared/utils'; -import { mapToTimestamp } from '@dsh/operators'; import { PaymentSearchFormValue } from '../../types'; diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts index f9a2671a..dd5ea585 100644 --- a/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts +++ b/src/app/sections/payment-section/operations/refunds/refunds-list/components/refund-row/refund-row.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { RefundSearchResult } from '@vality/swag-anapi-v2'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Component({ selector: 'dsh-refund-row', diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts index 2e4b9dd8..56b0eeb6 100644 --- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts +++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-invoice/receive-invoice.service.ts @@ -3,7 +3,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'; @Injectable() export class ReceiveInvoiceService { diff --git a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts index 91fdc88c..2501df70 100644 --- a/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts +++ b/src/app/sections/payment-section/operations/refunds/refunds-list/refund-details/services/receive-payment/receive-payment.service.ts @@ -3,7 +3,7 @@ import { PaymentSearchResult } from '@vality/swag-payments'; 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'; export interface ReceivePaymentParams { invoiceID: string; diff --git a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts index 1db79220..83b5b9c6 100644 --- a/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts +++ b/src/app/sections/payment-section/operations/refunds/refunds-search-filters/additional-filters/refund-status-filter/refund-status-filter.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { WrappedFormControlSuperclass } from '@s-libs/ng-core'; import { RefundStatus } from '@vality/swag-anapi-v2'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; import { provideValueAccessor } from '@dsh/utils'; @Component({ diff --git a/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts b/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts index 46c7555d..92944c33 100644 --- a/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts +++ b/src/app/sections/payment-section/operations/refunds/services/fetch-refunds/fetch-refunds.service.ts @@ -3,9 +3,9 @@ import { RefundSearchResult } 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 { SearchFiltersParams } from '../../refunds-search-filters'; diff --git a/src/app/sections/payment-section/payouts/create-payout-report/create-payout-report-dialog.service.ts b/src/app/sections/payment-section/payouts/create-payout-report/create-payout-report-dialog.service.ts index 41b1c1f7..f4cab02b 100644 --- a/src/app/sections/payment-section/payouts/create-payout-report/create-payout-report-dialog.service.ts +++ b/src/app/sections/payment-section/payouts/create-payout-report/create-payout-report-dialog.service.ts @@ -3,7 +3,7 @@ import { Payout } from '@vality/swag-anapi-v2'; import { BehaviorSubject, of, Subject } from 'rxjs'; import { catchError, filter, switchMap, tap } from 'rxjs/operators'; -import { ReportsService } from '@dsh/api/anapi'; +import { ReportsService } from '@dsh/app/api/anapi'; @Injectable() export class CreatePayoutReportDialogService { diff --git a/src/app/sections/payment-section/payouts/create-payout/create-payout-dialog.service.ts b/src/app/sections/payment-section/payouts/create-payout/create-payout-dialog.service.ts index 82195f28..9c2cd559 100644 --- a/src/app/sections/payment-section/payouts/create-payout/create-payout-dialog.service.ts +++ b/src/app/sections/payment-section/payouts/create-payout/create-payout-dialog.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, forkJoin, merge, of, Subject } from 'rxjs'; import { catchError, filter, map, shareReplay, switchMap, take, tap } from 'rxjs/operators'; -import { PayoutsService } from '@dsh/api/payments'; +import { PayoutsService } from '@dsh/app/api/payments'; import { ShopsDataService } from '@dsh/app/shared'; import { toPayoutParams } from './to-payout-params'; diff --git a/src/app/sections/payment-section/payouts/fetch-payouts.service.ts b/src/app/sections/payment-section/payouts/fetch-payouts.service.ts index af8aebd4..25777d25 100644 --- a/src/app/sections/payment-section/payouts/fetch-payouts.service.ts +++ b/src/app/sections/payment-section/payouts/fetch-payouts.service.ts @@ -3,9 +3,9 @@ import { Payout } 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 { SearchParams } from './types/search-params'; diff --git a/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts b/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts index 557917ac..fc054f11 100644 --- a/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts +++ b/src/app/sections/payment-section/reports/cancel-report/cancel-report.service.ts @@ -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 { ReportsService } from '@dsh/api/anapi'; +import { ReportsService } from '@dsh/app/api/anapi'; import { ConfirmActionDialogComponent } from '@dsh/components/popups'; @Injectable() diff --git a/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts b/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts index 8ce7d18f..97f6874f 100644 --- a/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts +++ b/src/app/sections/payment-section/reports/create-report/create-report-dialog.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, of, Subject } from 'rxjs'; import { catchError, filter, map, switchMap, tap } from 'rxjs/operators'; -import { ReportsService } from '@dsh/api/anapi'; +import { ReportsService } from '@dsh/app/api/anapi'; import { formValueToCreateValue } from './form-value-to-create-value'; diff --git a/src/app/sections/payment-section/reports/fetch-reports.service.ts b/src/app/sections/payment-section/reports/fetch-reports.service.ts index 1c53d5da..c69d93d5 100644 --- a/src/app/sections/payment-section/reports/fetch-reports.service.ts +++ b/src/app/sections/payment-section/reports/fetch-reports.service.ts @@ -4,10 +4,10 @@ import isEmpty from 'lodash-es/isEmpty'; import { Observable } from 'rxjs'; import { shareReplay } from 'rxjs/operators'; -import { ReportsService as ReportsApiService } from '@dsh/api/anapi'; +import { ReportsService as ReportsApiService } from '@dsh/app/api/anapi'; +import { mapToTimestamp } from '@dsh/app/custom-operators'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { PartialFetcher } from '@dsh/app/shared'; -import { mapToTimestamp } from '@dsh/operators'; import { SearchFiltersParams } from './reports-search-filters'; diff --git a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts index 054fcb44..efe2f5a6 100644 --- a/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts +++ b/src/app/sections/payment-section/reports/report-details/report-main-info/report-main-info.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Report } from '@vality/swag-anapi-v2'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Component({ selector: 'dsh-report-main-info', diff --git a/src/app/sections/payment-section/reports/report-files/report-files.service.ts b/src/app/sections/payment-section/reports/report-files/report-files.service.ts index 8ebdb4bc..f231ec87 100644 --- a/src/app/sections/payment-section/reports/report-files/report-files.service.ts +++ b/src/app/sections/payment-section/reports/report-files/report-files.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, forkJoin, of, Subject } from 'rxjs'; import { catchError, map, switchMap, tap } from 'rxjs/operators'; -import { ReportsService } from '@dsh/api/anapi'; +import { ReportsService } from '@dsh/app/api/anapi'; import { multipleDownload } from '@dsh/utils'; @Injectable() diff --git a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts index 8510e39b..ddd7e77f 100644 --- a/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts +++ b/src/app/sections/payment-section/reports/reports-list/report-row/report-row.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Report } from '@vality/swag-anapi-v2'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Component({ selector: 'dsh-report-row', diff --git a/src/app/sections/payment-section/services/payment-institution-realm.service.ts b/src/app/sections/payment-section/services/payment-institution-realm.service.ts index cf18a5e0..8fd0aa23 100644 --- a/src/app/sections/payment-section/services/payment-institution-realm.service.ts +++ b/src/app/sections/payment-section/services/payment-institution-realm.service.ts @@ -4,7 +4,7 @@ import { PaymentInstitution } from '@vality/swag-payments'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { shareReplayRefCount } from '@dsh/operators'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import RealmEnum = PaymentInstitution.RealmEnum; diff --git a/src/app/sections/payment-section/services/realm-shops.service.ts b/src/app/sections/payment-section/services/realm-shops.service.ts index b839fa9e..a7e3c531 100644 --- a/src/app/sections/payment-section/services/realm-shops.service.ts +++ b/src/app/sections/payment-section/services/realm-shops.service.ts @@ -3,8 +3,8 @@ import { Shop } from '@vality/swag-payments'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import { ShopsDataService } from '@dsh/app/shared'; -import { shareReplayRefCount } from '@dsh/operators'; import { PaymentInstitutionRealmService } from './payment-institution-realm.service'; import { getShopsByRealm } from '../operations/operators'; diff --git a/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.spec.ts b/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.spec.ts index 7228d615..454e29ec 100644 --- a/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.spec.ts +++ b/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.spec.ts @@ -5,9 +5,9 @@ import { Observable, of, ReplaySubject } from 'rxjs'; import { map } from 'rxjs/operators'; import { instance, mock, when } from 'ts-mockito'; -import { AnalyticsService } from '@dsh/api/analytics'; -import { PaymentInstitutionRealm } from '@dsh/api/model'; -import { ApiShopsService } from '@dsh/api/shop'; +import { AnalyticsService } from '@dsh/app/api/analytics'; +import { PaymentInstitutionRealm } from '@dsh/app/api/model'; +import { ApiShopsService } from '@dsh/app/api/shop'; import { FetchShopsService, SHOPS_LIST_PAGINATION_OFFSET } from './fetch-shops.service'; import { generateMockShopsList } from '../../tests/generate-mock-shops-list'; diff --git a/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts b/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts index 24498cbd..dcf7d4d5 100644 --- a/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts +++ b/src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts @@ -1,14 +1,14 @@ import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'; import { PaymentInstitution, Shop as ApiShop } from '@vality/swag-payments'; import isNil from 'lodash-es/isNil'; -import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable, ReplaySubject, defer } from 'rxjs'; import { map, mapTo, pluck, scan, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators'; +import { mapToTimestamp, shareReplayRefCount } from '@dsh/app/custom-operators'; import { ShopsDataService } from '@dsh/app/shared'; -import { mapToTimestamp, shareReplayRefCount } from '@dsh/operators'; import { combineShopItem } from './combine-shop-item'; -import { filterShopsByRealm } from '../../../operations/operators'; +import { getShopsByRealm } from '../../../operations/operators'; import { ShopBalance } from '../../types/shop-balance'; import { ShopFiltersData } from '../../types/shop-filters-data'; import { ShopItem } from '../../types/shop-item'; @@ -24,7 +24,10 @@ export const SHOPS_LIST_PAGINATION_OFFSET = new InjectionToken('shops-list-pagin @Injectable() export class FetchShopsService { - allShops$: Observable; + allShops$ = defer(() => combineLatest([this.realmData$, this.shopsDataService.shops$])).pipe( + map(([realm, shops]) => getShopsByRealm(shops, realm)), + shareReplayRefCount() + ); shownShops$: Observable; lastUpdated$: Observable; isLoading$: Observable; @@ -50,7 +53,6 @@ export class FetchShopsService { private paginationOffset: number = DEFAULT_LIST_PAGINATION_OFFSET ) { this.initPaginationOffset(); - this.initAllShopsFetching(); this.initOffsetObservable(); this.initFilteredShopsObservable(); this.initShownShopsObservable(); @@ -96,10 +98,6 @@ export class FetchShopsService { } } - private initAllShopsFetching(): void { - this.allShops$ = this.realmData$.pipe(filterShopsByRealm(this.shopsDataService.shops$), shareReplayRefCount()); - } - private initOffsetObservable(): void { this.listOffset$ = this.showMore$.pipe( mapTo(this.paginationOffset), diff --git a/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.spec.ts b/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.spec.ts index 5a16091a..e6da2dd9 100644 --- a/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.spec.ts +++ b/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.spec.ts @@ -5,7 +5,7 @@ import { of } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { instance, mock, when } from 'ts-mockito'; -import { PayoutsService } from '@dsh/api/payouts'; +import { PayoutsService } from '@dsh/app/api/payouts'; import { ShopPayoutToolDetailsService } from './shop-payout-tool-details.service'; diff --git a/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.ts b/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.ts index 95cbf9c4..de9f7f1e 100644 --- a/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.ts +++ b/src/app/sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service.ts @@ -4,7 +4,7 @@ import { PayoutTool } from '@vality/swag-payments'; import { BehaviorSubject, defer, Observable, of, ReplaySubject, Subject } from 'rxjs'; import { catchError, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators'; -import { PayoutsService } from '@dsh/api/payments'; +import { PayoutsService } from '@dsh/app/api/payments'; import { PayoutToolParams } from '../../shops-list/shop-details/types/payout-tool-params'; diff --git a/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.spec.ts b/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.spec.ts index 4e28fb21..ec6769c3 100644 --- a/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.spec.ts +++ b/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; // import { of, scheduled } from 'rxjs'; // import { map } from 'rxjs/operators'; -import { AnalyticsService } from '@dsh/api/analytics'; +import { AnalyticsService } from '@dsh/app/api/analytics'; // import { generateMockBalance } from '../../tests/generate-mock-balance'; // import { generateMockShopId } from '../../tests/generate-mock-shop-id'; diff --git a/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts b/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts index 5e17412c..22fc183a 100644 --- a/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts +++ b/src/app/sections/payment-section/shops/services/shops-balance/shops-balance.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; -import { AnalyticsService } from '@dsh/api/anapi'; +import { AnalyticsService } from '@dsh/app/api/anapi'; import { ShopBalance } from '../../types/shop-balance'; diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.spec.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.spec.ts index dfe52402..31562243 100644 --- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.spec.ts +++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.spec.ts @@ -3,7 +3,7 @@ import { Category } from '@vality/swag-payments'; import { cold, getTestScheduler } from 'jasmine-marbles'; import { Observable, of, scheduled } from 'rxjs'; -import { CategoriesService } from '@dsh/api/categories'; +import { CategoriesService } from '@dsh/app/api/categories'; import { CategoryService } from './category.service'; import { makeEmptyList } from '../../../../tests/make-empty-list'; diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts index b73513b5..e5d6421d 100644 --- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts +++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/category/category.service.ts @@ -3,8 +3,8 @@ import { Category } from '@vality/swag-payments'; import { combineLatest, defer, ReplaySubject } from 'rxjs'; import { map } from 'rxjs/operators'; -import { CategoriesService } from '@dsh/api/payments'; -import { shareReplayRefCount } from '@dsh/operators'; +import { CategoriesService } from '@dsh/app/api/payments'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; @Injectable() export class CategoryService { diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.spec.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.spec.ts index 6f0d1e9b..219e50ec 100644 --- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.spec.ts +++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.spec.ts @@ -7,7 +7,7 @@ import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { instance, mock, verify, when } from 'ts-mockito'; -import { ApiShopsService } from '@dsh/api/shop'; +import { ApiShopsService } from '@dsh/app/api/shop'; import { ConfirmActionDialogComponent } from '@dsh/components/popups'; import { ShopActionsService } from './shop-actions.service'; diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts index 0ea9bc76..4c3d3539 100644 --- a/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts +++ b/src/app/sections/payment-section/shops/shops-list/shop-details/services/shop-actions/shop-actions.service.ts @@ -5,7 +5,7 @@ import { TranslocoService } from '@ngneat/transloco'; import { Observable, of } from 'rxjs'; import { catchError, filter, map, switchMap } from 'rxjs/operators'; -import { ShopsService } from '@dsh/api/payments'; +import { ShopsService } from '@dsh/app/api/payments'; import { ConfirmActionDialogComponent } from '@dsh/components/popups'; import { ShopActionResult } from '../../types/shop-action-result'; diff --git a/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.component.spec.ts b/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.component.spec.ts index 02c221ad..25148046 100644 --- a/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.component.spec.ts +++ b/src/app/sections/payment-section/shops/shops-list/shop-details/shop-details.component.spec.ts @@ -8,8 +8,8 @@ import { TranslocoTestingModule } from '@ngneat/transloco'; import { of } from 'rxjs'; import { instance, mock, when } from 'ts-mockito'; -import { CategoriesModule } from '@dsh/api/categories'; -import { ContractsModule } from '@dsh/api/contracts'; +import { CategoriesModule } from '@dsh/app/api/categories'; +import { ContractsModule } from '@dsh/app/api/contracts'; import { ContractDetailsModule, PayoutToolModule } from '@dsh/app/shared/components'; import { ShopContractDetailsService } from '@dsh/app/shared/services/shop-contract-details'; import { ButtonModule } from '@dsh/components/buttons'; diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts index 1547868a..102b17a2 100644 --- a/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts +++ b/src/app/sections/wallet-section/deposits/deposit-panels/components/deposit-row/deposit-row.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Deposit } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-deposit-row', diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts index 031b09c1..f268220d 100644 --- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts +++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-details/deposit-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Deposit } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-deposit-details', diff --git a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-reverts/services/fetch-deposit-reverts.service.ts b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-reverts/services/fetch-deposit-reverts.service.ts index a42721bd..5f5940a5 100644 --- a/src/app/sections/wallet-section/deposits/deposit-panels/deposit-reverts/services/fetch-deposit-reverts.service.ts +++ b/src/app/sections/wallet-section/deposits/deposit-panels/deposit-reverts/services/fetch-deposit-reverts.service.ts @@ -6,7 +6,7 @@ import { ListDepositRevertsRequestParams } from '@vality/swag-wallet/lib/api/dep import { Observable, of } from 'rxjs'; import { catchError, shareReplay } from 'rxjs/operators'; -import { DepositsService } from '@dsh/api/wallet'; +import { DepositsService } from '@dsh/app/api/wallet'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared'; diff --git a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts index 9fc71dd9..0b01b46d 100644 --- a/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts +++ b/src/app/sections/wallet-section/deposits/deposits-filters/additional-filters/deposit-status-filter/deposit-status-filter.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { FormControl } from '@ngneat/reactive-forms'; import { DepositStatus } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; import { DEPOSIT_STATUSES_LIST } from './consts'; import { DepositStatusFilterValue } from './types/deposit-status-filter-value'; diff --git a/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts b/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts index 2d2dac4a..e179089d 100644 --- a/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts +++ b/src/app/sections/wallet-section/deposits/services/fetch-deposits/fetch-deposits.service.ts @@ -6,11 +6,11 @@ import { ListDepositsRequestParams } from '@vality/swag-wallet/lib/api/deposits. import { Observable, of } from 'rxjs'; import { catchError, shareReplay } from 'rxjs/operators'; -import { DepositsService } from '@dsh/api/wallet'; +import { DepositsService } from '@dsh/app/api/wallet'; +import { mapToTimestamp } from '@dsh/app/custom-operators'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared'; import { isNumber } from '@dsh/app/shared/utils'; -import { mapToTimestamp } from '@dsh/operators'; @Injectable() export class FetchDepositsService extends PartialFetcher< diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts index 6abf92fe..63668267 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-dialog.service.ts @@ -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/wallet'; +import { WebhooksService } from '@dsh/app/api/wallet'; import { oneMustBeSelected } from '@dsh/components/form-controls'; import { FormParams } from './form-params'; diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts index b9a0da5c..a2602c2e 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook-form/create-webhook-form.component.ts @@ -5,7 +5,7 @@ import { WebhookScope } from '@vality/swag-wallet'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; -import { IdentitiesService, WalletDictionaryService } from '@dsh/api/wallet'; +import { IdentitiesService, WalletDictionaryService } from '@dsh/app/api/wallet'; import { oneMustBeSelected } from '@dsh/components/form-controls'; import { getEventsByTopic } from '../get-events-by-topic'; diff --git a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts index dc74b8d2..76554f80 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/create-webhook/create-webhook.service.ts @@ -3,7 +3,7 @@ import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; import { Observable, Subject } from 'rxjs'; import { filter, switchMap, take, takeUntil } from 'rxjs/operators'; -import { IdentitiesService } from '@dsh/api/wallet'; +import { IdentitiesService } from '@dsh/app/api/wallet'; import { CreateWebhookDialogComponent } from './create-webhook-dialog.component'; diff --git a/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts b/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts index 07ef09c0..fc61aa20 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/delete-webhook/delete-webhook.service.ts @@ -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/wallet'; +import { WebhooksService } from '@dsh/app/api/wallet'; import { ConfirmActionDialogComponent } from '@dsh/components/popups'; import { DeleteWebhookParams } from '../webhook-details/webhook-actions'; diff --git a/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts b/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts index cb037291..313fd5bb 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/receive-webhooks.service.ts @@ -6,7 +6,7 @@ import sortBy from 'lodash-es/sortBy'; import { BehaviorSubject, forkJoin, Observable, of, Subject } from 'rxjs'; import { catchError, filter, map, shareReplay, switchMap } from 'rxjs/operators'; -import { IdentitiesService, WebhooksService } from '@dsh/api/wallet'; +import { IdentitiesService, WebhooksService } from '@dsh/app/api/wallet'; import { mapToTimestamp, SHARE_REPLAY_CONF, progress } from '../../../../custom-operators'; diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts index f04b4e92..91f998bc 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-details/webhook-events/webhook-events.component.ts @@ -3,7 +3,7 @@ import { DestinationsTopic, WebhookScope, WithdrawalsTopic } from '@vality/swag- import { combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-webhook-events', diff --git a/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-row/webhook-row.component.ts b/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-row/webhook-row.component.ts index 7b7f0399..8a3cea63 100644 --- a/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-row/webhook-row.component.ts +++ b/src/app/sections/wallet-section/integrations/webhooks/webhook-list/webhook-row/webhook-row.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { map } from 'rxjs/operators'; -import { IdentitiesService } from '@dsh/api/wallet'; +import { IdentitiesService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-webhook-row', diff --git a/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts b/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts index 71bd6535..6c289951 100644 --- a/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts +++ b/src/app/sections/wallet-section/wallets/services/fetch-wallets/fetch-wallets.service.ts @@ -3,10 +3,10 @@ import { Wallet } from '@vality/swag-wallet'; import { ListWalletsRequestParams } from '@vality/swag-wallet/lib/api/wallets.service'; import { Observable } from 'rxjs'; -import { WalletsService } from '@dsh/api/wallet'; +import { WalletsService } from '@dsh/app/api/wallet'; +import { mapToTimestamp, shareReplayRefCount } from '@dsh/app/custom-operators'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { FetchResult, PartialFetcher } from '@dsh/app/shared'; -import { mapToTimestamp, shareReplayRefCount } from '@dsh/operators'; @Injectable() export class FetchWalletsService extends PartialFetcher< diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts index 29695ace..f1c1e5ec 100644 --- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts +++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-account-info/services/fetch-wallet-account/fetch-wallet-account.service.ts @@ -4,9 +4,9 @@ import { WalletAccount } from '@vality/swag-wallet'; import { BehaviorSubject, defer, EMPTY, Observable, ReplaySubject } from 'rxjs'; import { catchError, map, switchMap } from 'rxjs/operators'; -import { WalletsService } from '@dsh/api/wallet'; +import { WalletsService } from '@dsh/app/api/wallet'; +import { shareReplayUntilDestroyed } from '@dsh/app/custom-operators'; import { ErrorService } from '@dsh/app/shared'; -import { shareReplayUntilDestroyed } from '@dsh/operators'; import { errorTo, progressTo } from '@dsh/utils'; @UntilDestroy() diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts index 85928247..8a16640d 100644 --- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts +++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/components/wallet-deposit-details/wallet-deposit-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Deposit } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-wallet-deposit-details', diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts index 92adb8a0..20604bf5 100644 --- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts +++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-deposits/services/fetch-wallet-deposits/fetch-wallet-deposits.service.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core'; import { UntilDestroy } from '@ngneat/until-destroy'; import { Deposit } from '@vality/swag-wallet'; -import { DepositsService } from '@dsh/api/wallet'; +import { DepositsService } from '@dsh/app/api/wallet'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { PartialFetcher } from '@dsh/app/shared'; diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts index 9056db6f..27188db9 100644 --- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts +++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/components/wallet-deposit-details/wallet-withdrawal-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Withdrawal } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-wallet-withdrawal-details', diff --git a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts index 6f4d32b2..6017ff58 100644 --- a/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts +++ b/src/app/sections/wallet-section/wallets/wallets-list/wallet-withdrawals/services/fetch-wallet-withdrawals/fetch-wallet-withdrawals.service.ts @@ -3,7 +3,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { Withdrawal } from '@vality/swag-wallet'; import { Observable } from 'rxjs'; -import { WithdrawalsService } from '@dsh/api/wallet'; +import { WithdrawalsService } from '@dsh/app/api/wallet'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { PartialFetcher } from '@dsh/app/shared'; diff --git a/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts b/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts index 0e7dc242..f8d20964 100644 --- a/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts +++ b/src/app/sections/wallet-section/withdrawals/services/fetch-withdrawals/fetch-withdrawals.service.ts @@ -6,10 +6,10 @@ import { ListWithdrawalsRequestParams } from '@vality/swag-wallet/lib/api/withdr import { Observable, of } from 'rxjs'; import { catchError, shareReplay } from 'rxjs/operators'; -import { WithdrawalsService } from '@dsh/api/wallet'; +import { WithdrawalsService } from '@dsh/app/api/wallet'; +import { mapToTimestamp } from '@dsh/app/custom-operators'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME, PartialFetcher } from '@dsh/app/shared'; -import { mapToTimestamp } from '@dsh/operators'; type WithdrawalsAndContinuationToken = InlineResponse2007; diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts index 61fa8a9f..648f9c5c 100644 --- a/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts +++ b/src/app/sections/wallet-section/withdrawals/withdrawals-filters/additional-filters/withdrawal-status-filter/withdrawal-status-filter.component.ts @@ -4,7 +4,7 @@ import { WithdrawalStatus } from '@vality/swag-wallet'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; import { Option } from '@dsh/components/form-controls/radio-group-field'; import { provideValueAccessor } from '@dsh/utils'; diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts index 62ecfeb7..3e39eeab 100644 --- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts +++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-details/withdrawal-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Withdrawal } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-withdrawal-details', diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts index 2f5aca65..4a661f45 100644 --- a/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts +++ b/src/app/sections/wallet-section/withdrawals/withdrawals-list/components/withdrawal-row/withdrawal-row.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Withdrawal } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-withdrawal-row', diff --git a/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts b/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts index 422edeaf..cf4068c0 100644 --- a/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts +++ b/src/app/sections/wallet-section/withdrawals/withdrawals.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; import { TranslocoService } from '@ngneat/transloco'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import { QueryParamsService } from '@dsh/app/shared/services/query-params'; -import { shareReplayRefCount } from '@dsh/operators'; import { FetchWithdrawalsService, WithdrawalsExpandedIdManager } from './services'; import { WithdrawalsFilters } from './withdrawals-filters'; diff --git a/src/app/shared/components/api-model-details/deposit-revert-details/deposit-revert-details.component.ts b/src/app/shared/components/api-model-details/deposit-revert-details/deposit-revert-details.component.ts index 2e4d246d..9415a6b1 100644 --- a/src/app/shared/components/api-model-details/deposit-revert-details/deposit-revert-details.component.ts +++ b/src/app/shared/components/api-model-details/deposit-revert-details/deposit-revert-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { DepositRevert } from '@vality/swag-wallet'; -import { WalletDictionaryService } from '@dsh/api/wallet'; +import { WalletDictionaryService } from '@dsh/app/api/wallet'; @Component({ selector: 'dsh-deposit-revert-details', diff --git a/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts b/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts index ebf9dfb7..a5fea717 100644 --- a/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts +++ b/src/app/shared/components/api-model-details/invoice-details/invoice-details.component.ts @@ -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-details', diff --git a/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts b/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts index 9ff0bded..6bdc94df 100644 --- a/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts +++ b/src/app/shared/components/api-model-details/refund-details/refund-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { RefundSearchResult } from '@vality/swag-payments'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Component({ selector: 'dsh-refund-details', diff --git a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts index 26af1d28..779d5c5f 100644 --- a/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts +++ b/src/app/shared/components/create-invoice-form/create-invoice-form.component.ts @@ -11,7 +11,7 @@ import { Moment } from 'moment'; import { distinctUntilChanged, map, startWith } from 'rxjs/operators'; import { Overwrite } from 'utility-types'; -import { shareReplayUntilDestroyed } from '@dsh/operators'; +import { shareReplayUntilDestroyed } from '@dsh/app/custom-operators'; import { provideValueAccessor, replaceFormArrayValue, diff --git a/src/app/shared/components/create-payment-link-form/create-payment-link-form.component.ts b/src/app/shared/components/create-payment-link-form/create-payment-link-form.component.ts index 64fe3817..97e2b330 100644 --- a/src/app/shared/components/create-payment-link-form/create-payment-link-form.component.ts +++ b/src/app/shared/components/create-payment-link-form/create-payment-link-form.component.ts @@ -7,7 +7,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { BankCard, PaymentMethod, PaymentTerminal, DigitalWallet } from '@vality/swag-payments'; import { Observable } from 'rxjs'; -import { TokenProvider, TerminalProvider } from '@dsh/api/payments'; +import { TokenProvider, TerminalProvider } from '@dsh/app/api/payments'; import { NotificationService } from '@dsh/app/shared'; import { PaymentLinkParams } from '@dsh/app/shared/services/create-payment-link/types/payment-link-params'; import { ComponentChanges } from '@dsh/type-utils'; diff --git a/src/app/shared/components/create-payment-link-form/create-payment-link-form.module.ts b/src/app/shared/components/create-payment-link-form/create-payment-link-form.module.ts index 80f1191b..a1d0bd61 100644 --- a/src/app/shared/components/create-payment-link-form/create-payment-link-form.module.ts +++ b/src/app/shared/components/create-payment-link-form/create-payment-link-form.module.ts @@ -12,7 +12,7 @@ import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; import { TranslocoModule } from '@ngneat/transloco'; -import { UrlShortenerModule } from '@dsh/api/url-shortener'; +import { UrlShortenerModule } from '@dsh/app/api/url-shortener'; import { ButtonModule } from '@dsh/components/buttons'; import { FormControlsModule } from '@dsh/components/form-controls'; import { LayoutModule } from '@dsh/components/layout'; diff --git a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts index 255e7d3e..5e14ecd2 100644 --- a/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts +++ b/src/app/shared/components/inputs/category-autocomplete-field/category-autocomplete-field.component.ts @@ -5,9 +5,9 @@ import { coerceBoolean } from 'coerce-property'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { CategoriesService } from '@dsh/api/payments'; +import { CategoriesService } from '@dsh/app/api/payments'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import { Option } from '@dsh/components/form-controls/select-search-field'; -import { shareReplayRefCount } from '@dsh/operators'; import { provideValueAccessor } from '@dsh/utils'; @Component({ diff --git a/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts b/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts index e2ad3453..9869ce98 100644 --- a/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts +++ b/src/app/shared/components/inputs/country-autocomplete-field/countries-autocomplete-field.component.ts @@ -3,7 +3,7 @@ import { WrappedFormControlSuperclass } from '@s-libs/ng-core'; import { coerceBoolean } from 'coerce-property'; import { map } from 'rxjs/operators'; -import { CountriesService } from '@dsh/api/payments'; +import { CountriesService } from '@dsh/app/api/payments'; import { provideValueAccessor } from '@dsh/utils'; import { CountryId } from './types'; diff --git a/src/app/shared/components/inputs/invoice-status-field/pipes/invoce-status-label.pipe.ts b/src/app/shared/components/inputs/invoice-status-field/pipes/invoce-status-label.pipe.ts index 4d98be62..16fd7141 100644 --- a/src/app/shared/components/inputs/invoice-status-field/pipes/invoce-status-label.pipe.ts +++ b/src/app/shared/components/inputs/invoice-status-field/pipes/invoce-status-label.pipe.ts @@ -3,7 +3,7 @@ import { InvoiceStatus } from '@vality/swag-anapi-v2'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Pipe({ name: 'invoiceStatusLabel' }) export class InvoiceStatusLabelPipe implements PipeTransform { diff --git a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts index c7e41f81..fdbc3bf6 100644 --- a/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts +++ b/src/app/shared/components/inputs/payment-institution-field/payment-institution-field.component.ts @@ -5,7 +5,7 @@ import { coerceBoolean } from 'coerce-property'; import { Observable } from 'rxjs'; import { map, share } from 'rxjs/operators'; -import { PaymentInstitutionsService } from '@dsh/api/payments'; +import { PaymentInstitutionsService } from '@dsh/app/api/payments'; import { Option } from '@dsh/components/form-controls/select-search-field'; import { provideValueAccessor } from '@dsh/utils'; diff --git a/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts b/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts index eff4f305..4e07cc61 100644 --- a/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts +++ b/src/app/shared/components/inputs/refund-status-field/pipes/refund-status-label.pipe.ts @@ -3,7 +3,7 @@ import { RefundStatus } from '@vality/swag-anapi-v2'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Pipe({ name: 'refundStatusLabel' }) export class RefundStatusLabelPipe implements PipeTransform { diff --git a/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts b/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts index fb17ca51..9918d967 100644 --- a/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts +++ b/src/app/shared/components/inputs/report-types-field/pipes/report-types-label.pipe.ts @@ -3,7 +3,7 @@ import { Report } from '@vality/swag-anapi-v2'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; @Pipe({ name: 'reportTypesLabelPipe' }) export class ReportTypesLabelPipe implements PipeTransform { diff --git a/src/app/shared/components/inputs/shop-field/shop-field.component.ts b/src/app/shared/components/inputs/shop-field/shop-field.component.ts index bfb03f46..ff1e8b2e 100644 --- a/src/app/shared/components/inputs/shop-field/shop-field.component.ts +++ b/src/app/shared/components/inputs/shop-field/shop-field.component.ts @@ -5,11 +5,11 @@ import { coerceBoolean } from 'coerce-property'; import { defer, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { toLiveShops } from '@dsh/api/payments'; +import { toLiveShops } from '@dsh/app/api/payments'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import { ShopsDataService } from '@dsh/app/shared'; import { shopToOption } from '@dsh/app/shared/components/inputs/shop-field/utils/shops-to-options'; import { Option } from '@dsh/components/form-controls/select-search-field'; -import { shareReplayRefCount } from '@dsh/operators'; import { provideValueAccessor } from '@dsh/utils'; import { SHOPS } from './shops-token'; diff --git a/src/app/shared/components/inputs/shops-field/shops-field.component.ts b/src/app/shared/components/inputs/shops-field/shops-field.component.ts index b5701d89..d540f39e 100644 --- a/src/app/shared/components/inputs/shops-field/shops-field.component.ts +++ b/src/app/shared/components/inputs/shops-field/shops-field.component.ts @@ -4,7 +4,7 @@ import { Shop } from '@vality/swag-payments'; import { defer, ReplaySubject } from 'rxjs'; import { map } from 'rxjs/operators'; -import { shareReplayRefCount } from '@dsh/operators'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import { ComponentChanges } from '@dsh/type-utils'; import { provideValueAccessor } from '@dsh/utils'; diff --git a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts index a56fa771..ce31e150 100644 --- a/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts +++ b/src/app/shared/components/inputs/wallet-autocomplete-field/wallet-autocomplete-field.component.ts @@ -3,7 +3,7 @@ import { WrappedFormControlSuperclass } from '@s-libs/ng-core'; import { coerceBoolean } from 'coerce-property'; import { map } from 'rxjs/operators'; -import { WalletsService } from '@dsh/api/wallet'; +import { WalletsService } from '@dsh/app/api/wallet'; import { provideValueAccessor } from '@dsh/utils'; import { WalletId } from './types'; diff --git a/src/app/shared/components/organization-roles/organization-roles.component.ts b/src/app/shared/components/organization-roles/organization-roles.component.ts index 43ea83d1..94970c46 100644 --- a/src/app/shared/components/organization-roles/organization-roles.component.ts +++ b/src/app/shared/components/organization-roles/organization-roles.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { MemberRole } from '@vality/swag-organizations'; import { coerceBoolean } from 'coerce-property'; -import { OrganizationsDictionaryService } from '@dsh/api/organizations'; +import { OrganizationsDictionaryService } from '@dsh/app/api/organizations'; import { RoleGroup } from './types/role-group'; import { groupRoles } from './utils/group-roles'; diff --git a/src/app/shared/components/organization-roles/utils/group-roles.spec.ts b/src/app/shared/components/organization-roles/utils/group-roles.spec.ts index 5ce87b77..28ae7906 100644 --- a/src/app/shared/components/organization-roles/utils/group-roles.spec.ts +++ b/src/app/shared/components/organization-roles/utils/group-roles.spec.ts @@ -1,7 +1,7 @@ import { ResourceScopeId, RoleId } from '@vality/swag-organizations'; -import { MOCK_MEMBER } from '@dsh/api/organizations/tests/mock-member'; -import { MOCK_MEMBER_ROLE } from '@dsh/api/organizations/tests/mock-member-role'; +import { MOCK_MEMBER } from '@dsh/app/api/organizations/tests/mock-member'; +import { MOCK_MEMBER_ROLE } from '@dsh/app/api/organizations/tests/mock-member-role'; import { groupRoles } from './group-roles'; import { RoleGroup } from '../types/role-group'; diff --git a/src/app/shared/components/payment-status/payment-status.component.ts b/src/app/shared/components/payment-status/payment-status.component.ts index 8f13bd48..093b312e 100644 --- a/src/app/shared/components/payment-status/payment-status.component.ts +++ b/src/app/shared/components/payment-status/payment-status.component.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { Component, Input } from '@angular/core'; import { PaymentSearchResult } from '@vality/swag-anapi-v2'; -import { AnapiDictionaryService } from '@dsh/api/anapi'; +import { AnapiDictionaryService } from '@dsh/app/api/anapi'; import { StatusModule } from '@dsh/components/indicators'; import { PAYMENT_STATUS_COLOR } from './payment-status-color'; diff --git a/src/app/shared/components/shop-creation/components/create-shop-dialog/create-shop-dialog.component.html b/src/app/shared/components/shop-creation/components/create-shop-dialog/create-shop-dialog.component.html index 0448bb1f..9faa34e5 100644 --- a/src/app/shared/components/shop-creation/components/create-shop-dialog/create-shop-dialog.component.html +++ b/src/app/shared/components/shop-creation/components/create-shop-dialog/create-shop-dialog.component.html @@ -1,47 +1,47 @@ - - - -
-

{{ t('type') }}

- - {{ t('russianLegalEntityType') }} - {{ - t('internationalLegalEntityType') - }} - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + diff --git a/src/app/shared/components/shop-creation/create-international-shop-entity/components/shop-form/shop-form.component.ts b/src/app/shared/components/shop-creation/create-international-shop-entity/components/shop-form/shop-form.component.ts index e3d092c4..f61a3d50 100644 --- a/src/app/shared/components/shop-creation/create-international-shop-entity/components/shop-form/shop-form.component.ts +++ b/src/app/shared/components/shop-creation/create-international-shop-entity/components/shop-form/shop-form.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FormBuilder } from '@ngneat/reactive-forms'; +import { FormGroupSuperclass, createControlProviders } from '@vality/ng-core'; import { createTypeUnionDefaultForm } from '@dsh/app/shared/components/shop-creation/created-existing-switch/created-existing-switch.component'; -import { createControlProviders, ValidatedControlSuperclass } from '@dsh/utils'; import { InternationalShopEntityFormValue } from '../../types/international-shop-entity-form-value'; @@ -12,7 +12,7 @@ import { InternationalShopEntityFormValue } from '../../types/international-shop changeDetection: ChangeDetectionStrategy.OnPush, providers: createControlProviders(() => ShopFormComponent), }) -export class ShopFormComponent extends ValidatedControlSuperclass { +export class ShopFormComponent extends FormGroupSuperclass { control = this.fb.group({ shopDetails: null, orgDetails: createTypeUnionDefaultForm(), diff --git a/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.html b/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.html index d66fca88..2d2b4ed8 100644 --- a/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.html +++ b/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.html @@ -2,7 +2,7 @@ - diff --git a/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.ts b/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.ts index 75f734a7..7012d15e 100644 --- a/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.ts +++ b/src/app/shared/components/shop-creation/create-international-shop-entity/create-international-shop-entity.component.ts @@ -3,11 +3,14 @@ import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack import { Router } from '@angular/router'; import { FormControl } from '@ngneat/reactive-forms'; import { TranslocoService } from '@ngneat/transloco'; -import { take } from 'rxjs/operators'; +import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; +import { progressTo } from '@vality/ng-core'; +import { BehaviorSubject, first } from 'rxjs'; import { CreateInternationalShopEntityService } from './services/create-international-shop-entity/create-international-shop-entity.service'; import { InternationalShopEntityFormValue } from './types/international-shop-entity-form-value'; +@UntilDestroy() @Component({ selector: 'dsh-create-international-shop-entity', templateUrl: 'create-international-shop-entity.component.html', @@ -18,6 +21,7 @@ export class CreateInternationalShopEntityComponent { @Output() send = new EventEmitter(); @Output() cancel = new EventEmitter(); + progress$ = new BehaviorSubject(0); form = new FormControl(null); constructor( @@ -30,11 +34,11 @@ export class CreateInternationalShopEntityComponent { createShop(): void { this.createShopInternationalLegalEntityService .createShop(this.form.value) - .pipe(take(1)) + .pipe(progressTo(this.progress$), first(), untilDestroyed(this)) .subscribe( - ({ id }) => { + () => { this.send.emit(); - void this.router.navigate(['claim-section', 'claims', id]); + void this.router.navigate(['claim-section', 'claims']); }, (err) => { console.error(err); diff --git a/src/app/shared/components/shop-creation/create-international-shop-entity/services/create-international-shop-entity/create-international-shop-entity.service.ts b/src/app/shared/components/shop-creation/create-international-shop-entity/services/create-international-shop-entity/create-international-shop-entity.service.ts index 4eb0a422..c5065d62 100644 --- a/src/app/shared/components/shop-creation/create-international-shop-entity/services/create-international-shop-entity/create-international-shop-entity.service.ts +++ b/src/app/shared/components/shop-creation/create-international-shop-entity/services/create-international-shop-entity/create-international-shop-entity.service.ts @@ -10,7 +10,7 @@ import { createShopCreationModification, makeShopLocation, createInternationalContractPayoutToolModification, -} from '@dsh/api/claim-management'; +} from '@dsh/app/api/claim-management'; import { IdGeneratorService } from '@dsh/app/shared/services/id-generator'; import { diff --git a/src/app/shared/components/shop-creation/create-russian-shop-entity/components/new-contractor-form/new-contractor-form.component.ts b/src/app/shared/components/shop-creation/create-russian-shop-entity/components/new-contractor-form/new-contractor-form.component.ts index c27eb29e..418d175e 100644 --- a/src/app/shared/components/shop-creation/create-russian-shop-entity/components/new-contractor-form/new-contractor-form.component.ts +++ b/src/app/shared/components/shop-creation/create-russian-shop-entity/components/new-contractor-form/new-contractor-form.component.ts @@ -10,7 +10,7 @@ import { isReqLegalEntity, isReqIndividualEntity, getAddress, -} from '@dsh/api/questionary-aggr-proxy'; +} from '@dsh/app/api/questionary-aggr-proxy'; import { ValidatedControlSuperclass, createControlProviders } from '@dsh/utils'; import { RussianBankAccountForm } from '../russian-bank-account-form/types/bank-account-form-data'; diff --git a/src/app/shared/components/shop-creation/create-russian-shop-entity/services/create-russian-shop-entity/create-russian-shop-entity.service.ts b/src/app/shared/components/shop-creation/create-russian-shop-entity/services/create-russian-shop-entity/create-russian-shop-entity.service.ts index f178dde9..24a6a1f7 100644 --- a/src/app/shared/components/shop-creation/create-russian-shop-entity/services/create-russian-shop-entity/create-russian-shop-entity.service.ts +++ b/src/app/shared/components/shop-creation/create-russian-shop-entity/services/create-russian-shop-entity/create-russian-shop-entity.service.ts @@ -11,7 +11,7 @@ import { createRussianLegalEntityModification, createShopCreationModification, makeShopLocation, -} from '@dsh/api/claim-management'; +} from '@dsh/app/api/claim-management'; import { IdGeneratorService } from '@dsh/app/shared/services/id-generator'; import { RussianShopForm } from '../../types/russian-shop-entity'; diff --git a/src/app/shared/components/shop-creation/existing-bank-account/existing-bank-account.component.ts b/src/app/shared/components/shop-creation/existing-bank-account/existing-bank-account.component.ts index 61494a0d..f4692185 100644 --- a/src/app/shared/components/shop-creation/existing-bank-account/existing-bank-account.component.ts +++ b/src/app/shared/components/shop-creation/existing-bank-account/existing-bank-account.component.ts @@ -12,7 +12,7 @@ import { Observable, BehaviorSubject, of, throwError, EMPTY } from 'rxjs'; import { switchMap, tap, share, catchError } from 'rxjs/operators'; import { Overwrite } from 'utility-types'; -import { PayoutsService } from '@dsh/api/payments'; +import { PayoutsService } from '@dsh/app/api/payments'; import { CommonError, ErrorService } from '@dsh/app/shared'; import { ValidatedControlSuperclass, createControlProviders, progressTo, errorTo } from '@dsh/utils'; diff --git a/src/app/shared/components/shop-creation/existing-contract-form/existing-contract-form.component.ts b/src/app/shared/components/shop-creation/existing-contract-form/existing-contract-form.component.ts index 7a95a052..410bac6c 100644 --- a/src/app/shared/components/shop-creation/existing-contract-form/existing-contract-form.component.ts +++ b/src/app/shared/components/shop-creation/existing-contract-form/existing-contract-form.component.ts @@ -7,7 +7,7 @@ import { BehaviorSubject, EMPTY, of, Observable, throwError } from 'rxjs'; import { switchMap, catchError, share, tap } from 'rxjs/operators'; import { Overwrite } from 'utility-types'; -import { ContractsService } from '@dsh/api/payments'; +import { ContractsService } from '@dsh/app/api/payments'; import { CommonError, ErrorService } from '@dsh/app/shared'; import { ValidatedControlSuperclass, createControlProviders, progressTo, errorTo } from '@dsh/utils'; diff --git a/src/app/shared/pipes/api-model-refs/identity-details.pipe.ts b/src/app/shared/pipes/api-model-refs/identity-details.pipe.ts index 84bde999..e5bb1e19 100644 --- a/src/app/shared/pipes/api-model-refs/identity-details.pipe.ts +++ b/src/app/shared/pipes/api-model-refs/identity-details.pipe.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; import { distinctUntilChanged, map, pluck, takeUntil } from 'rxjs/operators'; -import { IdentitiesService } from '@dsh/api/wallet'; +import { IdentitiesService } from '@dsh/app/api/wallet'; @Pipe({ name: 'identityDetails', diff --git a/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts b/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts index db7571e1..4b1c1638 100644 --- a/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts +++ b/src/app/shared/pipes/api-model-refs/wallet-details.pipe.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core import { BehaviorSubject, combineLatest, Subject } from 'rxjs'; import { distinctUntilChanged, map, pluck, takeUntil } from 'rxjs/operators'; -import { WalletsService } from '@dsh/api/wallet'; +import { WalletsService } from '@dsh/app/api/wallet'; @Pipe({ name: 'walletDetails', diff --git a/src/app/shared/services/context-organization/context-organization.service.ts b/src/app/shared/services/context-organization/context-organization.service.ts index 1ef1116b..40417ac3 100644 --- a/src/app/shared/services/context-organization/context-organization.service.ts +++ b/src/app/shared/services/context-organization/context-organization.service.ts @@ -6,7 +6,7 @@ import isNil from 'lodash-es/isNil'; import { Observable, ReplaySubject, EMPTY, concat, defer, combineLatest, of, throwError } from 'rxjs'; import { switchMap, shareReplay, catchError, map, tap, filter } from 'rxjs/operators'; -import { OrgsService, MembersService, DEFAULT_ORGANIZATION_NAME } from '@dsh/api/organizations'; +import { OrgsService, MembersService, DEFAULT_ORGANIZATION_NAME } from '@dsh/app/api/organizations'; import { KeycloakTokenInfoService } from '@dsh/app/shared/services/keycloak-token-info'; import { ErrorService } from '../error'; diff --git a/src/app/shared/services/create-payment-link/create-payment-link.service.ts b/src/app/shared/services/create-payment-link/create-payment-link.service.ts index 4daa3ead..472cfe6c 100644 --- a/src/app/shared/services/create-payment-link/create-payment-link.service.ts +++ b/src/app/shared/services/create-payment-link/create-payment-link.service.ts @@ -4,8 +4,8 @@ import moment from 'moment'; import { Observable } from 'rxjs'; import { pluck, switchMap } from 'rxjs/operators'; -import { InvoicesService } from '@dsh/api/payments'; -import { ShortenerService } from '@dsh/api/url-shortener'; +import { InvoicesService } from '@dsh/app/api/payments'; +import { ShortenerService } from '@dsh/app/api/url-shortener'; import { queryParamsToStr } from '@dsh/utils'; import { PaymentLinkParams } from './types/payment-link-params'; diff --git a/src/app/shared/services/fetch-organizations/fetch-organizations.service.spec.ts b/src/app/shared/services/fetch-organizations/fetch-organizations.service.spec.ts index eb6bd0a5..1f2487fb 100644 --- a/src/app/shared/services/fetch-organizations/fetch-organizations.service.spec.ts +++ b/src/app/shared/services/fetch-organizations/fetch-organizations.service.spec.ts @@ -3,8 +3,8 @@ import { OrganizationSearchResult } from '@vality/swag-organizations'; import { of } from 'rxjs'; import { 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 { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME } from '@dsh/app/shared'; import { provideMockService, provideMockToken } from '@dsh/app/shared/tests'; diff --git a/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts b/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts index 6a999b1b..cd7242ed 100644 --- a/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts +++ b/src/app/shared/services/fetch-organizations/fetch-organizations.service.ts @@ -3,10 +3,10 @@ import { Organization } from '@vality/swag-organizations'; import { Observable } from 'rxjs'; import { shareReplay } from 'rxjs/operators'; -import { OrgsService } from '@dsh/api/organizations'; +import { OrgsService } from '@dsh/app/api/organizations'; +import { mapToTimestamp } from '@dsh/app/custom-operators'; import { SEARCH_LIMIT } from '@dsh/app/sections/tokens'; import { DEBOUNCE_FETCHER_ACTION_TIME, FetchResult, PartialFetcher } from '@dsh/app/shared'; -import { mapToTimestamp } from '@dsh/operators'; @Injectable() export class FetchOrganizationsService extends PartialFetcher { diff --git a/src/app/shared/services/organization-management/organization-management.service.spec.ts b/src/app/shared/services/organization-management/organization-management.service.spec.ts index 8e4c14b7..a10a3f04 100644 --- a/src/app/shared/services/organization-management/organization-management.service.spec.ts +++ b/src/app/shared/services/organization-management/organization-management.service.spec.ts @@ -3,9 +3,9 @@ import { cold } from 'jasmine-marbles'; 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 { ErrorService, KeycloakTokenInfoService } from '@dsh/app/shared'; import { provideMockService } from '@dsh/app/shared/tests'; diff --git a/src/app/shared/services/organization-management/organization-management.service.ts b/src/app/shared/services/organization-management/organization-management.service.ts index 329ce92b..4eaacd2a 100644 --- a/src/app/shared/services/organization-management/organization-management.service.ts +++ b/src/app/shared/services/organization-management/organization-management.service.ts @@ -3,10 +3,10 @@ import { Member, Organization, RoleId } from '@vality/swag-organizations'; import { combineLatest, defer, Observable, ReplaySubject } from 'rxjs'; import { map, pluck, shareReplay, switchMap } from 'rxjs/operators'; -import { MembersService } from '@dsh/api/organizations'; +import { MembersService } from '@dsh/app/api/organizations'; +import { SHARE_REPLAY_CONF } from '@dsh/app/custom-operators'; import { ContextOrganizationService } from '@dsh/app/shared'; import { Initializable } from '@dsh/app/shared/types'; -import { SHARE_REPLAY_CONF } from '@dsh/operators'; @Injectable() export class OrganizationManagementService implements Initializable { diff --git a/src/app/shared/services/sections-links/section-links.service.ts b/src/app/shared/services/sections-links/section-links.service.ts index 6eac60dd..dae06ac6 100644 --- a/src/app/shared/services/sections-links/section-links.service.ts +++ b/src/app/shared/services/sections-links/section-links.service.ts @@ -3,7 +3,7 @@ import { TranslocoService } from '@ngneat/transloco'; import { combineLatest, Observable } from 'rxjs'; import { first, map } from 'rxjs/operators'; -import { WalletsService } from '@dsh/api/wallet'; +import { WalletsService } from '@dsh/app/api/wallet'; import { RoleAccessName, RoleAccessService } from '@dsh/app/auth'; import { SectionLink } from './types'; diff --git a/src/app/shared/services/shop-contract-details/shop-contract-details.service.spec.ts b/src/app/shared/services/shop-contract-details/shop-contract-details.service.spec.ts index 4c2b65b4..c66b1e90 100644 --- a/src/app/shared/services/shop-contract-details/shop-contract-details.service.spec.ts +++ b/src/app/shared/services/shop-contract-details/shop-contract-details.service.spec.ts @@ -5,7 +5,7 @@ import { of } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { instance, mock, when } from 'ts-mockito'; -import { ContractsService } from '@dsh/api/contracts'; +import { ContractsService } from '@dsh/app/api/contracts'; import { ShopContractDetailsService } from './shop-contract-details.service'; diff --git a/src/app/shared/services/shop-contract-details/shop-contract-details.service.ts b/src/app/shared/services/shop-contract-details/shop-contract-details.service.ts index 855dae1d..aa869b50 100644 --- a/src/app/shared/services/shop-contract-details/shop-contract-details.service.ts +++ b/src/app/shared/services/shop-contract-details/shop-contract-details.service.ts @@ -6,7 +6,7 @@ import { BehaviorSubject, defer, Observable, of, ReplaySubject, Subject } from ' import { catchError, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators'; import { Overwrite } from 'utility-types'; -import { ContractsService } from '@dsh/api/payments'; +import { ContractsService } from '@dsh/app/api/payments'; @UntilDestroy() @Injectable() diff --git a/src/app/shared/services/shops-data/shops-data.service.ts b/src/app/shared/services/shops-data/shops-data.service.ts index b0676987..1eed31c4 100644 --- a/src/app/shared/services/shops-data/shops-data.service.ts +++ b/src/app/shared/services/shops-data/shops-data.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { Shop } from '@vality/swag-payments'; -import { Observable, Subject, of, repeat } from 'rxjs'; -import { startWith, switchMap, takeWhile } from 'rxjs/operators'; +import { Observable, Subject, of, repeat, merge, defer, first } from 'rxjs'; +import { switchMap, filter, catchError } from 'rxjs/operators'; -import { createTestShopClaimChangeset, ClaimsService } from '@dsh/api/claim-management'; -import { ShopsService } from '@dsh/api/payments'; +import { createTestShopClaimChangeset, ClaimsService } from '@dsh/app/api/claim-management'; +import { ShopsService } from '@dsh/app/api/payments'; +import { shareReplayRefCount } from '@dsh/app/custom-operators'; import { ContextOrganizationService } from '@dsh/app/shared'; -import { shareReplayRefCount } from '@dsh/operators'; import { IdGeneratorService } from '../id-generator'; @@ -14,15 +14,16 @@ import { IdGeneratorService } from '../id-generator'; providedIn: 'root', }) export class ShopsDataService { - shops$: Observable = this.contextOrganizationService.organization$.pipe( - switchMap(() => this.reloadShops$), - startWith(this.shopsService.getShopsForParty()), - switchMap((shops$) => shops$), + shops$: Observable = merge( + this.contextOrganizationService.organization$, + defer(() => this.reloadShops$) + ).pipe( + switchMap(() => this.shopsService.getShopsForParty()), switchMap((shops) => (shops.length ? of(shops) : this.createTestShop())), shareReplayRefCount() ); - private reloadShops$ = new Subject>(); + private reloadShops$ = new Subject(); constructor( private shopsService: ShopsService, @@ -31,33 +32,28 @@ export class ShopsDataService { private claimsService: ClaimsService ) {} - reloadShops(): Observable { - const shop$ = this.shopsService.getShopsForParty(); - this.reloadShops$.next(shop$); - return shop$; + reloadShops() { + this.reloadShops$.next(); } private createTestShop(): Observable { - return this.claimsService - .searchClaims({ limit: 1 }) - .pipe( - switchMap((claims) => - claims.result.length - ? of(claims.result[0]) - : this.claimsService.createClaim({ - changeset: createTestShopClaimChangeset( - this.idGenerator.uuid(), - this.idGenerator.uuid(), - this.idGenerator.uuid(), - this.idGenerator.uuid() - ), - }) - ) - ) - .pipe( - switchMap(() => this.shopsService.getShopsForParty()), - repeat({ count: 2, delay: 1000 }), - takeWhile((shops) => !shops.length) - ); + return this.claimsService.searchClaims({ limit: 1 }).pipe( + switchMap((claims) => + claims.result.length + ? of(claims.result[0]) + : this.claimsService.createClaim({ + changeset: createTestShopClaimChangeset( + this.idGenerator.uuid(), + this.idGenerator.uuid(), + this.idGenerator.uuid(), + this.idGenerator.uuid() + ), + }) + ), + switchMap(() => this.shopsService.getShopsForParty().pipe(repeat({ count: 5, delay: 1000 }))), + filter((shops) => !!shops.length), + first(), + catchError(() => of([])) + ); } } diff --git a/src/assets/i18n/components/en.json b/src/assets/i18n/components/en.json index 19a8b41d..0d299396 100644 --- a/src/assets/i18n/components/en.json +++ b/src/assets/i18n/components/en.json @@ -136,12 +136,6 @@ "send": "Send for review", "title": "Request to create a shop" }, - "createShopDialog": { - "internationalLegalEntityType": "International legal entity", - "russianLegalEntityType": "Russian legal entity", - "title": "New claim", - "type": "Create shop" - }, "createdExistingSwitch": { "created": "Specify new", "existing": "Use existing" diff --git a/src/assets/i18n/components/ru.json b/src/assets/i18n/components/ru.json index 17b976d5..a1c15d54 100644 --- a/src/assets/i18n/components/ru.json +++ b/src/assets/i18n/components/ru.json @@ -136,12 +136,6 @@ "send": "Отправить на рассмотрение", "title": "Заявка на создание магазина" }, - "createShopDialog": { - "internationalLegalEntityType": "Международное ЮЛ", - "russianLegalEntityType": "Российское ЮЛ", - "title": "Новая заявка", - "type": "Создание магазина" - }, "createdExistingSwitch": { "created": "Указать новые", "existing": "Использовать существующие" diff --git a/src/components/nested-table/services/layout-management/layout-management.service.ts b/src/components/nested-table/services/layout-management/layout-management.service.ts index 2f3f6408..719c4a7c 100644 --- a/src/components/nested-table/services/layout-management/layout-management.service.ts +++ b/src/components/nested-table/services/layout-management/layout-management.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, combineLatest, defer, Observable, of, ReplaySubject } from 'rxjs'; import { distinctUntilChanged, map, shareReplay, switchMap } from 'rxjs/operators'; -import { SHARE_REPLAY_CONF } from '@dsh/operators'; +import { SHARE_REPLAY_CONF } from '@dsh/app/custom-operators'; @Injectable() export class LayoutManagementService { diff --git a/tsconfig.json b/tsconfig.json index 026e0790..0944887c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,19 +18,7 @@ "resolveJsonModule": true, "skipLibCheck": true, "paths": { - "@dsh/components/*": ["src/components/*"], - "@dsh/components": ["src/components"], - "@dsh/pipes/*": ["src/pipes/*"], - "@dsh/pipes": ["src/pipes"], - "@dsh/app/shared/*": ["src/app/shared/*"], - "@dsh/app/shared": ["src/app/shared"], - "@dsh/api/*": ["src/app/api/*"], - "@dsh/api": ["src/app/api"], - "@dsh/app/sections/tokens": ["src/app/sections/tokens.ts"], - "@dsh/type-utils": ["src/type-utils/index.ts"], - "@dsh/utils": ["src/utils/index.ts"], - "@dsh/operators": ["src/app/custom-operators/index.ts"], - "@dsh/app/*": ["src/app/*"] + "@dsh/*": ["src/*"] } }, "angularCompilerOptions": { diff --git a/webpack.extra.js b/webpack.extra.js deleted file mode 100644 index 0ebf5355..00000000 --- a/webpack.extra.js +++ /dev/null @@ -1,22 +0,0 @@ -const webpack = require('webpack'); -const SentryWebpackPlugin = require('@sentry/webpack-plugin'); - -module.exports = { - plugins: [ - new webpack.IgnorePlugin({ - resourceRegExp: /^\.\/locale$/, - contextRegExp: /moment$/, - }), - ...(process.env.SENTRY_AUTH_TOKEN - ? [ - new SentryWebpackPlugin({ - authToken: process.env.SENTRY_AUTH_TOKEN, - org: 'rbkmoney-fd', - project: 'dashboard', - include: './dist', - ignore: ['node_modules', 'webpack.config.js'], - }), - ] - : []), - ], -};