diff options
90 files changed, 692 insertions, 846 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/config/ConfigLoader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/config/ConfigLoader.java index de62b738..b1640d92 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/config/ConfigLoader.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/config/ConfigLoader.java @@ -65,99 +65,99 @@ public class ConfigLoader { public static final String RAPTOR_PDF_PROPERTIES = "raptor_pdf"; private static String raptorActionMapString = - "report.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_run.jsp \n" - + "mobile.report.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |mobile_report_run.jsp \n" - + "report.dashrep1.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep1 |report_run_dashrep1.jsp \n" - + "report.dashrep2.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep2 |report_run_dashrep2.jsp \n" - + "report.dashrep3.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep3 |report_run_dashrep3.jsp \n" - + "report.dashrep4.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep4 |report_run_dashrep4.jsp \n" - + "report.download |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_xls.jsp \n" - + "report.download.excel2007 |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_xlsx.jsp \n" - + "report.download.page |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_page_xls.jsp \n" - + "report.csv.download |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_csv.jsp \n" - + "report.text.download |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_txt.jsp \n" - + "report.search |org.onap.portalsdk.analytics.controller.ActionHandler|reportSearch |report_search.jsp \n" - + "report.search.execute |org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchExecute |report_search \n" - + "report.search.user |org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchUser |report_search.jsp \n" - + "report.search.public |org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchPublic |report_search.jsp \n" - + "report.search.favorite |org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchFavorites |report_search.jsp \n" - + "report.wizard |org.onap.portalsdk.analytics.controller.ActionHandler|reportWizard |report_wizard \n" - + "report.create |org.onap.portalsdk.analytics.controller.ActionHandler|reportCreate |report_wizard \n" - + "report.import |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_import \n" - + "report.import.save |org.onap.portalsdk.analytics.controller.ActionHandler|reportImportSave |report_wizard \n" - + "report.copy |org.onap.portalsdk.analytics.controller.ActionHandler|reportCopy |report_wizard \n" - + "report.copy.container |org.onap.portalsdk.analytics.controller.ActionHandler|reportCopy |raptor_wizard_container.jsp \n" - + "report.edit |org.onap.portalsdk.analytics.controller.ActionHandler|reportEdit |report_wizard \n" - + "report.delete |org.onap.portalsdk.analytics.controller.ActionHandler|reportDelete |report_search \n" - + "report.popup.field |org.onap.portalsdk.analytics.controller.ActionHandler|reportFormFieldPopup |popup_field.jsp \n" - + "report.popup.map |org.onap.portalsdk.analytics.controller.ActionHandler|reportValuesMapDefPopup |popup_map.jsp \n" - + "report.popup.drilldown.table |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |popup_drill_down_table.jsp \n" - + "report.popup.drilldown.report|org.onap.portalsdk.analytics.controller.ActionHandler|reportDrillDownToReportDefPopup|popup_drill_down_report \n" - + "report.popup.import.semaphore|org.onap.portalsdk.analytics.controller.ActionHandler|importSemaphorePopup |popup_import_semaphore \n" - + "report.popup.semaphore |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |popup_semaphore \n" - + "report.popup.semaphore.save |org.onap.portalsdk.analytics.controller.ActionHandler|saveSemaphorePopup |popup_semaphore \n" - + "report.popup.filter.col |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |popup_filter_col.jsp \n" - + "report.popup.filter.data |org.onap.portalsdk.analytics.controller.ActionHandler|reportFilterDataPopup |popup_filter_data.jsp \n" - + "report.popup.sql |org.onap.portalsdk.analytics.controller.ActionHandler|reportShowSQLPopup |popup_sql \n " - + "report.run.popup |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_run_popup.jsp \n" - + "report.popup.test.cond |org.onap.portalsdk.analytics.controller.ActionHandler|testSchedCondPopup |popup_sql \n" - + "report.popup.testrun.sql |org.onap.portalsdk.analytics.controller.ActionHandler|testRunSQLPopup |popup_testrun_sql \n" - + "report.test.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |test_run_sql \n" - + "report.field.testrun.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |test_field_run_sql \n" - + "report.field.default.testrun.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |default_field_run_sql \n" - + "report.field.date.start.testrun.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |date_start_field_run_sql \n" - + "report.field.date.end.testrun.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |date_end_field_run_sql \n" - + "report.popup.table.cols |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |popup_table_cols \n" - + "refresh.cache |org.onap.portalsdk.analytics.controller.ActionHandler|refreshCache |message.jsp \n" - + "report.message |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |message.jsp \n" - + "report.download.pdf |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_pdf.jsp \n" - + "report.popup.pdfconfig |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |popup_pdf_config.jsp \n" - + "download.all |org.onap.portalsdk.analytics.controller.ActionHandler|downloadAll |close.jsp \n" - + "download.all.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |popup_download_flat_file.jsp \n" - + "download.data.file |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |download_data_file.jsp \n" - + "popup.calendar |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |gtm_calendar.jsp \n" - + "report.folderlist |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |folder_report_list.jsp \n" - + "report.folderlist_iframe |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |folder_report_list_iframe.jsp \n" - + "report.childDropDown |org.onap.portalsdk.analytics.controller.ActionHandler|getChildDropDown |raptor_childdropdown.jsp \n" - + "report.create.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_create_container.jsp \n" - + "report.search.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_search_container.jsp \n" - + "report.search.execute.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_search_execute_container.jsp \n" - + "report.search.user.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_search_user_container.jsp \n" - + "report.search.public.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_search_public_container.jsp \n" - + "report.search.favorite.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_search_favorite_container.jsp \n" - + "report.run.container |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_run_container.jsp \n" - + "report.formfields.run.container |org.onap.portalsdk.analytics.controller.ActionHandler|formFieldRun |report_run_container.jsp \n" - + "report.run.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_run.jsp \n" - + "report.schedule.multiple |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |wizard_schedule_multiple.jsp \n" - + "report.schedule.submit |org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule |wizard_schedule_only.jsp \n" - + "report.schedule.report.submit |org.onap.portalsdk.analytics.controller.ActionHandler|processScheduleReportList |wizard_schedule_only.jsp \n" - + "report.schedule.report.submit_wmenu |org.onap.portalsdk.analytics.controller.ActionHandler|processScheduleReportList |wizard_schedule_only_from_search.jsp \n" - + "report.schedule_only |org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule |wizard_schedule_only \n" - + "report.schedule_only_from_search |org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule |wizard_schedule_only_from_search.jsp \n" - + "report.schedule_delete |org.onap.portalsdk.analytics.controller.ActionHandler|processScheduleDelete |report_run_container.jsp \n" - + "report.schedule.submit_from_search |org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule |wizard_schedule_only_from_search.jsp \n" - + "report.dashboard.detail |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |dashboard_report_run_detail.jsp \n" - + "report.csv.download.direct |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_csv.jsp \n" - + "report.csv.download.direct |org.onap.portalsdk.analytics.controller.ActionHandler|reportRun |report_download_csv.jsp \n" - + "report.download.csv.session |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_download_csv \n" - + "report.download.excel2007.session |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_download_xlsx.jsp \n" - + "report.download.excel.session |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_download_xls.jsp \n" - + "report.download.pdf.session |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_download_pdf.jsp \n" - + "report.download.page.session |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_download_page_xls.jsp \n" - + "report.data.remove.session |org.onap.portalsdk.analytics.controller.ActionHandler|removeReportDataFromSession |report_run_container.jsp \n" - + "report.dashboard.run.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_dashboard_run_container.jsp \n" - + "chart.force.cluster |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |force_cluster.jsp \n" - + "chart.run |org.onap.portalsdk.analytics.controller.ActionHandler|reportChartRun |report_run_container.jsp \n" - + "chart.json |org.onap.portalsdk.analytics.controller.ActionHandler|reportChartRun |report_run_container.jsp \n" - + "chart.data.json |org.onap.portalsdk.analytics.controller.ActionHandler|reportChartDataRun |report_run_container.jsp \n" - + "quicklinks.json |org.onap.portalsdk.analytics.controller.ActionHandler|getQuickLinksJSON |report_run_container.jsp \n" - + "embed.run |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_embed_run_container.zul \n" - + "schedule.edit |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |wizard_adhoc_schedule.zul \n" - + "chart.annotations.run |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |plugin_chart_annotation.jsp \n" - + "chart.annotations.exec |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |chart_annotations.jsp \n" - + "chart.mini |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |chart_minified.jsp \n" - + "report.olap.run.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_olap_run_container.jsp \n" - + "report.hive.run.container |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp |report_hive_run_container.jsp \n" + "report.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_run.jsp\t\n" + + "mobile.report.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|mobile_report_run.jsp\t\n" + + "report.dashrep1.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep1\t|report_run_dashrep1.jsp\t\n" + + "report.dashrep2.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep2\t|report_run_dashrep2.jsp\t\n" + + "report.dashrep3.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep3\t|report_run_dashrep3.jsp\t\n" + + "report.dashrep4.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportDashRep4\t|report_run_dashrep4.jsp\t\n" + + "report.download\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_xls.jsp\t\n" + + "report.download.excel2007\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_xlsx.jsp\t\n" + + "report.download.page\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_page_xls.jsp\t\n" + + "report.csv.download\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_csv.jsp\t\n" + + "report.text.download\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_txt.jsp\t\n" + + "report.search\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportSearch\t|report_search.jsp\t\n" + + "report.search.execute\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchExecute\t|report_search\t\n" + + "report.search.user\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchUser\t|report_search.jsp\t\n" + + "report.search.public\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchPublic\t|report_search.jsp\t\n" + + "report.search.favorite\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportSearchFavorites\t|report_search.jsp\t\n" + + "report.wizard\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportWizard\t|report_wizard\t\n" + + "report.create\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportCreate\t|report_wizard\t\n" + + "report.import\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_import\t\n" + + "report.import.save\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportImportSave\t|report_wizard\t\n" + + "report.copy\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportCopy\t|report_wizard\t\n" + + "report.copy.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportCopy\t|raptor_wizard_container.jsp\t\n" + + "report.edit\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportEdit\t|report_wizard\t\n" + + "report.delete\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportDelete\t|report_search\t\n" + + "report.popup.field\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportFormFieldPopup\t|popup_field.jsp\t\n" + + "report.popup.map\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportValuesMapDefPopup\t|popup_map.jsp\t\n" + + "report.popup.drilldown.table\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|popup_drill_down_table.jsp\t\n" + + "report.popup.drilldown.report|org.onap.portalsdk.analytics.controller.ActionHandler|reportDrillDownToReportDefPopup|popup_drill_down_report\t\n" + + "report.popup.import.semaphore|org.onap.portalsdk.analytics.controller.ActionHandler|importSemaphorePopup\t|popup_import_semaphore\t\n" + + "report.popup.semaphore\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|popup_semaphore\t\n" + + "report.popup.semaphore.save\t|org.onap.portalsdk.analytics.controller.ActionHandler|saveSemaphorePopup\t|popup_semaphore\t\n" + + "report.popup.filter.col\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|popup_filter_col.jsp \n" + + "report.popup.filter.data\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportFilterDataPopup\t|popup_filter_data.jsp\t\n" + + "report.popup.sql\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportShowSQLPopup\t|popup_sql\t\n " + + "report.run.popup\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_run_popup.jsp\t\n" + + "report.popup.test.cond\t|org.onap.portalsdk.analytics.controller.ActionHandler|testSchedCondPopup\t|popup_sql\t\n" + + "report.popup.testrun.sql\t|org.onap.portalsdk.analytics.controller.ActionHandler|testRunSQLPopup\t|popup_testrun_sql\t\n" + + "report.test.jsp\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|test_run_sql\t\n" + + "report.field.testrun.jsp\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|test_field_run_sql\t\n" + + "report.field.default.testrun.jsp\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|default_field_run_sql\t\n" + + "report.field.date.start.testrun.jsp\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|date_start_field_run_sql\t\n" + + "report.field.date.end.testrun.jsp |org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|date_end_field_run_sql\t\n" + + "report.popup.table.cols\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|popup_table_cols\t\n" + + "refresh.cache\t|org.onap.portalsdk.analytics.controller.ActionHandler|refreshCache\t|message.jsp\t\n" + + "report.message\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|message.jsp\t\n" + + "report.download.pdf\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_pdf.jsp\t\n" + + "report.popup.pdfconfig\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|popup_pdf_config.jsp\t\n" + + "download.all\t|org.onap.portalsdk.analytics.controller.ActionHandler|downloadAll\t|close.jsp\t\n" + + "download.all.jsp\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|popup_download_flat_file.jsp\t\n" + + "download.data.file\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|download_data_file.jsp\t\n" + + "popup.calendar\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|gtm_calendar.jsp\t\n" + + "report.folderlist\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|folder_report_list.jsp\t\n" + + "report.folderlist_iframe\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|folder_report_list_iframe.jsp\t\n" + + "report.childDropDown\t|org.onap.portalsdk.analytics.controller.ActionHandler|getChildDropDown\t|raptor_childdropdown.jsp\t\n" + + "report.create.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_create_container.jsp\t\n" + + "report.search.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_search_container.jsp\t\n" + + "report.search.execute.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_search_execute_container.jsp\t\n" + + "report.search.user.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_search_user_container.jsp\t\n" + + "report.search.public.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_search_public_container.jsp\t\n" + + "report.search.favorite.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_search_favorite_container.jsp\t\n" + + "report.run.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_run_container.jsp\t\n" + + "report.formfields.run.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|formFieldRun\t|report_run_container.jsp\t\n" + + "report.run.jsp\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_run.jsp\t\n" + + "report.schedule.multiple\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|wizard_schedule_multiple.jsp\t\n" + + "report.schedule.submit\t|org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule\t|wizard_schedule_only.jsp\t\n" + + "report.schedule.report.submit\t|org.onap.portalsdk.analytics.controller.ActionHandler|processScheduleReportList\t|wizard_schedule_only.jsp\t\n" + + "report.schedule.report.submit_wmenu\t|org.onap.portalsdk.analytics.controller.ActionHandler|processScheduleReportList\t|wizard_schedule_only_from_search.jsp\t\n" + + "report.schedule_only\t|org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule\t|wizard_schedule_only\t\n" + + "report.schedule_only_from_search\t|org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule\t|wizard_schedule_only_from_search.jsp\t\n" + + "report.schedule_delete\t|org.onap.portalsdk.analytics.controller.ActionHandler|processScheduleDelete\t|report_run_container.jsp\t\n" + + "report.schedule.submit_from_search\t|org.onap.portalsdk.analytics.controller.ActionHandler|processSchedule\t|wizard_schedule_only_from_search.jsp\t\n" + + "report.dashboard.detail\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|dashboard_report_run_detail.jsp\t\n" + + "report.csv.download.direct\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_csv.jsp\t\n" + + "report.csv.download.direct\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportRun\t|report_download_csv.jsp\t\n" + + "report.download.csv.session\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_download_csv\t\n" + + "report.download.excel2007.session\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_download_xlsx.jsp\t\n" + + "report.download.excel.session\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_download_xls.jsp\t\n" + + "report.download.pdf.session\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_download_pdf.jsp\t\n" + + "report.download.page.session\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_download_page_xls.jsp\t\n" + + "report.data.remove.session\t|org.onap.portalsdk.analytics.controller.ActionHandler|removeReportDataFromSession\t|report_run_container.jsp\t\n" + + "report.dashboard.run.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_dashboard_run_container.jsp\t\n" + + "chart.force.cluster\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|force_cluster.jsp\t\n" + + "chart.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportChartRun\t|report_run_container.jsp\t\n" + + "chart.json\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportChartRun\t|report_run_container.jsp\t\n" + + "chart.data.json\t|org.onap.portalsdk.analytics.controller.ActionHandler|reportChartDataRun\t|report_run_container.jsp\t\n" + + "quicklinks.json\t|org.onap.portalsdk.analytics.controller.ActionHandler|getQuickLinksJSON\t|report_run_container.jsp\t\n" + + "embed.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_embed_run_container.zul\t\n" + + "schedule.edit\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|wizard_adhoc_schedule.zul\t\n" + + "chart.annotations.run\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|plugin_chart_annotation.jsp\t\n" + + "chart.annotations.exec\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|chart_annotations.jsp\t\n" + + "chart.mini\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|chart_minified.jsp\t\n" + + "report.olap.run.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_olap_run_container.jsp\t\n" + + "report.hive.run.container\t|org.onap.portalsdk.analytics.controller.ActionHandler|gotoJsp\t|report_hive_run_container.jsp\t\n" ; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java index a92d5244..01e9f3f4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java @@ -501,9 +501,10 @@ public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject { for (int i = 0; i < ds.getRowCount(); i++) { QuickLink quickLink = new QuickLink(); StringBuffer link = new StringBuffer(""); - link.append(AppUtils.getReportExecuteActionURLNG() + "c_master=" + ds.getString(i, 0)); - if (b) - link.append("&PAGE_ID=" + menuId + "&refresh=Y"); + //link.append(AppUtils.getReportExecuteActionURLNG() + "c_master=" + ds.getString(i, 0)); + //if (b) + //link.append("&PAGE_ID=" + menuId + "&refresh=Y"); + link.append("v2/run/"+ ds.getString(i, 0)); quickLink.setReportURL(link.toString()); quickLink.setReportName(ds.getString(i, 1)); quickLink.setShowDescr(Globals.getShowDescrAtRuntime()); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java index 4a5aa77e..5ceae666 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java @@ -1035,7 +1035,6 @@ public class ReportSchedule extends RaptorObject implements Serializable{ c_sql = c_sql.replace("[getScheduleID()]", getScheduleID()); sb.append(c_sql); - //sb.append("DELETE FROM cr_report_schedule where rep_id = " + reportID +" and sched_user_id = " + getScheduleUserID() + " and schedule_id = " + getScheduleID()); DbUtils.executeUpdate(connection, sb.toString()); } @@ -1134,8 +1133,6 @@ public class ReportSchedule extends RaptorObject implements Serializable{ try { connection = DbUtils.getConnection(); - - //String sql = "SELECT condition_large_sql FROM cr_report_schedule WHERE schedule_id=?"; String sql = Globals.getLoadCondSql(); stmt = connection.prepareStatement(sql); stmt.setString(1,scheduleId); @@ -1212,12 +1209,10 @@ public class ReportSchedule extends RaptorObject implements Serializable{ ResultSet rs = null; try { - //String sql = "update cr_report_schedule set condition_large_sql = EMPTY_CLOB() where schedule_id = " + scheduleId; String sql = Globals.getPersistCondSqlUpdate(); sql = sql.replace("[scheduleId]", scheduleId); DbUtils.executeUpdate(sql); - //sql = "SELECT condition_large_sql FROM cr_report_schedule cr WHERE schedule_id=? FOR UPDATE"; sql = Globals.getPersistCondSqlLarge(); stmt = connection.prepareStatement(sql); stmt.setString(1,scheduleId); @@ -1237,7 +1232,6 @@ public class ReportSchedule extends RaptorObject implements Serializable{ } catch (RaptorException ex) { if(ex.getMessage().indexOf("invalid identifier")!= -1) { try { - //String sql = "update cr_report_schedule set condition_sql = ? where schedule_id = " + scheduleId; String sql = Globals.getPersistCondSqlSet(); sql = sql.replace("[scheduleId]", scheduleId); stmt = connection.prepareStatement(sql); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/pdf/PdfReportHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/pdf/PdfReportHandler.java index f3aad70f..496b1598 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/pdf/PdfReportHandler.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/pdf/PdfReportHandler.java @@ -1108,7 +1108,6 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ for(dr.resetNext();dr.hasNext();) { DataValue dv = dr.getNext(); - //System.out.println(columnCount +" --> "+dv); if(dv.isVisible()) { HtmlFormatter cfmt = dv.getCellFormatter(); HtmlFormatter rfmt = dv.getRowFormatter(); @@ -1161,7 +1160,6 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ for(;dr.hasNext();) { DataValue dv = dr.getNext(); - //System.out.println(columnCount +" --> "+dv); if(dv.isVisible()) { HtmlFormatter cfmt = dv.getCellFormatter(); HtmlFormatter rfmt = dv.getRowFormatter(); @@ -1226,8 +1224,6 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ font.setColor(Color.decode(fmt.getFontColor())); if(fmt.getFontSize().trim().length()>0) font.setSize(Float.parseFloat(fmt.getFontSize())-Globals.getDataFontSizeOffset()); -// if(fmt.getFontFace().trim().length()>0) -// cellFont.setFamily() } @@ -1363,7 +1359,6 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ String title = (String) session.getAttribute("TITLE_"+index); String subtitle = (String) session.getAttribute("SUBTITLE_"+index); if(nvl(title).length()>0) { - //PdfPTable table = new PdfPTable(1); table.setWidthPercentage(100f); table.getDefaultCell().setHorizontalAlignment(Rectangle.ALIGN_CENTER); table.getDefaultCell().setVerticalAlignment(Rectangle.ALIGN_BOTTOM); @@ -1374,17 +1369,11 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ Font.BOLD, Color.BLACK); - //addEmptyRows(table,1); table.getDefaultCell().setHorizontalAlignment(Rectangle.ALIGN_CENTER); - //table.getDefaultCell().setBackgroundColor(Color.decode(Globals.getDataTableHeaderBackgroundFontColor())); title = Utils.replaceInString(title, "<BR/>", " "); title = Utils.replaceInString(title, "<br/>", " "); title = Utils.replaceInString(title, "<br>", " "); title = strip.stripHtml(nvl(title).trim()); - //subtitle = Utils.replaceInString(subtitle, "<BR/>", " "); - //subtitle = Utils.replaceInString(subtitle, "<br/>", " "); - //subtitle = Utils.replaceInString(subtitle, "<br>", " "); - //subtitle = strip.stripHtml(nvl(subtitle).trim()); StyleSheet styles = new StyleSheet(); HTMLWorker htmlWorker = new HTMLWorker(document); @@ -1401,17 +1390,11 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ } p1.add(elem); } - //cell = new PdfPCell(p1); StyleSheet style = new StyleSheet(); style.loadTagStyle("font", "font-size", "3"); style.loadTagStyle("font", "size", "3"); styles.loadStyle("pdfFont1", "size", "11px"); styles.loadStyle("pdfFont1", "font-size", "11px"); - /*ArrayList p = HTMLWorker.parseToList(new StringReader(nvl(title)), style); - for (int k = 0; k < p.size(); ++k){ - document.add((com.lowagie.text.Element)p.get(k)); - }*/ - //p1.font().setSize(3.0f); PdfPCell titleCell = new PdfPCell(new Phrase(title, font)); titleCell.setColspan(rr.getVisibleColumnCount()); PdfPCell subtitleCell = new PdfPCell(p1); @@ -1420,7 +1403,6 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ subtitleCell.setHorizontalAlignment(1); table.addCell(titleCell); table.addCell(subtitleCell); - //document.add(table); } return table; } @@ -1450,14 +1432,7 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ Font.BOLD, Color.BLACK); - - //addEmptyRows(table,1); table.getDefaultCell().setHorizontalAlignment(Rectangle.ALIGN_CENTER); - //table.getDefaultCell().setBackgroundColor(Color.decode(Globals.getDataTableHeaderBackgroundFontColor())); - /*title = Utils.replaceInString(title, "<BR/>", " "); - title = Utils.replaceInString(title, "<br/>", " "); - title = Utils.replaceInString(title, "<br>", " "); - title = strip.stripHtml(nvl(title).trim());*/ StyleSheet style = new StyleSheet(); HTMLWorker htmlWorker = new HTMLWorker(document); @@ -1475,15 +1450,12 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ p1.add(elem); } -/* - HTMLWorker.parseToList(new StringReader(nvl(title)), style);*/ PdfPCell titleCell = new PdfPCell(p1); titleCell.setHorizontalAlignment(Element.ALIGN_LEFT); table.addCell(titleCell); //table. document.add(table); } - //return table; } @@ -1494,39 +1466,26 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ FONT_SIZE+1f, Font.BOLD, Color.decode(Globals.getDataTableHeaderFontColor())); - //table.setHeaderRows(1); table.getDefaultCell().setHorizontalAlignment(Rectangle.ALIGN_CENTER); table.getDefaultCell().setBackgroundColor(Color.decode(Globals.getDataTableHeaderBackgroundFontColor())); String title = ""; boolean firstPass = true; - /*if(rd.reportTotalRowHeaderCols!=null) { - if(firstPass) { - table.addCell(new Paragraph("No.", font)); - firstPass = false; - } - }*/ for (rd.reportColumnHeaderRows.resetNext(); rd.reportColumnHeaderRows.hasNext();) { if(firstPass) { for(rd.reportRowHeaderCols.resetNext();rd.reportRowHeaderCols.hasNext();) { - /*if(firstPass) { - table.addCell(new Paragraph("No.", font)); - firstPass = false; - } else {*/ RowHeaderCol rhc = rd.reportRowHeaderCols.getNext(); title = rhc.getColumnTitle(); title = Utils.replaceInString(title,"_nl_", " \n"); table.addCell(new Paragraph(title,font)); - //} } } ColumnHeaderRow chr = rd.reportColumnHeaderRows.getNext(); for (chr.resetNext(); chr.hasNext();) { ColumnHeader ch = chr.getNext(); - //System.out.println(ch); if(ch.isVisible()) { title = ch.getColumnTitle(); title = Utils.replaceInString(title,"_nl_", " \n"); @@ -1542,13 +1501,10 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ Date sysdate = oracleDateFormat.parse(ReportLoader.getSystemDateTime()); SimpleDateFormat dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern()); return dtimestamp.format(sysdate)+" "+Globals.getTimeZone(); - //paramList.add(new IdNameValue("DATE", dtimestamp.format(sysdate)+" "+Globals.getTimeZone())); } catch(Exception ex) {} SimpleDateFormat s = new SimpleDateFormat(pattern); s.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone())); - //System.out.println("^^^^^^^^^^^^^^^^^^^^ " + Calendar.getInstance().getTime()); - //System.out.println("^^^^^^^^^^^^^^^^^^^^ " + s.format(Calendar.getInstance().getTime())); return s.format(Calendar.getInstance().getTime()); } @@ -1567,12 +1523,10 @@ public class PdfReportHandler extends org.onap.portalsdk.analytics.RaptorObject{ } catch (NumberFormatException e) {} pb.setCurrentPage(temp); - //pb.setPortrait( trueORfalse(request.getParameter("isPortrait"),true)); pb.setPortrait(trueORfalse(rr.getPDFOrientation() == "portait"?"true":"false", true)); - //pb.setCoverPageIncluded( trueORfalse(request.getParameter("isCoverPageIncluded"), true)); - //if(Globals.isCoverPageNeeded()) { - pb.setCoverPageIncluded(Globals.isCoverPageNeeded()?rr.isPDFCoverPage():false); - //} + + pb.setCoverPageIncluded(Globals.isCoverPageNeeded()?rr.isPDFCoverPage():false); + pb.setTitle(nvl(request.getParameter("title"))); pb.setPagesize(nvls(request.getParameter("pagesize"),"LETTER")); 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 0934e35c..a63ce959 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 @@ -3271,141 +3271,115 @@ public class ChartD3Helper { int flagDate = 10; */ - //date = MMDDYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; if(date==null) { - //date = EEEMMDDYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(EEEMMDDYYYYFormat, dateStr); if(date!=null) formatFlag = DAYOFTHEWEEKFLAG; } if(date==null) { - //date = MMDDYYYYHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //MMDDYYYYHHFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - //date = MMDDYYYYHHFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHFormat, dateStr); if(date!=null) formatFlag = HOURFLAG; } if(date==null) { - //date = MMDDYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = YYYYMMDDFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYMMDDFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = timestampFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = timestampHrFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampHrFormat, dateStr); if(date!=null) formatFlag = HOURFLAG; } if(date==null) { - //date = timestampDayFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampDayFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = MONYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MONYYYYFormat, dateStr); if(date!=null) formatFlag = MONTHFLAG; } if(date==null) { - //date = MMYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMYYYYFormat, dateStr); if(date!=null) formatFlag = MONTHFLAG; } if(date==null) { - //date = MMMMMDDYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMMMMDDYYYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = MONTHYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MONTHYYYYFormat, dateStr); if(date!=null) formatFlag = MONTHFLAG; } if(date==null) { - //date = YYYYMMDDHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYMMDDHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = YYYYMMDDHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYMMDDHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = DDMONYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(DDMONYYYYHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = DDMONYYYYHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(DDMONYYYYHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = DDMONYYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(DDMONYYYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = MMDDYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYHHMMSSFormat, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = MMDDYYHHMMFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYHHMMFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = MMDDYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYFormat, dateStr); if(date!=null) formatFlag = DAYFLAG; } if(date==null) { - //date = timestampFormat1.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestampFormat1, dateStr); if(date!=null) formatFlag = SECFLAG; } if(date==null) { - //date = MMDDYYYYHHMMZFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(MMDDYYYYHHMMZFormat, dateStr); if(date!=null) formatFlag = MINFLAG; } if(date==null) { - //date = YYYYFormat.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(YYYYFormat, dateStr); /* Some random numbers should not satisfy this year format. */ if(dateStr.length()>4) date = null; if(date!=null) formatFlag = YEARFLAG; } if(date==null) { - //date = timestamp_W_dash.parse(dateStr, new ParsePosition(0)); date = timezoneConversion(timestamp_W_dash, dateStr); if(date!=null) formatFlag = SECFLAG; } @@ -3453,16 +3427,6 @@ public class ChartD3Helper { final int MILLISECFLAG = 7; final int DAYOFTHEWEEKFLAG = 8; final int FLAGDATE = 9; - /*int yearFlag = 1; - int monthFlag = 2; - int dayFlag = 3; - int hourFlag = 4; - int minFlag = 5; - int secFlag = 6; - int milliSecFlag = 7; - int dayoftheweekFlag = 8; - int flagDate = 10; - */ date = MMDDYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0)); if(date!=null) @@ -3478,7 +3442,6 @@ public class ChartD3Helper { formatFlag = MINFLAG; } if(date==null) { - //MMDDYYYYHHFormat.setTimeZone(TimeZone.getTimeZone("UTC")); date = MMDDYYYYHHFormat.parse(dateStr, new ParsePosition(0)); if(date!=null) formatFlag = HOURFLAG; @@ -3656,8 +3619,6 @@ public class ChartD3Helper { private void clearReportRuntimeBackup(HttpServletRequest request) { - //Session sess = Sessions.getCurrent(true)getCurrent(); - //HttpSession session = (HttpSession)sess.getNativeSession(); HttpSession session = request.getSession(); session.removeAttribute(AppConstants.DRILLDOWN_REPORTS_LIST); request.removeAttribute(AppConstants.DRILLDOWN_INDEX); @@ -3740,7 +3701,7 @@ public class ChartD3Helper { try { if(vals[j] !=null && vals[j].length() > 0) { vals[j] = Utils.oracleSafe(vals[j]); - value.append(java.net.URLDecoder.decode(vals[j], "UTF-8"));// + ","; + value.append(java.net.URLDecoder.decode(vals[j], "UTF-8")); } else value.append(vals[j]); @@ -3762,8 +3723,6 @@ public class ChartD3Helper { value.append(")"); } } - - //value = value.substring(0 , value.length()); valuesMap.put(fieldNameMap.get(formField), value.toString()); } else if(request.getParameter(formField) != null) { 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 797333cc..088409e1 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 @@ -642,8 +642,6 @@ public class ChartJSONHelper { if (nvl(getChartType()).length() == 0) return null; //TODO: display chart function to be added. - //if (!getDisplayChart()) - // return null; String sql = null; sql = generateChartSQL(userId, request); @@ -848,8 +846,6 @@ public class ChartJSONHelper { public String getSelectExpr(DataColumnType dct) { - // String colName = - // dct.isCalculated()?dct.getColName():((nvl(dct.getTableId()).length()>0)?(dct.getTableId()+"."+dct.getColName()):dct.getColName()); return getSelectExpr(dct, dct.getColName() /* colName */); } // getSelectExpr @@ -1420,7 +1416,7 @@ public class ChartJSONHelper { try { if(vals[j] !=null && vals[j].length() > 0) { vals[j] = Utils.oracleSafe(vals[j]); - value.append(java.net.URLDecoder.decode(vals[j], "UTF-8"));// + ","; + value.append(java.net.URLDecoder.decode(vals[j], "UTF-8")); } else value.append(vals[j]); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java index 49ed35b3..e8bd9295 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java @@ -80,7 +80,6 @@ import org.onap.portalsdk.analytics.model.base.IdNameSql; import org.onap.portalsdk.analytics.model.base.IdNameValue; import org.onap.portalsdk.analytics.system.AppUtils; import org.onap.portalsdk.analytics.system.ConnectionUtils; -import org.onap.portalsdk.analytics.system.ExecuteQuery; import org.onap.portalsdk.analytics.system.Globals; import org.onap.portalsdk.analytics.util.DataSet; import org.onap.portalsdk.analytics.util.Utils; @@ -559,9 +558,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } lookup = new IdNameSql(-1, SQL, lu.getDefaultSQL()); } - // } lookupList = lookup; - // } lookup.loadUserData(0, "", getDbInfo(), getUserId()); } @@ -580,9 +577,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } // for - // lookup.clearData(); } catch (Exception e) { - // throw new RaptorRuntimeException(e); } if (!hasPredefinedList) { if (oldSQL != null && !oldSQL.equals("")) { @@ -751,7 +746,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme lookup = new IdNameSql(-1, SQL, lu.getDefaultSQL()); } lookupList = lookup; - // } if (nvl(fieldValue).length() > 0 && (dependsOn == null || dependsOn.length() <= 0)) { sb.append((fieldValue != null) ? "obj.value=\"" + nvl(fieldValue) + "\";" : ""); } else if (lookup != null) { @@ -779,7 +773,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } } catch (Exception e) { } - // if(isVisible()) return sb.toString(); } else if (fieldType.equals(FFT_LIST_BOX)) { StringBuffer sb = new StringBuffer(); @@ -817,10 +810,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } lookup = new IdNameSql(-1, SQL, lu.getDefaultSQL()); } - // } lookupList = lookup; - - // } try { lookup.loadUserData(0, "", getDbInfo(), getUserId()); } catch (Exception e) { @@ -867,7 +857,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme ((IdNameSql) lookup).setSQL(oldSQL); } } - // System.out.println("FORMFIELD 6666667 " + ((IdNameSql)lookup).getSql()); if (isVisible()) return sb.toString(); else @@ -890,9 +879,7 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } catch (IllegalArgumentException ex1) { } catch (Exception ex2) { } - // System.out.println(fieldName + " " + fieldType + " " + fieldValue); if (fieldType.equals(FFT_TEXT_W_POPUP)) { - // System.out.println("TEXT POPUP " + fieldName); String oldSQL = ""; IdNameValue idNamevalue = null; String fieldDefValue = ""; @@ -915,7 +902,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme Map.Entry entry = (Entry) iter.next(); value = (String) entry.getValue(); SQL = Utils.replaceInString(SQL, "[" + entry.getKey() + "]", value); - // if(SQL.indexOf("'"+"["+entry.getKey()+"]"+"'")!=-1) { if (SQL.indexOf("'" + "[" + entry.getKey() + "]" + "'") != -1 || SQL.indexOf("'" + "[" + entry.getKey()) != -1 || SQL.indexOf(entry.getKey() + "]" + "'") != -1 @@ -952,7 +938,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme lookup = new IdNameSql(-1, SQL, null); } } - // lookupList = lookup; if (getFieldDefaultSQL() != null && (fieldValue == null || fieldValue.trim().equalsIgnoreCase("null") || fieldValue.trim().length() <= 0)) { @@ -1034,13 +1019,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } if (isVisible()) { - /* - * return "<input type=text class=\"text\" size=30 maxlength=50 id=\"" + - * fieldName +"\" name=\"" + fieldName + "\" value=\"" + nvl(fieldDefValue) + - * "\">\n" + "<a href=\"javascript:showArgPopupNew('" + fieldName + - * "', 'document.formd." + fieldName + "')\"><img border=0 src=\"" + - * AppUtils.getImgFolderURL() + "shareicon.gif\" " + getHelpLink(fieldName); - */ String progress = "<div id=\"" + fieldName + "_content\" style=\"display:none;width:100%;height:100%;align:center;\"> <img src=\"" + AppUtils.getImgFolderURL() @@ -1070,8 +1048,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme if (lu.getSql().length() > 0) { valueSQL = lu.getSql(); avail_ReadOnly = (valueSQL.toLowerCase().indexOf(readOnlyInSql) != -1); - // System.out.println("OLD SQL TEXT" + valueSQL); - // oldSQL = lu.getSql(); if (formValues != null) { Set set = formValues.entrySet(); String value1 = ""; @@ -1087,11 +1063,8 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } } // should be value one. - // lookup = new IdNameSql(-1,valueSQL,lu.getDefaultSQL()); } } - // lookupList = lookup; - // System.out.println("8888888 88 " + valueSQL); } if (valueSQL != null && valueSQL.length() > 0) { DataSet ds = ConnectionUtils.getDataSet(valueSQL.toString(), dbInfo); @@ -1113,10 +1086,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme && !inSchedule) ? "" : "") + getCallableJavascript(getFieldName(), rr) + " " + (readOnly ? " readonly " : " ") + " value=\""; - /* - * if(getFieldDefaultSQL()!=null) returnString += nvl(value.getId()); else - * returnString += fieldValue; - */ if (fieldValue != null && fieldValue.length() > 0 && (!(fieldValue.toUpperCase().indexOf("SELECT ") != -1 && fieldValue.toUpperCase().indexOf("FROM") != -1))) { if (validationType.startsWith("TIMESTAMP")) { @@ -1159,15 +1128,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } else returnString += nvl((value != null) ? value.getId() : ""); - /* - * returnString += "\">" + (validationType.equals(VT_DATE) ? - * "\n\t\t\t<a href=\"#\" onClick=\"window.dateField=document." + HTML_FORM + - * "." + fieldName + ";calendar=window.open('" + AppUtils.getRaptorActionURL() + - * "popup.calendar','cal','WIDTH=200,HEIGHT=250');return false;\">" + - * "\n\t\t\t\t<img src=\"" + AppUtils.getImgFolderURL() + - * "calender_icon.gif\" align=absmiddle border=0 width=20 height=20></a>" : ""); - */ - SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy"); String stRangeText = this.getRangeStartDate() == null ? null : dtf.format(this.getRangeStartDate().getTime()); @@ -1176,12 +1136,8 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme // get the date sqls - // System.out.println("////////////start range date before Start" + - // this.getRangeStartDateSQL()); - if (this.getRangeStartDateSQL() != null && this.getRangeStartDateSQL().trim().toLowerCase().startsWith("select")) { - // System.out.println("////////////start range date Starting"); String SQL = this.getRangeStartDateSQL(); if (formValues != null) { Set set = formValues.entrySet(); @@ -1189,15 +1145,12 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme for (Iterator iter = set.iterator(); iter.hasNext();) { Map.Entry entry = (Entry) iter.next(); v = (String) entry.getValue(); - // System.out.println("///////// key is " + entry.getKey() + " = " + v); SQL = Utils.replaceInString(SQL, "[" + entry.getKey() + "]", v); } } - // System.out.println("////////////start range date sql created" + SQL); try { DataSet ds = ConnectionUtils.getDataSet(SQL.toString(), dbInfo); - // System.out.println("////////////start range date is : " + ds.get(0)); dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar tStart = Calendar.getInstance(); tStart.setTime(dtf.parse(ds.getString(0, 0))); @@ -1211,7 +1164,6 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme if (this.getRangeEndDateSQL() != null && this.getRangeEndDateSQL().trim().toLowerCase().startsWith("select")) { - // System.out.println("////////////end range date Starting"); String SQL = this.getRangeEndDateSQL(); if (formValues != null) { Set set = formValues.entrySet(); @@ -1225,12 +1177,10 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme } try { DataSet ds = ConnectionUtils.getDataSet(SQL.toString(), dbInfo); - // System.out.println("////////////end range date is : " + ds.get(0)); dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar tStart = Calendar.getInstance(); tStart.setTime(dtf.parse(ds.getString(0, 0))); dtf = new SimpleDateFormat("MM/dd/yyyy"); - // endRangeText = dtf.format(tStart.getTime()); endRangeText = dtf.format(tStart.getTime().getTime() + MILLIS_IN_DAY); } catch (Exception e) { System.out.println("Exception////////// : end range date is : " + e); @@ -1267,30 +1217,17 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme if (inSchedule) hour = Integer.parseInt(nvl(((String) formValues.get(fieldName + "_Hr")), "0")); } - // System.out.println("Hour =" + hour); } catch (NumberFormatException ex) { hour = 0; } try { t_hr = Integer.parseInt(timestamphr); - // System.out.println("THR =" + t_hr); } catch (NumberFormatException ex) { t_hr = 0; } if (hour <= 0) hour = t_hr; - // System.out.println("Form Values 887 " + formValues); - /* - * if (formValues.containsKey(fieldDisplayName+"_Hr")){ - * formValues.remove(fieldDisplayName+"_Hr"); - * formValues.put(fieldDisplayName+"_Hr", hour); } else - * formValues.put(fieldDisplayName+"_Hr", hour); - * System.out.println("Form Values 887 " + formValues); - */ - - // int t_min = Integer.parseInt(timestampmin); - // int t_sec = Integer.parseInt(timestampsec); for (int i = 0; i < 24; i++) { if (i == 0) timeStampStr += "<option value=\"" + i + "\"" + ((hour == i) ? " selected" : "") diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java index 62bf4335..1c0e1c3d 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormatProcessor.java @@ -343,7 +343,6 @@ public class FormatProcessor extends RaptorObject { count++; } } - //} } else { dv.setCellFormatter(formatter); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java index 73380025..037a6ec5 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamDateValueParser.java @@ -48,22 +48,6 @@ import org.onap.portalsdk.analytics.util.Utils; public class ReportParamDateValueParser { - /*public static final SimpleDateFormat[] dateFormats; - - static { - dateFormats = new SimpleDateFormat[5]; - (dateFormats[0] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MONTHYYYY)) - .setLenient(true); - (dateFormats[1] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MONTHDDYYYY)) - .setLenient(true); - (dateFormats[2] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MMDDYYYY)) - .setLenient(true); - (dateFormats[3] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MMYYYY)) - .setLenient(true); - (dateFormats[4] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_DDMONYYYY)) - .setLenient(true); - }*/ - public static boolean isDateHrParam(String param) { SimpleDateFormat[] dateFormats = new SimpleDateFormat[2]; dateFormats[0] = new SimpleDateFormat(AppConstants.JAVA_DATE_FORMAT_MMDDYYYY_HR); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java index 2cff3e63..98651143 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java @@ -107,12 +107,6 @@ public class ReportParamValues extends Hashtable { } // for } // ReportParamValues - /* - * public ReportParamValues(ReportFormFields rff, HttpServletRequest - * request) { this(rff); - * - * setParamValues(request); } // ReportParamValues - */ public boolean isParameterMultiValue(String fieldName) { Boolean b = (Boolean) paramIsMultiValue.get(fieldName); return (b != null) ? b.booleanValue() : false; @@ -130,7 +124,6 @@ public class ReportParamValues extends Hashtable { public boolean setParamValues(HttpServletRequest request, boolean refresh) { long currentTime = System.currentTimeMillis(); - //System.out.println("ReportParamValues setParamValues called " + refresh); boolean paramUpdated = false; if(refresh) clearValues(); @@ -152,41 +145,24 @@ public class ReportParamValues extends Hashtable { newValue = XSSFilter.filterRequestOnlyScript(sb.toString()); } // if } else if (isParameterTextAreaValue(key)) { -/* String[] values = request.getParameterValues(key); - - if (values != null) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < values.length; i++) { - if (sb.length() > 0) - sb.append('|'); - sb.append(values[i]); - } // for -*/ String value = ""; value = request.getParameter(key); value = Utils.oracleSafe(nvl(value)); paramIsTextAreaDrilldownValue.put(key, value); value = value.replaceAll(",", "|"); value = "('" + Utils.replaceInString(value, "|", "','") + "')"; - //value = Utils.replaceInString(value, "|", ","); newValue = XSSFilter.filterRequestOnlyScript(value); paramIsTextAreaValueModified.put(key, new Boolean(true)); //} // if } else - // newValue = nvl(request.getParameter(key)); newValue = XSSFilter.filterRequestOnlyScript(request.getParameter(key)); - //debugLogger.debug("IN REPORTPARAM ^NEW VALUE " + newValue + " OLD VALUE " + oldValue + " KEY " + key + " isParameterMultiValue(key) " + isParameterMultiValue(key)); if(!isParameterMultiValue(key) && !isParameterTextAreaValue(key)) { if(refresh && nvl(newValue).length()<=0) { put(key, oldValue); } else if ( ((newValue != null && newValue.trim().length()>0) && (oldValue!=null && oldValue.trim().length()>0) && !newValue.equals(oldValue)) || ((newValue != null && newValue.trim().length()>0) && (oldValue == null || oldValue.trim().length() <= 0)) ) { - paramUpdated = true; - //System.out.println("paramupdated1 " +paramUpdated+ " " + newValue + " " + oldValue); - // if(newValue.startsWith("[") && newValue.endsWith("]")) { - // newValue = getDateAsString(newValue); - // } + paramUpdated = true; put(key, newValue); } else if (((newValue == null || newValue.trim().length()<=0)) && (oldValue!=null && oldValue.trim().length()>0)) { paramUpdated = true; @@ -212,12 +188,10 @@ public class ReportParamValues extends Hashtable { } else if (((newValue == null || newValue.trim().length()<=0)) && (oldValue!=null && oldValue.trim().length()>0) && (isParameterMultiValue(key)||isParameterTextAreaValue(key))) { paramUpdated = true; - //System.out.println("paramupdated3 " +paramUpdated+ " N" + newValue + " O" + oldValue); put(key, ""); } } } // for - //printValues(); logger.debug(EELFLoggerDelegate.debugLogger, ("[DEBUG MESSAGE FROM RAPTOR] ------->Time Taken for Adding/Clearing Param Values for Search Field Display " + (System.currentTimeMillis() - currentTime))); return paramUpdated; } // setParamValues @@ -240,18 +214,10 @@ public class ReportParamValues extends Hashtable { } value = Utils.replaceInString(value, "~", "' , '"); value = "('" + Utils.replaceInString(value, "|", "','") + "')"; // changed from "|" - //value = Utils.replaceInString(value, "|", ","); value = XSSFilter.filterRequestOnlyScript(value); return value; } else return ""; -// if(nvl(value).length()>0) { -// value = Utils.replaceInString(value, ",", "|"); -// value = value.indexOf("('")!=-1? value.substring(2, value.length()-2):value; -// value = Utils.replaceInString(value, "'|'", ","); -// } -// return value; - } else return (String) get(key); } @@ -305,7 +271,6 @@ public class ReportParamValues extends Hashtable { if(nvl(defaultValue).length()>0) { put(key,ff.getDefaultValue()); } else if(nvl(defaultSQL).length() > 0) { - //defaultSQL = Utils.replaceInString(defaultSQL, "[LOGGED_USERID]", userId); if(!(isParameterMultiValue(key) || isParameterTextAreaValue(key))) { defaultQuery = "SELECT id, name FROM (SELECT rownum r, id, name FROM (" + defaultSQL + ") x " @@ -325,13 +290,7 @@ public class ReportParamValues extends Hashtable { } } } - } - -/* for (Enumeration enKeys = keys(); enKeys.hasMoreElements();) { - String key = (String) enKeys.nextElement(); - put(key,""); - } -*/ + } } @@ -346,28 +305,20 @@ public class ReportParamValues extends Hashtable { private String getDateAsString (String keyword) { String sql = ""; if (keyword.equals("[PROCESSING_DATE]")) { - //sql = "select to_char(trunc(sysdate,'dd'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate,'dd'), 'mm/dd/yyyy') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_NEXT_DATE]")) { - //sql = "select to_char(trunc(sysdate+1,'dd'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate+1,'dd'), 'mm/dd/yyyy') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_DAY_BEFORE_DATE]")) { - //sql = "select to_char(trunc(sysdate-1,'dd'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate-1,'dd'), 'mm/dd/yyyy') as dateStr"+ Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_MONTH_START_DATE]")) { - //sql = "select to_char(trunc(sysdate,'MM'), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(trunc(sysdate,'MM'), 'mm/dd/yyyy') as dateStr"+ Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PROCESSING_MONTH_END_DATE]")) { - //sql = "select to_char(last_day(sysdate), 'mm/dd/yyyy') as dateStr from dual"; sql = "select to_char(last_day(sysdate), 'mm/dd/yyyy') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[CURRENT_HOUR]")) { - //sql = "select to_char(trunc(sysdate,'HH24'),'mm/dd/yyyy HH24') as dateStr from dual"; sql = "select to_char(trunc(sysdate,'HH24'),'mm/dd/yyyy HH24') as dateStr"+ Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[PREVIOUS_HOUR]")) { - //sql = "select to_char(trunc(sysdate-1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr from dual"; sql = "select to_char(trunc(sysdate-1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr" + Globals.getGenerateSqlVisualDual(); } else if (keyword.equals("[NEXT_HOUR]")) { - //sql = "select to_char(trunc(sysdate+1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr from dual"; sql = "select to_char(trunc(sysdate+1/24, 'HH24'),'mm/dd/yyyy HH24') as dateStr" + Globals.getGenerateSqlVisualDual(); } DataSet ds = null; @@ -381,7 +332,6 @@ public class ReportParamValues extends Hashtable { return ""; } catch (RaptorException ex) { logger.error(EELFLoggerDelegate.errorLogger, "RaptorException in getDateAsString", ex); - //throw ex; } return ""; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java index 483e9fe4..62d95efb 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java @@ -91,12 +91,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // for } // ReportParamValues - /* - * public ReportParamValues(ReportFormFields rff, HttpServletRequest - * request) { this(rff); - * - * setParamValues(request); } // ReportParamValues - */ public boolean isParameterMultiValue(String fieldName) { Boolean b = (Boolean) paramIsMultiValue.get(fieldName); return (b != null) ? b.booleanValue() : false; @@ -108,7 +102,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // isParameterMultiValue public boolean setParamValues(HttpServletRequest request, boolean refresh) { - //debugLogger.debug("ReportParamValues for PDF Excel setParamValues called " + refresh); long currentTime = System.currentTimeMillis(); boolean paramUpdated = false; if(refresh) @@ -141,7 +134,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { for (Iterator iter = rff.iterator(); iter.hasNext();) { name=""; //just added ff = (FormField) iter.next(); - //debugLogger.debug("ff.getFieldName " + ff.getFieldName() + " " + ff.getFieldDisplayName() + " " + ff.getFieldType()+ " " +ff.getBaseSQLForPDFExcel()+ " "+ rr.getParamValue(ff.getFieldName())); if(!ff.getFieldType().equals(FormField.FFT_BLANK)) { sql = ff.getBaseSQLForPDFExcel(); if(sql!=null && sql.trim().length()>0) @@ -197,34 +189,28 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(name.length()<=0) name = ff.getFieldName(); value = rr.getParamValue(name); - //debugLogger.debug("Name "+ name+ " value:" + value); String paramValue = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), getParamValueForSQL(name, value)); - //debugLogger.debug("PDFEXCEL " + name+ " " + ff.getFieldName()+ " " + value + " " + sql +" "+ paramValue); if(name!=null && name.equals(ff.getFieldName())) sql = Utils.replaceInString(sql, "[VALUE]", paramValue); if(paramValue == null) { if(sql.lastIndexOf("where id = ''")>0) sql = sql.substring(0, sql.lastIndexOf("where id = ''")); } - //debugLogger.debug("SQL Modified " + sql); FormField ff2 = null; for (Iterator iter1 = rff.iterator(); iter1.hasNext();) { ff2 = (FormField)iter1.next(); sql = Utils.replaceInString(sql, "[" + ff2.getFieldDisplayName() +"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),getParamValue(ff2.getFieldName()))); } - //debugLogger.debug("SQL Modified after replacing formfield" + sql); try { String[] reqParameters = Globals.getRequestParams().split(","); String[] sessionParameters = Globals.getSessionParams().split(","); String[] scheduleSessionParameters = Globals.getSessionParamsForScheduling().split(","); - javax.servlet.http.HttpSession session = request.getSession(); - //debugLogger.debug("B4 Session " + sql); + javax.servlet.http.HttpSession session = request.getSession(); if(session != null ) { for (int i = 0; i < sessionParameters.length; i++) { sql = Utils.replaceInString(sql, "[" + sessionParameters[i].toUpperCase()+"]", (String)session.getAttribute(sessionParameters[i]) ); } - } - //debugLogger.debug("B4 request " + sql); + } if(request != null ) { for (int i = 0; i < scheduleSessionParameters.length; i++) { sql = Utils.replaceInString(sql, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(scheduleSessionParameters[i]) )); @@ -243,8 +229,7 @@ public class ReportParamValuesForPDFExcel extends Hashtable { else sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } - } - //debugLogger.debug("After request " + sql); + } DataSet ds = null; try { ds = ConnectionUtils.getDataSet(sql, dbInfo); @@ -255,12 +240,9 @@ public class ReportParamValuesForPDFExcel extends Hashtable { StringBuffer multiValue = new StringBuffer(""); if(ds!=null) { for(int i = 0; i < ds.getRowCount(); i++) { - //if(i==0) multiValue.append("("); multiValue.append(ds.getString(i,1)); if(i<ds.getRowCount()-1) multiValue.append("|"); - //else multiValue.append(")"); - } } put(ff.getFieldName(), nvl(multiValue.toString())); @@ -278,7 +260,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { .getParamValue(ff.getFieldName()+"_Sec")).length() > 0 ? ":"+ addZero(Utils.oracleSafe(nvl(rr .getParamValue(ff.getFieldName()+"_Sec")))) : ""); } - //debugLogger.debug("77777777777777 " + value1); put(ff.getFieldName(), nvl(value1)); } else { @@ -293,15 +274,12 @@ public class ReportParamValuesForPDFExcel extends Hashtable { logger.debug(EELFLoggerDelegate.debugLogger, ("sql not complete" + sql)); } catch (Exception ex) {} - - //debugLogger.debug("66666666666666666 " + ff.getValidationType()); //Added for TimeStamp validation } else { if(!ff.getFieldType().equals(FormField.FFT_BLANK)) { //Added for TimeStamp validation - //debugLogger.debug("666666666666 " + ff.getValidationType()); if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC) ) { value1 = nvl(rr.getParamValue(ff.getFieldName())) + " "+addZero(Utils.oracleSafe(nvl(rr .getParamValue(ff.getFieldName()+"_Hr")))); @@ -315,7 +293,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { .getParamValue(ff.getFieldName()+"_Sec")).length() > 0 ? ":"+ addZero(Utils.oracleSafe(nvl(rr .getParamValue(ff.getFieldName()+"_Sec")))) : ""); } - //debugLogger.debug("77777777777777 " + value1); } else value1 = nvl(rr.getParamValue(ff.getFieldName())); if(value1.length()<=0) @@ -331,7 +308,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // dbInfo } // !=null - //printValues(); logger.debug(EELFLoggerDelegate.debugLogger, ("[DEBUG MESSAGE FROM RAPTOR] ------->Time Taken for Adding/Clearing Param Values for FormField Info Bar " + (System.currentTimeMillis() - currentTime))); return paramUpdated; } // setParamValues @@ -351,7 +327,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { } // getParamValue public String getParamDisplayValue(String key) { - //debugLogger.debug("Key is " + key +" Value is " + getParamValue(key)); String value = getParamValue(key); if (isParameterMultiValue(key)) value = "(" + Utils.replaceInString(value, "|", ",") + ")"; @@ -397,7 +372,6 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(nvl(defaultValue).length()>0) { put(key,ff.getDefaultValue()); } else if(nvl(defaultSQL).length() > 0) { - //defaultSQL = Utils.replaceInString(defaultSQL, "[LOGGED_USERID]", userId); if(!(isParameterMultiValue(key) || isParameterTextAreaValue(key))) { defaultQuery = "SELECT id, name FROM (SELECT rownum r, id, name FROM (" + defaultSQL + ") x " diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java index d10826af..987a8227 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java @@ -56,7 +56,6 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; -import org.apache.jcs.engine.CacheUtils; import org.onap.portalsdk.analytics.error.RaptorException; import org.onap.portalsdk.analytics.model.DataCache; import org.onap.portalsdk.analytics.model.ReportHandler; @@ -73,7 +72,6 @@ import org.onap.portalsdk.analytics.system.Globals; import org.onap.portalsdk.analytics.util.AppConstants; import org.onap.portalsdk.analytics.util.CachingUtils; import org.onap.portalsdk.analytics.util.DataSet; -import org.onap.portalsdk.analytics.util.RemDbInfo; import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.analytics.view.ColumnHeader; import org.onap.portalsdk.analytics.view.ColumnHeaderRow; @@ -88,10 +86,8 @@ import org.onap.portalsdk.analytics.xmlobj.DataColumnType; import org.onap.portalsdk.analytics.xmlobj.FormFieldType; import org.onap.portalsdk.analytics.xmlobj.ObjectFactory; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.onap.portalsdk.core.objectcache.jcs.JCSCacheManager; import org.onap.portalsdk.core.util.SecurityCodecUtil; import org.owasp.esapi.ESAPI; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; @@ -1129,9 +1125,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa Vector visibleCols = new Vector(reportCols.size()); Vector formatProcessors = new Vector(reportCols.size()); - // ColumnHeaderRow chr = new ColumnHeaderRow(); - // rd.reportColumnHeaderRows.addColumnHeaderRow(chr); - // chr.setRowHeight("30"); int count =0 ; ReportFormFields rff = getReportFormFields(); ReportFormFields childReportFormFields = null; @@ -1189,7 +1182,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa } } } - //} String widthInPxls = dc.getDisplayWidthInPxls(); @@ -1446,7 +1438,6 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa } } } - //} String widthInPxls = dc.getDisplayWidthInPxls(); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java index b68acec8..82d3f76c 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResult.java @@ -68,13 +68,6 @@ public class ReportSearchResult extends SearchResult { "Are you sure you want to create a copy of this report?", AppUtils .getImgFolderURL() + "modify_icon.gif", "13", "12", true, false, false)); - /*addColumn(new SearchResultColumn(" Schedule ", "5%", "Center", - "document." + HTML_FORM + "." + AppConstants.RI_ACTION - + ".value='report.schedule_only';", "Schedule report", HTML_FORM, - null, AppUtils - .getImgFolderURL() - + "calendar_icon.gif", "13", "12", true, false, false)); - */ addColumn(new SearchResultColumn("edit"," Edit ", "5%", "Center", "document." + HTML_FORM + "." + AppConstants.RI_ACTION diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResultJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResultJSON.java index 2bd278e4..6c2cc8f3 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResultJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/ReportSearchResultJSON.java @@ -214,6 +214,12 @@ public class ReportSearchResultJSON extends SearchResultJSON { int endRow = (pageNo >= 0) ? Math.min(startRow + pageSize, ds.getRowCount()) : ds .getRowCount(); + + String showAllRecords = AppUtils.getRequestNvlValue(request, "show_all"); + if(showAllRecords!=null && "true".equalsIgnoreCase(showAllRecords)) { + endRow = ds.getRowCount(); + } + for (int r = startRow; r < endRow; r++) { SearchResultRow row = new SearchResultRow(); searchResultRows.add(row); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java index 9f32eeba..7d74f59a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultField.java @@ -216,17 +216,6 @@ public class SearchResultField extends org.onap.portalsdk.analytics.RaptorObject return (displayValue.length() == 0) ? " " : displayValue; } - /*public String getAlignmentHtml() { - return (alignment.length() == 0) ? "" : (" align=" + alignment); - }*/ - - /*public String getDisplayValueLinkHtml() { - if (nvl(drillDownLink).length() == 0) - return getDisplayValueHtml(); - else - return getDrillDownLink(); - } // getDisplayValueLinkHtml*/ - public String getColumnId() { return columnId; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java index 9bb5c7dd..d141eb43 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/search/SearchResultRow.java @@ -65,8 +65,6 @@ class ColumnContent { } public class SearchResultRow extends ArrayList { - - //private SearchResultField searchresultField; private int nextElemIdx = 0; public void resetNext() { diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java index 191334f6..a54ec7be 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendEmail.java @@ -38,7 +38,6 @@ package org.onap.portalsdk.analytics.scheduler; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -51,10 +50,6 @@ import java.sql.Types; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.onap.portalsdk.analytics.error.ReportSQLException; import org.onap.portalsdk.analytics.scheduler.SchedulerUtil.Executor; import org.onap.portalsdk.analytics.system.Globals; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java index c13e2ba7..fba9fee4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/scheduler/SendNotifications.java @@ -346,18 +346,6 @@ public class SendNotifications { } } - // schedulerUtil.getAndExecute("select c.column_value from table(CR_DISSECTURL(p_formfields)) c - // where substr(c.column_value, 1, instr(c.column_value, '=')-1) = substr(" + result.v_name + - // ",1,instr(" + result.v_name + ",'_auto')-1)||'_Hr'", new Executor() { - // - // @Override - // public void execute(ResultSet rs) throws SQLException { - // - // result.v_hour = rs.getString("column_value"); - // } - // - // }); - if (result.v_hour.length() > 0) { result.v_hour_value = result.v_hour.substring(result.v_hour.indexOf('=') + 1); } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java index 972cf721..245ae55a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java @@ -135,10 +135,6 @@ public class AppUtils /* implements IAppUtils */{ return Globals.getAppUtils().isUserInRole(request,roleId); } // isUserInRole -// public static boolean isUserInRole(String userId, String roleId) throws RaptorException { -// return Globals.getAppUtils().isUserInRole(userId, roleId); -// } // isUserInRole - public static Vector getUserRoles(HttpServletRequest request) throws RaptorException { return Globals.getAppUtils().getUserRoles(request); } // getUserRoles @@ -146,10 +142,6 @@ public class AppUtils /* implements IAppUtils */{ public static Vector getUserRoles(String userID) throws RaptorException { return Globals.getAppUtils().getUserRoles(userID); } // getUserRoles - -// public static Vector getUserRoles(HttpServletRequest request) throws RaptorException { -// return Globals.getAppUtils().getUserRoles(request); -// } // getUserRoles public static void resetUserCache() { Globals.getAppUtils().resetUserCache(); @@ -170,12 +162,6 @@ public class AppUtils /* implements IAppUtils */{ else return isUserInRole(request, getSuperRoleID()); } // isSuperUser - /*public static boolean isSuperUser(String userId) throws RaptorException { - if(Globals.isAdminRoleEquivalenttoSuperRole()) return isAdminUser(userId); - else return isUserInRole(userId, getSuperRoleID()); - } // isSuperUser - */ - public static boolean isAdminUser(HttpServletRequest request) throws RaptorException { if (isSuperUser(request)) return true; @@ -186,18 +172,6 @@ public class AppUtils /* implements IAppUtils */{ return false; } // isAdminUser - /*public static boolean isAdminUser(String userId) throws RaptorException { - if (isSuperUser(userId)) - return true; - - for (int i = 0; i < getAdminRoleIDs().size(); i++) - if (isUserInRole(userId, (String) getAdminRoleIDs().get(i))) - return true; - - return false; - } // isAdminUser - */ - public static String getTempFolderPath() { String path = Globals.getAppUtils().getTempFolderPath(); if (path.endsWith(File.separator) || path.endsWith("/")){ @@ -266,19 +240,6 @@ public class AppUtils /* implements IAppUtils */{ return Globals.getAppUtils().getFolderPathAdj(); } // getBaseFolderURL - - /* - * public static String getReportExecuteActionURL() { return - * Globals.getAppUtils().getReportExecuteActionURL(); } // - * getReportExecuteActionURL - * - * public static String getDataViewActionURL() { return - * Globals.getAppUtils().getDataViewActionURL(); } // getDataViewActionURL - * - * public static String getDataViewActionParam() { return - * Globals.getAppUtils().getDataViewActionParam(); } // - * getDataViewActionParam - */ public static String getDirectAccessURL() { return Globals.getAppUtils().getDirectAccessURL(); } // getDirectAccessURL diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java index b64f8e07..6d9c94f9 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java @@ -990,10 +990,6 @@ return sheetName; } return limit; } - -// public static String getWhereConditionForUserRole() { -// return nvls(raptorProperties.getProperty("schedule_where_condition"),"").trim(); -// } public static String getCustomizedScheduleQueryForUsers() { return nvls(raptorProperties.getProperty("schedule_custom_query_for_users"),"").trim(); } @@ -1336,65 +1332,6 @@ return sheetName; List formParameter = new ArrayList(); String formField = ""; -// for(int i = 1 ; i < (countOfFields+1); i++) -// { -// formField ="ff"+i; -// -// if(request.getParameterValues(formField) != null && request.getParameterValues(formField).length > 1 ) -// { -// String[] vals = request.getParameterValues(formField); -// boolean isMultiValue = false; -// StringBuffer value = new StringBuffer(""); -// if(vals.length > 1) { -// isMultiValue = true; -// value.append("("); -// } -// for(int j = 0 ; j < vals.length; j++) -// { -// if(isMultiValue) value.append("'"); -// try { -// if(vals[j] !=null && vals[j].length() > 0) -// value.append(java.net.URLDecoder.decode(vals[j], "UTF-8"));// + ","; -// else -// value.append(vals[j]); -// } catch (UnsupportedEncodingException ex) {value.append(vals[j]);} -// catch (IllegalArgumentException ex1){value.append(vals[j]);} -// catch (Exception ex2){value.append(vals[j]);} -// -// -// if(isMultiValue) value.append("'"); -// -// if(j != vals.length -1) { -// value.append(","); -// } -// } -// if(vals.length > 1) { -// value.append(")"); -// } -// -// //value = value.substring(0 , value.length()); -// -// valuesMap.put(fieldNameMap.get(formField), value.toString()); -// value = new StringBuffer(""); -// -// } -// else if(request.getParameter(formField) != null) -// { -// String value = ""; -// value = request.getParameter(formField); -// try { -// if(value !=null && value.length() > 0) -// value = java.net.URLDecoder.decode(request.getParameter(formField), "UTF-8"); -// } catch (UnsupportedEncodingException ex) {} -// catch (IllegalArgumentException ex1){} -// catch (Exception ex2){} -// valuesMap.put(fieldNameMap.get(formField), value); -// -// }else -// { -// valuesMap.put(fieldNameMap.get(formField), "NULL" ); -// } -// } for(int i = 0 ; i < rff.size(); i++) { ff = ((FormField)rff.getFormField(i)); formField = ff.getFieldName(); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java index 8eda540d..a044a9c4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorController.java @@ -58,6 +58,7 @@ import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; @@ -73,30 +74,30 @@ public class RaptorController extends RestrictedBaseController { private static final String IS_EMBEDDED = "isEmbedded"; private static final String ACTION_NOT_FOUND = "Action not found"; - @RequestMapping(value = { "/report" }, method = RequestMethod.GET) + @GetMapping(value = { "/report" }) public ModelAndView report(HttpServletRequest request) { request.getSession().setAttribute(IS_EMBEDDED, false); return new ModelAndView("report"); } - @RequestMapping(value = { "/reportDS1" }, method = RequestMethod.GET) + @GetMapping(value = { "/reportDS1" }) public ModelAndView reportDS1(HttpServletRequest request) { request.getSession().setAttribute(IS_EMBEDDED, false); return new ModelAndView("reportDS1"); } - @RequestMapping(value = { "/report_embedded" }, method = RequestMethod.GET) + @GetMapping(value = { "/report_embedded" }) public ModelAndView reportEmbedded(HttpServletRequest request) { request.getSession().setAttribute(IS_EMBEDDED, true); return new ModelAndView("report_embedded"); } - @RequestMapping(value = { "/report_sample" }, method = RequestMethod.GET) + @GetMapping(value = { "/report_sample" }) public ModelAndView reportSample(HttpServletRequest request) { return new ModelAndView("report_sample"); } - @RequestMapping(value = { "/report_import.htm" }, method = RequestMethod.GET) + @GetMapping(value = { "/report_import.htm" }) public ModelAndView reportImport(HttpServletRequest request) throws IOException { String viewName = "report_import"; Action action = null; @@ -119,7 +120,7 @@ public class RaptorController extends RestrictedBaseController { return new ModelAndView(viewName, "model", null); } - @RequestMapping(value = { "/report_wizard.htm" }, method = { RequestMethod.POST, RequestMethod.GET }) + @GetMapping(value = { "/report_wizard.htm" }) public ModelAndView reportWizard(HttpServletRequest request, HttpServletResponse response) throws IOException { String viewName = ""; String actionKey = nvl(request.getParameter(AppConstants.RI_ACTION), request.getParameter("action")); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java index ae9d39a1..a39d371d 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java @@ -120,6 +120,9 @@ import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; @@ -137,7 +140,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { private String viewName; - @RequestMapping(value = { "/raptor.htm" }, method = RequestMethod.GET) + @GetMapping(value = { "/raptor.htm" }) public void RaptorSearch(HttpServletRequest request, HttpServletResponse response) throws IOException, RaptorException { @@ -301,7 +304,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } } - @RequestMapping(value = "/report/wizard/drill_down_param/{parameter}", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "/report/wizard/drill_down_param/{parameter}", produces = "application/json") public @ResponseBody List<DrillDownParamDef> getDrillDownParamDef (@PathVariable("parameter") String parameter, HttpServletRequest request, HttpServletResponse response) { List<DrillDownParamDef> list = new ArrayList<>(); @@ -315,7 +318,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return list; } - @RequestMapping(value = "/report/wizard/list_columns", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "/report/wizard/list_columns", produces = "application/json") public @ResponseBody ArrayList<ColumnJSON> listColumns(HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); @@ -332,7 +335,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return listJSON; } - @RequestMapping(value = "/report/wizard/list_drilldown_reports", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "/report/wizard/list_drilldown_reports", produces = "application/json") public @ResponseBody ArrayList<ColumnJSON> list_drilldown_reports(HttpServletRequest request, HttpServletResponse response) throws RaptorException { ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); @@ -380,7 +383,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return listJSON; } - @RequestMapping(value = "/report/wizard/list_formfields", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "/report/wizard/list_formfields", produces = "application/json") public @ResponseBody ArrayList<SearchFieldJSON> listFormFields(HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); @@ -402,7 +405,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return listJSON; } - @RequestMapping(value = "/report/wizard/list_child_report_col/{reportID}", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "/report/wizard/list_child_report_col/{reportID}", produces = "application/json") public @ResponseBody ArrayList<ColumnJSON> listChildReportCols(@PathVariable("reportID") String reportID, HttpServletRequest request, HttpServletResponse response) throws RaptorException { ReportRuntime ddRr = (new ReportHandler()).loadReportRuntime(request, reportID, false); @@ -420,7 +423,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return listJSON; } - @RequestMapping(value = "/report/wizard/list_child_report_ff/{reportID}", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "/report/wizard/list_child_report_ff/{reportID}", produces = "application/json") public @ResponseBody ArrayList<SearchFieldJSON> listChildReportFormFields(@PathVariable("reportID") String reportID, HttpServletRequest request, HttpServletResponse response) throws RaptorException { ReportRuntime ddRr = (new ReportHandler()).loadReportRuntime(request, reportID, false); @@ -442,7 +445,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return listJSON; } - @RequestMapping(value = "report/wizard/copy_report/{reportID}", method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = "report/wizard/copy_report/{reportID}", produces = "application/json") public @ResponseBody MessageJSON copyReport(@PathVariable("reportID") String reportID, HttpServletRequest request, HttpServletResponse response){ MessageJSON messageJSON = new MessageJSON(); @@ -469,7 +472,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return messageJSON; } - @RequestMapping(value = "report/wizard/import_report", method = RequestMethod.POST, consumes = "application/json") + @PostMapping(value = "report/wizard/import_report", consumes = "application/json") public @ResponseBody MessageJSON importReport(@RequestBody ImportJSON importJSON, HttpServletRequest request, HttpServletResponse response) { MessageJSON messageJSON = new MessageJSON(); @@ -500,7 +503,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = "report/wizard/get_formfield_groups_data/{id}", method = RequestMethod.GET) + @GetMapping(value = "report/wizard/get_formfield_groups_data/{id}") public @ResponseBody FormFieldGroupsJSON getFFGroupsData(@PathVariable Map<String, String> pathVariables, HttpServletRequest request, HttpServletResponse response) throws IOException, RaptorException { @@ -531,7 +534,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return formFieldGroupsJSON; } - @RequestMapping(value = "report/wizard/clearSession", method = RequestMethod.GET) + @GetMapping(value = "report/wizard/clearSession") public @ResponseBody MessageJSON clearSession(HttpServletRequest request, HttpServletResponse response) { MessageJSON messageJSON = new MessageJSON(); removeVariablesFromSession(request); @@ -542,7 +545,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = "report/wizard/save_formfield_groups_data", method = RequestMethod.POST) + @PostMapping(value = "report/wizard/save_formfield_groups_data") public @ResponseBody MessageJSON saveFFGroupsData(@RequestBody FormFieldGroupsJSON formFieldGroupsJSON, HttpServletRequest request, HttpServletResponse response) throws IOException, RaptorException { @@ -577,7 +580,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return messageJSON; } - @RequestMapping(value = "report/wizard/save_formfield_tab_data", method = RequestMethod.POST) + @PostMapping(value = "report/wizard/save_formfield_tab_data") public @ResponseBody MessageJSON saveFFTabWiseData(@RequestBody FormEditJSON formEditJSON, HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef = null; @@ -663,7 +666,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return messageJSON; } - @RequestMapping(value = "report/wizard/add_formfield_tab_data", method = RequestMethod.POST) + @PostMapping(value = "report/wizard/add_formfield_tab_data") public @ResponseBody MessageJSON addFFTabWiseData(@RequestBody FormEditJSON formEditJSON, HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef; @@ -720,7 +723,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return messageJSON; } - @RequestMapping(value = "report/wizard/save_col_tab_data", method = RequestMethod.POST) + @PostMapping(value = "report/wizard/save_col_tab_data") public @ResponseBody MessageJSON saveColTabWiseData(@RequestBody ColumnEditJSON columnEditJSON, HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef; @@ -785,7 +788,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return messageJSON; } - @RequestMapping(value = "report/wizard/save_def_tab_data/{id}", method = RequestMethod.POST) + @PostMapping(value = "report/wizard/save_def_tab_data/{id}") public @ResponseBody MessageJSON saveDefTabWiseData(@PathVariable("id") String id, @RequestBody DefinitionJSON definitionJSON, HttpServletRequest request, HttpServletResponse response) { @@ -983,8 +986,8 @@ public class RaptorControllerAsync extends RestrictedBaseController { return messageJSON; } - @RequestMapping(value = { "/report/wizard/retrieve_form_tab_wise_data/{id}", - "/report/wizard/retrieve_form_tab_wise_data/{id}/{action}" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/retrieve_form_tab_wise_data/{id}", + "/report/wizard/retrieve_form_tab_wise_data/{id}/{action}" }) public @ResponseBody FormEditJSON retrieveFormTabWiseData(@PathVariable Map<String, String> pathVariables, HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef; @@ -1072,7 +1075,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return wizardJSON; } - @RequestMapping(value = { "/report/wizard/retrieve_col_tab_wise_data/{id}" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/retrieve_col_tab_wise_data/{id}" }) public @ResponseBody ColumnEditJSON retrieveColTabWiseData(@PathVariable Map<String, String> pathVariables, HttpServletRequest request, HttpServletResponse response) { ReportDefinition rdef; @@ -1137,8 +1140,8 @@ public class RaptorControllerAsync extends RestrictedBaseController { return wizardJSON; } - @RequestMapping(value = { "/report/wizard/retrieve_sql_tab_wise_data/{id}", - "/report/wizard/retrieve_sql_tab_wise_data/" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/retrieve_sql_tab_wise_data/{id}", + "/report/wizard/retrieve_sql_tab_wise_data/" }) public @ResponseBody QueryJSON retrieveSqlTabWiseData(@PathVariable Map<String, String> pathVariables, HttpServletRequest request, HttpServletResponse response) throws RaptorException { ReportDefinition rdef = null; @@ -1181,7 +1184,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return wizardJSON; } - @RequestMapping(value = { "/report/wizard/retrieveTotalForTheColList" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/retrieveTotalForTheColList" }) public @ResponseBody List<IdNameValue> getTotalForTheCol(HttpServletRequest request) { IdNameList idNameList = AppConstants.TOTAL_FUNCTIONS; @@ -1192,7 +1195,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return list; } - @RequestMapping(value = { "/report/wizard/security/retrieveReportUserList" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/retrieveReportUserList" }) public @ResponseBody List<SecurityEntry> getReportUserList(HttpServletRequest request) throws RaptorException { List<SecurityEntry> reportUserList = new ArrayList<>(); @@ -1205,7 +1208,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return reportUserList; }; - @RequestMapping(value = { "/report/wizard/security/retrieveReportRoleList" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/retrieveReportRoleList" }) public @ResponseBody List<IdNameValue> getReportRoleList(HttpServletRequest request) throws RaptorException { List<IdNameValue> reportRoleList = new ArrayList<>(); @@ -1219,7 +1222,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return reportRoleList; }; - @RequestMapping(value = { "/report/wizard/security/retrieveReportUserList_query" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/retrieveReportUserList_query" }) public @ResponseBody List<Map<String, String>> getReportUserListQuery(HttpServletRequest request) { List<Map<String, String>> reportUserList = new ArrayList(); @@ -1242,7 +1245,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { - @RequestMapping(value = "/report/security/addReportUser", method = RequestMethod.POST) + @PostMapping(value = "/report/security/addReportUser") public @ResponseBody Map<String,String> addSelectedReportUser( @RequestBody String userIdToAdd, HttpServletRequest request, HttpServletResponse response) { @@ -1263,7 +1266,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } } - @RequestMapping(value = "/report/security/removeReportUser", method = RequestMethod.POST) + @PostMapping(value = "/report/security/removeReportUser") public @ResponseBody Map<String,String> removeSelectedReportUser( @RequestBody String userIdToRemove, HttpServletRequest request, HttpServletResponse response) { @@ -1285,7 +1288,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } } - @RequestMapping(value = "/report/security/addReportRole", method = RequestMethod.POST) + @PostMapping(value = "/report/security/addReportRole") public @ResponseBody Map<String,String> addSelectedReportRole( @RequestBody String roleIdToAdd, HttpServletRequest request, HttpServletResponse response) { Map<String, String> JsonResponse = new HashMap<>(); @@ -1305,7 +1308,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } } - @RequestMapping(value = "/report/security/removeReportRole", method = RequestMethod.POST) + @PostMapping(value = "/report/security/removeReportRole") public @ResponseBody Map<String,String> removeSelectedReportRole( @RequestBody String roleIdToRemove, HttpServletRequest request, HttpServletResponse response) { @@ -1326,7 +1329,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } } - @RequestMapping(value = "/report/security/updateReportSecurityInfo", method = RequestMethod.POST) + @PostMapping(value = "/report/security/updateReportSecurityInfo") public @ResponseBody Map<String,String> updateReportSecurityInfo( @RequestBody Map<String,String> securityInfo, HttpServletRequest request, HttpServletResponse response) { @@ -1350,7 +1353,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } } - @RequestMapping(value = "/report/security/toggleUserEditAccess/{userID}", method = RequestMethod.POST) + @PostMapping(value = "/report/security/toggleUserEditAccess/{userID}") public @ResponseBody Map<String,String> toggleUserEditAccess( @PathVariable("userID") String userId, @RequestBody String readOnly, HttpServletRequest request, HttpServletResponse response) @@ -1377,7 +1380,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } }; - @RequestMapping(value = "/report/security/toggleRoleEditAccess/{roleID}", method = RequestMethod.POST) + @PostMapping(value = "/report/security/toggleRoleEditAccess/{roleID}") public @ResponseBody Map<String,String> toggleRoleEditAccess( @PathVariable("roleID") String roleId, @RequestBody String readOnly, HttpServletRequest request, HttpServletResponse response) @@ -1404,7 +1407,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } }; - @RequestMapping(value = { "/report/wizard/security/retrieveReportOwner" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/retrieveReportOwner" }) public @ResponseBody List<IdNameValue> getReportOwnerInList(HttpServletRequest request) throws RaptorException { ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); @@ -1443,7 +1446,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = { "/report/wizard/security/getReportSecurityInfo" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/getReportSecurityInfo" }) public @ResponseBody Map<String,String> getReportSecurityInfo(HttpServletRequest request) { Map<String, String> securityInfoMap = new HashMap<>(); @@ -1465,7 +1468,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return securityInfoMap; } - @RequestMapping(value = { "/report/wizard/security/getReportSecurityUsers" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/getReportSecurityUsers" }) public @ResponseBody List<SecurityEntry> getReportSecurityUsers(HttpServletRequest request) throws RaptorException { @@ -1484,7 +1487,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = { "/report/wizard/security/getReportSecurityRoles" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/security/getReportSecurityRoles" }) public @ResponseBody List<SecurityEntry> getReportSecurityRoles(HttpServletRequest request) throws RaptorException { @@ -1501,8 +1504,8 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = { "/report/wizard/retrieve_def_tab_wise_data/{id}", - "/report/wizard/retrieve_def_tab_wise_data/{id}/{detailId}" }, method = RequestMethod.GET) + @GetMapping(value = { "/report/wizard/retrieve_def_tab_wise_data/{id}", + "/report/wizard/retrieve_def_tab_wise_data/{id}/{detailId}" }) public @ResponseBody DefinitionJSON retrieveDefTabWiseData(@PathVariable Map<String, String> pathVariables, HttpServletRequest request, HttpServletResponse response) throws RaptorException { ReportDefinition rdef; @@ -1662,7 +1665,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = "/report/wizard/retrieve_data/{validate}", method = RequestMethod.POST) + @PostMapping(value = "/report/wizard/retrieve_data/{validate}") public @ResponseBody RaptorResponse retrieveDataForGivenQuery(@PathVariable("validate") boolean validate, @RequestBody QueryJSON queryJSON, HttpServletRequest request, HttpServletResponse response) throws RaptorException { @@ -1859,7 +1862,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { } - @RequestMapping(value = "/report/wizard/get_report_log/{reportID}", method = RequestMethod.GET) + @GetMapping(value = "/report/wizard/get_report_log/{reportID}") public @ResponseBody ArrayList<ReportLogEntry> getLogs(@PathVariable("reportID") String reportId, HttpServletRequest request, HttpServletResponse ReportLogEntry) { ArrayList<ReportLogEntry> arrayList = new ArrayList<>(); @@ -1875,7 +1878,7 @@ public class RaptorControllerAsync extends RestrictedBaseController { return arrayList; } - @RequestMapping(value = "save_chart", method = RequestMethod.POST) + @PostMapping(value = "save_chart") public void reportChartReceive(@RequestBody ChartJSON chartJSON, HttpServletRequest request, HttpServletResponse response) { //ReportRuntime reportRuntime; diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java index fbb9cc5d..09cbb0ac 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java @@ -52,6 +52,8 @@ import org.onap.portalsdk.core.logging.aspect.AuditLog; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.onboarding.rest.FavoritesClient; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.service.AppService; import org.onap.portalsdk.core.util.SystemProperties; import org.slf4j.MDC; @@ -109,7 +111,7 @@ public class FavoritesController extends RestrictedBaseController { appUserName = app.getUsername(); try { decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "FavoritesController.getFavorites failed while decrypting password", e); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java index bbd08c45..d41bf239 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java @@ -37,20 +37,16 @@ */ package org.onap.portalapp.controller.core; +import java.util.HashMap; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; import org.onap.portalsdk.core.controller.UnRestrictedBaseController; -import org.onap.portalsdk.core.domain.User; -import org.onap.portalsdk.core.logging.aspect.MetricsLog; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; -import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; -import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.servlet.ModelAndView; @Controller @@ -59,8 +55,6 @@ public class LogoutController extends UnRestrictedBaseController { private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(LogoutController.class); - private User user; - /** * * invalidates the current application session, then redirects to portal logout @@ -72,53 +66,12 @@ public class LogoutController extends UnRestrictedBaseController { public ModelAndView globalLogout(HttpServletRequest request) { ModelAndView modelView = null; try { - chatRoomLogout(request); request.getSession().invalidate(); - String portalUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL); - String portalDomain = portalUrl.substring(0, portalUrl.lastIndexOf('/')); - String redirectUrl = portalDomain + "/logout.htm"; - modelView = new ModelAndView("redirect:" + redirectUrl); + Map<String, Object> model = new HashMap<>(); + return new ModelAndView("login", "model", model); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "Logout failed", e); } return modelView; } - - /** - * - * invalidates the current session (application logout) and redirects user to - * Portal. - * - * @param request - * @return modelView - */ - @RequestMapping(value = { "/app_logout.htm" }, method = RequestMethod.GET) - public ModelAndView appLogout(HttpServletRequest request) { - ModelAndView modelView = null; - try { - chatRoomLogout(request); - modelView = new ModelAndView( - "redirect:" + PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)); - UserUtils.clearUserSession(request); - request.getSession().invalidate(); - } catch (Exception e) { - logger.error(EELFLoggerDelegate.errorLogger, "Application Logout failed", e); - } - return modelView; - } - - @MetricsLog - public void chatRoomLogout(HttpServletRequest request) { - request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); - setUser(UserUtils.getUserSession(request)); - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - } diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java index 98388dfa..0a928cf7 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java @@ -139,6 +139,24 @@ public class ProfileSearchController extends RestrictedBaseController { logger.error(EELFLoggerDelegate.applicationLogger, "getUserPagination failed", e); } } + + @RequestMapping(value = { "/get_all_users" }, method = RequestMethod.GET) + public void getAllUsers(HttpServletRequest request, HttpServletResponse response) { + Map<String, Object> model = new HashMap<>(); + ObjectMapper mapper = new ObjectMapper(); + logger.info(EELFLoggerDelegate.applicationLogger, "Initiating get_all_users in ProfileSearchController"); + List<User> profileList = null; + try { + profileList = service.listAllUsers(); + model.put("profileList", mapper.writeValueAsString(profileList)); + JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); + JSONObject j = new JSONObject(msg); + response.setContentType(APPLICATION_JSON); + response.getWriter().write(j.toString()); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.applicationLogger, "getAllUsers failed", e); + } + } @SuppressWarnings("unchecked") private Map<String, Object> setDashboardData(HttpServletRequest request) diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleFunctionListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleFunctionListController.java index 4ac5f37a..ad41a9cc 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleFunctionListController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleFunctionListController.java @@ -57,7 +57,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.ObjectMapper; @@ -74,7 +75,7 @@ public class RoleFunctionListController extends RestrictedBaseController { private String viewName; - @RequestMapping(value = { "/role_function_list" }, method = RequestMethod.GET) + @GetMapping(value = { "/role_function_list" }) public ModelAndView welcome(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -88,7 +89,7 @@ public class RoleFunctionListController extends RestrictedBaseController { return new ModelAndView(getViewName(), model); } - @RequestMapping(value = { "/get_role_functions" }, method = RequestMethod.GET) + @GetMapping(value = { "/get_role_functions" }) public void getRoleFunctionList(HttpServletRequest request, HttpServletResponse response) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -104,7 +105,7 @@ public class RoleFunctionListController extends RestrictedBaseController { } } - @RequestMapping(value = { "/role_function_list/saveRoleFunction" }, method = RequestMethod.POST) + @PostMapping(value = { "/role_function_list/saveRoleFunction" }) public void saveRoleFunction(HttpServletRequest request, HttpServletResponse response, @RequestBody String roleFunc) throws IOException { ObjectMapper mapper = new ObjectMapper(); @@ -129,7 +130,7 @@ public class RoleFunctionListController extends RestrictedBaseController { response.getWriter().write(j.toString()); } - @RequestMapping(value = { "/role_function_list/addRoleFunction" }, method = RequestMethod.POST) + @PostMapping(value = { "/role_function_list/addRoleFunction" }) public void addRoleFunction(HttpServletRequest request, HttpServletResponse response, @RequestBody String roleFunc) throws IOException { ObjectMapper mapper = new ObjectMapper(); @@ -161,7 +162,7 @@ public class RoleFunctionListController extends RestrictedBaseController { response.getWriter().write(j.toString()); } - @RequestMapping(value = { "/role_function_list/removeRoleFunction" }, method = RequestMethod.POST) + @PostMapping(value = { "/role_function_list/removeRoleFunction" }) public void removeRoleFunction(HttpServletRequest request, HttpServletResponse response, @RequestBody String roleFunc) throws IOException { ObjectMapper mapper = new ObjectMapper(); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java index 0360770e..53b1945e 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java @@ -58,7 +58,8 @@ import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -81,7 +82,7 @@ public class RoleListController extends RestrictedBaseController { private static final String isCentralized = "remote"; - @RequestMapping(value = { "/role_list" }, method = RequestMethod.GET) + @GetMapping(value = { "/role_list" }) public ModelAndView getRoleList(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -94,7 +95,7 @@ public class RoleListController extends RestrictedBaseController { return new ModelAndView(getViewName(), model); } - @RequestMapping(value = { "/get_roles" }, method = RequestMethod.GET) + @GetMapping(value = { "/get_roles" }) public void getRoles(HttpServletRequest request, HttpServletResponse response) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -109,7 +110,7 @@ public class RoleListController extends RestrictedBaseController { } } - @RequestMapping(value = { "/role_list/toggleRole" }, method = RequestMethod.POST) + @PostMapping(value = { "/role_list/toggleRole" }) public ModelAndView toggleRole(HttpServletRequest request, HttpServletResponse response) throws IOException { User user = UserUtils.getUserSession(request); try { @@ -147,7 +148,7 @@ public class RoleListController extends RestrictedBaseController { } - @RequestMapping(value = { "/role_list/removeRole" }, method = RequestMethod.POST) + @PostMapping(value = { "/role_list/removeRole" }) public ModelAndView removeRole(HttpServletRequest request, HttpServletResponse response) throws IOException { User user = UserUtils.getUserSession(request); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java index 6418b1e1..a585b9f7 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java @@ -53,7 +53,8 @@ import org.onap.portalsdk.core.web.support.AppUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; @Controller @@ -68,24 +69,24 @@ public class SDKLoginController extends UnRestrictedBaseController { private String viewName; - @RequestMapping(value = { "/login.htm" }, method = RequestMethod.GET) + @GetMapping(value = { "/login.htm" }) public ModelAndView login() { Map<String, Object> model = new HashMap<>(); return new ModelAndView("login", "model", model); } - @RequestMapping(value = { "/login_external.htm" }, method = RequestMethod.GET) + @GetMapping(value = { "/login_external.htm" }) public ModelAndView externalLogin() { Map<String, Object> model = new HashMap<>(); return new ModelAndView("login_external", "model", model); } - @RequestMapping(value = { "/login_external" }, method = RequestMethod.POST) + @PostMapping(value = { "/login_external" }) public ModelAndView doexternalLogin(HttpServletRequest request, HttpServletResponse response) throws IOException { return loginStrategy.doExternalLogin(request, response); } - @RequestMapping(value = { "/doLogin" }, method = RequestMethod.GET) + @GetMapping(value = { "/doLogin" }) public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception { return loginStrategy.doLogin(request, response); } diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java index 83962c63..95ac28d8 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java @@ -70,7 +70,7 @@ import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.util.WebUtils; @@ -116,7 +116,7 @@ public class SingleSignOnController extends UnRestrictedBaseController { * @return Redirect to an appropriate address * @throws Exception */ - @RequestMapping(value = { "/single_signon.htm" }, method = RequestMethod.GET) + @GetMapping(value = { "/single_signon.htm" }) public ModelAndView singleSignOnLogin(HttpServletRequest request) throws Exception { Map<String, String> model = new HashMap<>(); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java index fabc06bf..00b8d796 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UsageListController.java @@ -56,7 +56,7 @@ import org.onap.portalsdk.core.util.UsageUtils; import org.onap.portalsdk.core.web.support.JsonMessage; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; @Controller @@ -93,7 +93,7 @@ public class UsageListController extends RestrictedBaseController { } @SuppressWarnings({ "unchecked", "rawtypes" }) - @RequestMapping(value = { "/usage_list" }, method = RequestMethod.GET) + @GetMapping(value = { "/usage_list" }) public ModelAndView usageList(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); @@ -117,7 +117,7 @@ public class UsageListController extends RestrictedBaseController { } @SuppressWarnings({ "unchecked", "rawtypes" }) - @RequestMapping(value = { "/get_usage_list" }, method = RequestMethod.GET) + @GetMapping(value = { "/get_usage_list" }) public void getUsageList(HttpServletRequest request, HttpServletResponse response) { HttpSession httpSession = request.getSession(); @@ -144,7 +144,7 @@ public class UsageListController extends RestrictedBaseController { } @SuppressWarnings("rawtypes") - @RequestMapping(value = { "/usage_list/removeSession" }, method = RequestMethod.GET) + @GetMapping(value = { "/usage_list/removeSession" }) public void removeSession(HttpServletRequest request, HttpServletResponse response) throws IOException { HashMap activeUsers = (HashMap) request.getSession().getServletContext().getAttribute(ACTIVE_USERS); UserRowBean data = new UserRowBean(); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java index 5067be1e..c637719d 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/UserProfileController.java @@ -49,7 +49,7 @@ import org.onap.portalsdk.core.service.ProfileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.ObjectMapper; @@ -68,7 +68,7 @@ public class UserProfileController extends RestrictedBaseController { @Autowired private ProfileService service; - @RequestMapping(value = { "/user_profile" }, method = RequestMethod.GET) + @GetMapping(value = { "/user_profile" }) public ModelAndView userProfile() throws IOException { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java index 7193f6bb..ce6b8ef1 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/WelcomeController.java @@ -40,7 +40,7 @@ package org.onap.portalapp.controller.core; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; /** @@ -51,7 +51,7 @@ import org.springframework.web.servlet.ModelAndView; @Controller @RequestMapping("/") public class WelcomeController extends RestrictedBaseController { - @RequestMapping(value = { "/welcome" }, method = RequestMethod.GET) + @GetMapping(value = { "/welcome" }) public ModelAndView welcome() { final String defaultViewName = null; return new ModelAndView(defaultViewName); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java index 96b602c3..98f1db84 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java @@ -45,7 +45,7 @@ import javax.servlet.http.HttpServletRequest; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; /** @@ -57,7 +57,7 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping("/") public class AngularSinglePageController extends RestrictedBaseController { - @RequestMapping(value = { "/singlePageSample" }, method = RequestMethod.GET) + @GetMapping(value = { "/singlePageSample" }) public ModelAndView view(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); return new ModelAndView("single_page_sample", "model", model); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java index 2b75aea1..8598ed15 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java @@ -62,6 +62,8 @@ import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; import org.onap.portalsdk.core.onboarding.exception.PortalAPIException; import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; import org.onap.portalsdk.core.restful.domain.EcompRole; @@ -527,7 +529,7 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR appUserName = app.getUsername(); try { decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (CipherUtilException e) { logger.error(EELFLoggerDelegate.errorLogger, "getAppCredentials failed", e); } diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/FavoritesControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/FavoritesControllerTest.java index 5c54d40d..e980f2a1 100644 --- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/FavoritesControllerTest.java +++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/FavoritesControllerTest.java @@ -53,6 +53,8 @@ import org.onap.portalsdk.core.domain.App; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.onboarding.rest.FavoritesClient; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.service.AppService; import org.onap.portalsdk.core.util.SystemProperties; import org.powermock.api.mockito.PowerMockito; @@ -60,7 +62,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PrepareForTest({SystemProperties.class, CipherUtil.class, FavoritesClient.class}) +@PrepareForTest({SystemProperties.class, CipherUtil.class, FavoritesClient.class, KeyProperties.class, KeyConstants.class}) public class FavoritesControllerTest { @InjectMocks @@ -89,6 +91,8 @@ public class FavoritesControllerTest { HttpSession session = Mockito.mock(HttpSession.class); Mockito.when(request.getSession()).thenReturn(session); PowerMockito.mockStatic(SystemProperties.class); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); User user = new User(); user.setId(123L); Mockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user"); @@ -101,7 +105,7 @@ public class FavoritesControllerTest { Mockito.when(appService.getDefaultApp()).thenReturn(app); PowerMockito.mockStatic(CipherUtil.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), app.getAppPassword())).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(FavoritesClient.class); @@ -120,6 +124,8 @@ public class FavoritesControllerTest { HttpSession session = Mockito.mock(HttpSession.class); Mockito.when(request.getSession()).thenReturn(session); PowerMockito.mockStatic(SystemProperties.class); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); User user = new User(); user.setId(123L); Mockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user"); @@ -131,7 +137,7 @@ public class FavoritesControllerTest { app.setAppPassword("Password"); Mockito.when(appService.getDefaultApp()).thenReturn(app); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(FavoritesClient.class); Mockito.when(FavoritesClient.getFavorites(Mockito.anyString(), Mockito.anyString(), @@ -149,6 +155,8 @@ public class FavoritesControllerTest { HttpSession session = Mockito.mock(HttpSession.class); Mockito.when(request.getSession()).thenReturn(session); PowerMockito.mockStatic(SystemProperties.class); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); User user = new User(); user.setId(123L); Mockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user"); @@ -161,7 +169,7 @@ public class FavoritesControllerTest { Mockito.when(appService.getDefaultApp()).thenReturn(null); PowerMockito.mockStatic(CipherUtil.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), app.getAppPassword())).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(FavoritesClient.class); diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java index 8883cfa8..71d7277a 100644 --- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java +++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java @@ -37,9 +37,6 @@ */ package org.onap.portalapp.controller.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -111,46 +108,4 @@ public class LogoutControllerTest { .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); logoutController.globalLogout(mockedRequest); } - - @Test - public void globalLogoutExceptionTest(){ - PowerMockito.mockStatic(PortalApiProperties.class); - PowerMockito.mockStatic(PortalApiConstants.class); - Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); - assertNull(logoutController.globalLogout(mockedRequest)); - } - - @Test - public void appLogoutTest(){ - ModelAndView actualModelView = new ModelAndView("redirect:http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); - PowerMockito.mockStatic(PortalApiProperties.class); - PowerMockito.mockStatic(PortalApiConstants.class); - PowerMockito.mockStatic(RequestContextHolder.class); - ServletRequestAttributes ServletRequestAttributes = new ServletRequestAttributes(mockedRequest); - Mockito.when(RequestContextHolder.currentRequestAttributes()).thenReturn(ServletRequestAttributes); - Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); - ModelAndView expectedModelView = logoutController.appLogout(mockedRequest); - assertEquals(actualModelView.getViewName(), expectedModelView.getViewName()); - } - - @Test - public void appLogoutExceptionTest(){ - PowerMockito.mockStatic(PortalApiProperties.class); - PowerMockito.mockStatic(PortalApiConstants.class); - Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); - assertNull(logoutController.appLogout(mockedRequest)); - } - - @Test - public void getUserTest(){ - User expectedUser = new User(); - expectedUser.setActive(false); - user.setActive(false); - logoutController.setUser(user); - User actualUser = logoutController.getUser(); - assertEquals(expectedUser.getActive(), actualUser.getActive()); - } } diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java index 9d5e4fea..2c6827ed 100644 --- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java +++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/service/OnBoardingApiServiceImplTest.java @@ -65,6 +65,8 @@ import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; import org.onap.portalsdk.core.onboarding.exception.PortalAPIException; import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; import org.onap.portalsdk.core.restful.domain.EcompRole; @@ -83,7 +85,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.context.ApplicationContext; @RunWith(PowerMockRunner.class) -@PrepareForTest({ AppContextManager.class, PortalApiProperties.class, JSONUtil.class, PortalTimeoutHandler.class, SystemProperties.class, CipherUtil.class }) +@PrepareForTest({ AppContextManager.class, PortalApiProperties.class, JSONUtil.class, PortalTimeoutHandler.class, SystemProperties.class, CipherUtil.class, KeyProperties.class, KeyConstants.class }) public class OnBoardingApiServiceImplTest { @Mock @@ -426,7 +428,9 @@ public class OnBoardingApiServiceImplTest { PowerMockito.mockStatic(SystemProperties.class); PowerMockito.mockStatic(CipherUtil.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(key); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(key); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), key)).thenReturn(app.getAppPassword()); Mockito.when(appServiceImpl.getDefaultApp()).thenReturn(app); OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl(); @@ -453,7 +457,9 @@ public class OnBoardingApiServiceImplTest { PowerMockito.mockStatic(SystemProperties.class); PowerMockito.mockStatic(CipherUtil.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(key); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(key); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), key)).thenThrow(CipherUtilException.class); Mockito.when(appServiceImpl.getDefaultApp()).thenReturn(app); OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl(); diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz b/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz Binary files differindex ae63bfb4..c8b68ce0 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/app.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/app.module.ts index a86ea759..6dcdda67 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/app.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/app.module.ts @@ -36,7 +36,7 @@ * */ import { CommonModule } from '@angular/common'; -import { HttpClientModule } from '@angular/common/http'; +import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -47,6 +47,7 @@ import { SidebarService } from './shared/services/index'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { UserService } from './shared/services/user/user.service'; +import { HeaderInterceptor } from './shared/interceptors/header-interceptor'; @NgModule({ imports: [ @@ -60,7 +61,11 @@ import { UserService } from './shared/services/user/user.service'; ReactiveFormsModule, ], declarations: [AppComponent], - providers: [SidebarService,UserService], + providers: [SidebarService,UserService,{ + provide: HTTP_INTERCEPTORS, + useClass: HeaderInterceptor, + multi: true, + }], bootstrap: [AppComponent] }) export class AppModule {} diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts index 7d14ee39..1c631347 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts @@ -10,56 +10,59 @@ export class ProfileService { constructor(private http:HttpClient) { } getUserPagination(){ - return this.http.get(environment.getUserPagination,{ withCredentials: true }); + return this.http.get(environment.getUserPagination); } + getAllUsers(){ + return this.http.get(environment.getAllUsers); + } getPostSearch(postSearchBean:any) { - return this.http.post(environment.postSearch,JSON.stringify({postSearchBean: postSearchBean}),{ withCredentials: true }); + return this.http.post(environment.postSearch,JSON.stringify({postSearchBean: postSearchBean})); } importUser(postSearchBean:any) { - return this.http.post(environment.importSearch,JSON.stringify({postSearchBean: postSearchBean}),{ withCredentials: true }); + return this.http.post(environment.importSearch,JSON.stringify({postSearchBean: postSearchBean})); } getPostProfile() { - return this.http.get(environment.getPostProfile,{ withCredentials: true }); + return this.http.get(environment.getPostProfile); } getSelfProfile() { - return this.http.get(environment.getSelfProfile,{ withCredentials: true }); + return this.http.get(environment.getSelfProfile); } getProfileById(profileId){ - return this.http.get(environment.getProfileById+"?profile_id="+profileId, {withCredentials: true }); + return this.http.get(environment.getProfileById+"?profile_id="+profileId); } removeRole(data,profileId) { - return this.http.post(environment.removeUserRole+'?profile_id='+profileId,JSON.stringify({role: data}),{ withCredentials: true }); + return this.http.post(environment.removeUserRole+'?profile_id='+profileId,JSON.stringify({role: data})); } addUserRole(data,profileId) { - return this.http.post(environment.addUserRole+'?profile_id='+profileId,JSON.stringify({role: data}),{ withCredentials: true }); + return this.http.post(environment.addUserRole+'?profile_id='+profileId,JSON.stringify({role: data})); } saveProfile(data,profileId) { - return this.http.post(environment.saveProfile+'?profile_id='+profileId,JSON.stringify({profile: data.profile,selectedCountry:data.selectedCountry, selectedState:data.selectedState, selectedTimeZone:data.selectedTimeZone}),{ withCredentials: true }); + return this.http.post(environment.saveProfile+'?profile_id='+profileId,JSON.stringify({profile: data.profile,selectedCountry:data.selectedCountry, selectedState:data.selectedState, selectedTimeZone:data.selectedTimeZone})); } toggleProfileActive(profileId){ - return this.http.get(environment.toggleProfileActive+profileId,{ withCredentials: true }); + return this.http.get(environment.toggleProfileActive+profileId); } 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 60052f92..459220ab 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 @@ -13,6 +13,7 @@ import { HeaderTabsWrapperComponent } from './analytics/Report_List/header-tabs- 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'; +import { DisplayAreaComponent } from './analytics/Report_List/display-area/display-area.component'; @@ -31,6 +32,7 @@ const routes: Routes = [ { path: 'run/:reportId', component: RunReportFormFieldsComponent}, { path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent}, { path: 'run', component: RunReportFormFieldsComponent}, + { path: 'displayArea/:menuId', component: DisplayAreaComponent}, { path: 'welcome', component :WelcomeDashboardComponent}, { path: 'refresh', component: RefreshComponent}, { path: '', redirectTo: 'welcome'} diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/bar-chart/bar-chart.component.html b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/bar-chart/bar-chart.component.html index 16141e6b..26c5c21d 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/bar-chart/bar-chart.component.html +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/bar-chart/bar-chart.component.html @@ -34,6 +34,6 @@ ============LICENSE_END============================================ --> -<div> - <canvas id="fixes-enhancements"></canvas> +<div style="display: block; height: 250px; width: 400px;"> + <canvas id="fixes-enhancements" style="display: block; height: 250px; width: 400px;"></canvas> </div> diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/pie-chart/pie-chart.component.html b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/pie-chart/pie-chart.component.html index e4977f96..8bc42862 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/pie-chart/pie-chart.component.html +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/pie-chart/pie-chart.component.html @@ -34,6 +34,6 @@ ============LICENSE_END============================================ --> -<div style="display: block; height: 250px; width: 450px;"> - <canvas id="fb-root-causes" style="display: block; height: 250px; width: 450px;"></canvas> +<div style="display: block; height: 250px; width: 428px;"> + <canvas id="fb-root-causes" style="display: block; height: 250px; width: 428px;"></canvas> </div> diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.css b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.css index 0124786e..50a2f690 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.css +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.css @@ -203,7 +203,6 @@ button { cursor: pointer; background: transparent; border: none; - padding: 10px; font-size: xx-large; outline: none; } diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.html b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.html index d010f983..a58d7e50 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.html +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.html @@ -100,7 +100,7 @@ <div class="gridster-box"> <div class="gridster-box-header"> <h3>Important Links</h3> - <div class="gridster-box-content"> + <div class="gridster-box-content" style="height:390px"> <div> <table> <thead> diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts index 47e83e90..5a56c9aa 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts @@ -118,8 +118,8 @@ export class WelcomeDashboardComponent { ngOnInit(){ this.gridOptions = { - minCols: 6, - maxCols: 6, + minCols: 4, + maxCols: 4, minRows: 10, maxRows: 10, maxItemCols: 50, 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 e53aeb67..df7495c6 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 @@ -11,6 +11,7 @@ export const environment = { getFunctionCdList:'admin_fn_menu/get_function_cd_list', getParentList:'admin_fn_menu/get_parent_list', getUserPagination:'get_user_pagination?pageNum=0&viewPerPage=0', + getAllUsers:'get_all_users', deleteRole:'role_list/removeRole', getTopMenu:'get_topMenuInfo', deleteRoleFunction:'role_function_list/removeRoleFunction', @@ -28,5 +29,6 @@ export const environment = { getLeftMenu :'get_menu', removeRoleFunction:'role/removeRoleFunction.htm?role_id=', saveRole:'role/saveRole.htm?role_id=', - toggleProfileActive: 'profile/toggleProfileActive?profile_id=' + toggleProfileActive: 'profile/toggleProfileActive?profile_id=', + isLogDisabled:'true' }; 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 0114df00..f51d577d 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/environments/environment.ts @@ -15,6 +15,7 @@ export const environment = { getFunctionCdList:'http://www.sdk.onap.org:8080/epsdk-app-os/admin_fn_menu/get_function_cd_list', getParentList:'http://www.sdk.onap.org:8080/epsdk-app-os/admin_fn_menu/get_parent_list', getUserPagination:'http://www.sdk.onap.org:8080/epsdk-app-os/get_user_pagination?pageNum=0&viewPerPage=0', + getAllUsers:'http://www.sdk.onap.org:8080/epsdk-app-os/get_all_users', deleteRole:'http://www.sdk.onap.org:8080/epsdk-app-os/role_list/removeRole', getTopMenu:'http://www.sdk.onap.org:8080/epsdk-app-os/get_topMenuInfo', deleteRoleFunction:'http://www.sdk.onap.org:8080/epsdk-app-os/role_function_list/removeRoleFunction', @@ -32,7 +33,8 @@ export const environment = { getLeftMenu :'http://www.sdk.onap.org:8080/epsdk-app-os/get_menu', removeRoleFunction:'http://www.sdk.onap.org:8080/epsdk-app-os/role/removeRoleFunction.htm?role_id=', 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=' + toggleProfileActive: 'http://www.sdk.onap.org:8080/epsdk-app-os/profile/toggleProfileActive?profile_id=', + isLogDisabled:'false' }; /* diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/favicon.ico b/ecomp-sdk/epsdk-app-os/ngappsrc/src/favicon.ico Binary files differindex 8081c7ce..4d425981 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/favicon.ico +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/favicon.ico diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/main.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/main.ts index c7b673cf..a892a2e6 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/main.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/main.ts @@ -10,3 +10,8 @@ if (environment.production) { platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err)); + +console.log("isLogDisabled :: ",environment.isLogDisabled); +if (environment.isLogDisabled ==='true'){ + window['console']['log'] = function() {}; +}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java index 074311dc..d8076a71 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java @@ -47,6 +47,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; import org.onap.portalsdk.core.onboarding.exception.PortalAPIException; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.util.SystemProperties; import org.springframework.web.servlet.ModelAndView; @@ -100,9 +102,9 @@ public class LoginStrategyImpl extends LoginStrategy { Cookie userIdCookie = getCookie(request, USER_ID); if (userIdCookie != null) { final String cookieValue = userIdCookie.getValue(); - if (!SystemProperties.containsProperty(SystemProperties.Decryption_Key)) - throw new IllegalStateException("Failed to find property " + SystemProperties.Decryption_Key); - final String decryptionKey = SystemProperties.getProperty(SystemProperties.Decryption_Key); + if ((null == KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)) || ("".equalsIgnoreCase(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)))) + throw new IllegalStateException("Failed to find property " + KeyConstants.CIPHER_ENCRYPTION_KEY); + final String decryptionKey = KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY); userId = CipherUtil.decrypt(cookieValue, decryptionKey); logger.debug(EELFLoggerDelegate.debugLogger, "getUserIdFromCookie: decrypted as {}", userId); } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html index 04701ca7..77ced1b1 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.html @@ -7,7 +7,7 @@ <ul class="navbar-nav ml-auto"> <li class="nav-item dropdown" ngbDropdown> <a href="javascript:void(0)" class="nav-link" ngbDropdownToggle> - <i class="fa fa-user"></i> {{userFirstName}} <b class="caret"></b> + <i class="icon ion-md-person"></i> {{userFirstName}} <b class="caret"></b> </a> <div class="dropdown-menu-right" ngbDropdownMenu> @@ -16,13 +16,13 @@ <br/> <div ><span class="reg-userEmail-value-spn"> - <div>Email:</div>{{userEmail}}</span></div> + <div style="font-weight: bold;">Email:</div>{{userEmail}}</span></div> <br/> <div ><span class="reg-userEmail-value-spn"> - <div>userId:</div>{{userId}}</span></div> + <div style="font-weight: bold;">User Id:</div>{{userId}}</span></div> <br/> <div id="reg-logout-div" style="padding-top: 8px"> - <a href="logout.htm" id="allLogout" class="btn btn-primary"> + <a href="{{logOutURL}}" id="allLogout" class="btn btn-primary"> Log out </a> </div> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.spec.ts index bd9bea48..4b3e1c7c 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.spec.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.spec.ts @@ -47,7 +47,6 @@ import { LayoutModule } from '../../layout.module'; import { CookieService } from 'ngx-cookie-service'; import { HeaderService } from 'src/app/shared/services/header/header.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { Router } from '@angular/router'; import 'rxjs/add/observable/of'; import { Observable } from 'rxjs/Observable'; @@ -55,11 +54,8 @@ import { Observable } from 'rxjs/Observable'; describe('HeaderComponent', () => { let headerService:HeaderService; - let cookieService:CookieService; - let router:Router; let component: HeaderComponent; let fixture: ComponentFixture<HeaderComponent>; - let spy: any; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -83,7 +79,6 @@ describe('HeaderComponent', () => { component = fixture.componentInstance; fixture.detectChanges(); headerService = TestBed.get(HeaderService); - cookieService=TestBed.get(CookieService); }); @@ -96,6 +91,10 @@ describe('HeaderComponent', () => { let spy=spyOn(headerService, 'getTopMenuItems').and.returnValue(Observable.of('you object')); component.ngOnInit(); expect(spy).toHaveBeenCalled(); + expect(component.userFirstName).toEqual(component.response.firstName); + expect(component.userEmail).toEqual(component.response.email); + expect(component.userId).toEqual(component.response.userid); + expect(component.userName).toEqual(component.userName); }) }) diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts index 7bf5c649..8cfcdbe4 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts @@ -38,9 +38,8 @@ import { Component, OnInit } from '@angular/core'; import { Router, NavigationEnd } from '@angular/router'; import { HeaderService } from '../../../shared/services/header/header.service'; -import { UserService } from 'src/app/shared/services/user/user.service'; -import { User } from 'src/app/shared/services/user/user'; import { CookieService } from 'ngx-cookie-service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-header', @@ -57,9 +56,18 @@ export class HeaderComponent implements OnInit { userName; appName:string; showHeader:boolean = true; + logOutURL = environment.baseUrl; - constructor(public router: Router,public headerService: HeaderService,public cookieService: CookieService) { + constructor(public router: Router,public headerService: HeaderService,public cookieService: CookieService) { + + if(window.location.pathname.split('/').length > 3) { + var portNum = ( window.location.port === '' || window.location.port === '0' ) ? '' : ':'+ window.location.port; + this.logOutURL = window.location.protocol + "//" + window.location.hostname + portNum + window.location.pathname.substring(0, this.nthIndex(window.location.pathname, "/", 2) + 0) + '/logout.htm'; + } else { + this.logOutURL = environment.baseUrl + 'logout.htm'; + } + this.router.events.subscribe(val => { if ( @@ -78,7 +86,7 @@ export class HeaderComponent implements OnInit { } this.pushRightClass = 'push-right'; - this.appName= 'ONAP Portal' ; + this.appName= 'Portal SDK' ; let result = this.headerService.getTopMenuItems(); result.subscribe(res => { this.response = res; @@ -103,4 +111,13 @@ export class HeaderComponent implements OnInit { onLoggedout() { localStorage.removeItem('isLoggedin'); } + + nthIndex(str, pat, n) { + var L = str.length, i = -1; + while (n-- && i++ < L) { + i = str.indexOf(pat, i); + if (i < 0) break; + } + return i; + } } 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 e640f84f..5f8a2ec5 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,7 +1,11 @@ -<div class="sidebar" [ngClass]="{'siderbar-height': showHeader, 'siderbar-height-noHeader': !showHeader}" > +<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="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"> @@ -23,7 +27,7 @@ <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> + <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"> @@ -45,4 +49,4 @@ </div> </div> </nav> -</div>
\ No newline at end of file +</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.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts index 6487d745..fbe38c9d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.ts @@ -144,6 +144,8 @@ export class SidebarComponent implements OnInit { } else { this.showMenu = element; } + this.collapsed=false; + this.collapsedEvent.emit(false); } toggleCollapsed() { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.service.ts index 1240e981..c42235be 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.service.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.service.ts @@ -51,7 +51,7 @@ export class AdminService { constructor(private http:HttpClient) { } getRoleFunctionList(){ - return this.http.get(environment.roleFunctionList,{ withCredentials: true }); + return this.http.get(environment.roleFunctionList); } saveRoleFunction(roleData:string){ @@ -60,65 +60,65 @@ export class AdminService { getUsageList() { - return this.http.get(environment.usageList,{ withCredentials: true }); + return this.http.get(environment.usageList); } getCacheRegions(){ - return this.http.get(environment.cachedRegions,{ withCredentials: true }); + return this.http.get(environment.cachedRegions); } getRole(roleId){ - return this.http.get(environment.getRole+'?role_id=' + roleId,{ withCredentials: true }); + return this.http.get(environment.getRole+'?role_id=' + roleId); } getFnMenuItems() { - return this.http.get(environment.getFnMenuItems,{ withCredentials: true }); + return this.http.get(environment.getFnMenuItems); } updateFnMenuItem(menuObj: any): Observable<any> { let updateMenuURL = environment.updateFnMenuItem; - return this.http.post(updateMenuURL, menuObj, {withCredentials: true}) + return this.http.post(updateMenuURL, menuObj) } getFunctionCdList(): Observable<any>{ let getFunctionCdListURL = environment.getFunctionCdList; - return this.http.get(getFunctionCdListURL , { withCredentials: true } ); + return this.http.get(getFunctionCdListURL); } getParentData(): Observable<any>{ let getParentDataURL = environment.getParentList; - return this.http.get(getParentDataURL , { withCredentials: true } ); + return this.http.get(getParentDataURL); } deleteRole(roleData:any){ - return this.http.post(environment.deleteRole,JSON.stringify({role: roleData}),{ withCredentials: true }); + return this.http.post(environment.deleteRole,JSON.stringify({role: roleData})); } deleteRoleFunction(roleFunc:any) { - return this.http.post(environment.deleteRoleFunction,roleFunc,{ withCredentials: true }); + return this.http.post(environment.deleteRoleFunction,roleFunc); } removeRoleFunction(roleFunc:any, roleId:any){ let removeRoleFunctionURL = environment.removeRoleFunction+roleId; - return this.http.post(removeRoleFunctionURL,JSON.stringify({roleFunction:roleFunc}),{ withCredentials: true }); + return this.http.post(removeRoleFunctionURL,JSON.stringify({roleFunction:roleFunc})); } saveRole(roleObj:any, roleId:any){ let saveRoleURL = environment.saveRole+roleId; - return this.http.post(saveRoleURL,JSON.stringify(roleObj),{ withCredentials: true }); + return this.http.post(saveRoleURL,JSON.stringify(roleObj)); } deleteMenu(fnMenuItem:any){ - return this.http.post(environment.deleteMenu,JSON.stringify({fnMenuItem: fnMenuItem}),{ withCredentials: true }); + return this.http.post(environment.deleteMenu,JSON.stringify({fnMenuItem: fnMenuItem})); } getCacheRegionDetails(cacheName:any){ - return this.http.get(environment.getRegion+'?cacheName='+cacheName,{ withCredentials: true }); + return this.http.get(environment.getRegion+'?cacheName='+cacheName); } } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts index eb8b63dd..a32b2e3e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts @@ -56,11 +56,6 @@ describe('MenusComponent', () => { expect(component).toBeTruthy(); }); - // it('should test getFnMenuItems method inside getMenus',()=>{ - // let spy=spyOn(adminService,'getFnMenuItems').and.returnValue(Observable.of(stubData)) - // component.getMenus(); - // expect(spy).toHaveBeenCalled(); - // }) describe('test getMenus',()=>{ it('should test getMenus',()=>{ let spy=spyOn(adminService,'getParentData').and.returnValue(Observable.of('you object')) diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts index 5d996964..c6fbc8c4 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts @@ -72,12 +72,12 @@ export class MenusComponent implements OnInit { public columns: any = []; activeStatusOptions = [ - {index: 0, value: 'true', name: 'Y'}, - {index: 1, value: 'false', name: 'N'} + {id: '0', name: 'Y'}, + {id: '1', name: 'N'} ]; separatorStatusOptions = [ - {index: 0, value: 'true', name: 'Y'}, - {index: 1, value: 'false', name: 'N'} + {id: '0', name: 'Y'}, + {id: '1', name: 'N'} ]; functionCDselectData = []; parentListSelectData = []; @@ -192,6 +192,7 @@ export class MenusComponent implements OnInit { this.parentList.push({id: _data[i][0], name: _data[i][1]}); } console.log("Actual parent list : ", this.parentList); + this.menuService.getParentList(this.parentList); } }, error => { this.showSpinner = false; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.service.ts index aeb8ea49..912b65bb 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.service.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.service.ts @@ -104,23 +104,32 @@ export class MenusService implements RdpCrudInterface { data.active = this.updateStatus(data.active); data.separator = this.updateStatus(data.separator); let keys = Object.keys(data); + let menuCache = this.menu; keys.forEach(element => { if (data[element] != null || data[element] != undefined) { if (element == 'parentId') { - this.menu[element] = 1; + if (isNaN(data[element])) { + menuCache[element] = this.updateParentNameToID(data[element]); + } else{ + menuCache[element] = data[element]; + } + console.log("Parent Id to update : ", menuCache[element]); } else { - this.menu[element] = data[element]; + menuCache[element] = data[element]; } } }); - let result = { availableFnMenuItem: this.menu }; + let result = { availableFnMenuItem: menuCache }; let postData = JSON.stringify(result); console.log("postData >>>>>>", postData); this.adminService.updateFnMenuItem(postData) .subscribe(_data => { + console.log("Response : ", _data); this.statusResponse.next("200"); + menuCache = this.menu; }, error => { console.log("Error : ", error); + menuCache = this.menu; }); } @@ -130,11 +139,10 @@ export class MenusService implements RdpCrudInterface { console.log(data.active); data.active = this.updateStatus(data.active); data.separator = this.updateStatus(data.separator); - let result = { availableFnMenuItem: data }; - this.adminService.deleteMenu(result).subscribe(response => { + this.adminService.deleteMenu(data).subscribe(response => { console.log("Response ", response); this.statusResponse.next("200"); - }, error =>{ + }, error => { console.log("Error : ", error); }) } @@ -147,15 +155,44 @@ export class MenusService implements RdpCrudInterface { } } + private updateBooleanValue(data) { + if (data) { + return 'Y'; + } else { + return 'N'; + } + } + + parentList: any; + + getParentList(list) { + this.parentList = list; + } + + private updateParentNameToID(data) { + let val; + this.parentList.forEach(ele => { + if (ele['name'] == data) { + val = ele['id']; + } + }); + console.log("ParentId value ", val); + return val; + } + get() { - console.log("get method is getting called from AppServie data:: "); + console.log("get method is getting called from MenuServie data:: "); let response = this.adminService.getFnMenuItems(); let resp; response.subscribe(res => { - console.log("Get Response : ", res); resp = res; - console.log("edited : ",JSON.parse(resp.data).fnMenuItems); - this.updatedData.next(JSON.parse(resp.data).fnMenuItems); + let responseData = JSON.parse(resp.data).fnMenuItems; + responseData.forEach(element => { + element.active = this.updateBooleanValue(element.active); + element.separator = this.updateBooleanValue(element.separator); + }) + this.updatedData.next(responseData); }) } + } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.ts index 2a8561e6..25f5109c 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.ts @@ -114,7 +114,7 @@ export class ColumnListComponent implements OnInit { } ngOnInit() { - + this.showSpinner = true; this.displayTable = true; this._columnService.getColumnList() .subscribe((response) => { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.service.ts index 3cd72584..0c1781bc 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.service.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.service.ts @@ -12,6 +12,6 @@ export class DashboardReportGridService { getReportList() : Observable<any> { - return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0"); + return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0&show_all=true"); } } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts index fc34cccd..e3bab3bb 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts @@ -76,16 +76,20 @@ export class FormFieldsComponent implements OnInit { } ngOnInit() { + this.showSpinner = true; this._formFieldsService.getListOfFormFields() .subscribe((responseFormFields) => { + this.showSpinner = true; for (let m = 0; m < responseFormFields.length; m++) { responseFormFields[m]["orderSeq"] = m + 1; this.formFieldsListObj.push(responseFormFields[m]); } - + this.showSpinner = false; this._formFieldsService.getFormFieldGroupsData(this.reportId1) .subscribe((responseGroupsData) => { + this.showSpinner = true; this.Groups = JSON.parse(responseGroupsData["formFieldGroupsJSON"]); + this.showSpinner = false; }); }); } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/log/log.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/log/log.component.ts index 47ec2383..a90a1f8e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/log/log.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/log/log.component.ts @@ -22,7 +22,7 @@ export class LogComponent implements OnInit { } ngOnInit() { - + this.showSpinner = true; if(this.reportType === "Dashboard") { this.stepNo= "3"; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.html index dc6ef1cd..60eb927f 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.html @@ -21,12 +21,12 @@ <div *ngIf="!showformFiledSpinner" class="stdForm"> <div *ngIf="formFieldList" class="wrapper"> <div *ngFor="let item of formFieldList; let i = index;"> - <div *ngIf="item.fieldType == 'TEXT' && item.validationType !== 'DATE'" + <div *ngIf="item.fieldType == 'TEXT' && item.validationType !== 'DATE' && item.visible" class="fieldWidth"> <label class="labelWidth">{{item.fieldDisplayName}} :</label> <textarea placement="right" ngbTooltip="comma seperated" [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" [(ngModel)]="formFieldListValueArr[i]" class="defaultFontSizeTextArea" id="item.fieldId"></textarea> </div> - <div *ngIf="item.fieldType == 'LIST_BOX'" class="fieldWidth"> + <div *ngIf="item.fieldType == 'LIST_BOX' && item.visible" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> <select [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" class="browser-default custom-select defaultFontSize" required="required" @@ -35,7 +35,7 @@ class="defaultFontSize" value="{{listItem.id}}">{{listItem.name}}</option> </select> </div> - <div *ngIf="item.fieldType == 'LIST_MULTI_SELECT'" class="fieldWidth"> + <div *ngIf="item.fieldType == 'LIST_MULTI_SELECT' && item.visible" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> <mat-form-field> <mat-select [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" multiple> @@ -44,7 +44,7 @@ </mat-select> </mat-form-field> </div> - <div *ngIf="item.validationType == 'DATE'" class="fieldWidth"> + <div *ngIf="item.validationType == 'DATE' && item.visible" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> <mat-form-field><input [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" [matDatepicker]="picker" @@ -71,11 +71,11 @@ <div *ngIf="formFieldList" class="wrapper"> <div *ngFor="let item of toggleFormFieldRenderArr; let i = index;"> - <div *ngIf="item.fieldType == 'TEXT' && item.validationType !== 'DATE'" class="fieldWidth"> + <div *ngIf="item.fieldType == 'TEXT' && item.validationType !== 'DATE' && item.visible" class="fieldWidth"> <label class="labelWidth">{{item.fieldDisplayName}} :</label><textarea placement="right" ngbTooltip="comma seperated" [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" class="defaultFontSizeTextArea" id="item.fieldId"></textarea> </div> - <div *ngIf="item.fieldType == 'LIST_BOX'" class="fieldWidth"> + <div *ngIf="item.fieldType == 'LIST_BOX' && item.visible" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> <select [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" class="browser-default custom-select defaultFontSize" required="required" @@ -85,7 +85,7 @@ </select> </div> - <div *ngIf="item.fieldType == 'LIST_MULTI_SELECT'" class="fieldWidth"> + <div *ngIf="item.fieldType == 'LIST_MULTI_SELECT' && item.visible" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> <mat-form-field> <mat-select [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" @@ -97,7 +97,7 @@ <br/> </div> - <div *ngIf="item.validationType == 'DATE'" class="fieldWidth"> + <div *ngIf="item.validationType == 'DATE' && item.visible" class="fieldWidth"> <label class="labelWidth" for="reportType">{{item.fieldDisplayName}} :</label> <mat-form-field><input [ngModel]="formFieldListValueMap.get(item.fieldId)" (ngModelChange)="formFieldListValueMap.set(item.fieldId, $event)" [matDatepicker]="picker" class="defaultFontSize" diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.html index 4b647528..69de20bf 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.html @@ -33,7 +33,7 @@ </div> <span *ngIf="download_in_progress" class="ecomp-small-spinner"></span> <div *ngIf="!showDashboardReport"> - <div *ngIf="error == false" [hidden]="isChartAvailable == false" align="center"> + <div *ngIf="error == false && showChart" [hidden]="isChartAvailable == false" align="center"> <iframe #iframe height="500" style="border: none" width="70%"></iframe> </div> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.ts index a2163054..7e0ac549 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report/run-report.component.ts @@ -90,6 +90,7 @@ export class RunReportComponent implements OnInit, AfterViewInit { timeTaken = '...'; saveResponseObj: any; showBackButton = false; + showChart: boolean = false; constructor(private _http: HttpClient, private _route: ActivatedRoute, @@ -361,7 +362,9 @@ export class RunReportComponent implements OnInit, AfterViewInit { if (response['chartWizardAvailable'] === true) { this.isChartAvailable = true; - this.iframe.nativeElement.setAttribute('src', this.chartRunUrl); + if(this.iframe){ + this.iframe.nativeElement.setAttribute('src', this.chartRunUrl); + } } let totalCnt = 0; @@ -437,6 +440,9 @@ export class RunReportComponent implements OnInit, AfterViewInit { } this.dataSource.data = this.displayedRowObj; this.dataSource.sort = this.sort; + if(this.totalRecords >0){ + this.showChart = true; + } } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts index 62c7d7a4..897aa03e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts @@ -46,6 +46,7 @@ export class SQLComponent implements OnInit { } ngOnInit() { + this.showSpinner = true; this.showSaveSQLDialog = false; this.SQLPostResponse = true; this.ValidatePostResponse = {}; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.html new file mode 100644 index 00000000..eb07a769 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.html @@ -0,0 +1,14 @@ + +<div > +<div class="tab-content"> + <h3>{{this.menuId}} Reports</h3> +</div> +<span class="ecomp-spinner" *ngIf="showSpinner"></span> +<div> + +<ng-container *ngFor="let item of finalRowArr"> + <li><a href="javascript:void(0);" (click)="runReport(item.reportURL)">{{item.reportName}}</a></li> +</ng-container> + +</div> +</div> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.scss new file mode 100644 index 00000000..bc189348 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.scss @@ -0,0 +1,10 @@ + +button{ + margin: 0; + font-size: 100%; + vertical-align: middle; + color:white; + background-color: #0568ae +} + +
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.spec.ts new file mode 100644 index 00000000..27329a9b --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.spec.ts @@ -0,0 +1,26 @@ +// import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +// import { DisplayAreaComponent } from './display-area.component'; + +// describe('DisplayAreaComponent', () => { +// let component: DisplayAreaComponent; +// let fixture: ComponentFixture<DisplayAreaComponent>; + +// beforeEach(async(() => { +// TestBed.configureTestingModule({ +// declarations: [ DisplayAreaComponent ] +// }) +// .compileComponents(); +// })); + +// beforeEach(() => { +// fixture = TestBed.createComponent(DisplayAreaComponent); +// 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/pages/analytics/Report_List/display-area/display-area.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.ts new file mode 100644 index 00000000..e08190e7 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/display-area/display-area.component.ts @@ -0,0 +1,65 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { DisplayAreaService } from 'src/app/shared/services/displayArea/display-area.service'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { MatTable, MatTableDataSource } from '@angular/material/table'; + +@Component({ + selector: 'app-display-area', + templateUrl: './display-area.component.html', + styleUrls: ['./display-area.component.scss'] +}) +export class DisplayAreaComponent implements OnInit { + + @ViewChild( MatPaginator, { static: false } as any ) paginator: MatPaginator; + @ViewChild( MatSort, { static: false } as any ) sort: MatSort; + @ViewChild( MatTable, { static: false } as any ) table: MatTable<any>; + menuId:string; + showSpinner: boolean; + dataSource1: any; + displayedColumns = ["reportName", "reportDescr","reportURL"]; + finalGETObj: {}; + finalRowArr: any[]; + rowObj: any; + reportId: string; + + constructor(private _route: ActivatedRoute, private _router: Router, private _displayAreaService: DisplayAreaService) { } + + ngOnInit() { + this._route.params.subscribe(params => { + this.menuId = params['menuId']; + console.log("displayArea " +this.menuId); + this.initializeReportList(this.menuId); + }); + + + + } + + initializeReportList(menuId:string) { + this.showSpinner = true; + this.dataSource1 = new MatTableDataSource(); + this.finalGETObj = new Object(); +//this.finalGETObjRowsArr = new Array(); + this.finalRowArr = new Array(); + this._displayAreaService.getMenuIdSpecificReports(this.menuId) + .subscribe(( responseObj ) => { + this.finalGETObj = responseObj; + for (let entry of responseObj) { + this.rowObj = new Object(); + this.rowObj["reportName"] = entry["reportName"]; + this.rowObj["reportDescr"] = entry["reportDescr"]; + this.rowObj["reportURL"] = entry["reportURL"]; + this.finalRowArr.push( this.rowObj ); + } + this.showSpinner = false; + } ); +} + +runReport( reportId: string ) { + this.reportId = reportId; + this._router.navigate( [reportId] ); +} + +} diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.component.html index 0295bdd6..7bb6729d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.component.html @@ -84,7 +84,7 @@ [length]="dataSource1?.data.length" [pageIndex]="0" [pageSize]="20" - [pageSizeOptions]="[20]"> + [pageSizeOptions]="[20,40,60,80,100]"> </mat-paginator> </div> </div> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts index 560bd6e1..aad435f5 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts @@ -15,6 +15,6 @@ export class ReportListService { return this._http.get(environment.baseUrl + "/raptor.htm?action=report.delete&c_master=" + reportId); } getAllReports():Observable<any>{ - return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0"); + return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0&show_all=true"); } } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html index 5f131fb6..a6682306 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html @@ -50,12 +50,12 @@ <ng-container matColumnDef="Last Name"> <th mat-header-cell *matHeaderCellDef id="heading2"> {{userHeaders[1]}} </th> - <td mat-cell *matCellDef="let rowData"> {{rowData.lastName}} </td> + <td mat-cell *matCellDef="let rowData"> {{rowData.last_name}} </td> </ng-container> <ng-container matColumnDef="First Name"> <th mat-header-cell *matHeaderCellDef id="heading3">{{userHeaders[2]}} </th> - <td mat-cell *matCellDef="let rowData"> {{rowData.firstName}}</td> + <td mat-cell *matCellDef="let rowData"> {{rowData.first_name}}</td> </ng-container> <ng-container matColumnDef="Email"> @@ -63,12 +63,12 @@ <td mat-cell *matCellDef="let rowData" > {{rowData.email}} </td> </ng-container> - <ng-container matColumnDef="orgUserId"> + <ng-container matColumnDef="Org User ID"> <th mat-header-cell *matHeaderCellDef id="heading4"> {{userHeaders[4]}} </th> <td mat-cell *matCellDef="let rowData" > {{rowData.orgUserId}} </td> </ng-container> - <ng-container matColumnDef="orgManagerUserId"> + <ng-container matColumnDef="Org Manager User ID"> <th mat-header-cell *matHeaderCellDef id="heading4"> {{userHeaders[5]}} </th> <td mat-cell *matCellDef="let rowData" > {{rowData.orgManagerUserId}} </td> </ng-container> @@ -86,7 +86,7 @@ <ng-container matColumnDef="Active?"> <th mat-header-cell *matHeaderCellDef id="heading6"> {{userHeaders[7]}} </th> <td mat-cell *matCellDef="let rowData"> - <mat-slide-toggle [(ngModel)]="rowData.active" (change)="toggleUserActive(rowData)"></mat-slide-toggle> + <mat-slide-toggle [checked]="(rowData.active_yn =='Y' || rowData.active_yn == true) ? true : false" (change)="toggleUserActive(rowData,$event)"></mat-slide-toggle> </td> </ng-container> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.scss index 3b9e9d3b..ec84c3b0 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.scss +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.scss @@ -37,35 +37,18 @@ */ table { - width: 100%; - } - - .mat-form-field { - font-size: 14px; - width: 100%; - } - - td, th { - width: 25%; - } - .mat-form-field[_ngcontent-c4] { - font-size: 14px; - width: 20%; - float: right; - } + width: 100%; +} - /*td.mat-cell, td.mat-footer-cell{ - padding: 0; - border-bottom-width: 1px; - border-bottom-style: solid; - border-right-style: solid; - border-right-color: rgba(0,0,0,.12); - border-right-width: 1px; - } -*/ +::ng-deep .mat-header-cell{ + font-weight: bold; + font-size: 14px; + color: #343a40; +} -td[_ngcontent-c4], th[_ngcontent-c4] { - width: 15%; +::ng-deep .mat-form-field[_ngcontent-c4] { + font-size: 14px; + width: 20%; } #edit-button{ diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts index 9ae59ca8..734aaf09 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts @@ -57,14 +57,13 @@ export class SearchComponent implements OnInit { response: any; result: any; profileList:any; - userHeaders = ["User ID","Last Name","First Name","Email","orgUserId","orgManagerUserId","Edit","Active?"]; + userHeaders = ["User ID","Last Name","First Name","Email","Org User ID","Org Manager User ID","Edit","Active?"]; constructor(public profileservice:ProfileService, public ngbModal: NgbModal,private _router: Router) { } dataSource: MatTableDataSource<[]>; @ViewChild(MatPaginator, {}) paginator: MatPaginator; @ViewChild(MatSort, {}) sort: MatSort; - ngOnInit() { this.getUsers(); } @@ -72,7 +71,7 @@ export class SearchComponent implements OnInit { getUsers(){ this.showSpinner = true; let response; - this.response = this.profileservice.getUserPagination(); + this.response = this.profileservice.getAllUsers(); this.response.subscribe(data => { response = data; this.result = JSON.parse(response.data); @@ -84,9 +83,9 @@ export class SearchComponent implements OnInit { }); } - toggleUserActive(user){ - let activeOrInactive = (user.active) ? 'activate' : 'inactivate'; - let confirmationMsg = 'You are about to ' + activeOrInactive + ' the user ' + user.firstName +" "+user.lastName+ '. Do you want to continue?'; + toggleUserActive(user, e){ + let activeOrInactive = (e.checked) ? 'activate' : 'inactivate'; + let confirmationMsg = 'You are about to ' + activeOrInactive + ' the user ' + user.first_name +" "+user.last_name+ '. Do you want to continue?'; const modalInfoRef = this.ngbModal.open(InformationModalComponent); modalInfoRef.componentInstance.title = 'Confirmation'; modalInfoRef.componentInstance.message = confirmationMsg; @@ -104,7 +103,7 @@ export class SearchComponent implements OnInit { this.openConfirmationModal("Error",error); }); } else { - user.active = !user.active; + this.ngOnInit(); } }, (result) => { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts index 37231147..45789f27 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts @@ -67,6 +67,7 @@ import { LayoutModule } from '@angular/cdk/layout'; 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 { DisplayAreaComponent } from './analytics/Report_List/display-area/display-area.component'; @@ -118,6 +119,7 @@ import { RdpModule } from 'portalsdk-tag-lib'; DashboardReportGridComponent, DataChartComponent, RunDashboardReportComponent, DialogOverviewExampleDialog, + DisplayAreaComponent ], diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/interceptors/header-interceptor.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/interceptors/header-interceptor.ts index 5a5a41a8..1539877c 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/interceptors/header-interceptor.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/interceptors/header-interceptor.ts @@ -42,21 +42,27 @@ import { HttpHandler, HttpRequest, HttpHeaders, + HttpErrorResponse } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import { Observable, throwError} from 'rxjs'; import { v4 as uuid } from 'uuid'; -declare const getWebJunctionXSRFToken: any; +import { catchError } from 'rxjs/internal/operators/catchError'; +import { environment } from '../../../environments/environment'; + +function nthIndex(str, pat, n) { + var L = str.length, i = -1; + while (n-- && i++ < L) { + i = str.indexOf(pat, i); + if (i < 0) break; + } + return i; +} + export class HeaderInterceptor implements HttpInterceptor { intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { - // Clone the request to add the new header - // HttpHeader object immutable - copy values - var XSRFToken = getWebJunctionXSRFToken(); - console.log('XSRFToken:', XSRFToken); const headerSettings: { [name: string]: string | string[]; } = {}; headerSettings['X-ECOMP-RequestID'] = uuid(); const requestType = req.params.get('requestType'); - if (XSRFToken.name && XSRFToken.value) - headerSettings['X-XSRF-TOKEN'] = XSRFToken.value; if(requestType!=null && requestType==='fileUpload'){ //headerSettings['Content-Type'] = 'multipart/form-data'; }else{ @@ -65,6 +71,23 @@ export class HeaderInterceptor implements HttpInterceptor { const newHeader = new HttpHeaders(headerSettings); const clonedRequest = req.clone({ headers: newHeader, withCredentials: true }); // Pass the cloned request instead of the original request to the next handle - return next.handle(clonedRequest); + //return next.handle(clonedRequest); + var url = ''; + return next.handle(clonedRequest).pipe( + catchError(error => { + if ( error instanceof HttpErrorResponse ) { + if ( error.status === 0 ) { // If 0(302) Redirect to Login Page + if(window.location.pathname.split('/').length > 3) { + var portNum = ( window.location.port === '' || window.location.port === '0' ) ? '' : ':'+ window.location.port; + url = window.location.protocol + "//" + window.location.hostname + portNum + window.location.pathname.substring(0, nthIndex(window.location.pathname, "/", 2) + 0) + '/login.htm'; + window.open( url, '_self' ); + } else { + window.open( environment.baseUrl + 'login.htm', '_self' ); + } + } + } + return throwError(error); + }) + ); } }
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/displayArea/display-area.service.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/displayArea/display-area.service.spec.ts new file mode 100644 index 00000000..f8324dac --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/displayArea/display-area.service.spec.ts @@ -0,0 +1,13 @@ +// import { TestBed } from '@angular/core/testing'; + +// import { DisplayAreaService } from './display-area.service'; + +// describe('DisplayAreaService', () => { +// beforeEach(() => TestBed.configureTestingModule({})); + +// it('should be created', () => { +// const service: DisplayAreaService = TestBed.get(DisplayAreaService); +// expect(service).toBeTruthy(); +// }); +// }); + diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/displayArea/display-area.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/displayArea/display-area.service.ts new file mode 100644 index 00000000..71433031 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/displayArea/display-area.service.ts @@ -0,0 +1,16 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { environment } from '../../../../environments/environment'; +@Injectable({ + providedIn: 'root' +}) +export class DisplayAreaService { + + constructor(private _http : HttpClient) { } + + getMenuIdSpecificReports(menuId : string) : Observable<any> + { + return this._http.get(environment.baseUrl + "raptor.htm?action=quicklinks.json&quick_links_menu_id=" + menuId); + } +} diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java index 58c6cd62..3a7baccd 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/interceptor/ResourceInterceptor.java @@ -51,6 +51,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.objectcache.AbstractCacheManager; import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; import org.onap.portalsdk.core.service.DataAccessService; @@ -144,7 +146,7 @@ public class ResourceInterceptor extends HandlerInterceptorAdapter { String decreptedPwd = null; try { decreptedPwd = CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "handleSessionUpdates failed to decrypt password", e); } diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java index d9b96284..8f1a26bb 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RestApiRequestBuilder.java @@ -46,6 +46,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.util.SystemProperties; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; @@ -78,7 +80,7 @@ public class RestApiRequestBuilder { appUserName = app.getUsername(); try { decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (CipherUtilException e) { logger.error(EELFLoggerDelegate.errorLogger, "getViaREST failed", e); throw new IOException("getViaREST failed", e); @@ -116,7 +118,7 @@ public class RestApiRequestBuilder { appUserName = app.getUsername(); try { decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (CipherUtilException e) { logger.error(EELFLoggerDelegate.errorLogger, "postViaREST failed", e); throw new IOException("postViaREST failed", e); @@ -153,7 +155,7 @@ public class RestApiRequestBuilder { appUserName = app.getUsername(); try { decryptedPwd = CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (CipherUtilException e) { logger.error(EELFLoggerDelegate.errorLogger, "deleteViaRest failed", e); throw new IOException("deleteViaRest failed", e); diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java index 9ed0f38c..7df80183 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java @@ -58,6 +58,8 @@ import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.domain.UserApp; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.util.SystemProperties; import org.onap.portalsdk.external.authorization.domain.ExternalAccessPerms; import org.onap.portalsdk.external.authorization.domain.ExternalAccessRole; @@ -265,7 +267,7 @@ public class UserApiServiceImpl implements UserApiService { if (encrypted != null && encrypted.length() > 0) { try { result = CipherUtil.decryptPKC(encrypted, - SystemProperties.getProperty(SystemProperties.Decryption_Key)); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e); throw e; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileService.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileService.java index 9a43a203..880b6d73 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileService.java @@ -51,4 +51,6 @@ public interface UserProfileService { public List<User> findAllUserWithOnOffline(String originOrgUserId); List<User> findAllActive(); + + List<User> listAllUsers(); } diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java index 879a11de..67dfefab 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java @@ -45,6 +45,7 @@ import java.util.SortedSet; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Restrictions; +import org.onap.portalsdk.core.domain.Profile; import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.domain.support.CollaborateList; @@ -132,4 +133,11 @@ public class UserProfileServiceImpl implements UserProfileService { return users; } + @Override + public List<User> listAllUsers() { + @SuppressWarnings("unchecked") + List<User> users = getDataAccessService().getList(Profile.class, null); + return users; + } + } diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java index 5582fd2e..a49be085 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/WebServiceCallServiceImpl.java @@ -42,6 +42,8 @@ import java.util.List; import org.onap.portalsdk.core.domain.App; import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -70,7 +72,7 @@ public class WebServiceCallServiceImpl implements WebServiceCallService { String encriptedPwdDB = app.getAppPassword(); String appUserName = app.getUsername(); String decreptedPwd = CipherUtil.decryptPKC(encriptedPwdDB, - secretKey == null ? SystemProperties.getProperty(SystemProperties.Decryption_Key) : secretKey); + secretKey == null ? KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY) : secretKey); if (decreptedPwd.equals(requestPassword) && appUserName.equals(requestAppName)) { return true; } diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java index 099f4c42..132ab546 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/RestApiRequestBuilderTest.java @@ -48,13 +48,15 @@ import org.mockito.Mockito; import org.onap.portalsdk.core.domain.App; import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.util.SystemProperties; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PrepareForTest({ SystemProperties.class, CipherUtil.class, RestWebServiceClient.class }) +@PrepareForTest({ SystemProperties.class, CipherUtil.class, RestWebServiceClient.class, KeyProperties.class, KeyConstants.class }) public class RestApiRequestBuilderTest { @InjectMocks @@ -77,10 +79,12 @@ public class RestApiRequestBuilderTest { String status = "SUCCESS"; PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(CipherUtil.class); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn(app.getAppPassword()); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(RestWebServiceClient.class); @@ -110,7 +114,9 @@ public class RestApiRequestBuilderTest { app.setAppPassword("Password"); PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); Mockito.when(appService.getDefaultApp()).thenReturn(app); restApiRequestBuilder.getViaREST(restEndPoint, isBasicAuth, userId); @@ -155,10 +161,12 @@ public class RestApiRequestBuilderTest { String status = "SUCCESS"; PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(CipherUtil.class); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn(app.getAppPassword()); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(RestWebServiceClient.class); RestWebServiceClient client = Mockito.mock(RestWebServiceClient.class); @@ -187,7 +195,9 @@ public class RestApiRequestBuilderTest { app.setAppPassword("Password"); PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); Mockito.when(appService.getDefaultApp()).thenReturn(app); restApiRequestBuilder.postViaREST(restEndPoint, isBasicAuth,content, userId); @@ -230,10 +240,12 @@ public class RestApiRequestBuilderTest { String status = "SUCCESS"; PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(CipherUtil.class); Mockito.when(CipherUtil.decryptPKC(app.getAppPassword(), - SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn(app.getAppPassword()); + KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn(app.getAppPassword()); PowerMockito.mockStatic(RestWebServiceClient.class); RestWebServiceClient client = Mockito.mock(RestWebServiceClient.class); @@ -262,7 +274,9 @@ public class RestApiRequestBuilderTest { app.setAppPassword("Password"); PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(app.getAppPassword()); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(app.getAppPassword()); Mockito.when(appService.getDefaultApp()).thenReturn(app); restApiRequestBuilder.deleteViaRest(restEndPoint, isBasicAuth,content, userId); diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java index 69e9b410..89c2fabf 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/WebServiceCallServiceImplTest.java @@ -48,13 +48,15 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.onap.portalsdk.core.domain.App; import org.onap.portalsdk.core.onboarding.util.CipherUtil; +import org.onap.portalsdk.core.onboarding.util.KeyConstants; +import org.onap.portalsdk.core.onboarding.util.KeyProperties; import org.onap.portalsdk.core.util.SystemProperties; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PrepareForTest({CipherUtil.class, SystemProperties.class}) +@PrepareForTest({CipherUtil.class, SystemProperties.class, KeyProperties.class, KeyConstants.class}) public class WebServiceCallServiceImplTest { @InjectMocks @@ -78,7 +80,9 @@ public class WebServiceCallServiceImplTest { Mockito.when(appService.getDefaultApp()).thenReturn(app); PowerMockito.mockStatic(CipherUtil.class); PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(secretKey); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(secretKey); Mockito.when(CipherUtil.decryptPKC(Mockito.anyString(), Mockito.anyString())).thenReturn(requestPassword); webServiceCallServiceImpl.verifyRESTCredential(secretKey, requestAppName, requestPassword); Assert.assertTrue(true); @@ -95,7 +99,9 @@ public class WebServiceCallServiceImplTest { Mockito.when(appService.getDefaultApp()).thenReturn(app); PowerMockito.mockStatic(CipherUtil.class); PowerMockito.mockStatic(SystemProperties.class); - Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn("Key"); + PowerMockito.mockStatic(KeyProperties.class); + PowerMockito.mockStatic(KeyConstants.class); + Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn("Key"); Mockito.when(CipherUtil.decryptPKC(Mockito.anyString(), Mockito.anyString())).thenReturn("Key"); webServiceCallServiceImpl.verifyRESTCredential(secretKey, requestAppName, requestPassword); Assert.assertFalse(false); diff --git a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss index c0c95d90..b039facb 100644 --- a/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss +++ b/ecomp-sdk/portalsdk-tag-library/projects/portalsdk-tag-lib/src/lib/rdp/rdp-data-table/rdp-data-table-edit/rdp-data-table-edit.component.scss @@ -60,4 +60,18 @@ .item-label{ margin-bottom: 1px; +} + + +::ng-deep .mat-option-text { + display: unset; + flex-grow: 0; + overflow: unset; + text-overflow: unset; +} + + +::ng-deep .mat-option { + white-space: nowrap; + overflow: unset; }
\ No newline at end of file |