Просмотр исходного кода

refactor(admin-ui): Move asset gallery components to SharedModule

Michael Bromley 6 лет назад
Родитель
Сommit
c3187eccdd

+ 1 - 12
packages/admin-ui/src/app/catalog/catalog.module.ts

@@ -6,10 +6,7 @@ import { SharedModule } from '../shared/shared.module';
 
 
 import { catalogRoutes } from './catalog.routes';
 import { catalogRoutes } from './catalog.routes';
 import { ApplyFacetDialogComponent } from './components/apply-facet-dialog/apply-facet-dialog.component';
 import { ApplyFacetDialogComponent } from './components/apply-facet-dialog/apply-facet-dialog.component';
-import { AssetFileInputComponent } from './components/asset-file-input/asset-file-input.component';
-import { AssetGalleryComponent } from './components/asset-gallery/asset-gallery.component';
 import { AssetListComponent } from './components/asset-list/asset-list.component';
 import { AssetListComponent } from './components/asset-list/asset-list.component';
-import { AssetPickerDialogComponent } from './components/asset-picker-dialog/asset-picker-dialog.component';
 import { AssetPreviewComponent } from './components/asset-preview/asset-preview.component';
 import { AssetPreviewComponent } from './components/asset-preview/asset-preview.component';
 import { CollectionContentsComponent } from './components/collection-contents/collection-contents.component';
 import { CollectionContentsComponent } from './components/collection-contents/collection-contents.component';
 import { CollectionDetailComponent } from './components/collection-detail/collection-detail.component';
 import { CollectionDetailComponent } from './components/collection-detail/collection-detail.component';
@@ -47,10 +44,7 @@ import { ProductVariantsResolver } from './providers/routing/product-variants-re
         ProductVariantsListComponent,
         ProductVariantsListComponent,
         ApplyFacetDialogComponent,
         ApplyFacetDialogComponent,
         AssetListComponent,
         AssetListComponent,
-        AssetGalleryComponent,
         ProductAssetsComponent,
         ProductAssetsComponent,
-        AssetPickerDialogComponent,
-        AssetFileInputComponent,
         VariantPriceDetailComponent,
         VariantPriceDetailComponent,
         CollectionListComponent,
         CollectionListComponent,
         CollectionDetailComponent,
         CollectionDetailComponent,
@@ -64,12 +58,7 @@ import { ProductVariantsResolver } from './providers/routing/product-variants-re
         UpdateProductOptionDialogComponent,
         UpdateProductOptionDialogComponent,
         ProductVariantsEditorComponent,
         ProductVariantsEditorComponent,
     ],
     ],
