From 3caae651141afb8f90a3e7d468b26bb3f3765f7e Mon Sep 17 00:00:00 2001
From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Fri, 5 Mar 2021 16:16:25 +0100
Subject: [PATCH] Clean up and add license headings

Change-Id: Id2b4a202879119568b796f1d8100a4694961fba7
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Issue-ID: NONRTRIC-457
---
 webapp-frontend/src/app/app.module.ts              |  2 --
 .../app/node-modules/node-modules.component.html   |  1 -
 .../app/node-modules/node-modules.component.scss   |  0
 .../node-modules/node-modules.component.spec.ts    | 25 ----------------------
 .../src/app/node-modules/node-modules.component.ts | 15 -------------
 .../no-type-policy-editor.component.html           | 22 +++++++++++++++++++
 .../no-type-policy-editor.component.scss           | 20 +++++++++++++++++
 .../no-type-policy-editor.component.spec.ts        |  1 -
 .../no-type-policy-editor.component.ts             |  1 -
 ...o-type-policy-instance-dialog.component.spec.ts |  7 +-----
 .../policy-instance-dialog.component.ts            |  3 ---
 .../policy-instance/policy-instance.component.ts   |  2 +-
 .../policy-instance/policy-instance.datasource.ts  |  6 +-----
 .../ric-selector/ric-selector.component.html       | 22 +++++++++++++++++++
 .../ric-selector/ric-selector.component.scss       | 20 +++++++++++++++++
 .../ric-selector/ric-selector.component.spec.ts    |  1 -
 .../policy/ric-selector/ric-selector.component.ts  |  3 +--
 .../src/app/services/policy/policy.service.ts      |  4 +---
 webapp-frontend/src/styles.css                     | 22 +++++++++++++++++++
 19 files changed, 111 insertions(+), 66 deletions(-)
 delete mode 100644 webapp-frontend/src/app/node-modules/node-modules.component.html
 delete mode 100644 webapp-frontend/src/app/node-modules/node-modules.component.scss
 delete mode 100644 webapp-frontend/src/app/node-modules/node-modules.component.spec.ts
 delete mode 100644 webapp-frontend/src/app/node-modules/node-modules.component.ts

diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index ecb20bd..e84cf6b 100644
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -63,7 +63,6 @@ import { AppRoutingModule } from './app-routing.module';
 import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component';
 import { UiService } from './services/ui/ui.service';
 import { CookieService } from 'ngx-cookie-service';
-import { NodeModulesComponent } from './node-modules/node-modules.component';
 import { HttpMockRequestInterceptor } from './interceptor.mock';
 import { environment } from 'src/environments/environment';
 import { HttpRequestInterceptor } from './interceptor';
@@ -77,7 +76,6 @@ export const isMock = environment.mock;
     ErrorDialogComponent,
     FooterComponent,
     MainComponent,
-    NodeModulesComponent,
     SidenavListComponent,
   ],
   imports: [
diff --git a/webapp-frontend/src/app/node-modules/node-modules.component.html b/webapp-frontend/src/app/node-modules/node-modules.component.html
deleted file mode 100644
index a1950bc..0000000
--- a/webapp-frontend/src/app/node-modules/node-modules.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>node-modules works!</p>
diff --git a/webapp-frontend/src/app/node-modules/node-modules.component.scss b/webapp-frontend/src/app/node-modules/node-modules.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp-frontend/src/app/node-modules/node-modules.component.spec.ts b/webapp-frontend/src/app/node-modules/node-modules.component.spec.ts
deleted file mode 100644
index ea620d9..0000000
--- a/webapp-frontend/src/app/node-modules/node-modules.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NodeModulesComponent } from './node-modules.component';
-
-describe('NodeModulesComponent', () => {
-  let component: NodeModulesComponent;
-  let fixture: ComponentFixture<NodeModulesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ NodeModulesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NodeModulesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/webapp-frontend/src/app/node-modules/node-modules.component.ts b/webapp-frontend/src/app/node-modules/node-modules.component.ts
deleted file mode 100644
index 5a3cfb4..0000000
--- a/webapp-frontend/src/app/node-modules/node-modules.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'nrcp-node-modules',
-  templateUrl: './node-modules.component.html',
-  styleUrls: ['./node-modules.component.scss']
-})
-export class NodeModulesComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.html b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.html
index 0be8837..9a2112e 100644
--- a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.html
+++ b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.html
@@ -1,3 +1,25 @@
+<!--
+ -
+   ========================LICENSE_START=================================
+   O-RAN-SC
+   %%
+   Copyright (C) 2021: Nordix Foundation
+   %%
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ========================LICENSE_END===================================
+  /
+-->
+
 <mat-form-field style="width: 800px;"  appearance="fill">
     <textarea id="policyJsonTextArea" formControlName="policyJsonTextArea" matInput cdkTextareaAutosize
         cdkAutosizeMinRows="10" required [value]="this.policyJson" placeholder="Policy properties"
