From 0e11eebd28f278c8ef9edc7dfed3f75a7d58be09 Mon Sep 17 00:00:00 2001
From: Mehmet Erim <bilgi@mehmeterim.com>
Date: Wed, 22 Sep 2021 14:38:56 +0300
Subject: [PATCH] fix some errors

---
 .../src/lib/tenant-box.service.ts             |  8 +++----
 .../packages/core/src/lib/utils/date-utils.ts |  1 -
 .../packages/core/src/lib/utils/index.ts      |  1 -
 .../packages/core/src/lib/utils/rxjs-utils.ts |  3 ---
 .../lib/components/modal/modal.component.ts   | 24 +++----------------
 5 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 npm/ng-packs/packages/core/src/lib/utils/rxjs-utils.ts

diff --git a/npm/ng-packs/packages/account-core/src/lib/tenant-box.service.ts b/npm/ng-packs/packages/account-core/src/lib/tenant-box.service.ts
index ef0a71a245..d8212b39e8 100644
--- a/npm/ng-packs/packages/account-core/src/lib/tenant-box.service.ts
+++ b/npm/ng-packs/packages/account-core/src/lib/tenant-box.service.ts
@@ -1,12 +1,11 @@
-import { Injectable } from '@angular/core';
-import { ToasterService } from '@abp/ng.theme.shared';
 import {
-  AbpApplicationConfigurationService,
   AbpTenantService,
   ConfigStateService,
   CurrentTenantDto,
   SessionStateService,
 } from '@abp/ng.core';
+import { ToasterService } from '@abp/ng.theme.shared';
+import { Injectable } from '@angular/core';
 import { finalize } from 'rxjs/operators';
 
 @Injectable()
@@ -24,7 +23,6 @@ export class TenantBoxService {
     private tenantService: AbpTenantService,
     private sessionState: SessionStateService,
     private configState: ConfigStateService,
-    private appConfigService: AbpApplicationConfigurationService,
   ) {}
 
   onSwitch() {
@@ -57,7 +55,7 @@ export class TenantBoxService {
 
   private setTenant(tenant: CurrentTenantDto) {
     this.sessionState.setTenant(tenant);
-    this.appConfigService.get().subscribe(res => this.configState.setState(res));
+    this.configState.refreshAppState();
   }
 
   private showError() {
diff --git a/npm/ng-packs/packages/core/src/lib/utils/date-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/date-utils.ts
index 6c4793f895..2144bf69a1 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/date-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/date-utils.ts
@@ -1,4 +1,3 @@
-import { ApplicationConfiguration } from '../models/application-configuration';
 import { DateTimeFormatDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models';
 import { ConfigStateService } from '../services';
 
diff --git a/npm/ng-packs/packages/core/src/lib/utils/index.ts b/npm/ng-packs/packages/core/src/lib/utils/index.ts
index e7fe63deb0..56378f664f 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/index.ts
@@ -16,6 +16,5 @@ export * from './multi-tenancy-utils';
 export * from './number-utils';
 export * from './object-utils';
 export * from './route-utils';
-export * from './rxjs-utils';
 export * from './string-utils';
 export * from './tree-utils';
diff --git a/npm/ng-packs/packages/core/src/lib/utils/rxjs-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/rxjs-utils.ts
deleted file mode 100644
index 9d81d523cb..0000000000
--- a/npm/ng-packs/packages/core/src/lib/utils/rxjs-utils.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-function isFunction(value) {
-  return typeof value === 'function';
-}
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
index 44e077160b..008a2c3e9b 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
@@ -5,7 +5,6 @@ import {
   EventEmitter,
   Inject,
   Input,
-  isDevMode,
   OnDestroy,
   OnInit,
   Optional,
@@ -144,9 +143,8 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal {
 
     setTimeout(() => this.listen(), 0);
     this.modalRef = this.modal.open(this.modalContent, {
-      // TODO: set size to 'lg' when removed the size variable
-      size: this.size,
-      centered: this.centered,
+      size: 'lg',
+      centered: true,
       keyboard: false,
       scrollable: true,
       beforeDismiss: () => {
@@ -156,7 +154,7 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal {
         return !this.visible;
       },
       ...this.options,
-      windowClass: `${this.modalClass} ${this.options.windowClass || ''} ${this.modalIdentifier}`,
+      windowClass: `${this.options.windowClass || ''} ${this.modalIdentifier}`,
     });
 
     this.appear.emit();
@@ -212,22 +210,6 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal {
         }
       });
 
-    setTimeout(() => {
-      if (!this.abpClose) return;
-      this.warnForDeprecatedClose();
-      fromEvent(this.abpClose.nativeElement, 'click')
-        .pipe(takeUntil(this.destroy$))
-        .subscribe(() => this.close());
-    }, 0);
-
     this.init.emit();
   }
-
-  private warnForDeprecatedClose() {
-    if (isDevMode()) {
-      console.warn(
-        'Please use abpClose directive instead of #abpClose template variable. #abpClose will be removed in v5.0',
-      );
-    }
-  }
 }