SHIBUI-598 Fixing dependency issues

TIER · Jun 19, 2018 · e232e39 · e232e39
1 parent 527e747
commit e232e39
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 8 deletions.
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
@@ -19,6 +19,7 @@ import { NotificationModule } from './notification/notification.module';
 import { ErrorInterceptor } from './core/service/error.interceptor';
 import { NavigatorService } from './core/service/navigator.service';
 import { ContentionModule } from './contention/contention.module';
+import { SharedModule } from './shared/shared.module';
 
 @NgModule({
     declarations: [
@@ -39,7 +40,8 @@ import { ContentionModule } from './contention/contention.module';
         NgbPaginationModule.forRoot(),
         NotificationModule,
         HttpClientModule,
-        ContentionModule
+        ContentionModule,
+        SharedModule
     ],
     providers: [
         NavigatorService,

diff --git a/ui/src/app/contention/contention.module.ts b/ui/src/app/contention/contention.module.ts
@@ -8,6 +8,7 @@ import { ContentionEffects } from './effect/contention.effect';
 import { ContentionDialogComponent } from './component/contention-dialog.component';
 import { ChangeItemComponent } from './component/change-item.component';
 import { ContentionService } from './service/contention.service';
+import { SharedModule } from '../shared/shared.module';
 
 export const COMPONENTS = [
     ContentionDialogComponent,
@@ -17,6 +18,7 @@ export const COMPONENTS = [
 @NgModule({
     imports: [
         CommonModule,
+        SharedModule,
         StoreModule.forFeature('contention', reducers),
         EffectsModule.forFeature([ContentionEffects])
     ],

diff --git a/ui/src/app/metadata/domain/domain.module.ts b/ui/src/app/metadata/domain/domain.module.ts
@@ -11,14 +11,12 @@ import { EntityDraftService } from './service/draft.service';
 
 import { MetadataProviderService } from './service/provider.service';
 import { EntityEffects } from './effect/entity.effect';
-import { I18nTextComponent } from './component/i18n-text.component';
 import { PreviewDialogComponent } from './component/preview-dialog.component';
 
 export const COMPONENTS = [];
 
 export const DECLARATIONS = [
     ...COMPONENTS,
-    I18nTextComponent,
     PreviewDialogComponent
 ];
 

diff --git a/ui/src/app/metadata/manager/manager.module.ts b/ui/src/app/metadata/manager/manager.module.ts
@@ -28,7 +28,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
     ],
     imports: [
         RouterModule.forChild([
-            { path: '', component: ManagerComponent }
+            { path: 'manager', component: ManagerComponent }
         ]),
         StoreModule.forFeature('manager', reducers),
         EffectsModule.forFeature([SearchEffects]),

diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts
@@ -12,7 +12,7 @@ import { reducers } from './metadata.reducer';
     imports: [
         ResolverModule,
         FilterModule,
-        DomainModule,
+        DomainModule.forRoot(),
         StoreModule.forFeature('metadata', reducers),
         RouterModule.forChild([
             { path: '', component: MetadataPageComponent }

diff --git a/ui/src/app/metadata/resolver/resolver.module.ts b/ui/src/app/metadata/resolver/resolver.module.ts
@@ -5,6 +5,7 @@ import { HttpClientModule } from '@angular/common/http';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { NewResolverComponent } from './container/new-resolver.component';
 
@@ -51,7 +52,8 @@ import { EditorEffects } from './effect/editor.effect';
         RouterModule,
         ReactiveFormsModule,
         FormsModule,
-        ProviderEditorFormModule
+        ProviderEditorFormModule,
+        NgbDropdownModule
     ],
     exports: [
         ProviderEditorFormModule,

diff --git a/...domain/component/i18n-text.component.html → ...shared/component/i18n-text.component.html b/...domain/component/i18n-text.component.html → ...shared/component/i18n-text.component.html
diff --git a/...a/domain/component/i18n-text.component.ts → ...p/shared/component/i18n-text.component.ts b/...a/domain/component/i18n-text.component.ts → ...p/shared/component/i18n-text.component.ts
diff --git a/.../component/valid-form-icon.component.html → .../component/valid-form-icon.component.html b/.../component/valid-form-icon.component.html → .../component/valid-form-icon.component.html
diff --git a/...er/component/valid-form-icon.component.ts → ...ed/component/valid-form-icon.component.ts b/...er/component/valid-form-icon.component.ts → ...ed/component/valid-form-icon.component.ts
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
@@ -5,6 +5,8 @@ import { HighlightPipe } from './pipe/highlight.pipe';
 import { AutoCompleteComponent } from './autocomplete/autocomplete.component';
 import { ValidationClassDirective } from './validation/validation-class.directive';
 import { InputDefaultsDirective } from './directive/input-defaults.directive';
+import { I18nTextComponent } from './component/i18n-text.component';
+import { ValidFormIconComponent } from './component/valid-form-icon.component';
 
 @NgModule({
     imports: [
@@ -16,15 +18,19 @@ import { InputDefaultsDirective } from './directive/input-defaults.directive';
         HighlightPipe,
         AutoCompleteComponent,
         ValidationClassDirective,
-        InputDefaultsDirective
+        InputDefaultsDirective,
+        I18nTextComponent,
+        ValidFormIconComponent
     ],
     exports: [
         HighlightPipe,
         AutoCompleteComponent,
         CommonModule,
         ReactiveFormsModule,
         FormsModule,
-        InputDefaultsDirective
+        InputDefaultsDirective,
+        I18nTextComponent,
+        ValidFormIconComponent
     ]
 })
 export class SharedModule { }