From 45e7f20d7c629ba766cef9270c753b1c526e91e6 Mon Sep 17 00:00:00 2001
From: Sudarshan Kumar <sudarshan.kumar@att.com>
Date: Mon, 2 Mar 2020 15:03:03 +0530
Subject: Chnages made for rdp-data-table layout fix

Chnages made for rdp-data-table layout fix and modified pom files

Issue-ID: PORTAL-836
Change-Id: I42f0d0ed188a19e42e14ad56250a1e904b92827f
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>
---
 .gitignore                                         |   2 +-
 ecomp-sdk/epsdk-aaf/pom.xml                        |   5 ++
 ecomp-sdk/epsdk-analytics/pom.xml                  |  20 +++++++
 ecomp-sdk/epsdk-core/pom.xml                       |  54 ++++++++++++++++++
 ecomp-sdk/pom.xml                                  |   5 +-
 .../portalsdk-tag-lib-test-app/package-lock.json   |   2 +-
 .../portalsdk-tag-lib-0.0.1.tgz                    | Bin 315349 -> 344394 bytes
 .../rdp-input-editor.component.scss                |  40 ++++++++++++-
 .../rdp-input-editor/rdp-input-editor.component.ts |  38 +++++++++++++
 .../rdp-select-editor.component.ts                 |  53 +++++++++++++++--
 .../rdp-data-table-edit.component.html             |  25 ++++----
 .../rdp-data-table-edit.component.scss             |  63 +++++++++++++++++++++
 12 files changed, 284 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20a07442..d52d74e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@ ecomp-sdk/*/null*
 ecomp-sdk/*/jacoco.exec
 ecomp-sdk/*/target
 .settings
-target/*
+ecomp-sdk/target/*
 test*.txt
diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml
index d2cb0c5e..34b0c7b7 100644
--- a/ecomp-sdk/epsdk-aaf/pom.xml
+++ b/ecomp-sdk/epsdk-aaf/pom.xml
@@ -136,6 +136,11 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>2.6.3</version>
 		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.3</version>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<!-- disable doclint, a new feature in Java 8, when generating javadoc -->
diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml
index 96bdd186..48c67c67 100644
--- a/ecomp-sdk/epsdk-analytics/pom.xml
+++ b/ecomp-sdk/epsdk-analytics/pom.xml
@@ -17,6 +17,26 @@
 	<url>https://wiki.onap.org/display/DW/Portal</url>
 
 	<!-- properties are inherited from parent -->
+	<build>
+	<plugins>
+		<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+				<configuration>
+					<skipTests>${skiptests}</skipTests>
+					<includes>
+						<include>**/Test*.java</include>
+						<include>**/*Test.java</include>
+						<include>**/*TestCase.java</include>
+					</includes>
+					<systemPropertyVariables>
+						<container.classpath>classpath:</container.classpath>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+	</plugins>
+	</build>
 
 	<!-- repositories are inherited from parent -->
 	<dependencies>
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 1e8bca6a..bf6e1764 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -43,6 +43,60 @@
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
+			
+			      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.onap.oparent</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>2.0.0</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>onap-license</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <configLocation>onap-checkstyle/check-license.xml</configLocation>
+              <includeResources>false</includeResources>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <includeTestResources>false</includeTestResources>
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <excludes>
+              </excludes>
+              <consoleOutput>true</consoleOutput>
+              <failsOnViolation>false</failsOnViolation>
+            </configuration>
+          </execution>
+          <execution>
+            <id>onap-java-style</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>none</phase>
+            <configuration>
+              <!-- Use Google Java Style Guide:
+                   https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                   with minor changes -->
+              <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+              <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
+              <sourceDirectory>src</sourceDirectory>
+              <includeResources>true</includeResources>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <includeTestResources>true</includeTestResources>
+              <excludes>
+              </excludes>
+              <consoleOutput>true</consoleOutput>
+              <failsOnViolation>false</failsOnViolation>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
 		</plugins>
 	</build>
diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index a5d1cfc7..b5f59ada 100644
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.2.0</version>
+		<version>2.0.0</version>
 		<relativePath/>
 	</parent>
 
