diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index f275679ff7..074749db43 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -622,6 +622,7 @@ } }, "cli": { + "analytics": false, "defaultCollection": "@nrwl/angular" }, "schematics": { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/actions/index.ts b/npm/ng-packs/packages/tenant-management/src/lib/actions/index.ts deleted file mode 100644 index 5c9207873f..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/actions/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './tenant-management.actions'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts b/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts deleted file mode 100644 index 23e0aecb9e..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { GetTenantsInput, TenantCreateDto, TenantUpdateDto } from '../proxy/models'; - -export class GetTenants { - static readonly type = '[TenantManagement] Get Tenant'; - constructor(public payload?: GetTenantsInput) {} -} - -export class GetTenantById { - static readonly type = '[TenantManagement] Get Tenant By Id'; - constructor(public payload: string) {} -} - -export class CreateTenant { - static readonly type = '[TenantManagement] Create Tenant'; - constructor(public payload: TenantCreateDto) {} -} - -export class UpdateTenant { - static readonly type = '[TenantManagement] Update Tenant'; - constructor(public payload: TenantUpdateDto & { id: string }) {} -} - -export class DeleteTenant { - static readonly type = '[TenantManagement] Delete Tenant'; - constructor(public payload: string) {} -} diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html index c296589afd..f626ba3460 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html @@ -5,7 +5,7 @@
{{ 'AbpTenantManagement::Tenants' | abpLocalization }}
- +
@@ -23,8 +23,8 @@ diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts index 22880151f4..0007fcb940 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts @@ -1,27 +1,17 @@ import { ListService, PagedResultDto } from '@abp/ng.core'; import { eFeatureManagementComponents } from '@abp/ng.feature-management'; -import { Confirmation, ConfirmationService, getPasswordValidators } from '@abp/ng.theme.shared'; -import { Component, Injector, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Select, Store } from '@ngxs/store'; -import { Observable } from 'rxjs'; -import { finalize, pluck, switchMap, take } from 'rxjs/operators'; -import { - CreateTenant, - DeleteTenant, - GetTenantById, - GetTenants, - UpdateTenant, -} from '../../actions/tenant-management.actions'; -import { GetTenantsInput, TenantDto } from '../../proxy/models'; -import { TenantService } from '../../proxy/tenant.service'; -import { TenantManagementState } from '../../states/tenant-management.state'; +import { Confirmation, ConfirmationService } from '@abp/ng.theme.shared'; import { EXTENSIONS_IDENTIFIER, FormPropData, generateFormFromProps, } from '@abp/ng.theme.shared/extensions'; +import { Component, Injector, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { finalize, take } from 'rxjs/operators'; import { eTenantManagementComponents } from '../../enums/components'; +import { GetTenantsInput, TenantDto } from '../../proxy/models'; +import { TenantService } from '../../proxy/tenant.service'; interface SelectedModalContent { type: 'saveConnStr' | 'saveTenant'; @@ -41,11 +31,7 @@ interface SelectedModalContent { ], }) export class TenantsComponent implements OnInit { - @Select(TenantManagementState.get) - data$: Observable>; - - @Select(TenantManagementState.getTenantsTotalCount) - totalCount$: Observable; + data: PagedResultDto; selected: TenantDto; @@ -112,9 +98,8 @@ export class TenantsComponent implements OnInit { public readonly list: ListService, private injector: Injector, private confirmationService: ConfirmationService, - private tenantService: TenantService, + private service: TenantService, private fb: FormBuilder, - private store: Store, ) {} ngOnInit() { @@ -150,14 +135,11 @@ export class TenantsComponent implements OnInit { } editTenant(id: string) { - this.store - .dispatch(new GetTenantById(id)) - .pipe(pluck('TenantManagementState', 'selectedItem')) - .subscribe(selected => { - this.selected = selected; - this.createTenantForm(); - this.openModal('AbpTenantManagement::Edit', this.tenantModalTemplate, 'saveTenant'); - }); + this.service.get(id).subscribe(res => { + this.selected = res; + this.createTenantForm(); + this.openModal('AbpTenantManagement::Edit', this.tenantModalTemplate, 'saveTenant'); + }); } save() { @@ -172,7 +154,7 @@ export class TenantsComponent implements OnInit { this.modalBusy = true; if (this.useSharedDatabase || (!this.useSharedDatabase && !this.connectionString)) { - this.tenantService + this.service .deleteDefaultConnectionString(this.selected.id) .pipe( take(1), @@ -182,7 +164,7 @@ export class TenantsComponent implements OnInit { this.isModalVisible = false; }); } else { - this.tenantService + this.service .updateDefaultConnectionString(this.selected.id, this.connectionString) .pipe( take(1), @@ -198,12 +180,12 @@ export class TenantsComponent implements OnInit { if (!this.tenantForm.valid || this.modalBusy) return; this.modalBusy = true; - this.store - .dispatch( - this.selected.id - ? new UpdateTenant({ ...this.selected, ...this.tenantForm.value, id: this.selected.id }) - : new CreateTenant(this.tenantForm.value), - ) + const { id } = this.selected; + + (id + ? this.service.update(id, { ...this.selected, ...this.tenantForm.value }) + : this.service.create(this.tenantForm.value) + ) .pipe(finalize(() => (this.modalBusy = false))) .subscribe(() => { this.isModalVisible = false; @@ -222,13 +204,13 @@ export class TenantsComponent implements OnInit { ) .subscribe((status: Confirmation.Status) => { if (status === Confirmation.Status.confirm) { - this.store.dispatch(new DeleteTenant(id)).subscribe(() => this.list.get()); + this.service.delete(id).subscribe(() => this.list.get()); } }); } hookToQuery() { - this.list.hookToQuery(query => this.store.dispatch(new GetTenants(query))).subscribe(); + this.list.hookToQuery(query => this.service.getList(query)).subscribe(); } onSharedDatabaseChange(value: boolean) { diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts deleted file mode 100644 index 22b8fba686..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './tenant-management-state.service'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts deleted file mode 100644 index 4475bef141..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngxs/store'; -import { TenantManagementState } from '../states/tenant-management.state'; -import { ABP } from '@abp/ng.core'; -import { GetTenants, GetTenantById, CreateTenant, UpdateTenant, DeleteTenant } from '../actions'; -import { TenantManagement } from '../models'; - -@Injectable({ - providedIn: 'root', -}) -export class TenantManagementStateService { - constructor(private store: Store) {} - - get() { - return this.store.selectSnapshot(TenantManagementState.get); - } - - getTenantsTotalCount() { - return this.store.selectSnapshot(TenantManagementState.getTenantsTotalCount); - } - - dispatchGetTenants(...args: ConstructorParameters) { - return this.store.dispatch(new GetTenants(...args)); - } - - dispatchGetTenantById(...args: ConstructorParameters) { - return this.store.dispatch(new GetTenantById(...args)); - } - - dispatchCreateTenant(...args: ConstructorParameters) { - return this.store.dispatch(new CreateTenant(...args)); - } - - dispatchUpdateTenant(...args: ConstructorParameters) { - return this.store.dispatch(new UpdateTenant(...args)); - } - - dispatchDeleteTenant(...args: ConstructorParameters) { - return this.store.dispatch(new DeleteTenant(...args)); - } -} diff --git a/npm/ng-packs/packages/tenant-management/src/lib/states/index.ts b/npm/ng-packs/packages/tenant-management/src/lib/states/index.ts deleted file mode 100644 index a6fb4168fe..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/states/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './tenant-management.state'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts b/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts deleted file mode 100644 index 2002afbcd9..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { ABP, PagedResultDto } from '@abp/ng.core'; -import { Action, Selector, State, StateContext } from '@ngxs/store'; -import { tap } from 'rxjs/operators'; -import { - CreateTenant, - DeleteTenant, - GetTenantById, - GetTenants, - UpdateTenant, -} from '../actions/tenant-management.actions'; -import { TenantManagement } from '../models/tenant-management'; -import { Injectable } from '@angular/core'; -import { TenantService } from '../proxy/tenant.service'; -import { TenantDto } from '../proxy/models'; - -@State({ - name: 'TenantManagementState', - defaults: { result: {}, selectedItem: {} } as TenantManagement.State, -}) -@Injectable() -export class TenantManagementState { - @Selector() - static get({ result }: TenantManagement.State): TenantDto[] { - return result.items || []; - } - - @Selector() - static getTenantsTotalCount({ result }: TenantManagement.State): number { - return result.totalCount; - } - - constructor(private service: TenantService) {} - - @Action(GetTenants) - get({ patchState }: StateContext, { payload }: GetTenants) { - return this.service.getList(payload).pipe( - tap(result => - patchState({ - result, - }), - ), - ); - } - - @Action(GetTenantById) - getById({ patchState }: StateContext, { payload }: GetTenantById) { - return this.service.get(payload).pipe( - tap(selectedItem => - patchState({ - selectedItem, - }), - ), - ); - } - - @Action(DeleteTenant) - delete(_, { payload }: DeleteTenant) { - return this.service.delete(payload); - } - - @Action(CreateTenant) - add(_, { payload }: CreateTenant) { - return this.service.create(payload); - } - - @Action(UpdateTenant) - update({ getState }: StateContext, { payload }: UpdateTenant) { - return this.service.update(payload.id, { ...getState().selectedItem, ...payload }); - } -} diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts index e349b9b820..1aca283a29 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts @@ -5,11 +5,9 @@ import { UiExtensionsModule } from '@abp/ng.theme.shared/extensions'; import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxValidateCoreModule } from '@ngx-validate/core'; -import { NgxsModule } from '@ngxs/store'; import { TenantsComponent } from './components/tenants/tenants.component'; import { TenantManagementExtensionsGuard } from './guards/extensions.guard'; import { TenantManagementConfigOptions } from './models/config-options'; -import { TenantManagementState } from './states/tenant-management.state'; import { TenantManagementRoutingModule } from './tenant-management-routing.module'; import { TENANT_MANAGEMENT_CREATE_FORM_PROP_CONTRIBUTORS, @@ -24,7 +22,6 @@ import { exports: [TenantsComponent], imports: [ TenantManagementRoutingModule, - NgxsModule.forFeature([TenantManagementState]), NgxValidateCoreModule, CoreModule, ThemeSharedModule, diff --git a/npm/ng-packs/packages/tenant-management/src/public-api.ts b/npm/ng-packs/packages/tenant-management/src/public-api.ts index e012a538b4..55c8340e49 100644 --- a/npm/ng-packs/packages/tenant-management/src/public-api.ts +++ b/npm/ng-packs/packages/tenant-management/src/public-api.ts @@ -1,10 +1,7 @@ -export * from './lib/actions'; export * from './lib/components'; export * from './lib/enums'; export * from './lib/guards'; export * from './lib/models'; export * from './lib/proxy'; -export * from './lib/services'; -export * from './lib/states'; export * from './lib/tenant-management.module'; export * from './lib/tokens'; diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index f8d092d5d2..afc0a27c97 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -295,17 +295,6 @@ rxjs "6.6.7" source-map "0.7.3" -"@angular-devkit/core@8.3.29", "@angular-devkit/core@^8.0.3": - version "8.3.29" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.3.29.tgz#3477edd6458653f83e6d78684b100c1bef81382f" - integrity sha512-4jdja9QPwR6XG14ZSunyyOWT3nE2WtZC5IMDIBZADxujXvhzOU0n4oWpy6/JVHLUAxYNNgzLz+/LQORRWndcPg== - dependencies: - ajv "6.12.3" - fast-json-stable-stringify "2.0.0" - magic-string "0.25.3" - rxjs "6.4.0" - source-map "0.7.3" - "@angular-devkit/schematics-cli@~12.2.0": version "12.2.5" resolved "https://registry.yarnpkg.com/@angular-devkit/schematics-cli/-/schematics-cli-12.2.5.tgz#93a264fe8e8a5fc7b1974a8da13478a8866b2c86" @@ -336,14 +325,6 @@ ora "5.4.1" rxjs "6.6.7" -"@angular-devkit/schematics@^8.0.6": - version "8.3.29" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.3.29.tgz#b3ba658b90fb3226a80ff12977be7dd583e99c49" - integrity sha512-AFJ9EK0XbcNlO5Dm9vr0OlBo1Nw6AaFXPR+DmHGBdcDDHxqEmYYLWfT+JU/8U2YFIdgrtlwvdtf6UQ3V2jdz1g== - dependencies: - "@angular-devkit/core" "8.3.29" - rxjs "6.4.0" - "@angular-devkit/schematics@~11.0.2": version "11.0.7" resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.0.7.tgz#7cd2398c98d82f8e5bdc3bb5c70e92d6b1d12a12" @@ -3256,11 +3237,6 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jasmine@^3.3.9": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.9.0.tgz#0118a74c447a580035406521c2600b22f28db4d4" - integrity sha512-x7aAO0c4EpBEJkUd/v012GLO7tDXXtv+t7Cz5xK+WdSmitH27eHgsQr+36CblfJFuqBQ0++O0xgBTuaKJnB4fg== - "@types/jest@26.0.24": version "26.0.24" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" @@ -3311,11 +3287,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.15.tgz#d5ebfb62a69074ebb85cbe0529ad917bb8f2bae8" integrity sha512-D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA== -"@types/node@^8.0.31": - version "8.10.66" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" - integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== - "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -3936,16 +3907,6 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@6.12.3: - version "6.12.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" - integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@6.12.4: version "6.12.4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" @@ -4658,7 +4619,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.1, browserslist@^4.16.6, browserslist@^4.16.8, browserslist@^4.6.4, browserslist@^4.9.1: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.1, browserslist@^4.16.6, browserslist@^4.17.0, browserslist@^4.6.4, browserslist@^4.9.1: version "4.17.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c" integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g== @@ -5534,17 +5495,17 @@ copy-webpack-plugin@9.0.1: serialize-javascript "^6.0.0" core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.16.0: - version "3.17.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.2.tgz#f461ab950c0a0ffedfc327debf28b7e518950936" - integrity sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg== + version "3.17.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.17.3.tgz#b39c8e4dec71ecdc735c653ce5233466e561324e" + integrity sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA== dependencies: - browserslist "^4.16.8" + browserslist "^4.17.0" semver "7.0.0" core-js-pure@^3.16.0: - version "3.17.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.17.2.tgz#ba6311b6aa1e2f2adeba4ac6ec51a9ff40bdc1af" - integrity sha512-2VV7DlIbooyTI7Bh+yzOOWL9tGwLnQKHno7qATE+fqZzDKYr6llVjVQOzpD/QLZFgXDPb8T71pJokHEZHEYJhQ== + version "3.17.3" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.17.3.tgz#98ea3587188ab7ef4695db6518eeb71aec42604a" + integrity sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ== core-js@3.16.0: version "3.16.0" @@ -5552,9 +5513,9 @@ core-js@3.16.0: integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g== core-js@^3.6.5: - version "3.17.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.2.tgz#f960eae710dc62c29cca93d5332e3660e289db10" - integrity sha512-XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA== + version "3.17.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz#8e8bd20e91df9951e903cabe91f9af4a0895bc1e" + integrity sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw== core-util-is@1.0.2: version "1.0.2" @@ -6973,11 +6934,6 @@ fast-glob@^3.1.1, fast-glob@^3.2.5: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= - fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -8650,11 +8606,6 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-core@~3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.9.0.tgz#09a3c8169fe98ec69440476d04a0e4cb4d59e452" - integrity sha512-Tv3kVbPCGVrjsnHBZ38NsPU3sDOtNa0XmbG2baiyJqdb5/SPpDO6GVwJYtUryl6KB4q1Ssckwg612ES9Z0dreQ== - jasmine-marbles@~0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.8.3.tgz#a27253d1d52dfe49d8f145aba63f0bf18147b4ff" @@ -8671,14 +8622,6 @@ jasmine@2.8.0: glob "^7.0.6" jasmine-core "~2.8.0" -jasmine@^3.3.1: - version "3.9.0" - resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.9.0.tgz#286c4f9f88b69defc24acf3989af5533d5c6a0e6" - integrity sha512-JgtzteG7xnqZZ51fg7N2/wiQmXon09szkALcRMTgCMX4u/m17gVJFjObnvw5FXkZOWuweHPaPRVB6DI2uN0wVA== - dependencies: - glob "^7.1.6" - jasmine-core "~3.9.0" - jasminewd2@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e" @@ -9726,13 +9669,6 @@ lz-string@^1.4.4: resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= -magic-string@0.25.3: - version "0.25.3" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9" - integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA== - dependencies: - sourcemap-codec "^1.4.4" - magic-string@0.25.7, magic-string@^0.25.0, magic-string@^0.25.7: version "0.25.7" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" @@ -10362,18 +10298,6 @@ ng-zorro-antd@^12.0.1: date-fns "^2.10.0" tslib "^2.2.0" -ngxs-schematic@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/ngxs-schematic/-/ngxs-schematic-1.1.9.tgz#45f55777944b5e2d542e5a246046194ad522816e" - integrity sha512-l8mX/hKXoYw5a+kDXycSoY/3NqyWR6LhmKmiw3Fij3cVkxVCWRy2OByNEFi9Qm3sSIQpeo7aDGHWNcCXS0AYPA== - dependencies: - "@angular-devkit/core" "^8.0.3" - "@angular-devkit/schematics" "^8.0.6" - "@types/jasmine" "^3.3.9" - "@types/node" "^8.0.31" - jasmine "^3.3.1" - typescript "^3.5.2" - nice-napi@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b" @@ -11941,9 +11865,9 @@ prelude-ls@~1.1.2: integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= prettier@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" - integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== + version "2.4.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba" + integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ== pretty-bytes@^5.3.0, pretty-bytes@^5.6.0: version "5.6.0" @@ -12689,13 +12613,6 @@ rxjs-for-await@0.0.2: resolved "https://registry.yarnpkg.com/rxjs-for-await/-/rxjs-for-await-0.0.2.tgz#26598a1d6167147cc192172970e7eed4e620384b" integrity sha512-IJ8R/ZCFMHOcDIqoABs82jal00VrZx8Xkgfe7TOKoaRPAW5nH/VFlG23bXpeGdrmtqI9UobFPgUKgCuFc7Lncw== -rxjs@6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" - integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== - dependencies: - tslib "^1.9.0" - rxjs@6.6.2: version "6.6.2" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2" @@ -13200,7 +13117,7 @@ source-map-resolve@^0.6.0: atob "^2.1.2" decode-uri-component "^0.2.0" -source-map-support@0.5.19, source-map-support@^0.5.17, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19: +source-map-support@0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -13208,6 +13125,14 @@ source-map-support@0.5.19, source-map-support@^0.5.17, source-map-support@^0.5.5 buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.5.17, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-support@~0.4.0: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" @@ -14203,7 +14128,7 @@ typescript@4.3.5, typescript@~4.3.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== -typescript@^3.5.2, typescript@~3.9.2: +typescript@~3.9.2: version "3.9.10" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==