Create policy module 94/5694/2
authorelinuxhenrik <henrik.b.andersson@est.tech>
Wed, 24 Feb 2021 16:09:47 +0000 (17:09 +0100)
committerelinuxhenrik <henrik.b.andersson@est.tech>
Thu, 25 Feb 2021 13:37:15 +0000 (14:37 +0100)
Change-Id: Ic9deb46d254c0d83104db9f1c5c765a14f6ce82a
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Issue-ID: NONRTRIC-451

25 files changed:
webapp-frontend/src/app/app-routing.module.ts
webapp-frontend/src/app/app.module.ts
webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.html [moved from webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.html with 100% similarity]
webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.scss [moved from webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.scss with 100% similarity]
webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.spec.ts [moved from webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.spec.ts with 97% similarity]
webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.ts [moved from webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts with 92% similarity]
webapp-frontend/src/app/policy/policy-card/policy-card.component.html [moved from webapp-frontend/src/app/ui/policy-card/policy-card.component.html with 100% similarity]
webapp-frontend/src/app/policy/policy-card/policy-card.component.scss [moved from webapp-frontend/src/app/ui/policy-card/policy-card.component.scss with 100% similarity]
webapp-frontend/src/app/policy/policy-card/policy-card.component.spec.ts [moved from webapp-frontend/src/app/ui/policy-card/policy-card.component.spec.ts with 100% similarity]
webapp-frontend/src/app/policy/policy-card/policy-card.component.ts [moved from webapp-frontend/src/app/ui/policy-card/policy-card.component.ts with 95% similarity]
webapp-frontend/src/app/policy/policy-control.component.html [moved from webapp-frontend/src/app/policy-control/policy-control.component.html with 100% similarity]
webapp-frontend/src/app/policy/policy-control.component.scss [moved from webapp-frontend/src/app/policy-control/policy-control.component.scss with 100% similarity]
webapp-frontend/src/app/policy/policy-control.component.spec.ts [moved from webapp-frontend/src/app/policy-control/policy-control.component.spec.ts with 97% similarity]
webapp-frontend/src/app/policy/policy-control.component.ts [moved from webapp-frontend/src/app/policy-control/policy-control.component.ts with 95% similarity]
webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.html [moved from webapp-frontend/src/app/policy-control/policy-instance-dialog.component.html with 100% similarity]
webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.scss [moved from webapp-frontend/src/app/policy-control/policy-instance-dialog.component.scss with 100% similarity]
webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts [moved from webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts with 95% similarity]
webapp-frontend/src/app/policy/policy-instance/policy-instance.component.html [moved from webapp-frontend/src/app/policy-control/policy-instance.component.html with 100% similarity]
webapp-frontend/src/app/policy/policy-instance/policy-instance.component.scss [moved from webapp-frontend/src/app/policy-control/policy-instance.component.scss with 100% similarity]
webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts [moved from webapp-frontend/src/app/policy-control/policy-instance.component.ts with 86% similarity]
webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts [moved from webapp-frontend/src/app/policy-control/policy-instance.datasource.ts with 94% similarity]
webapp-frontend/src/app/policy/policy-type/policy-type.datasource.spec.ts [moved from webapp-frontend/src/app/policy-control/policy-type.datasource.spec.ts with 95% similarity]
webapp-frontend/src/app/policy/policy-type/policy-type.datasource.ts [moved from webapp-frontend/src/app/policy-control/policy-type.datasource.ts with 95% similarity]
webapp-frontend/src/app/policy/policy.module.ts [new file with mode: 0644]
webapp-frontend/src/app/ui/ei-card/ei-card.component.ts

index f94d4e4..5881dc7 100644 (file)
@@ -22,7 +22,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { Routes, RouterModule } from '@angular/router';
 import { MainComponent } from './main/main.component';
-import { PolicyControlComponent } from './policy-control/policy-control.component';
+import { PolicyControlComponent } from './policy/policy-control.component';
 import { EICoordinatorComponent } from './ei-coordinator/ei-coordinator.component';
 
 
index ecd0e42..be4e434 100644 (file)
@@ -56,11 +56,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
 import { FooterComponent } from './footer/footer.component';
 import { MainComponent } from './main/main.component';
 import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
