From e32f386e359eb194aafbe9e366dc759fc8ef5a34 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 11 Sep 2020 10:58:24 +0300
Subject: [PATCH] refactor: recreate proxies for feature-management

---
 .../dev-app/src/environments/environment.ts   |  4 ++
 .../feature-management/features.service.ts    | 58 +++++++--------
 .../abp => }/feature-management/index.ts      |  0
 .../abp => }/feature-management/models.ts     | 72 +++++++++----------
 .../feature-management/src/lib/proxy/index.ts |  3 +-
 .../src/lib/proxy/validation/index.ts         |  1 +
 .../validation/string-values/index.ts         |  0
 .../validation/string-values/models.ts        | 26 +++----
 .../src/lib/proxy/volo/abp/index.ts           |  2 -
 .../lib/proxy/volo/abp/validation/index.ts    |  1 -
 .../src/lib/proxy/volo/index.ts               |  1 -
 .../feature-management/src/public-api.ts      |  3 +-
 12 files changed, 87 insertions(+), 84 deletions(-)
 rename npm/ng-packs/packages/feature-management/src/lib/proxy/{volo/abp => }/feature-management/features.service.ts (74%)
 rename npm/ng-packs/packages/feature-management/src/lib/proxy/{volo/abp => }/feature-management/index.ts (100%)
 rename npm/ng-packs/packages/feature-management/src/lib/proxy/{volo/abp => }/feature-management/models.ts (95%)
 create mode 100644 npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts
 rename npm/ng-packs/packages/feature-management/src/lib/proxy/{volo/abp => }/validation/string-values/index.ts (100%)
 rename npm/ng-packs/packages/feature-management/src/lib/proxy/{volo/abp => }/validation/string-values/models.ts (95%)
 delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/index.ts
 delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/index.ts
 delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/proxy/volo/index.ts

diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
index e338675552..f16ba9b898 100644
--- a/npm/ng-packs/apps/dev-app/src/environments/environment.ts
+++ b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
@@ -22,5 +22,9 @@ export const environment = {
       url: 'https://localhost:44305',
       rootNamespace: 'MyCompanyName.MyProjectName',
     },