-    entryComponents: [
-        AssetPickerDialogComponent,
-        ApplyFacetDialogComponent,
-        AssetPreviewComponent,
-        UpdateProductOptionDialogComponent,
-    ],
+    entryComponents: [ApplyFacetDialogComponent, AssetPreviewComponent, UpdateProductOptionDialogComponent],
     providers: [
     providers: [
         ProductResolver,
         ProductResolver,
         FacetResolver,
         FacetResolver,

+ 1 - 1
packages/admin-ui/src/app/catalog/components/product-assets/product-assets.component.ts

@@ -21,8 +21,8 @@ import {
 import { unique } from 'shared/unique';
 import { unique } from 'shared/unique';
 
 
 import { Asset } from '../../../common/generated-types';
 import { Asset } from '../../../common/generated-types';
+import { AssetPickerDialogComponent } from '../../../shared/components/asset-picker-dialog/asset-picker-dialog.component';
 import { ModalService } from '../../../shared/providers/modal/modal.service';
 import { ModalService } from '../../../shared/providers/modal/modal.service';
-import { AssetPickerDialogComponent } from '../asset-picker-dialog/asset-picker-dialog.component';
 import { AssetPreviewComponent } from '../asset-preview/asset-preview.component';
 import { AssetPreviewComponent } from '../asset-preview/asset-preview.component';
 
 
 export interface AssetChange {
 export interface AssetChange {

+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-file-input/asset-file-input.component.html → packages/admin-ui/src/app/shared/components/asset-file-input/asset-file-input.component.html


+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-file-input/asset-file-input.component.scss → packages/admin-ui/src/app/shared/components/asset-file-input/asset-file-input.component.scss


+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-file-input/asset-file-input.component.ts → packages/admin-ui/src/app/shared/components/asset-file-input/asset-file-input.component.ts


+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-gallery/asset-gallery.component.html → packages/admin-ui/src/app/shared/components/asset-gallery/asset-gallery.component.html


+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-gallery/asset-gallery.component.scss → packages/admin-ui/src/app/shared/components/asset-gallery/asset-gallery.component.scss


+ 2 - 2
packages/admin-ui/src/app/catalog/components/asset-gallery/asset-gallery.component.ts → packages/admin-ui/src/app/shared/components/asset-gallery/asset-gallery.component.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 
 
+import { AssetPreviewComponent } from '../../../catalog/components/asset-preview/asset-preview.component';
 import { Asset } from '../../../common/generated-types';
 import { Asset } from '../../../common/generated-types';
-import { ModalService } from '../../../shared/providers/modal/modal.service';
-import { AssetPreviewComponent } from '../asset-preview/asset-preview.component';
+import { ModalService } from '../../providers/modal/modal.service';
 
 
 @Component({
 @Component({
     selector: 'vdr-asset-gallery',
     selector: 'vdr-asset-gallery',

+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-picker-dialog/asset-picker-dialog.component.html → packages/admin-ui/src/app/shared/components/asset-picker-dialog/asset-picker-dialog.component.html


+ 0 - 0
packages/admin-ui/src/app/catalog/components/asset-picker-dialog/asset-picker-dialog.component.scss → packages/admin-ui/src/app/shared/components/asset-picker-dialog/asset-picker-dialog.component.scss


+ 1 - 1
packages/admin-ui/src/app/catalog/components/asset-picker-dialog/asset-picker-dialog.component.ts → packages/admin-ui/src/app/shared/components/asset-picker-dialog/asset-picker-dialog.component.ts

@@ -9,7 +9,7 @@ import { _ } from '../../../core/providers/i18n/mark-for-extraction';
 import { NotificationService } from '../../../core/providers/notification/notification.service';
 import { NotificationService } from '../../../core/providers/notification/notification.service';
 import { DataService } from '../../../data/providers/data.service';
 import { DataService } from '../../../data/providers/data.service';
 import { QueryResult } from '../../../data/query-result';
 import { QueryResult } from '../../../data/query-result';
-import { Dialog } from '../../../shared/providers/modal/modal.service';
+import { Dialog } from '../../providers/modal/modal.service';
 
 
 /**
 /**
  * A dialog which allows the creation and selection of assets.
  * A dialog which allows the creation and selection of assets.

+ 3 - 0
packages/admin-ui/src/app/shared/shared-declarations.ts

@@ -4,6 +4,9 @@ export {
     ActionBarRightComponent,
     ActionBarRightComponent,
 } from './components/action-bar/action-bar.component';
 } from './components/action-bar/action-bar.component';
 export { AffixedInputComponent } from './components/affixed-input/affixed-input.component';
 export { AffixedInputComponent } from './components/affixed-input/affixed-input.component';
+export { AssetFileInputComponent } from './components/asset-file-input/asset-file-input.component';
+export { AssetGalleryComponent } from './components/asset-gallery/asset-gallery.component';
+export { AssetPickerDialogComponent } from './components/asset-picker-dialog/asset-picker-dialog.component';
 export { PercentageSuffixInputComponent } from './components/affixed-input/percentage-suffix-input.component';
 export { PercentageSuffixInputComponent } from './components/affixed-input/percentage-suffix-input.component';
 export { ChipComponent } from './components/chip/chip.component';
 export { ChipComponent } from './components/chip/chip.component';
 export { ConfigurableInputComponent } from './components/configurable-input/configurable-input.component';
 export { ConfigurableInputComponent } from './components/configurable-input/configurable-input.component';

+ 7 - 1
packages/admin-ui/src/app/shared/shared.module.ts

@@ -21,6 +21,9 @@ import { ModalService } from './providers/modal/modal.service';
 import { CanDeactivateDetailGuard } from './providers/routing/can-deactivate-detail-guard';
 import { CanDeactivateDetailGuard } from './providers/routing/can-deactivate-detail-guard';
 import {
 import {
     AffixedInputComponent,
     AffixedInputComponent,
+    AssetFileInputComponent,
+    AssetGalleryComponent,
+    AssetPickerDialogComponent,
     ChipComponent,
     ChipComponent,
     ConfigurableInputComponent,
     ConfigurableInputComponent,
     CurrencyInputComponent,
     CurrencyInputComponent,
@@ -120,6 +123,9 @@ const DECLARATIONS = [
     HasPermissionPipe,
     HasPermissionPipe,
     ActionBarItemsComponent,
     ActionBarItemsComponent,
     DisabledDirective,
     DisabledDirective,
+    AssetFileInputComponent,
+    AssetGalleryComponent,
+    AssetPickerDialogComponent,
 ];
 ];
 
 
 @NgModule({
 @NgModule({
@@ -134,7 +140,7 @@ const DECLARATIONS = [
         ModalService,
         ModalService,
         CanDeactivateDetailGuard,
         CanDeactivateDetailGuard,
     ],
     ],
-    entryComponents: [ModalDialogComponent, SimpleDialogComponent],
+    entryComponents: [ModalDialogComponent, SimpleDialogComponent, AssetPickerDialogComponent],
     schemas: [CUSTOM_ELEMENTS_SCHEMA],
     schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 })
 export class SharedModule {}
 export class SharedModule {}