-import { NoTypePolicyInstanceDialogComponent } from './policy-control/no-type-policy-instance-dialog.component';
-import { PolicyCardComponent } from './ui/policy-card/policy-card.component';
-import { PolicyControlComponent } from './policy-control/policy-control.component';
-import { PolicyInstanceComponent } from './policy-control/policy-instance.component';
-import { PolicyInstanceDialogComponent } from './policy-control/policy-instance-dialog.component';
+import { PolicyModule } from './policy/policy.module'
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component';
@@ -85,11 +81,6 @@ export const isMock = environment.mock;
     FooterComponent,
     MainComponent,
     NodeModulesComponent,
-    NoTypePolicyInstanceDialogComponent,
-    PolicyCardComponent,
-    PolicyControlComponent,
-    PolicyInstanceComponent,
-    PolicyInstanceDialogComponent,
     SidenavListComponent,
   ],
   imports: [
@@ -124,6 +115,7 @@ export const isMock = environment.mock;
     MatToolbarModule,
     MaterialDesignFrameworkModule,
     MDBBootstrapModule.forRoot(),
+    PolicyModule,
     ReactiveFormsModule,
     ToastrModule.forRoot(),
   ],
@@ -148,8 +140,6 @@ export const isMock = environment.mock;
   entryComponents: [
     ConfirmDialogComponent,
     ErrorDialogComponent,
-    NoTypePolicyInstanceDialogComponent,
-    PolicyInstanceDialogComponent
   ],
   providers: [
     CookieService,
@@ -33,11 +33,11 @@ import { ReactiveFormsModule } from "@angular/forms";
 import { TestbedHarnessEnvironment } from "@angular/cdk/testing/testbed";
 import { ToastrModule } from "ngx-toastr";
 
-import { PolicyService } from "../services/policy/policy.service";
-import { ErrorDialogService } from "../services/ui/error-dialog.service";
-import { UiService } from "../services/ui/ui.service";
+import { PolicyService } from "../../services/policy/policy.service";
+import { ErrorDialogService } from "../../services/ui/error-dialog.service";
+import { UiService } from "../../services/ui/ui.service";
 import { NoTypePolicyInstanceDialogComponent } from "./no-type-policy-instance-dialog.component";
-import { Ric } from "../interfaces/ric";
+import { Ric } from "../../interfaces/ric";
 
 describe('NoTypePolicyInstanceDialogComponent', () => {
   let component: NoTypePolicyInstanceDialogComponent;
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { PolicyService } from '../services/policy/policy.service';
-import { NotificationService } from '../services/ui/notification.service';
-import { UiService } from '../services/ui/ui.service';
+import { PolicyService } from '../../services/policy/policy.service';
+import { NotificationService } from '../../services/ui/notification.service';
+import { UiService } from '../../services/ui/ui.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { ErrorDialogService } from '../services/ui/error-dialog.service';
+import { ErrorDialogService } from '../../services/ui/error-dialog.service';
 import * as uuid from 'uuid';
-import { Rics } from '../interfaces/ric';
-import { CreatePolicyInstance } from '../interfaces/policy.types';
+import { Rics } from '../../interfaces/ric';
+import { CreatePolicyInstance } from '../../interfaces/policy.types';
 
 @Component({
   selector: 'nrcp-no-type-policy-instance-dialog',
@@ -38,9 +38,4 @@ export class PolicyCardComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() { }
-
-  openDetails() {
-    this.router.navigateByUrl('../../policy');
-  }
-
 }
@@ -27,7 +27,7 @@ import { of } from 'rxjs';
 
 import { NotificationService } from '../services/ui/notification.service';
 import { PolicyControlComponent } from './policy-control.component';
-import { PolicyTypeDataSource } from './policy-type.datasource';
+import { PolicyTypeDataSource } from './policy-type/policy-type.datasource';
 import { UiService } from '../services/ui/ui.service';
 import { PolicyTypeSchema } from '../interfaces/policy.types';
 
@@ -23,11 +23,11 @@ import { MatDialog } from '@angular/material/dialog';
 
 import { BehaviorSubject, Observable } from 'rxjs';
 
-import { NoTypePolicyInstanceDialogComponent } from './no-type-policy-instance-dialog.component';
+import { NoTypePolicyInstanceDialogComponent } from './no-type-policy-instance-dialog/no-type-policy-instance-dialog.component';
 import { PolicyTypeSchema } from '../interfaces/policy.types';
-import { PolicyTypeDataSource } from './policy-type.datasource';
-import { getPolicyDialogProperties } from './policy-instance-dialog.component';
-import { PolicyInstanceDialogComponent } from './policy-instance-dialog.component';
+import { PolicyTypeDataSource } from './policy-type/policy-type.datasource';
+import { getPolicyDialogProperties } from './policy-instance-dialog/policy-instance-dialog.component';
+import { PolicyInstanceDialogComponent } from './policy-instance-dialog/policy-instance-dialog.component';
 import { UiService } from '../services/ui/ui.service';
 
 class PolicyTypeInfo {
@@ -23,15 +23,15 @@ import { MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA } from '@angular/materia
 import { MatMenuTrigger } from '@angular/material/menu';
 import { JsonPointer } from 'angular6-json-schema-form';
 import * as uuid from 'uuid';
-import { CreatePolicyInstance, PolicyInstance, PolicyTypeSchema } from '../interfaces/policy.types';
-import { PolicyService } from '../services/policy/policy.service';
-import { ErrorDialogService } from '../services/ui/error-dialog.service';
-import { NotificationService } from './../services/ui/notification.service';
-import { UiService } from '../services/ui/ui.service';
+import { CreatePolicyInstance, PolicyInstance, PolicyTypeSchema } from '../../interfaces/policy.types';
+import { PolicyService } from '../../services/policy/policy.service';
+import { ErrorDialogService } from '../../services/ui/error-dialog.service';
+import { NotificationService } from './../../services/ui/notification.service';
+import { UiService } from '../../services/ui/ui.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { ChangeDetectorRef } from '@angular/core';
-import { Ric, Rics } from '../interfaces/ric';
+import { Ric, Rics } from '../../interfaces/ric';
 
 
 @Component({
 import { MatSort } from '@angular/material/sort';
 import { Component, OnInit, ViewChild, Input, AfterViewInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { PolicyTypeSchema } from '../interfaces/policy.types';
+import { PolicyTypeSchema } from '../../interfaces/policy.types';
 import { PolicyInstanceDataSource } from './policy-instance.datasource';
-import { ErrorDialogService } from '../services/ui/error-dialog.service';
-import { NotificationService } from '../services/ui/notification.service';
-import { PolicyService } from '../services/policy/policy.service';
-import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
-import { PolicyInstance } from '../interfaces/policy.types';
-import { NoTypePolicyInstanceDialogComponent } from './no-type-policy-instance-dialog.component';
-import { PolicyInstanceDialogComponent } from './policy-instance-dialog.component';
-import { getPolicyDialogProperties } from './policy-instance-dialog.component';
+import { ErrorDialogService } from '../../services/ui/error-dialog.service';
+import { NotificationService } from '../../services/ui/notification.service';
+import { PolicyService } from '../../services/policy/policy.service';
+import { ConfirmDialogService } from '../../services/ui/confirm-dialog.service';
+import { PolicyInstance } from '../../interfaces/policy.types';
+import { NoTypePolicyInstanceDialogComponent } from '../no-type-policy-instance-dialog/no-type-policy-instance-dialog.component';
+import { PolicyInstanceDialogComponent } from '../policy-instance-dialog/policy-instance-dialog.component';
+import { getPolicyDialogProperties } from '../policy-instance-dialog/policy-instance-dialog.component';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { UiService } from '../services/ui/ui.service';
+import { UiService } from '../../services/ui/ui.service';
 
 @Component({
     selector: 'nrcp-policy-instance',
@@ -26,9 +26,9 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { merge } from 'rxjs';
 import { of } from 'rxjs/observable/of';
 import { catchError, finalize, map } from 'rxjs/operators';
-import { PolicyInstance, PolicyTypeSchema } from '../interfaces/policy.types';
-import { PolicyService } from '../services/policy/policy.service';
-import { NotificationService } from '../services/ui/notification.service';
+import { PolicyInstance, PolicyTypeSchema } from '../../interfaces/policy.types';
+import { PolicyService } from '../../services/policy/policy.service';
+import { NotificationService } from '../../services/ui/notification.service';
 
 export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
 
@@ -22,8 +22,8 @@ import { TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of } from 'rxjs';
 import { ToastrModule } from 'ngx-toastr';
 import { PolicyTypeDataSource } from './policy-type.datasource';
-import { PolicyService } from '../services/policy/policy.service';
-import { PolicyTypeSchema } from '../interfaces/policy.types';
+import { PolicyService } from '../../services/policy/policy.service';
+import { PolicyTypeSchema } from '../../interfaces/policy.types';
 
 describe('PolicyTypeDataSource', () => {
   let policyTypeDataSource: PolicyTypeDataSource;
@@ -24,8 +24,8 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { of } from 'rxjs/observable/of';
 import { Observable } from 'rxjs/Observable';
 
-import { PolicyType, PolicyTypes, PolicyTypeSchema } from '../interfaces/policy.types';
-import { PolicyService } from '../services/policy/policy.service';
+import { PolicyType, PolicyTypes, PolicyTypeSchema } from '../../interfaces/policy.types';
+import { PolicyService } from '../../services/policy/policy.service';
 
 @Injectable({
     providedIn: 'root'
diff --git a/webapp-frontend/src/app/policy/policy.module.ts b/webapp-frontend/src/app/policy/policy.module.ts
new file mode 100644 (file)
index 0000000..f7a41dc
--- /dev/null
@@ -0,0 +1,82 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { MatTableModule } from '@angular/material/table';
+import { PolicyCardComponent } from './policy-card/policy-card.component';
+import { PolicyControlComponent } from './policy-control.component';
+import { NoTypePolicyInstanceDialogComponent } from './no-type-policy-instance-dialog/no-type-policy-instance-dialog.component';
+import { PolicyInstanceDialogComponent } from './policy-instance-dialog/policy-instance-dialog.component';
+import { PolicyInstanceComponent } from './policy-instance/policy-instance.component';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatIconModule } from '@angular/material/icon';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MatButtonToggleModule } from '@angular/material/button-toggle';
+import { MatCardModule } from '@angular/material/card';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatExpansionModule } from '@angular/material/expansion';
+import { MatGridListModule } from '@angular/material/grid-list';
+import { MatInputModule } from '@angular/material/input';
+import { MatListModule } from '@angular/material/list';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatPaginatorModule } from '@angular/material/paginator';
+import { MatSelectModule } from '@angular/material/select';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatSliderModule } from '@angular/material/slider';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatSortModule } from '@angular/material/sort';
+import { MatTabsModule } from '@angular/material/tabs';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { Routes, RouterModule } from '@angular/router';
+
+const routes:Routes = [
+  {path: 'policy', component: PolicyControlComponent}
+];
+
+@NgModule({
+  declarations: [
+    NoTypePolicyInstanceDialogComponent,
+    PolicyCardComponent,
+    PolicyControlComponent,
+    PolicyInstanceComponent,
+    PolicyInstanceDialogComponent,
+  ],
+  imports: [
+    CommonModule,
+    FlexLayoutModule,
+    FormsModule,
+    MatButtonModule,
+    MatButtonToggleModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatDialogModule,
+    MatExpansionModule,
+    MatFormFieldModule,
+    MatGridListModule,
+    MatIconModule,
+    MatInputModule,
+    MatListModule,
+    MatMenuModule,
+    MatPaginatorModule,
+    MatSelectModule,
+    MatSidenavModule,
+    MatSliderModule,
+    MatSlideToggleModule,
+    MatSnackBarModule,
+    MatSortModule,
+    MatTableModule,
+    MatTabsModule,
+    MatToolbarModule,
+    MaterialDesignFrameworkModule,
+    ReactiveFormsModule,
+    RouterModule.forChild(routes)
+  ],
+  exports: [
+    PolicyCardComponent,
+    PolicyControlComponent
+  ],
+})
+export class PolicyModule { }
index 273e09f..57d24d9 100644 (file)
@@ -38,9 +38,4 @@ export class EICardComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() { }
-
-  openDetails() {
-    this.router.navigateByUrl('../../ei-coordinator');
-  }
-
 }