+    AbpFeatureManagement: {
+      url: 'https://localhost:44305',
+      rootNamespace: 'Volo.Abp',
+    },
   },
 } as Config.Environment;
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/features.service.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts
similarity index 74%
rename from npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/features.service.ts
rename to npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts
index 099ced1117..fa5c488b51 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/features.service.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts
@@ -1,29 +1,29 @@
-import type { GetFeatureListResultDto, UpdateFeaturesDto } from './models';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class FeaturesService {
-  apiName = 'AbpFeatureManagement';
-
-  get = (providerName: string, providerKey: string) =>
-    this.restService.request<any, GetFeatureListResultDto>({
-      method: 'GET',
-      url: '/api/feature-management/features',
-      params: { providerName, providerKey },
-    },
-    { apiName: this.apiName });
-
-  update = (providerName: string, providerKey: string, input: UpdateFeaturesDto) =>
-    this.restService.request<any, void>({
-      method: 'PUT',
-      url: '/api/feature-management/features',
-      params: { providerName, providerKey },
-      body: input,
-    },
-    { apiName: this.apiName });
-
-  constructor(private restService: RestService) {}
-}
+import type { GetFeatureListResultDto, UpdateFeaturesDto } from './models';
+import { RestService } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FeaturesService {
+  apiName = 'AbpFeatureManagement';
+
+  get = (providerName: string, providerKey: string) =>
+    this.restService.request<any, GetFeatureListResultDto>({
+      method: 'GET',
+      url: `/api/feature-management/features`,
+      params: { providerName: providerName, providerKey: providerKey },
+    },
+    { apiName: this.apiName });
+
+  update = (providerName: string, providerKey: string, input: UpdateFeaturesDto) =>
+    this.restService.request<any, void>({
+      method: 'PUT',
+      url: `/api/feature-management/features`,
+      params: { providerName: providerName, providerKey: providerKey },
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  constructor(private restService: RestService) {}
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/index.ts
similarity index 100%
rename from npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/index.ts
rename to npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/index.ts
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/models.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts
similarity index 95%
rename from npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/models.ts
rename to npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts
index bd41a5108b..8ea2d73164 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/feature-management/models.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts
@@ -1,36 +1,36 @@
-import type { IStringValueType } from '../validation/string-values/models';
-
-export interface FeatureDto {
-  name: string;
-  displayName: string;
-  value: string;
-  provider: FeatureProviderDto;
-  description: string;
-  valueType: IStringValueType;
-  depth: number;
-  parentName: string;
-}
-
-export interface FeatureGroupDto {
-  name: string;
-  displayName: string;
-  features: FeatureDto[];
-}
-
-export interface FeatureProviderDto {
-  name: string;
-  key: string;
-}
-
-export interface GetFeatureListResultDto {
-  groups: FeatureGroupDto[];
-}
-
-export interface UpdateFeatureDto {
-  name: string;
-  value: string;
-}
-
-export interface UpdateFeaturesDto {
-  features: UpdateFeatureDto[];
-}
+import type { IStringValueType } from '../validation/string-values/models';
+
+export interface FeatureDto {
+  name: string;
+  displayName: string;
+  value: string;
+  provider: FeatureProviderDto;
+  description: string;
+  valueType: IStringValueType;
+  depth: number;
+  parentName: string;
+}
+
+export interface FeatureGroupDto {
+  name: string;
+  displayName: string;
+  features: FeatureDto[];
+}
+
+export interface FeatureProviderDto {
+  name: string;
+  key: string;
+}
+
+export interface GetFeatureListResultDto {
+  groups: FeatureGroupDto[];
+}
+
+export interface UpdateFeatureDto {
+  name: string;
+  value: string;
+}
+
+export interface UpdateFeaturesDto {
+  features: UpdateFeatureDto[];
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts
index bf31674ba0..68eb7e2964 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/index.ts
@@ -1 +1,2 @@
-export * from './volo';
+export * as FeatureManagement from './feature-management';
+export * as Validation from './validation';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts
new file mode 100644
index 0000000000..bcd4535b81
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts
@@ -0,0 +1 @@
+export * as StringValues from './string-values';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/string-values/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/index.ts
similarity index 100%
rename from npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/string-values/index.ts
rename to npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/index.ts
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/string-values/models.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts
similarity index 95%
rename from npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/string-values/models.ts
rename to npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts
index 3e15dbb46f..f4f9381611 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/string-values/models.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts
@@ -1,13 +1,13 @@
-
-export interface IStringValueType {
-  name: string;
-  item: object;
-  properties: Record<string, object>;
-  validator: IValueValidator;
-}
-
-export interface IValueValidator {
-  name: string;
-  item: object;
-  properties: Record<string, object>;
-}
+
+export interface IStringValueType {
+  name: string;
+  item: object;
+  properties: Record<string, object>;
+  validator: IValueValidator;
+}
+
+export interface IValueValidator {
+  name: string;
+  item: object;
+  properties: Record<string, object>;
+}
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/index.ts
deleted file mode 100644
index 24792b06a6..0000000000
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './feature-management';
-export * from './validation';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/index.ts
deleted file mode 100644
index dbc9788333..0000000000
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/abp/validation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './string-values';
diff --git a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/index.ts b/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/index.ts
deleted file mode 100644
index c0475756d6..0000000000
--- a/npm/ng-packs/packages/feature-management/src/lib/proxy/volo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './abp';
diff --git a/npm/ng-packs/packages/feature-management/src/public-api.ts b/npm/ng-packs/packages/feature-management/src/public-api.ts
index 7184214e05..1d9ef938b8 100644
--- a/npm/ng-packs/packages/feature-management/src/public-api.ts
+++ b/npm/ng-packs/packages/feature-management/src/public-api.ts
@@ -1,4 +1,5 @@
 export * from './lib/feature-management.module';
 export * from './lib/components';
 export * from './lib/enums/components';
-export * from './lib/proxy';
+export * from './lib/proxy/feature-management';
+export * from './lib/proxy/validation/string-values';