Merge "Raptor backend java API Code(Analytics), UI Code(Overlay) and pages component in os project"

6 files changed, 74 insertions, 9 deletions

diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_2_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_2_OS.sql
index ece1be3e..f7726b79 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_2_OS.sql
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_2_OS.sql
@@ -6,6 +6,12 @@
 SET FOREIGN_KEY_CHECKS=1; 
 USE ecomp_sdk;
 
+INSERT INTO cr_report (REP_ID,TITLE,DESCR,PUBLIC_YN,REPORT_XML,CREATE_ID,CREATE_DATE,MAINT_ID,MAINT_DATE,MENU_ID,MENU_APPROVED_YN,OWNER_ID,FOLDER_ID,DASHBOARD_TYPE_YN,DASHBOARD_YN) VALUES 
+(1,'Demo Report - chart','this report show chart config','N','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<customReport pageSize=\"50\" reportType=\"Linear\">\n    <reportName>Demo Report - chart</reportName>\n    <reportDescr>this report show chart config</reportDescr>\n    <dbInfo>local</dbInfo>\n    <dbType>mysql</dbType>\n    <chartType>BarChart3D</chartType>\n    <chartMultiSeries>N</chartMultiSeries>\n    <chartLeftAxisLabel>Counts</chartLeftAxisLabel>\n    <chartWidth>1200</chartWidth>\n    <chartHeight>420</chartHeight>\n    <showChartTitle>true</showChartTitle>\n    <public>false</public>\n    <hideFormFieldAfterRun>false</hideFormFieldAfterRun>\n    <createId>1</createId>\n    <createDate>2019-09-25-04:00</createDate>\n    <reportSQL>SELECT \n	date_format(create_date,\'%Y-%m-%d\') Create_date, \n	count(*) num_rpt \nfrom cr_report\ngroup by date_format(create_date,\'%Y-%m-%d\')\norder by 1</reportSQL>\n    <reportTitle>Put Chart Title Here</reportTitle>\n    <reportSubTitle></reportSubTitle>\n    <frozenColumns>0</frozenColumns>\n    <emptyMessage>Your Search didn\'t yield any results.</emptyMessage>\n    <dataGridAlign>left</dataGridAlign>\n    <numFormCols>100</numFormCols>\n    <displayOptions>NNNNNNN</displayOptions>\n    <allowSchedule>N</allowSchedule>\n    <sizedByContent>N</sizedByContent>\n    <comment>N|</comment>\n    <dataSourceList>\n        <dataSource tableId=\"du0\">\n            <tableName>DUAL</tableName>\n            <tablePK></tablePK>\n            <displayName>DUAL</displayName>\n            <dataColumnList>\n                <dataColumn colId=\"Create_date\">\n                    <tableId>du0</tableId>\n                    <dbColName>VARCHAR2</dbColName>\n                    <colName>date_format(create_date,\'%Y-%m-%d\')</colName>\n                    <displayName>Create Date</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayWidthInPxls>0pxpx</displayWidthInPxls>\n                    <displayAlignment>Left</displayAlignment>\n                    <displayHeaderAlignment></displayHeaderAlignment>\n                    <orderSeq>1</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupByPos>0</groupByPos>\n                    <subTotalCustomText></subTotalCustomText>\n                    <hideRepeatedKey>false</hideRepeatedKey>\n                    <groupBreak>false</groupBreak>\n                    <displayTotal></displayTotal>\n                    <colOnChart>LEGEND</colOnChart>\n                    <chartSeq>-1</chartSeq>\n                    <chartColor></chartColor>\n                    <chartLineType></chartLineType>\n                    <chartSeries>false</chartSeries>\n                    <isSortable>false</isSortable>\n                    <drillDownType></drillDownType>\n                    <drillDownURL></drillDownURL>\n                    <drillDownParams></drillDownParams>\n                    <semaphoreId></semaphoreId>\n                    <dbColType>VARCHAR2</dbColType>\n                    <chartGroup></chartGroup>\n                    <yAxis></yAxis>\n                    <dependsOnFormField></dependsOnFormField>\n                    <nowrap>N</nowrap>\n                    <indentation>0</indentation>\n                    <level>0</level>\n                    <colspan>0</colspan>\n                </dataColumn>\n                <dataColumn colId=\"num_rpt\">\n                    <tableId>du0</tableId>\n                    <dbColName>VARCHAR2</dbColName>\n                    <colName>count(*)</colName>\n                    <displayName>Report Count</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayWidthInPxls>0pxpx</displayWidthInPxls>\n                    <displayAlignment>Left</displayAlignment>\n                    <displayHeaderAlignment></displayHeaderAlignment>\n                    <orderSeq>2</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupByPos>0</groupByPos>\n                    <subTotalCustomText></subTotalCustomText>\n                    <hideRepeatedKey>false</hideRepeatedKey>\n                    <groupBreak>false</groupBreak>\n                    <displayTotal></displayTotal>\n                    <colOnChart>0</colOnChart>\n                    <chartSeq>1</chartSeq>\n                    <chartColor>#FF0000</chartColor>\n                    <chartLineType>default</chartLineType>\n                    <chartSeries>false</chartSeries>\n                    <isSortable>false</isSortable>\n                    <drillDownType></drillDownType>\n                    <drillDownURL></drillDownURL>\n                    <drillDownParams></drillDownParams>\n                    <semaphoreId></semaphoreId>\n                    <dbColType>VARCHAR2</dbColType>\n                    <chartGroup></chartGroup>\n                    <yAxis></yAxis>\n                    <dependsOnFormField></dependsOnFormField>\n                    <nowrap>N</nowrap>\n                    <indentation>0</indentation>\n                    <level>0</level>\n                    <colspan>0</colspan>\n                </dataColumn>\n            </dataColumnList>\n        </dataSource>\n    </dataSourceList>\n    <formFieldList>\n        <formField fieldId=\"ff1\">\n            <colId></colId>\n            <fieldName>From Date</fieldName>\n            <fieldType>Select Field Type</fieldType>\n            <visible>Y</visible>\n            <validationType>DATE</validationType>\n            <mandatory>N</mandatory>\n            <defaultValue></defaultValue>\n            <orderBySeq>1</orderBySeq>\n            <fieldSQL>select date_format(sysdate(),\'%m/%d/%Y\') id, date_format(sysdate(),\'%m/%d/%Y\') name from dual</fieldSQL>\n            <fieldDefaultSQL></fieldDefaultSQL>\n            <rangeStartDate>0001-02-07+00:15</rangeStartDate>\n            <rangeStartDateSQL></rangeStartDateSQL>\n            <rangeEndDateSQL></rangeEndDateSQL>\n            <groupFormField>false</groupFormField>\n            <lastUpdatedFieldId>N</lastUpdatedFieldId>\n        </formField>\n        <formField fieldId=\"ff2\">\n            <colId></colId>\n            <fieldName>TO Date</fieldName>\n            <fieldType>Select Field Type</fieldType>\n            <visible>Y</visible>\n            <validationType>DATE</validationType>\n            <mandatory>N</mandatory>\n            <defaultValue></defaultValue>\n            <orderBySeq>2</orderBySeq>\n            <fieldSQL>select date_format(sysdate(),\'%m/%d/%Y\') id, date_format(sysdate(),\'%m/%d/%Y\') name from dual</fieldSQL>\n            <fieldDefaultSQL></fieldDefaultSQL>\n            <rangeStartDate>0001-02-07+00:15</rangeStartDate>\n            <rangeStartDateSQL></rangeStartDateSQL>\n            <rangeEndDateSQL></rangeEndDateSQL>\n            <groupFormField>false</groupFormField>\n            <lastUpdatedFieldId>N</lastUpdatedFieldId>\n        </formField>\n    </formFieldList>\n    <semaphoreList/>\n    <maxRowsInExcelDownload>500</maxRowsInExcelDownload>\n    <chartAdditionalOptions>\n        <chartOrientation>vertical</chartOrientation>\n        <hidechartLegend>N</hidechartLegend>\n        <legendPosition>top</legendPosition>\n        <labelAngle>up45</labelAngle>\n        <rangeAxisUpperLimit></rangeAxisUpperLimit>\n        <rangeAxisLowerLimit></rangeAxisLowerLimit>\n        <animate>true</animate>\n        <animateAnimatedChart>true</animateAnimatedChart>\n        <stacked>false</stacked>\n        <barControls>false</barControls>\n        <xAxisDateType>false</xAxisDateType>\n        <lessXaxisTickers>false</lessXaxisTickers>\n        <timeAxis>false</timeAxis>\n        <timeSeriesRender>line</timeSeriesRender>\n        <multiSeries>false</multiSeries>\n        <showXAxisLabel>false</showXAxisLabel>\n        <addXAxisTickers>false</addXAxisTickers>\n        <logScale>false</logScale>\n        <topMargin>100</topMargin>\n        <bottomMargin>100</bottomMargin>\n        <rightMargin>100</rightMargin>\n        <leftMargin>100</leftMargin>\n    </chartAdditionalOptions>\n    <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed>\n    <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed>\n    <isDailyScheduleAllowed>N</isDailyScheduleAllowed>\n    <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed>\n    <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed>\n    <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed>\n</customReport>\n',1,'2019-09-25 17:46:18',1,'2020-05-05 04:31:07','HOME','N',1,NULL,'N','N'),
+(2,'Demo Report - drilldown with formfield','Demo Report - drilldown with formfield','N','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<customReport pageSize=\"50\" reportType=\"Linear\">\n    <reportName>Demo Report - drilldown with formfield</reportName>\n    <reportDescr>Demo Report - drilldown with formfield</reportDescr>\n    <dbInfo>local</dbInfo>\n    <chartType></chartType>\n    <showChartTitle>false</showChartTitle>\n    <public>false</public>\n    <hideFormFieldAfterRun>false</hideFormFieldAfterRun>\n    <createId>1</createId>\n    <createDate>2019-09-25-04:00</createDate>\n    <reportSQL>SELECT \n	c.role_name ROLE_NAME, \n	a.FIRST_NAME FIRST_NAME, \n	a.LAST_NAME LAST_NAME, \n	a.EMAIL EMAIL \nfrom fn_user a, fn_user_role b, fn_role c\nwhere c.role_id=b.role_id and b.user_id=a.user_id and c.role_id in [ROLE]</reportSQL>\n    <frozenColumns>0</frozenColumns>\n    <emptyMessage>Your Search didn\'t yield any results.</emptyMessage>\n    <dataGridAlign>left</dataGridAlign>\n    <numFormCols>100</numFormCols>\n    <displayOptions>NYNNNNN</displayOptions>\n    <allowSchedule>N</allowSchedule>\n    <sizedByContent>N</sizedByContent>\n    <comment>N|</comment>\n    <dataSourceList>\n        <dataSource tableId=\"du0\">\n            <tableName>DUAL</tableName>\n            <tablePK></tablePK>\n            <displayName>DUAL</displayName>\n            <dataColumnList>\n                <dataColumn colId=\"ROLE_NAME\">\n                    <tableId>du0</tableId>\n                    <dbColName>c.role_name</dbColName>\n                    <colName>c.role_name</colName>\n                    <displayName>ROLE_NAME</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayAlignment>Left</displayAlignment>\n                    <orderSeq>1</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupBreak>false</groupBreak>\n                    <dbColType>VARCHAR2</dbColType>\n                </dataColumn>\n                <dataColumn colId=\"FIRST_NAME\">\n                    <tableId>du0</tableId>\n                    <dbColName>a.FIRST_NAME</dbColName>\n                    <colName>a.FIRST_NAME</colName>\n                    <displayName>FIRST_NAME</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayAlignment>Left</displayAlignment>\n                    <orderSeq>2</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupBreak>false</groupBreak>\n                    <dbColType>VARCHAR2</dbColType>\n                </dataColumn>\n                <dataColumn colId=\"LAST_NAME\">\n                    <tableId>du0</tableId>\n                    <dbColName>a.LAST_NAME</dbColName>\n                    <colName>a.LAST_NAME</colName>\n                    <displayName>LAST_NAME</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayAlignment>Left</displayAlignment>\n                    <orderSeq>3</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupBreak>false</groupBreak>\n                    <dbColType>VARCHAR2</dbColType>\n                </dataColumn>\n                <dataColumn colId=\"EMAIL\">\n                    <tableId>du0</tableId>\n                    <dbColName>a.EMAIL</dbColName>\n                    <colName>a.EMAIL</colName>\n                    <displayName>EMAIL</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayAlignment>Left</displayAlignment>\n                    <orderSeq>4</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupBreak>false</groupBreak>\n                    <dbColType>VARCHAR2</dbColType>\n                </dataColumn>\n            </dataColumnList>\n        </dataSource>\n    </dataSourceList>\n    <formFieldList>\n        <formField fieldId=\"ff1\">\n            <colId></colId>\n            <fieldName>ROLE</fieldName>\n            <fieldType>LIST_MULTI_SELECT</fieldType>\n            <visible>Y</visible>\n            <validationType></validationType>\n            <mandatory>N</mandatory>\n            <defaultValue></defaultValue>\n            <orderBySeq>1</orderBySeq>\n            <fieldSQL>select role_id id, role_name name from fn_role order by 2</fieldSQL>\n            <fieldDefaultSQL></fieldDefaultSQL>\n            <rangeStartDate>0001-02-07+00:15</rangeStartDate>\n            <rangeStartDateSQL></rangeStartDateSQL>\n            <rangeEndDateSQL></rangeEndDateSQL>\n            <groupFormField>false</groupFormField>\n            <lastUpdatedFieldId>N</lastUpdatedFieldId>\n        </formField>\n    </formFieldList>\n    <maxRowsInExcelDownload>500</maxRowsInExcelDownload>\n    <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed>\n    <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed>\n    <isDailyScheduleAllowed>N</isDailyScheduleAllowed>\n    <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed>\n    <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed>\n    <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed>\n</customReport>\n',1,'2019-09-25 18:25:02',1,'2020-05-05 04:04:01','','N',1,NULL,'N','N'),
+(3,'Demo Report - parent','this report show how many users for each ROLE. click Counts number to see USER details.','N','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<customReport pageSize=\"50\" reportType=\"Linear\">\n    <reportName>Demo Report - parent</reportName>\n    <reportDescr>this report show how many users for each ROLE. click Counts number to see USER details.</reportDescr>\n    <dbInfo>local</dbInfo>\n    <chartType></chartType>\n    <showChartTitle>false</showChartTitle>\n    <public>false</public>\n    <hideFormFieldAfterRun>false</hideFormFieldAfterRun>\n    <createId>1</createId>\n    <createDate>2019-12-06-05:00</createDate>\n    <reportSQL>SELECT \n	count(*) co3, \n	a.role_id ar5, \n	a.role_name ar4 \nfrom fn_role a, fn_user_role b, fn_user c \n  where a.role_id=b.role_id and b.user_id=c.user_id\n  group by a.role_name</reportSQL>\n    <reportTitle></reportTitle>\n    <frozenColumns>0</frozenColumns>\n    <emptyMessage>Your Search didn\'t yield any results.</emptyMessage>\n    <dataGridAlign>left</dataGridAlign>\n    <numFormCols>100</numFormCols>\n    <displayOptions>NYNNNNN</displayOptions>\n    <allowSchedule>N</allowSchedule>\n    <sizedByContent>N</sizedByContent>\n    <comment>N|Test Report Demo</comment>\n    <dataSourceList>\n        <dataSource tableId=\"du0\">\n            <tableName>DUAL</tableName>\n            <tablePK></tablePK>\n            <displayName>DUAL</displayName>\n            <dataColumnList>\n                <dataColumn colId=\"co3\">\n                    <tableId>du0</tableId>\n                    <dbColName>VARCHAR2</dbColName>\n                    <colName>count(*)</colName>\n                    <displayName>Counts </displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayWidthInPxls>0pxpx</displayWidthInPxls>\n                    <displayAlignment>Left</displayAlignment>\n                    <displayHeaderAlignment></displayHeaderAlignment>\n                    <orderSeq>1</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupByPos>0</groupByPos>\n                    <subTotalCustomText></subTotalCustomText>\n                    <hideRepeatedKey>false</hideRepeatedKey>\n                    <groupBreak>false</groupBreak>\n                    <displayTotal></displayTotal>\n                    <isSortable>false</isSortable>\n                    <drillDownType></drillDownType>\n                    <drillDownURL>28</drillDownURL>\n                    <drillDownParams>ff1=[ar5]</drillDownParams>\n                    <semaphoreId></semaphoreId>\n                    <dbColType>VARCHAR2</dbColType>\n                    <dependsOnFormField></dependsOnFormField>\n                    <nowrap>N</nowrap>\n                    <indentation>0</indentation>\n                    <level>0</level>\n                    <colspan>0</colspan>\n                </dataColumn>\n                <dataColumn colId=\"ar5\">\n                    <tableId>du0</tableId>\n                    <dbColName>VARCHAR2</dbColName>\n                    <colName>a.role_id</colName>\n                    <displayName>Role ID</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayWidthInPxls>0pxpx</displayWidthInPxls>\n                    <displayAlignment>Left</displayAlignment>\n                    <displayHeaderAlignment></displayHeaderAlignment>\n                    <orderSeq>2</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupByPos>0</groupByPos>\n                    <subTotalCustomText></subTotalCustomText>\n                    <hideRepeatedKey>false</hideRepeatedKey>\n                    <groupBreak>false</groupBreak>\n                    <displayTotal></displayTotal>\n                    <isSortable>false</isSortable>\n                    <drillDownType></drillDownType>\n                    <drillDownURL></drillDownURL>\n                    <drillDownParams></drillDownParams>\n                    <semaphoreId></semaphoreId>\n                    <dbColType>VARCHAR2</dbColType>\n                    <dependsOnFormField></dependsOnFormField>\n                    <nowrap>N</nowrap>\n                    <indentation>0</indentation>\n                    <level>0</level>\n                    <colspan>0</colspan>\n                </dataColumn>\n                <dataColumn colId=\"ar4\">\n                    <tableId>du0</tableId>\n                    <dbColName>VARCHAR2</dbColName>\n                    <colName>a.role_name</colName>\n                    <displayName>Role Name</displayName>\n                    <displayWidth>10</displayWidth>\n                    <displayWidthInPxls>0pxpx</displayWidthInPxls>\n                    <displayAlignment>Left</displayAlignment>\n                    <displayHeaderAlignment></displayHeaderAlignment>\n                    <orderSeq>3</orderSeq>\n                    <visible>true</visible>\n                    <calculated>true</calculated>\n                    <colType>VARCHAR2</colType>\n                    <groupByPos>0</groupByPos>\n                    <subTotalCustomText></subTotalCustomText>\n                    <hideRepeatedKey>false</hideRepeatedKey>\n                    <groupBreak>false</groupBreak>\n                    <displayTotal></displayTotal>\n                    <isSortable>false</isSortable>\n                    <drillDownType></drillDownType>\n                    <drillDownURL></drillDownURL>\n                    <drillDownParams></drillDownParams>\n                    <semaphoreId>sem1</semaphoreId>\n                    <dbColType>VARCHAR2</dbColType>\n                    <dependsOnFormField></dependsOnFormField>\n                    <nowrap>N</nowrap>\n                    <indentation>0</indentation>\n                    <level>0</level>\n                    <colspan>0</colspan>\n                </dataColumn>\n            </dataColumnList>\n        </dataSource>\n    </dataSourceList>\n    <semaphoreList>\n        <semaphore semaphoreId=\"sem1\">\n            <semaphoreName>Display Formatting 1</semaphoreName>\n            <semaphoreType>CELL</semaphoreType>\n            <comment>ar4</comment>\n            <formatList>\n                <format formatId=\"sem1_fmt1\">\n                    <lessThanValue></lessThanValue>\n                    <expression></expression>\n                    <bold>false</bold>\n                    <italic>false</italic>\n                    <underline>false</underline>\n                    <bgColor></bgColor>\n                    <fontColor></fontColor>\n                    <fontFace></fontFace>\n                    <fontSize>18</fontSize>\n                </format>\n                <format formatId=\"sem1_fmt2\">\n                    <lessThanValue>	 System Administrator</lessThanValue>\n                    <expression>=</expression>\n                    <bold>true</bold>\n                    <italic>false</italic>\n                    <underline>false</underline>\n                    <bgColor>#FF0000</bgColor>\n                    <fontColor></fontColor>\n                    <fontFace></fontFace>\n                    <fontSize>18</fontSize>\n                </format>\n            </formatList>\n        </semaphore>\n    </semaphoreList>\n    <maxRowsInExcelDownload>500</maxRowsInExcelDownload>\n    <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed>\n    <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed>\n    <isDailyScheduleAllowed>N</isDailyScheduleAllowed>\n    <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed>\n    <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed>\n    <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed>\n</customReport>\n',1,'2019-12-06 19:29:51',1,'2020-05-05 04:07:08','HOME','N',1,NULL,'N','N'),
+(4,'Demo Report - Dashboard type','Compose several sub-reports into one view, Drag report from Data section and Chart section.','N','<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<customReport pageSize=\"50\" reportType=\"Dashboard\">\n    <reportName>Demo Report - Dashboard type</reportName>\n    <reportDescr>Compose several sub-reports into one view, Drag report from Data section and Chart section.</reportDescr>\n    <dashboardLayoutHTML></dashboardLayoutHTML>\n    <dashboardLayoutJSON>[{\"x\":0,\"y\":0,\"cols\":7,\"rows\":1,\"hasContent\":{\"name\":\"Demo Report - chart\",\"id\":\"Data#27\",\"hideDisplay\":false}},{\"x\":0,\"y\":1,\"cols\":7,\"rows\":1,\"hasContent\":{\"name\":\"Demo Report - chart\",\"id\":\"Chart#27\",\"hideDisplay\":false}},{\"x\":0,\"y\":2,\"cols\":7,\"rows\":1,\"hasContent\":{\"name\":\"Demo Report - parent\",\"id\":\"Data#29\",\"hideDisplay\":false}}]</dashboardLayoutJSON>\n    <chartType></chartType>\n    <showChartTitle>false</showChartTitle>\n    <public>false</public>\n    <createId>1</createId>\n    <createDate>2020-05-06-04:00</createDate>\n    <allowSchedule>N</allowSchedule>\n    <dataSourceList/>\n</customReport>\n',1,'2020-05-06 14:40:27',1,'2020-05-06 14:59:50','','N',1,NULL,'N','Y');
+
 -- fn_menu 
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (1, 'Root', NULL, 10, NULL, 'menu_home', 'N', NULL, NULL, NULL, NULL, 'APP', 'N', NULL); --  we need even though it's inactive
 INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (5000, 'Sample Pages', 1, 30, 'sample.htm', 'menu_sample', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-documents-book');
diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/package.json b/ecomp-sdk/epsdk-app-os/ngappsrc/package.json
index 95879586..43dcd001 100644
--- a/ecomp-sdk/epsdk-app-os/ngappsrc/package.json
+++ b/ecomp-sdk/epsdk-app-os/ngappsrc/package.json
@@ -10,8 +10,23 @@
     "e2e": "ng e2e",
     "sonar": "sonar-scanner"
   },
