refactor: Reorganize CustomFields TypeScript & GraphQL types

vendure-ecommerce · Jul 11, 2019 · e0583dd · e0583dd
1 parent 3178578
commit e0583dd
Show file tree

Hide file tree

Showing 55 changed files with 852 additions and 530 deletions.
diff --git a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts
@@ -10,14 +10,14 @@ import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest, Observable } from 'rxjs';
 import { mergeMap, shareReplay, take } from 'rxjs/operators';
-import { CustomFieldConfig } from 'shared/shared-types';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {
     Collection,
     ConfigurableOperation,
     ConfigurableOperationInput,
     CreateCollectionInput,
+    CustomFieldConfig,
     FacetWithValues,
     GetActiveChannel,
     LanguageCode,

diff --git a/admin-ui/src/app/catalog/components/facet-detail/facet-detail.component.ts b/admin-ui/src/app/catalog/components/facet-detail/facet-detail.component.ts
@@ -4,13 +4,13 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest, EMPTY, forkJoin, Observable } from 'rxjs';
 import { map, mergeMap, switchMap, take } from 'rxjs/operators';
 import { normalizeString } from 'shared/normalize-string';
-import { CustomFieldConfig } from 'shared/shared-types';
 import { notNullOrUndefined } from 'shared/shared-utils';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {
     CreateFacetInput,
     CreateFacetValueInput,
+    CustomFieldConfig,
     DeletionResult,
     FacetWithValues,
     LanguageCode,

diff --git a/admin-ui/src/app/catalog/components/product-detail/product-detail.component.ts b/admin-ui/src/app/catalog/components/product-detail/product-detail.component.ts
@@ -5,14 +5,14 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest, EMPTY, merge, Observable } from 'rxjs';
 import { distinctUntilChanged, map, mergeMap, switchMap, take, withLatestFrom } from 'rxjs/operators';
 import { normalizeString } from 'shared/normalize-string';
-import { CustomFieldConfig } from 'shared/shared-types';
 import { notNullOrUndefined } from 'shared/shared-utils';
 import { unique } from 'shared/unique';
 import { IGNORE_CAN_DEACTIVATE_GUARD } from 'src/app/shared/providers/routing/can-deactivate-detail-guard';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {
     CreateProductInput,
+    CustomFieldConfig,
     FacetWithValues,
     LanguageCode,
     ProductWithVariants,

diff --git a/admin-ui/src/app/common/base-detail.component.ts b/admin-ui/src/app/common/base-detail.component.ts
@@ -1,12 +1,11 @@
 import { FormGroup } from '@angular/forms';
-import { ActivatedRoute, Data, Router } from '@angular/router';
-import { combineLatest, Observable, of, Subject } from 'rxjs';
-import { distinctUntilChanged, map, share, shareReplay, switchMap, takeUntil, tap } from 'rxjs/operators';
-import { CustomFieldConfig, CustomFields } from 'shared/shared-types';
+import { ActivatedRoute, Router } from '@angular/router';
+import { combineLatest, Observable, Subject } from 'rxjs';
+import { distinctUntilChanged, map, shareReplay, switchMap, takeUntil, tap } from 'rxjs/operators';
 
 import { ServerConfigService } from '../data/server-config';
 
-import { LanguageCode } from './generated-types';
+import { CustomFieldConfig, CustomFields, LanguageCode } from './generated-types';
 import { getDefaultLanguage } from './utilities/get-default-language';
 
 export abstract class BaseDetailComponent<Entity extends { id: string; updatedAt?: string }> {
@@ -62,8 +61,8 @@ export abstract class BaseDetailComponent<Entity extends { id: string; updatedAt
 
     protected abstract setFormValues(entity: Entity, languageCode: LanguageCode): void;
 
-    protected getCustomFieldConfig(key: keyof CustomFields): CustomFieldConfig[] {
-        return this.serverConfigService.serverConfig.customFields[key] || [];
+    protected getCustomFieldConfig(key: Exclude<keyof CustomFields, '__typename'>): CustomFieldConfig[] {
+        return this.serverConfigService.serverConfig.customFieldConfig[key] || [];
     }
 
     protected setQueryParam(key: string, value: any) {