Raptor reporting capability integrated

Raptor capability integrated

Issue-ID: PORTAL-980
Change-Id: Ibf83612374515109172cac8e397dd15d004ca8a6
Signed-off-by: jegadeeshbabu3 <jegadeesh.babu@att.com>

diff --git a/portal-FE-common/src/assets/images/pdf.png b/portal-FE-common/src/assets/images/pdf.png
new file mode 100644 (file)
index 0000000..ed96c5c
Binary files /dev/null and b/portal-FE-common/src/assets/images/pdf.png differ

diff --git a/portal-FE-common/src/assets/images/xlsx.png b/portal-FE-common/src/assets/images/xlsx.png
new file mode 100644 (file)
index 0000000..1ac3767
Binary files /dev/null and b/portal-FE-common/src/assets/images/xlsx.png differ

diff --git a/portal-FE-os/.gitignore b/portal-FE-os/.gitignore
index ae8fe5e..9a0c53a 100644 (file)
--- a/portal-FE-os/.gitignore
+++ b/portal-FE-os/.gitignore
@@ -37,6 +37,7 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+/ngapp
 
 .history/*
 /target/

diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index 4c8a529..a65181c 100644 (file)
--- a/portal-FE-os/pom.xml
+++ b/portal-FE-os/pom.xml
@@ -20,6 +20,8 @@
                <sonar.tests>src</sonar.tests>
                <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
                <sonar.nodejs.executable>${project.basedir}\node\</sonar.nodejs.executable>
+                <epsdk.version>3.3.0-SNAPSHOT</epsdk.version>
+
        </properties>
 
        <build>
@@ -44,6 +46,61 @@
                                        </filesets>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                               <execution>
+                                                       <id>unpack</id>
+                                                       <phase>initialize</phase>
+                                                       <goals>
+                                                       <goal>unpack</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                       <artifactItems>
+                                                               <artifactItem>
+                                                                       <groupId>org.onap.portal.sdk</groupId>
+                                                                       <artifactId>epsdk-app-overlay</artifactId>
+                                                                       <version>${epsdk.version}</version>
+                                                                       <type>war</type>
+                                                                       <overWrite>false</overWrite>
+                                                                       <includes>ngapp/src/app/pages/analytics/**</includes>
+                                                                       <outputDirectory>${basedir}/</outputDirectory>
+                                                               </artifactItem>
+                                                       </artifactItems>
+                                                       <overWriteReleases>true</overWriteReleases>
+                                                       <overWriteSnapshots>true</overWriteSnapshots>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                                               
+                               
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>3.0.2</version>
+                               <executions>
+
+                                       <execution>
+                                               <id>copy-analytics</id>
+                                               <phase>generate-sources</phase>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>${basedir}/src/app/pages/</outputDirectory>
+                                                       
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>${basedir}/ngapp/src/app/pages</directory>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+
+                               </executions>
+                       </plugin>
 
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>

diff --git a/portal-FE-os/src/app/pages/pages-routing.module.ts b/portal-FE-os/src/app/pages/pages-routing.module.ts
index d39db03..ea1d8b5 100644 (file)
--- a/portal-FE-os/src/app/pages/pages-routing.module.ts
+++ b/portal-FE-os/src/app/pages/pages-routing.module.ts
@@ -56,6 +56,10 @@ import { ContactUsComponent } from './contact-us/contact-us.component';
 import { RoleFunctionsComponent } from './role/role-functions/role-functions.component';
 import { NotificationHistoryComponent } from './notification-history/notification-history.component';
 import { GetAccessComponent } from './get-access/get-access.component';
+import { HeaderTabsWrapperComponent } from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component';
+import { RunReportFormFieldsComponent } from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component';
+import { DisplayAreaComponent } from './analytics/Report_List/display-area/display-area.component';
+import { ReportComponent } from './analytics/Report_List/Report/report.component';
 
 const routes: Routes = [
     { path: '', component: DashboardComponent },
@@ -77,6 +81,13 @@ const routes: Routes = [
     { path: 'contactUs', component: ContactUsComponent },
     { path: 'getAccess', component: GetAccessComponent },
     { path: 'recentNotifications', component: NotificationHistoryComponent },
+       { path: 'report-list', component:ReportComponent},
+    { path: 'create', component: HeaderTabsWrapperComponent},
+    { path: 'v2/app/reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
+    { path: 'v2/app/run/:reportId', component: RunReportFormFieldsComponent},
+    { path: 'v2/app/run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
+    { path: 'run', component: RunReportFormFieldsComponent},
+    { path: 'displayArea/:menuId', component: DisplayAreaComponent}
 ];
 
 @NgModule({

diff --git a/portal-FE-os/src/environments/environment.prod.ts b/portal-FE-os/src/environments/environment.prod.ts
index 7cc34da..93fdc51 100644 (file)
--- a/portal-FE-os/src/environments/environment.prod.ts
+++ b/portal-FE-os/src/environments/environment.prod.ts
@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
+  baseUrl: '',
   "api": {
     "singleAppInfo": "portalApi/singleAppInfo",
     "singleAppInfoById": "portalApi/singleAppInfoById",

diff --git a/portal-FE-os/src/environments/environment.ts b/portal-FE-os/src/environments/environment.ts
index d412522..ef9c35b 100644 (file)
--- a/portal-FE-os/src/environments/environment.ts
+++ b/portal-FE-os/src/environments/environment.ts
@@ -4,6 +4,7 @@
 
 export const environment = {
   production: false,
+  baseUrl: 'http://www.portal.onap.org:9080/portal-be-os/',
   "api": {
     "singleAppInfo": "http://www.portal.onap.org:9080/portal-be-os/portalApi/singleAppInfo",
     "singleAppInfoById": "http://www.portal.onap.org:9080/portal-be-os/portalApi/singleAppInfoById",