+  "browserslist": {
+    "production": [
+      "> 1%",
+      "ie 10",
+      "ie 11"
+    ],
+    "modern": [
+      "last 1 chrome version",
+      "last 1 firefox version"
+    ],
+    "ssr": [
+      "node 10"
+    ]
+  },
   "private": true,
   "dependencies": {
+    "@agm/core": "^1.0.0",
     "@angular/animations": "~7.0.0",
     "@angular/cdk": "~7.0.0",
     "@angular/common": "^7.0.0",
@@ -29,10 +44,15 @@
     "angular-google-charts": "^0.1.6",
     "angular-gridster2": "^8.2.0",
     "angular-tag-cloud-module": "^3.8.1",
+    "angular2-uuid": "^1.1.1",
+    "angular7-word-cloud": "^1.2.1",
     "chart.js": "^2.8.0",
+    "classlist.js": "^1.1.20150312",
     "core-js": "^2.5.4",
-    "d3": "^4.0.0",
+    "custom-event-polyfill": "^1.0.7",
+    "d3": "^4.3.0",
     "d3-scale": "^3.1.0",
+    "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "ionicons": "^4.6.2",
     "lodash-es": "^4.17.10",
@@ -44,6 +64,7 @@
     "rxjs-compat": "^6.5.2",
     "sonar-scanner": "^3.1.0",
     "tslib": "^1.9.0",
+    "web-animations-js": "^2.3.2",
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
@@ -53,10 +74,11 @@
     "@angular/language-service": "~7.0.0",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "~8.9.4",
+    "@types/node": "^8.9.5",
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
+    "jqwidgets-ng": "^8.3.3",
     "karma": "~3.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts
index 3439f8c9..60052f92 100644
--- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts
+++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts
@@ -12,6 +12,7 @@ import { RunReportComponent } from './analytics/Report_List/Report/run/run-repor
 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 { WelcomeDashboardComponent } from './welcome-dashboard/welcome-dashboard.component';
+import {RefreshComponent} from './refresh/refresh.component';
 
 
 
@@ -27,9 +28,12 @@ const routes: Routes = [
   { path: 'report-list', component:ReportComponent},
   { path: 'create', component: HeaderTabsWrapperComponent},
   { path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
-  { path: 'run/:reportId', component: RunReportComponent},
+  { path: 'run/:reportId', component: RunReportFormFieldsComponent},
   { path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
-  { path: 'welcome', component :WelcomeDashboardComponent}
+  { path: 'run', component: RunReportFormFieldsComponent},
+  { path: 'welcome', component :WelcomeDashboardComponent},
+  { path: 'refresh', component: RefreshComponent},
+  { path: '', redirectTo: 'welcome'}
 ];
 
 @NgModule({
diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts
index 041988ab..89f4ea93 100644
--- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts
+++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts
@@ -13,16 +13,21 @@ import { NewMenuComponent } from './admin/menus/new-menu/new-menu.component';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import { MaterialModule } from '../material-module';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatExpansionModule } from '@angular/material/expansion';
+import { SuccessModalComponent } from '../modals/success-modal/success-modal.component';
+import { ErrorModalComponent } from '../modals/error-modal/error-modal.component';
+import { MatFormFieldModule } from '@angular/material/form-field';
 
 
 import { DashboardReportGridComponent } from './analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.component';
 import { DataChartComponent } from './analytics/Report_List/Report/definition/dashboard-report-grid/data-chart/data-chart.component';
 import { RunDashboardReportComponent } from './analytics/Report_List/Report/run/run-report/run-dashboard-report/run-dashboard-report.component';
 import { DefinitionComponent } from './analytics/Report_List/Report/definition/definition.component';
-import { MatTabsModule} from '@angular/material';
+import {MatTabsModule, MatGridListModule, MatCardModule, MatMenuModule, MatButtonModule} from '@angular/material';
 import { SQLComponent } from './analytics/Report_List/Report/sql/sql.component';
 import { ColumnsComponent } from './analytics/Report_List/Report/columns/columns.component';
-import { FormFieldsComponent } from './analytics/Report_List/Report/form-fields/form-fields.component';
+import { FormFieldsComponent, DialogOverviewExampleDialog } from './analytics/Report_List/Report/form-fields/form-fields.component';
 import { ChartWizardComponent } from './analytics/Report_List/Report/chart-wizard/chart-wizard.component';
 import { SecurityComponent } from './analytics/Report_List/Report/security/security.component';
 import { LogComponent } from './analytics/Report_List/Report/log/log.component';
@@ -52,16 +57,25 @@ import { RunReportComponent } from './analytics/Report_List/Report/run/run-repor
 import { HeaderTabsWrapperComponent } from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component';
 import { SearchComponent } from './ext/profile/search/search.component';
 import { SelfComponent } from './ext/profile/self/self.component';
+import { GridsterModule } from 'angular-gridster2';
 import { NewRoleComponent } from './admin/roles/new-role/new-role.component';
 import { InformationModalComponent } from '../modals/information-modal/information-modal.component';
 import { NewRoleFunctionComponent } from './admin/role-functions/new-role-function/new-role-function.component';
 import { ConfirmationModalComponent } from '../modals/confirmation-modal/confirmation-modal.component';
 import { WelcomeDashboardComponent } from './welcome-dashboard/welcome-dashboard.component';
+import { LayoutModule } from '@angular/cdk/layout';
+import { Ng6O2ChartModule} from 'ng6-o2-chart';
 import { BarChartComponent } from './welcome-dashboard/bar-chart/bar-chart.component';
 import { PieChartComponent } from './welcome-dashboard/pie-chart/pie-chart.component';
+import { TagCloudModule } from 'angular-tag-cloud-module';
 import { NoteComponent } from './welcome-dashboard/note/note.component';
-import { GridsterModule } from 'angular-gridster2';
+import { GoogleChartsModule } from 'angular-google-charts';
+import { jqxChartModule } from 'jqwidgets-ng/jqxchart';
+import { NumbersOnlyDirective } from './analytics/Report_List/Report/chart-wizard/numbers-only.directive';
+import { ColumnAdvancedDisplayComponent } from './analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component';
+import {AgWordCloudModule} from 'angular7-word-cloud';
 import { RdpModule } from 'portalsdk-tag-lib';
+import { RefreshComponent } from './refresh/refresh.component';
 
 
 
@@ -75,6 +89,8 @@ import { RdpModule } from 'portalsdk-tag-lib';
     AdminComponent,
     RolesComponent,
     NewRoleComponent,
+    SuccessModalComponent,
+    ErrorModalComponent, 
     RoleFunctionsComponent,
     NewRoleFunctionComponent,
     UsageComponent,
@@ -110,6 +126,10 @@ import { RdpModule } from 'portalsdk-tag-lib';
     ReportListComponent,
     RunReportComponent,
     HeaderTabsWrapperComponent,
+    DialogOverviewExampleDialog,
+	ColumnAdvancedDisplayComponent,
+	NumbersOnlyDirective,
+	RefreshComponent,
 
     SearchComponent,
     SelfComponent,
@@ -128,8 +148,10 @@ import { RdpModule } from 'portalsdk-tag-lib';
     HttpClientModule,
     MatButtonToggleModule,
     NgbModule,
-
+    MatTooltipModule,
+    MatExpansionModule,
     FormsModule,
+        MatFormFieldModule,
     ReactiveFormsModule,
     MatTabsModule,
     HttpClientModule,
@@ -140,9 +162,20 @@ import { RdpModule } from 'portalsdk-tag-lib';
     MatSortModule,
     MatIconModule,
     GridsterModule,
+        MatGridListModule,
+        MatCardModule,
+        MatMenuModule,
+        MatButtonModule,
+        LayoutModule,
+        Ng6O2ChartModule,
+        TagCloudModule,
+        GoogleChartsModule.forRoot(),
+        GridsterModule,
+        jqxChartModule,
+        AgWordCloudModule,
 	  RdpModule
   ],
-  entryComponents: [InformationModalComponent, ConfirmationModalComponent, NewRoleComponent, NewRoleFunctionComponent, NewMenuComponent],
+  entryComponents: [DialogOverviewExampleDialog, InformationModalComponent,RolesComponent,SuccessModalComponent,ErrorModalComponent, SelfComponent,ConfirmationModalComponent, NewRoleComponent, NewRoleFunctionComponent, NewMenuComponent],
   providers: []
 
 })
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/assets/images/pdf.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/assets/images/pdf.png
new file mode 100644
index 00000000..ed96c5c1
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/assets/images/pdf.png
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/assets/images/xlsx.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/assets/images/xlsx.png
new file mode 100644
index 00000000..1ac37679
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/assets/images/xlsx.png