diff --git a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.scss b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.scss
index e69de29..0048316 100644
--- a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.scss
+++ b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.scss
@@ -0,0 +1,20 @@
+// -
+//   ========================LICENSE_START=================================
+//   O-RAN-SC
+//   %%
+//   Copyright (C) 2021: Nordix Foundation
+//   %%
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//   ========================LICENSE_END===================================
+//
+
diff --git a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.spec.ts b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.spec.ts
index 77477ed..529caee 100644
--- a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.spec.ts
+++ b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.spec.ts
@@ -16,7 +16,6 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 //   ========================LICENSE_END===================================
-//  /
 //
 
 import { HarnessLoader } from '@angular/cdk/testing';
diff --git a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts
index f167ada..8d2294c 100644
--- a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts
+++ b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts
@@ -17,7 +17,6 @@
 //   limitations under the License.
 //   ========================LICENSE_END===================================
 //  /
-//
 
 import { Component, Input, OnInit } from '@angular/core';
 import { AbstractControl, ControlContainer, FormBuilder, FormControl, FormGroup, FormGroupDirective, ValidatorFn, Validators } from '@angular/forms';
diff --git a/webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.spec.ts b/webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.spec.ts
index 2e62f57..0c3853d 100644
--- a/webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.spec.ts
+++ b/webapp-frontend/src/app/policy/no-type-policy-instance-dialog/no-type-policy-instance-dialog.component.spec.ts
@@ -25,11 +25,8 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatButtonHarness } from '@angular/material/button/testing';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSelectModule } from '@angular/material/select';
-import { MatSelectHarness } from '@angular/material/select/testing';
 import { MatInputModule } from '@angular/material/input';
-import { MatInputHarness } from '@angular/material/input/testing';
-import { of } from "rxjs/observable/of";
-import { FormControl, ReactiveFormsModule } from "@angular/forms";
+import { ReactiveFormsModule } from "@angular/forms";
 import { TestbedHarnessEnvironment } from "@angular/cdk/testing/testbed";
 import { ToastrModule } from "ngx-toastr";
 
