diff options
32 files changed, 667 insertions, 347 deletions
@@ -4,9 +4,9 @@ project_creation_date: '2017-02-03' project_category: '' lifecycle_state: 'Incubation' project_lead: &onap_portal_ptl - name: 'Manoop Talasila' - email: 'mt2061@att.com' - id: 'mt2061' + name: 'Sunder Tattavarada' + email: 'statta@research.att.com' + id: 'tattasunder' company: 'ATT' timezone: 'America/New_York' primary_contact: *onap_portal_ptl @@ -28,19 +28,19 @@ meetings: repeats: 'weekly' time: '15:00 UTC (DST)' repositories: - - 'portal' + - 'portal/sdk' committers: - <<: *onap_portal_ptl + - name: 'Sunder Tattavarada' + email: 'statta@research.att.com' + company: 'ATT' + id: 'tattasunder' + timezone: 'America/New_York' - name: 'Manoop Talasila' email: 'mt2061@att.com' company: 'ATT' id: 'mt2061' timezone: 'America/New_York' - - name: 'Sunder Tattavarada' - email: 'st782s@att.com' - company: 'ATT' - id: 'st782s' - timezone: 'America/New_York' - name: 'Lorraine A Welch' email: 'lb2391@att.com' company: 'ATT' diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml index 0377c511..4423c337 100644 --- a/ecomp-sdk/epsdk-aaf/pom.xml +++ b/ecomp-sdk/epsdk-aaf/pom.xml @@ -124,17 +124,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.6.3</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.6.3</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.6.3</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml index c9b3a4c4..7789fbf0 100644 --- a/ecomp-sdk/epsdk-analytics/pom.xml +++ b/ecomp-sdk/epsdk-analytics/pom.xml @@ -61,24 +61,24 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.11.4</version> + <version>2.11.0</version> </dependency> <!-- Raptor required Libraries --> <!-- for static charts --> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.10</version> + <version>1.15</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -142,7 +142,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -157,7 +157,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -172,7 +172,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-scratchpad</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -209,7 +209,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java index d8dd9304..b8f3284c 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java @@ -214,30 +214,30 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFCellStyle styleRed = wb.createCellStyle(); styleRed.cloneStyleFrom(styleDefault); - styleRed.setFillForegroundColor((short) HSSFColor.RED.index); + styleRed.setFillForegroundColor((short) HSSFColor.HSSFColorPredefined.RED.getIndex()); styleRed.setFillPattern(fillPattern.SOLID_FOREGROUND); XSSFFont fontRed = wb.createFont(); - fontRed.setColor((short) HSSFColor.WHITE.index); + fontRed.setColor((short) HSSFColor.HSSFColorPredefined.WHITE.getIndex()); fontRed.setFontHeight((short) (FONT_SIZE / 0.05)); fontRed.setFontName(FONT_TAHOMA); styleRed.setFont(fontRed); XSSFCellStyle styleYellow = wb.createCellStyle(); styleYellow.cloneStyleFrom(styleDefault); - styleYellow.setFillForegroundColor((short) HSSFColor.YELLOW.index); + styleYellow.setFillForegroundColor((short) HSSFColor.HSSFColorPredefined.YELLOW.getIndex()); styleYellow.setFillPattern(fillPattern.SOLID_FOREGROUND); XSSFFont fontYellow = wb.createFont(); - fontYellow.setColor((short) HSSFColor.BLACK.index); + fontYellow.setColor((short) HSSFColor.HSSFColorPredefined.BLACK.getIndex()); fontYellow.setFontHeight((short) (FONT_SIZE / 0.05)); fontYellow.setFontName(FONT_TAHOMA); styleYellow.setFont(fontYellow); XSSFCellStyle styleGreen = wb.createCellStyle(); styleGreen.cloneStyleFrom(styleDefault); - styleGreen.setFillForegroundColor((short) HSSFColor.GREEN.index); + styleGreen.setFillForegroundColor((short) HSSFColor.HSSFColorPredefined.GREEN.getIndex()); styleGreen.setFillPattern(fillPattern.SOLID_FOREGROUND); XSSFFont fontGreen = wb.createFont(); - fontGreen.setColor((short) HSSFColor.WHITE.index); + fontGreen.setColor((short) HSSFColor.HSSFColorPredefined.WHITE.getIndex()); fontGreen.setFontHeight((short) (FONT_SIZE / 0.05)); fontGreen.setFontName(FONT_TAHOMA); styleGreen.setFont(fontGreen); @@ -332,7 +332,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { short s1 = 0; short s2 = (short) 1; XSSFCellStyle styleName = wb.createCellStyle(); - styleName.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index); + styleName.setFillForegroundColor(HSSFColor.HSSFColorPredefined.GREY_25_PERCENT.getIndex()); styleName.setAlignment(HorizontalAlignment.CENTER); styleName.setBorderBottom(BorderStyle.THIN); styleName.setBorderTop(BorderStyle.THIN); @@ -342,7 +342,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFFont font = wb.createFont(); font.setFontHeight((short) (FONT_SIZE / 0.05)); font.setFontName(FONT_TAHOMA); - font.setColor(HSSFColor.BLACK.index); + font.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); font.setBold(true); styleName.setFont(font); @@ -368,7 +368,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFFont fontDescr = wb.createFont(); fontDescr.setFontHeight((short) (FONT_SIZE / 0.05)); // 14 fontDescr.setFontName(FONT_TAHOMA); - fontDescr.setColor(HSSFColor.BLACK.index); + fontDescr.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); fontDescr.setBold(true); styleDescription.setFont(font); XSSFCell cellDescr = null; @@ -521,7 +521,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFCellStyle styleDate = wb.createCellStyle(); HtmlStripper strip = new HtmlStripper(); XSSFCellStyle styleDataHeader = wb.createCellStyle(); - styleDataHeader.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index); + styleDataHeader.setFillForegroundColor(HSSFColor.HSSFColorPredefined.GREY_25_PERCENT.getIndex()); styleDataHeader.setFillPattern(fillPattern.SOLID_FOREGROUND); styleDataHeader.setAlignment(HorizontalAlignment.CENTER); styleDataHeader.setBorderBottom(BorderStyle.THIN); @@ -532,7 +532,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { font.setFontHeight((short) (FONT_SIZE / 0.05)); font.setFontName(FONT_TAHOMA); font.setBold(true); - font.setColor(HSSFColor.BLACK.index); + font.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); styleDataHeader.setFont(font); boolean firstPass = true; ArrayList cellWidth = new ArrayList(); @@ -2100,7 +2100,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFFont font = wb.createFont(); font.setFontHeight((short) (FONT_HEADER_TITLE_SIZE / 0.05)); // 14 font.setFontName(FONT_TAHOMA); - font.setColor(HSSFColor.BLACK.index); + font.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); styleHeader.setFont(font); XSSFCell cell = row.createCell((short) 0); @@ -2118,7 +2118,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFFont fontDescr = wb.createFont(); fontDescr.setFontHeight((short) FONT_HEADER_DESCR_SIZE); fontDescr.setFontName(FONT_TAHOMA); - fontDescr.setColor(HSSFColor.BLACK.index); + fontDescr.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); styleDescription.setFont(fontDescr); XSSFCell cellDescr = row.createCell((short) 0); cellDescr.setCellValue(reportDescr); @@ -2135,7 +2135,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { XSSFFont fontDescr = wb.createFont(); fontDescr.setFontHeight((short) (FONT_SIZE / 0.05)); // 14 fontDescr.setFontName(FONT_TAHOMA); - fontDescr.setColor(HSSFColor.BLACK.index); + fontDescr.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); fontDescr.setBold(true); styleDescription.setFont(fontDescr); XSSFCell cellDescr = row.createCell((short) 0); @@ -2416,7 +2416,10 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { paintExcelParams(wb, rowNum, col, paramsList, rr.getFormFieldComments(request), sheet, reportTitle, reportDescr); } // if + rowNum = sheet.getLastRowNum(); + if(rowNum<0) + rowNum = 0; final String formattedReportName = new HtmlStripper().stripSpecialCharacters(rr.getReportName()); final String formattedDate = new SimpleDateFormat("MMddyyyyHHmm").format(new Date()); @@ -5088,7 +5091,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { HtmlStripper strip = new HtmlStripper(); // Name Style HSSFCellStyle styleName = wb.createCellStyle(); - styleName.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index); + styleName.setFillForegroundColor(HSSFColor.HSSFColorPredefined.GREY_25_PERCENT.getIndex()); styleName.setAlignment(HorizontalAlignment.CENTER); styleName.setBorderBottom(BorderStyle.THIN); styleName.setBorderTop(BorderStyle.THIN); @@ -5098,7 +5101,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { HSSFFont font = wb.createFont(); font.setFontHeight((short) (FONT_SIZE / 0.05)); font.setFontName(FONT_TAHOMA); - font.setColor(HSSFColor.BLACK.index); + font.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); font.setBold(font.getBold()); styleName.setFont(font); // Data Style @@ -5131,7 +5134,7 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { HSSFFont fontDescr = wb.createFont(); fontDescr.setFontHeight((short) (FONT_HEADER_DESCR_SIZE / 0.05)); fontDescr.setFontName(FONT_TAHOMA); - fontDescr.setColor(HSSFColor.BLACK.index); + fontDescr.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex()); fontDescr.setBold(true); styleDescription.setFont(font); XSSFCell cellDescr = null; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java index a63ce959..6367c3e6 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java @@ -155,12 +155,12 @@ public class ChartD3Helper { try { precision = Integer.parseInt(chartOptionsMap.get("precision")); } catch (NumberFormatException ex) { - logger.debug(EELFLoggerDelegate.debugLogger, ex.getMessage()); + logger.debug(EELFLoggerDelegate.debugLogger, ex.getMessage()); } - final Long user_id = new Long((long) UserUtils.getUserId(request)); + final Long user_id = new Long((long) UserUtils.getUserId(request)); - String chartType = reportRuntime.getChartType(); + String chartType = reportRuntime.getChartType(); List l = reportRuntime.getAllColumns(); String chartLeftAxisLabel = reportRuntime.getFormFieldFilled(nvl(reportRuntime.getChartLeftAxisLabel())); @@ -175,12 +175,21 @@ public class ChartD3Helper { String legendColumnName = (reportRuntime.getChartLegendColumn()!=null)?reportRuntime.getChartLegendColumn().getDisplayName():"Legend Column"; boolean displayChart = (nvl(chartType).length()>0)&&reportRuntime.getDisplayChart(); - StringBuilder wholeScript = new StringBuilder(""); + StringBuilder wholeScript = new StringBuilder(""); String title = reportRuntime.getReportTitle(); - title = parseTitle(title, formValues); + //Assigning reportName as title in case of title is blank or null + if(title == null || "".equalsIgnoreCase(title)) { + title = reportRuntime.getReportName(); + } + if(title != null) { + title = parseTitle(title, formValues); + }else { + logger.debug(EELFLoggerDelegate.debugLogger, "Report Title is NULL."); + } + String chartScriptsPath = (isEmbedded?AppUtils.getChartScriptsPath(""):AppUtils.getChartScriptsPath()); if(displayChart) { @@ -2822,7 +2831,20 @@ public class ChartD3Helper { } } try(BufferedWriter out = new BufferedWriter(new FileWriter("test.txt"))) { - out.write(wholeScript.toString()); + if(wholeScript !=null && wholeScript.length() > 0) { + out.write(wholeScript.toString()); + }else { + wholeScript = new StringBuilder(""); + wholeScript.append("<!DOCTYPE html>\n"); + wholeScript.append("<html>\n"); + wholeScript.append(" <head>\n"); + wholeScript.append("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n"); + wholeScript.append("</head>\n"); + wholeScript.append("<body> \n"); + wholeScript.append("<div style=\"margin-top:135px;\"><h2>No Chart has been configured. Kindly go to Chart Wizard and configure your Chart.</h2></div>"); + wholeScript.append("</body></html> \n"); + out.write(wholeScript.toString()); + } } catch (IOException e) { e.printStackTrace(); System.out.println("Exception "); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java index 088409e1..934db0ab 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java @@ -359,7 +359,17 @@ public class ChartJSONHelper { String title = reportRuntime.getReportTitle(); - title = parseTitle(title, formValues); + //Assigning reportName as title in case of title is blank or null + if(title == null || "".equalsIgnoreCase(title)) { + title = reportRuntime.getReportName(); + } + + if(title != null) { + title = parseTitle(title, formValues); + }else { + logger.debug(EELFLoggerDelegate.debugLogger, "Report Title is NULL."); + } + ObjectMapper mapper = new ObjectMapper(); ChartJSON chartJSON = new ChartJSON(); String sql = ""; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/ExcelColorDef.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/ExcelColorDef.java index af979490..8d07333e 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/ExcelColorDef.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/ExcelColorDef.java @@ -47,23 +47,23 @@ public class ExcelColorDef { public static HashMap colors = new HashMap(); public static void initializeExcelColorDef() { - colors.put("#00FFFF",new Short(HSSFColor.AQUA.index)); - colors.put("#000000",new Short(HSSFColor.BLACK.index)); - colors.put("#0000FF",new Short(HSSFColor.BLUE.index)); - colors.put("#FF00FF",new Short(HSSFColor.PINK.index)); - colors.put("#808080",new Short(HSSFColor.GREY_40_PERCENT.index)); - colors.put("#008000",new Short(HSSFColor.BRIGHT_GREEN.index)); - colors.put("#00FF00",new Short(HSSFColor.LIME.index)); - colors.put("#800000",new Short(HSSFColor.MAROON.index)); - colors.put("#000080",new Short(HSSFColor.ROYAL_BLUE.index)); - colors.put("#808000",new Short(HSSFColor.OLIVE_GREEN.index)); - colors.put("#FF9900",new Short(HSSFColor.ORANGE.index)); - colors.put("#800080",new Short(HSSFColor.VIOLET.index)); - colors.put("#FF0000",new Short(HSSFColor.RED.index)); - colors.put("#C0C0C0",new Short(HSSFColor.CORAL.index)); - colors.put("#008080",new Short(HSSFColor.TEAL.index)); - colors.put("#FFFFFF",new Short(HSSFColor.WHITE.index)); - colors.put("#FFFF00",new Short(HSSFColor.YELLOW.index)); + colors.put("#00FFFF",new Short(HSSFColor.HSSFColorPredefined.AQUA.getIndex())); + colors.put("#000000",new Short(HSSFColor.HSSFColorPredefined.BLACK.getIndex())); + colors.put("#0000FF",new Short(HSSFColor.HSSFColorPredefined.BLUE.getIndex())); + colors.put("#FF00FF",new Short(HSSFColor.HSSFColorPredefined.PINK.getIndex())); + colors.put("#808080",new Short(HSSFColor.HSSFColorPredefined.GREY_40_PERCENT.getIndex())); + colors.put("#008000",new Short(HSSFColor.HSSFColorPredefined.BRIGHT_GREEN.getIndex())); + colors.put("#00FF00",new Short(HSSFColor.HSSFColorPredefined.LIME.getIndex())); + colors.put("#800000",new Short(HSSFColor.HSSFColorPredefined.MAROON.getIndex())); + colors.put("#000080",new Short(HSSFColor.HSSFColorPredefined.ROYAL_BLUE.getIndex())); + colors.put("#808000",new Short(HSSFColor.HSSFColorPredefined.OLIVE_GREEN.getIndex())); + colors.put("#FF9900",new Short(HSSFColor.HSSFColorPredefined.ORANGE.getIndex())); + colors.put("#800080",new Short(HSSFColor.HSSFColorPredefined.VIOLET.getIndex())); + colors.put("#FF0000",new Short(HSSFColor.HSSFColorPredefined.RED.getIndex())); + colors.put("#C0C0C0",new Short(HSSFColor.HSSFColorPredefined.CORAL.getIndex())); + colors.put("#008080",new Short(HSSFColor.HSSFColorPredefined.TEAL.getIndex())); + colors.put("#FFFFFF",new Short(HSSFColor.HSSFColorPredefined.WHITE.getIndex())); + colors.put("#FFFF00",new Short(HSSFColor.HSSFColorPredefined.YELLOW.getIndex())); } @@ -72,7 +72,7 @@ public class ExcelColorDef { return ((Short) colors.get(color)).shortValue(); } - return new Short(HSSFColor.WHITE.index).shortValue(); + return new Short(HSSFColor.HSSFColorPredefined.WHITE.getIndex()).shortValue(); } public static void main(String[] args) { diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index 75c7e29e..2af46dc8 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -134,17 +134,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.mchange</groupId> @@ -176,7 +176,7 @@ <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> - <version>7.2.1</version> + <version>7.6.1</version> <exclusions> <exclusion> <groupId>org.apache.lucene</groupId> @@ -312,7 +312,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j</artifactId> - <version>2.11.2</version> + <version>2.13.1</version> <type>pom</type> </dependency> diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_3_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_3_OS.sql index 90e23bcf..f13a4bb5 100644 --- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_3_OS.sql +++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_3_OS.sql @@ -50,7 +50,7 @@ UPDATE fn_menu SET ACTION='v2/admin/usage_list' WHERE LABEL='Usage'; UPDATE fn_menu SET ACTION='v2/admin/cache_admin' WHERE LABEL='Cache Admin'; UPDATE fn_menu SET ACTION='v2/admin/admin_menu_edit' WHERE LABEL='Menus'; UPDATE fn_menu SET ACTION='v2/app/create' WHERE LABEL='Create Reports'; -UPDATE fn_menu SET ACTION='v2/app/report-list' WHERE LABEL='All Reports' +UPDATE fn_menu SET ACTION='v2/app/report-list' WHERE LABEL='All Reports'; -- fn_user Insert into fn_user (USER_ID,ORG_ID,MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) values (1,null,null,'Demo',null,'User',null,null,null,'demo@email.com',null,null,null,'demo',null,'demo','demo',str_to_date('24-OCT-16','%d-%M-%Y'),'Y',null,str_to_date('17-OCT-16','%d-%M-%Y'),1,str_to_date('24-OCT-16','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null); diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/global.logo b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/global.logo Binary files differnew file mode 100644 index 00000000..bf85815a --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/global.logo diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/pdf.png b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/pdf.png Binary files differnew file mode 100644 index 00000000..ed96c5c1 --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/pdf.png diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/spinner.gif b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/spinner.gif Binary files differnew file mode 100644 index 00000000..c97ec6ea --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/spinner.gif diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/xlsx.png b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/xlsx.png Binary files differnew file mode 100644 index 00000000..1ac37679 --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/assets/images/xlsx.png diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.prod.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.prod.ts index 125d0548..d4692c04 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.prod.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.prod.ts @@ -31,5 +31,12 @@ export const environment = { saveRole:'role/saveRole.htm?role_id=', toggleProfileActive: 'profile/toggleProfileActive?profile_id=', isLogDisabled:'true', - brandName: "Portal SDK" + brandName: "Portal SDK", + getManifest: 'manifest', + brandLogoImagePath: '', + footerLink: '', + footerLinkText: '', + footerMessage: '', + footerLogoImagePath: '', + footerLogoText: '' }; diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.ts index 7d8f161c..003c89c8 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.ts @@ -35,7 +35,14 @@ export const environment = { saveRole:'http://www.sdk.onap.org:8080/epsdk-app-os/role/saveRole.htm?role_id=', toggleProfileActive: 'http://www.sdk.onap.org:8080/epsdk-app-os/profile/toggleProfileActive?profile_id=', isLogDisabled:'false', - brandName: "Portal SDK" + brandName: "Portal SDK", + getManifest: 'http://www.sdk.onap.org:8080/epsdk-app-os/manifest', + brandLogoImagePath: '', + footerLink: '', + footerLinkText: '', + footerMessage: '', + footerLogoImagePath: '', + footerLogoText: '' }; /* diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.html new file mode 100644 index 00000000..f7663462 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.html @@ -0,0 +1,11 @@ + <footer class="footer"> + <div id="footer-text" class="footerText"> + <p class="copyright-text"> + <a class="footer-link" href="{{footerLink}}" target="_blank"> + {{footerLinkText}}</a> {{footerMessage}} + {{brandName}} Version: {{buildVersion}} + <h2 style="color:white; text-align: center;" class="logo-title"> + <img class="footer-logo" *ngIf="(footerLogoImagePath !='')" src="{{footerLogoImagePath}}"> {{footerLogoText}} + </h2> + </div> + </footer> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss new file mode 100644 index 00000000..dbb5a100 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss @@ -0,0 +1,38 @@ +$topnav-background-color: #222; + +.footerText { + background-color: $topnav-background-color; +} + +.copyright-text { + background-color: $topnav-background-color; + color: #fff; + font-size: 11px; + margin-bottom: 0; + line-height: 3rem; + margin-top: 20px; + text-align: center; +} + +.footer { + position: fixed; + bottom: 0; + // background-color: $topnav-background-color; + width: 100%; + // height: 7.5em; + z-index: 1002; + // bottom: 0px; + // right: 0px; + // width: 84%; + margin-bottom: -.5rem; +} + +.footer-logo { + width: 1.5rem; + margin-top: -10px; +} + +.footerText h2 { + font-size: 1.5rem; + margin-top: -10px; +}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.spec.ts new file mode 100644 index 00000000..8eda932f --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.spec.ts @@ -0,0 +1,56 @@ +// import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +// import { FooterComponent } from './footer.component'; + +// describe('FooterComponent', () => { +// let component: FooterComponent; +// let fixture: ComponentFixture<FooterComponent>; + +// beforeEach(async(() => { +// TestBed.configureTestingModule({ +// declarations: [ FooterComponent ] +// }) +// .compileComponents(); +// })); + +// beforeEach(() => { +// fixture = TestBed.createComponent(FooterComponent); +// component = fixture.componentInstance; +// fixture.detectChanges(); +// }); + +// it('should create', () => { +// expect(component).toBeTruthy(); +// }); +// }); + +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { HttpClientModule } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { FooterComponent } from './footer.component'; + +describe('FooterComponent', () => { + let component: FooterComponent; + let fixture: ComponentFixture<FooterComponent>; + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + HttpClientTestingModule + ], + declarations: [ FooterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); + diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.ts new file mode 100644 index 00000000..7aae6d0b --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.ts @@ -0,0 +1,71 @@ +import { Component, OnInit } from '@angular/core'; +import { ManifestService } from 'src/app/shared/services'; +import { environment } from 'src/environments/environment'; + + +declare var runAnalytics: any +@Component({ + selector: 'app-footer', + templateUrl: './footer.component.html', + styleUrls: ['./footer.component.scss'] +}) +export class FooterComponent implements OnInit { + +buildVersion: string; + api = environment; + brandName: string; + footerLink: string; + footerLinkText: string; + footerMessage: string; + footerLogoImagePath: string; + footerLogoText: string; + + constructor(private manifest: ManifestService) { } + + ngOnInit() { + this.buildVersion = ''; + this.manifestDetails(); + + this.brandName = "ONAP Portal SDK"; + if(this.api.brandName != ''){ + this.brandName = this.api.brandName; + } + this.footerLink = this.api.footerLink; + this.footerLinkText = this.api.footerLinkText; + this.footerMessage= this.api.footerMessage; + if(this.api.footerLogoImagePath !=''){ + this.footerLogoImagePath= this.api.footerLogoImagePath; + } + this.footerLogoText= this.api.footerLogoText; + this.portalHook(); + + } + + manifestDetails() { + this.manifest.getManifest().subscribe((_res: any) => { + this.buildVersion = _res['Build-Number']; + }, (_err) => { + + }); + } + + portalHook() { + + let done = false; + let script = document.createElement('script'); + script.src = "api/v3/analytics" + script.async = true; + script.onload = ()=> { + runAnalytics(); + } + + document.head.appendChild(script); + + } + } + + + + + +
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html index 5f8a2ec5..c86a0693 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html @@ -1,52 +1,55 @@ -<div class="sidebar" [ngClass]="{'siderbar-height': showHeader, 'siderbar-height-noHeader': !showHeader, collapsed:collapsed}" > - <nav [ngClass]="{sidebarPushRight: isActive, collapsed: collapsed}"> - <div class="toggle-button" [ngClass]="{collapsed: collapsed}" (click)="toggleCollapsed()"> - <!--<i class="fa fa-angle-double-{{collapsed?'right':'left'}}"></i> --> - <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i> - <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i> - - - </div> - <div class="list-group" *ngFor="let menu of menuData ; index as item"> - - <div class="nested-menu" *ngIf="!(menu.menuItems.length > 0)"> - <a href="{{menu.href}}" target="{{menu.target}}" *ngIf="menu.target!==null else routerBlock" class="list-group-item"> - <i class="icon ion-ios-home"></i> - <span>{{menu.name}}</span> - </a> - - <ng-template #routerBlock> - <a [routerLink]="[menu.href]" class="list-group-item"> - <i class="{{menu.imageSrc}}"></i> - <span>{{menu.name}}</span> - </a> - </ng-template> - </div> +<div class="sidebar" [ngClass]="{'siderbar-height': showHeader, 'siderbar-height-noHeader': !showHeader}" > + <div class="sidebar-list" [ngClass]="{collapsed: collapsed}"> + + <nav [ngClass]="{sidebarPushRight: isActive, collapsed: collapsed}"> - <div class="nested-menu" *ngIf="menu.menuItems.length > 0"> - <a href="javascript:void(0)" class="list-group-item" - (click)="addExpandClass(menu.name)"> - <i class="{{menu.imageSrc}}"></i> - <i *ngIf = "!collapsed" style="float: right;" class="icon ion-ios-add-circle-outline"></i> - <span>{{menu.name}}</span> - </a> - <li class="nested" [class.expand]="showMenu === menu.name"> - <ul class="submenu"> - <li *ngFor="let menuItems of menu.menuItems"> - <a href="{{menuItems.href}}" target="{{menuItems.target}}" *ngIf="menuItems.href!==null else routerBlock"> - <i class="{{menuItems.imageSrc}}"></i> - <span>{{ menuItems.name }}</span> - </a> - <ng-template #routerBlock> - <a [routerLink]="[menuItems.router]"> - <i class="{{menuItems.imageSrc}}"></i> - <span>{{ menuItems.name }}</span> - </a> - </ng-template> - </li> - </ul> - </li> - </div> - </div> - </nav> -</div>
\ No newline at end of file + <div class="list-group" *ngFor="let menu of menuData ; index as item"> + + <div class="nested-menu" *ngIf="!(menu.menuItems.length > 0)"> + <a href="{{menu.href}}" target="{{menu.target}}" *ngIf="menu.target!==null else routerBlock" class="list-group-item"> + <i class="icon ion-ios-home"></i> + <span>{{menu.name}}</span> + </a> + + <ng-template #routerBlock> + <a [routerLink]="[menu.href]" class="list-group-item"> + <i class="{{menu.imageSrc}}"></i> + <span>{{menu.name}}</span> + </a> + </ng-template> + </div> + + <div class="nested-menu" *ngIf="menu.menuItems.length > 0"> + <a href="javascript:void(0)" class="list-group-item" + (click)="addExpandClass(menu.name)"> + <i class="{{menu.imageSrc}}"></i> + <i style="float: right;" class="icon ion-ios-add-circle-outline"></i> + <span>{{menu.name}}</span> + </a> + <li class="nested" [class.expand]="showMenu === menu.name"> + <ul class="submenu"> + <li *ngFor="let menuItems of menu.menuItems"> + <a href="{{menuItems.href}}" target="{{menuItems.target}}" *ngIf="menuItems.href!==null else routerBlock"> + <i class="{{menuItems.imageSrc}}"></i> + <span>{{ menuItems.name }}</span> + </a> + <ng-template #routerBlock> + <a [routerLink]="[menuItems.router]"> + <i class="{{menuItems.imageSrc}}"></i> + <span>{{ menuItems.name }}</span> + </a> + </ng-template> + </li> + </ul> + </li> + <!-- </br></br></br> --> + </div> + </div> + </nav> + </div> + <div class="toggle-button" [ngClass]="{collapsed: collapsed}" (click)="toggleCollapsed()"> + <!-- <i class="fa fa-angle-double-{{collapsed?'right':'left'}}"></i> --> + <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i> + <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i> + </div> + </div>
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss index 3917b896..02c969cc 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss @@ -35,203 +35,214 @@ * * */ -$topnav-background-color: #f2f2f2; + $topnav-background-color: #f2f2f2; -.siderbar-height-noHeader{ - top: 0px; -} - -.siderbar-height{ - top: 56px; -} - -.sidebar { - border-radius: 0; - position: fixed; - z-index: 1000; - left: 235px; - width: 235px; - margin-left: -235px; - margin-bottom: 48px; - border: none; - border-radius: 0; - overflow-y: auto; - background-color: $topnav-background-color; - bottom: 0; - overflow-x: hidden; - padding-bottom: 40px; - white-space: nowrap; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; - .list-group { - a.list-group-item { - background: $topnav-background-color; - border: 0; - border-top: 1px solid #999; - border-radius: 0; - color: #0568ae; - text-decoration: none; - .fa { - margin-right: 10px; - color: #000; - } - } - a:hover { - background: darken($topnav-background-color, 5%); - color: #fff; - } - a.router-link-active { - background: darken($topnav-background-color, 5%); - color: #fff; - } - .header-fields { - padding-top: 10px; - - > .list-group-item:first-child { - border-top: 1px solid rgba(255, 255, 255, 0.2); - } - } - } - .sidebar-dropdown { - *:focus { - border-radius: none; - border: none; - } - .panel-title { - font-size: 1rem; - height: 50px; - margin-bottom: 0; - a { - color: #999; - text-decoration: none; - font-weight: 400; - background: $topnav-background-color; - span { - position: relative; - display: block; - padding: 0.75rem 1.5rem; - padding-top: 1rem; - } - } - a:hover, - a:focus { - color: #fff; - outline: none; - outline-offset: -2px; - } - } - .panel-title:hover { - background: darken($topnav-background-color, 5%); - } - .panel-collapse { - border-radious: 0; - border: none; - .panel-body { - .list-group-item { - border-radius: 0; - background-color: $topnav-background-color; - border: 0 solid transparent; - a { - color: #999; - } - a:hover { - color: #fff; - } - } - .list-group-item:hover { - background: darken($topnav-background-color, 5%); - } - } - } - } -} - -.nested-menu { - .list-group-item { - cursor: pointer; - } - .nested { - list-style-type: none; - } - ul.submenu { - display: none; - height: 0; - } - & .expand { - ul.submenu { - display: block; - list-style-type: none; - height: auto; - li { - a { - color: #0568ae; - padding: 10px; - display: block; - } - } - } - } -} -@media screen and (max-width: 992px) { - .sidebar { - top: 54px; - left: 0px; - } -} -@media print { - .sidebar { - display: none !important; - } -} -@media (min-width: 992px) { - .header-fields { - display: none; - } -} - -::-webkit-scrollbar { - width: 8px; -} - -::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 0px rgba(255, 255, 255, 1); - border-radius: 3px; -} - -::-webkit-scrollbar-thumb { - border-radius: 3px; - -webkit-box-shadow: inset 0 0 3px rgba(255, 255, 255, 1); -} - -.toggle-button { - position: fixed; - width: 236px; - cursor: pointer; - padding: 12px; - bottom: 0; - color: #000;; - background: #f2f2f2; - i { - font-size: 23px; - } - &:hover { - background: darken($topnav-background-color, 5%); - color: #fff; - } - border-top: 1px solid #999; - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -ms-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -.collapsed { - width: 60px; - span { - display: none; - } -} + .siderbar-height-noHeader{ + top: 0px; + } + + .siderbar-height{ + top: 56px; + } + + .sidebar-list { + border-radius: 0; + position: fixed; + z-index: 1000; + left: 235px; + width: 235px; + //height: 100%; + height: 76%; + margin-left: -235px; + //margin-bottom: 48px; + margin-bottom: 0px; + border: none; + border-radius: 0; + overflow-y: auto; + background-color: $topnav-background-color; + top: 7.2em; + //top: 0em; + overflow-x: hidden; + //padding-bottom: 40px; + padding-bottom: 5em; + white-space: nowrap; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + .list-group { + a.list-group-item { + background: $topnav-background-color; + border: 0; + border-top: 1px solid #999; + border-radius: 0; + color: #0568ae; + text-decoration: none; + .fa { + margin-right: 10px; + color: #000; + } + } + a:hover { + background: darken($topnav-background-color, 5%); + color: #fff; + } + a.router-link-active { + background: darken($topnav-background-color, 5%); + color: #fff; + } + .header-fields { + padding-top: 10px; + + > .list-group-item:first-child { + border-top: 1px solid rgba(255, 255, 255, 0.2); + } + } + } + .sidebar-dropdown { + *:focus { + border-radius: none; + border: none; + } + .panel-title { + font-size: 1rem; + height: 50px; + margin-bottom: 0; + a { + color: #999; + text-decoration: none; + font-weight: 400; + background: $topnav-background-color; + span { + position: relative; + display: block; + padding: 0.75rem 1.5rem; + padding-top: 1rem; + } + } + a:hover, + a:focus { + color: #fff; + outline: none; + outline-offset: -2px; + } + } + .panel-title:hover { + background: darken($topnav-background-color, 5%); + } + .panel-collapse { + border-radious: 0; + border: none; + .panel-body { + .list-group-item { + border-radius: 0; + background-color: $topnav-background-color; + border: 0 solid transparent; + a { + color: #999; + } + a:hover { + color: #fff; + } + } + .list-group-item:hover { + background: darken($topnav-background-color, 5%); + } + } + } + } + } + + .nested-menu { + .list-group-item { + cursor: pointer; + } + .nested { + list-style-type: none; + } + ul.submenu { + display: none; + height: 0; + } + & .expand { + ul.submenu { + display: block; + list-style-type: none; + height: auto; + li { + a { + color: #0568ae; + padding: 10px; + display: block; + } + } + } + } + } + @media screen and (max-width: 992px) { + .sidebar { + top: 54px; + left: 0px; + } + } + @media print { + .sidebar { + display: none !important; + } + } + @media (min-width: 992px) { + .header-fields { + display: none; + } + } + + ::-webkit-scrollbar { + width: 8px; + } + + ::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 0px rgba(255, 255, 255, 1); + border-radius: 3px; + } + + ::-webkit-scrollbar-thumb { + border-radius: 3px; + -webkit-box-shadow: inset 0 0 3px rgba(255, 255, 255, 1); + } + .sidebar{ + position: relative; + } + .toggle-button { + position: fixed; + width: 236px; + cursor: pointer; + padding: 12px; + // bottom: 5.5em; + top: 3.5em; + left: 0; + z-index: 1001; + color: #000;; + background: #f2f2f2; + i { + font-size: 23px; + } + &:hover { + background: darken($topnav-background-color, 5%); + color: #fff; + } + border-bottom: 1px solid #999; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + } + + .collapsed { + width: 60px; + span { + display: none; + } + } +
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html index 446e8fc7..bf4507f6 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html @@ -4,7 +4,12 @@ </section> </div> -<app-sidebar (collapsedEvent)="receiveCollapsed($event)"></app-sidebar> <section class="main-container" [ngClass]="{collapsed: collapedSideBar}"> + <app-sidebar (collapsedEvent)="receiveCollapsed($event)"></app-sidebar> + <router-outlet></router-outlet> </section> + +<section > + <app-footer></app-footer> +</section>
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts index 51af0be1..07b8459c 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts @@ -44,6 +44,7 @@ import { LayoutRoutingModule } from './layout-routing.module'; import { LayoutComponent } from './layout.component'; import { SidebarComponent } from './components/sidebar/sidebar.component'; import { HeaderComponent } from './components/header/header.component'; +import { FooterComponent } from './components/footer/footer.component' import {A11yModule} from '@angular/cdk/a11y'; import {BidiModule} from '@angular/cdk/bidi'; import {ObserversModule} from '@angular/cdk/observers'; @@ -74,6 +75,6 @@ import {AdminModule} from '../admin/admin.module'; CdkStepperModule, CdkTableModule ], - declarations: [LayoutComponent, SidebarComponent, HeaderComponent] + declarations: [LayoutComponent, SidebarComponent, HeaderComponent, FooterComponent] }) export class LayoutModule {} diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/index.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/index.ts index c161be12..167a54b4 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/index.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/index.ts @@ -35,4 +35,5 @@ * * */ -export * from './sidebar/sidebar.service';
\ No newline at end of file +export * from './sidebar/sidebar.service'; +export * from './manifest/manifest.service';
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/manifest/manifest.service.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/manifest/manifest.service.spec.ts new file mode 100644 index 00000000..85e6e294 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/manifest/manifest.service.spec.ts @@ -0,0 +1,13 @@ +import { TestBed } from '@angular/core/testing'; + +import { ManifestService } from './manifest.service'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; + +describe('ManifestService', () => { + beforeEach(() => TestBed.configureTestingModule({imports:[HttpClientTestingModule]})); + + it('should be created', () => { + const service: ManifestService = TestBed.get(ManifestService); + expect(service).toBeTruthy(); + }); +}); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/manifest/manifest.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/manifest/manifest.service.ts new file mode 100644 index 00000000..7553e38c --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/manifest/manifest.service.ts @@ -0,0 +1,53 @@ +/*- + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 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 { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { environment } from 'src/environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class ManifestService { + + api = environment; + constructor(public httpClient: HttpClient) { } + + getManifest() { + return this.httpClient.get(this.api.getManifest); + } +} diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml index 1278a11b..b65801c1 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -299,23 +299,23 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.15</version> + <version>1.26</version> </dependency> <!-- Mapper --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.11.4</version> + <version>2.11.0</version> </dependency> <!-- Use Mariadb connector --> <dependency> @@ -366,7 +366,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.12</version> + <version>1.15</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -398,7 +398,7 @@ <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> - <version>6.8.2</version> + <version>7.6.1</version> <exclusions> <exclusion> <groupId>org.apache.lucene</groupId> @@ -498,7 +498,7 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> - <version>8.5.0</version> + <version>8.7.0</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -513,7 +513,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -523,7 +523,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -538,7 +538,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -553,7 +553,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-scratchpad</artifactId> - <version>3.17</version> + <version>4.1.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/ecomp-sdk/epsdk-domain/pom.xml b/ecomp-sdk/epsdk-domain/pom.xml index c55c4517..913087b3 100644 --- a/ecomp-sdk/epsdk-domain/pom.xml +++ b/ecomp-sdk/epsdk-domain/pom.xml @@ -23,17 +23,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.11.4</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/Role.java b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/Role.java index dee82c9e..ea745356 100644 --- a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/Role.java +++ b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/Role.java @@ -44,6 +44,7 @@ import java.util.TreeSet; import org.onap.portalsdk.core.domain.support.DomainVo; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * <p> @@ -55,6 +56,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; * * @version 1.0 */ + +@JsonIgnoreProperties(ignoreUnknown = true) public class Role extends DomainVo { private static final long serialVersionUID = 1L; diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml index 5ea16eaa..be64ae22 100644 --- a/ecomp-sdk/epsdk-fw/pom.xml +++ b/ecomp-sdk/epsdk-fw/pom.xml @@ -93,7 +93,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.10</version> + <version>1.15</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -102,13 +102,18 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.11.0</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.11.3</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.owasp.esapi</groupId> @@ -232,7 +237,7 @@ <artifactId>powermock-api-mockito</artifactId> <version>${powermock.version}</version> <scope>test</scope> - </dependency> + </dependency> </dependencies> </project> diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml index b952d65d..f7de89e7 100644 --- a/ecomp-sdk/epsdk-music/pom.xml +++ b/ecomp-sdk/epsdk-music/pom.xml @@ -127,17 +127,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.springframework.session</groupId> diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml index 49e3fc5b..00b78621 100644 --- a/ecomp-sdk/epsdk-workflow/pom.xml +++ b/ecomp-sdk/epsdk-workflow/pom.xml @@ -30,17 +30,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.10</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.11.4</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> |