@@ -125,7 +125,7 @@
 		<pluginManagement>
 			<plugins>
 				<!-- Silence Eclipse/m2e complaints about checkstyle plugin brought in 
-					by OParent -->
+					by OParent 
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -150,6 +150,7 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
+				-->
 				<!-- maven-site-plugin config is provided by OParent -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
diff --git a/ecomp-sdk/portalsdk-tag-lib-test-app/package-lock.json b/ecomp-sdk/portalsdk-tag-lib-test-app/package-lock.json
index 9bc7bc01..780e6580 100644
--- a/ecomp-sdk/portalsdk-tag-lib-test-app/package-lock.json
+++ b/ecomp-sdk/portalsdk-tag-lib-test-app/package-lock.json
@@ -8235,7 +8235,7 @@
     },
     "portalsdk-tag-lib": {
       "version": "file:portalsdk-tag-lib-0.0.1.tgz",
-      "integrity": "sha512-O3yOgsgD0OnvfWF8sM/kW27YdCu7HRUqhGXJOMEhKJY04RAGVHsjTkl2bEfaGu/n79GHYG8W3X1rqgHhV8OhzA==",
+      "integrity": "sha512-iqr81BSaZSC+ids5jIxDwvspC/yEKMX2PlTMoFAy0mvI/tcAeKUvSKgsFadqPRHBPbTbtXFDDpn22ZxgTtyc9Q==",
       "requires": {
         "tslib": "^1.9.0"
       }
diff --git a/ecomp-sdk/portalsdk-tag-lib-test-app/portalsdk-tag-lib-0.0.1.tgz b/ecomp-sdk/portalsdk-tag-lib-test-app/portalsdk-tag-lib-0.0.1.tgz
index ece29655..0bf78906 100644
Binary files a/ecomp-sdk/portalsdk-tag-lib-test-app/portalsdk-tag-lib-0.0.1.tgz and b/ecomp-sdk/portalsdk-tag-lib-test-app/portalsdk-tag-lib-0.0.1.tgz differ
diff --git a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.scss b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.scss
index 6e53e96f..64dd1d38 100644
--- a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.scss
+++ b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.scss
@@ -1,3 +1,37 @@
-.input-editor{
-    width: 31em;
-}
\ No newline at end of file
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 2020 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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============================================
+ *
+ * 
+ */
\ No newline at end of file
diff --git a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.ts b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.ts
index 31c9e9d7..ea6d1746 100644
--- a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.ts
+++ b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-input-editor/rdp-input-editor.component.ts
@@ -1,3 +1,41 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 2020 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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============================================
+ *
+ * 
+ */
+
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 
 @Component({
diff --git a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-select-editor/rdp-select-editor.component.ts b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-select-editor/rdp-select-editor.component.ts
index a657a000..5dbc037b 100644
--- a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-select-editor/rdp-select-editor.component.ts
+++ b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-cell-editor/rdp-select-editor/rdp-select-editor.component.ts
@@ -1,15 +1,56 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 2020 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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============================================
+ *
+ * 
+ */
+
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 
 @Component({
   selector: 'rdp-select-editor',
   styleUrls: ['./rdp-select-editor.component.scss'],
   template: `
-    <mat-select [(value)]="selected" 
-    (selectionChange)="detectChange(columnValue)">
-      <mat-option *ngFor="let item of data" [value]="item.name">
-      {{item.name}}
-      </mat-option>
-    </mat-select>
+  <mat-form-field>
+      <mat-label>{{columntitle | titlecase}}:</mat-label>
+      <mat-select [(value)]="selected" 
+      (selectionChange)="detectChange(columnValue)">
+        <mat-option *ngFor="let item of data" [value]="item.name">
+        {{item.name}}
+        </mat-option>
+      </mat-select>
+  </mat-form-field>    
   `
 })
 export class RdpSelectEditorComponent implements OnInit {
diff --git a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.html b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.html
index 8a967121..a0e2b01b 100644
--- a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.html
+++ b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.html
@@ -2,7 +2,7 @@
   ============LICENSE_START==========================================
   ONAP Portal- SDK
   ===================================================================
-  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
@@ -45,10 +45,10 @@
   
     <div class="modal-body">
       <!-- This is the modal body where fields has to apper with respect to their field type -->
-      <div *ngFor="let column of columnsInfoList">
-          {{column.dispalyTitle | titlecase}}
+      <div *ngFor="let column of columnsInfoList" class="elementsContainer">
           <div [ngSwitch]="column.type">
-            <div *ngSwitchCase="'text'">
+            <div *ngSwitchCase="'text'" class="groupItem">
+              <label class="item-label">{{column.dispalyTitle | titlecase}}:</label><br>
               <rdp-input-editor (changedColumnValue)="columnDataChanged($event, column.title)" 
                 rowdata="{{selectedRowData}}" 
                 columntitle="{{column.title}}" 
@@ -56,28 +56,33 @@
               >
               </rdp-input-editor>
             </div>
-            <div *ngSwitchCase="'dropdown'">
+            <div *ngSwitchCase="'dropdown'" class="groupItem">
               <rdp-select-editor (changedColumnValue)="columnDataChanged($event, column.title)"
                rowdata="{{selectedRowData}}" 
                [data]="column.listData" 
                columntitle="{{column.title}}"></rdp-select-editor>
             </div> 
-            <div *ngSwitchCase="'textarea'">
+            <div *ngSwitchCase="'textarea'" class="groupItem">
+              <label class="item-label">{{column.dispalyTitle | titlecase}}:</label><br>
               <rdp-textarea-editor rowdata="{{selectedRowData}}" columntitle="{{column.title}}"></rdp-textarea-editor>
             </div> 
-            <div *ngSwitchCase="'checkbox'">
+            <div *ngSwitchCase="'checkbox'" class="groupItem">
+              <label class="item-label">{{column.dispalyTitle | titlecase}}:</label><br>
               <rdp-checkbox-editor rowdata="{{selectedRowData}}" columntitle="{{column.title}}"></rdp-checkbox-editor>
             </div> 
-            <div *ngSwitchCase="'radio'">
+            <div *ngSwitchCase="'radio'" class="groupItem">
+              <label class="item-label">{{column.dispalyTitle | titlecase}}:</label><br>
               <rdp-radio-editor (changedColumnValue)="columnDataChanged($event, column.title)"
               [data]="column.listData" 
                rowdata="{{selectedRowData}}" 
                columntitle="{{column.title}}"></rdp-radio-editor>
             </div>
-            <div *ngSwitchCase="'datepicker'">
+            <div *ngSwitchCase="'datepicker'" class="groupItem">
+              <label class="item-label">{{column.dispalyTitle | titlecase}}:</label><br>
               <rdp-datepicker-editor rowdata="{{selectedRowData}}" columntitle="{{column.title}}"></rdp-datepicker-editor>
             </div>
-            <div *ngSwitchDefault>
+            <div *ngSwitchDefault class="groupItem">
+                <label class="item-label">{{column.dispalyTitle | titlecase}}:</label><br>
                 <rdp-input-editor (changedColumnValue)="columnDataChanged($event, column.title)" 
                 rowdata="{{selectedRowData}}" columntitle="{{column.title}}"></rdp-input-editor>
             </div>      
diff --git a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss
index e69de29b..c0c95d90 100644
--- a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss
+++ b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss
@@ -0,0 +1,63 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 2020 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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============================================
+ *
+ * 
+ */
+
+::ng-deep .modal-dialog { 
+    max-width: 1200px;
+    width: 855px;
+    overflow-x: auto;
+    overflow-y: auto;
+}
+
+
+.elementsContainer{
+    display: inline-flex;
+}
+
+.groupItem{
+    margin-right: 11px;
+    margin-bottom: 10px;
+}
+
+.form-field{
+    height: 30px;
+    width: 198px
+}
+
+.item-label{
+    margin-bottom: 1px;
+}
\ No newline at end of file
-- 
cgit 1.2.3-korg