@@ -37,8 +34,6 @@ 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 { RicSelectorComponent } from "../ric-selector/ric-selector.component";
-import { NoTypePolicyEditorComponent } from "../no-type-policy-editor/no-type-policy-editor.component";
 
 describe('NoTypePolicyInstanceDialogComponent', () => {
   let component: NoTypePolicyInstanceDialogComponent;
diff --git a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
index a703634..a2bd7a5 100644
--- a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
+++ b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
@@ -20,7 +20,6 @@
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { AfterViewInit, Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-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';
@@ -80,8 +79,6 @@ export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
     formValidationErrors: any;
     formIsValid = false;
 
-    @ViewChild(MatMenuTrigger, { static: true }) menuTrigger: MatMenuTrigger;
-
     policyInstanceId: string; // null if not yet created
     policyTypeName: string;
     darkMode: boolean;
diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
index 540bfc8..95313d0 100644
--- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
+++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
@@ -59,7 +59,7 @@ export class PolicyInstanceComponent implements OnInit, AfterViewInit {
     }
 
     ngOnInit() {
-        this.instanceDataSource = new PolicyInstanceDataSource(this.policySvc, this.sort, this.notificationService, this.policyTypeSchema);
+        this.instanceDataSource = new PolicyInstanceDataSource(this.policySvc, this.sort, this.policyTypeSchema);
         this.expanded.subscribe((isExpanded: boolean) => this.onExpand(isExpanded));
         this.ui.darkModeState.subscribe((isDark) => {
             this.darkMode = isDark;
diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
index 4b58e42..03a156d 100644
--- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
+++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
@@ -19,16 +19,13 @@
  */
 
 import { DataSource } from '@angular/cdk/collections';
-import { HttpErrorResponse } from '@angular/common/http';
 import { MatSort } from '@angular/material/sort';
 import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { merge } from 'rxjs';
-import { of } from 'rxjs/observable/of';
-import { catchError, finalize, map } from 'rxjs/operators';
+import { 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';
 
 export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
 
@@ -45,7 +42,6 @@ export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
     constructor(
         private policySvc: PolicyService,
         public sort: MatSort,
-        private notificationService: NotificationService,
         private policyTypeSchema: PolicyTypeSchema) {
         super();
     }
diff --git a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.html b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.html
index 1299058..13d1ec0 100644
--- a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.html
+++ b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.html
@@ -1,3 +1,25 @@
+<!--
+ -
+   ========================LICENSE_START=================================
+   O-RAN-SC
+   %%
+   Copyright (C) 2021: Nordix Foundation
+   %%
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ========================LICENSE_END===================================
+  /
+-->
+
 <mat-form-field appearance="fill">
     <mat-select id="ricSelector" formControlName="ricSelector" matInput required
         placeholder="Target" matTooltip="Element where the policy instance resides, e.g. a gNodeB or Near-RT RIC">
diff --git a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.scss b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.scss
index e69de29..0048316 100644
--- a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.scss
+++ b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.scss
@@ -0,0 +1,20 @@
+// -
+//   ========================LICENSE_START=================================
+//   O-RAN-SC
+//   %%
+//   Copyright (C) 2021: Nordix Foundation
+//   %%
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//   ========================LICENSE_END===================================
+//
+
diff --git a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts
index ab75c5e..f452fb5 100644
--- a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts
+++ b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.spec.ts
@@ -16,7 +16,6 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 //   ========================LICENSE_END===================================
-//  /
 //
 
 import { HarnessLoader } from '@angular/cdk/testing';
diff --git a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts
index d4b50c0..e0ba87e 100644
--- a/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts
+++ b/webapp-frontend/src/app/policy/ric-selector/ric-selector.component.ts
@@ -17,11 +17,10 @@
 //   limitations under the License.
 //   ========================LICENSE_END===================================
 //  /
-//
 
 import { Component, Input, OnInit } from '@angular/core';
 import { AbstractControl, ControlContainer, FormBuilder, FormControl, FormGroup, FormGroupDirective, Validators } from '@angular/forms';
-import { Ric, Rics } from 'src/app/interfaces/ric';
+import { Rics } from 'src/app/interfaces/ric';
 import { PolicyService } from 'src/app/services/policy/policy.service';
 
 @Component({
diff --git a/webapp-frontend/src/app/services/policy/policy.service.ts b/webapp-frontend/src/app/services/policy/policy.service.ts
index 72375e8..2e7273f 100644
--- a/webapp-frontend/src/app/services/policy/policy.service.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.ts
@@ -21,10 +21,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { CreatePolicyInstance, PolicyInstance, PolicyInstanceAck, PolicyInstances, PolicyStatus, PolicyType, PolicyTypes } from '../../interfaces/policy.types';
-import { ControlpanelSuccessTransport } from '../../interfaces/controlpanel.types';
-import { Ric, Rics } from 'src/app/interfaces/ric';
+import { Rics } from 'src/app/interfaces/ric';
 
 /**
  * Services for calling the policy endpoints.
diff --git a/webapp-frontend/src/styles.css b/webapp-frontend/src/styles.css
index e69de29..8a26e00 100644
--- a/webapp-frontend/src/styles.css
+++ b/webapp-frontend/src/styles.css
@@ -0,0 +1,22 @@
+/**
+ * -
+ *   ========================LICENSE_START=================================
+ *   O-RAN-SC
+ *   %%
+ *   Copyright (C) 2021: Nordix Foundation
+ *   %%
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *   ========================LICENSE_END===================================
+ *
+ */
+
-- 
2.16.6