diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-os')
4 files changed, 208 insertions, 9 deletions
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md index db7dcaaf..5d5935b7 100644 --- a/ecomp-sdk/epsdk-app-os/README.md +++ b/ecomp-sdk/epsdk-app-os/README.md @@ -17,6 +17,7 @@ Version 1.1.0 - [Portal-7] Improvements added as part of the rebasing process - [Portal-6] Updates to License and Trademark in the PORTAL Source Code - [Portal 13] ecompsdk db connection intermittent issue seen for VID app +- [Portal 15] Fix Charting and Search Capabilities of EcompSDK Analytics Version 1.0.0 - Initial release diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql index ea959a10..ce3565f6 100644 --- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql +++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql @@ -1,12 +1,107 @@ -- --------------------------------------------------------------------------------------------------------------- -- This rollback script is for the OpenSource ECOMP SDK App database from version 1707 to 1610.2. -- change size on 3 name columns from fn_user for the Opensource version --- -- changed DS1 icon names to DS2 icon names --- removed unnecessary fn_menu entries, updated fn_menu actions +-- removed unnecessary fn_menu entries, updated fn_menu actions; changes the schema name from ecomp_sdk to ecomp_sdk_os_os -- --------------------------------------------------------------------------------------------------------------- +SET FOREIGN_KEY_CHECKS=1; +CREATE DATABASE IF NOT EXISTS ecomp_sdk_os; + +rename table ecomp_sdk.cr_favorite_reports to ecomp_sdk_os.cr_favorite_reports; +rename table ecomp_sdk.cr_filehist_log to ecomp_sdk_os.cr_filehist_log; +rename table ecomp_sdk.cr_folder to ecomp_sdk_os.cr_folder; +rename table ecomp_sdk.cr_folder_access to ecomp_sdk_os.cr_folder_access; +rename table ecomp_sdk.cr_hist_user_map to ecomp_sdk_os.cr_hist_user_map; +rename table ecomp_sdk.cr_lu_file_type to ecomp_sdk_os.cr_lu_file_type; +rename table ecomp_sdk.cr_raptor_action_img to ecomp_sdk_os.cr_raptor_action_img; +rename table ecomp_sdk.cr_raptor_pdf_img to ecomp_sdk_os.cr_raptor_pdf_img; +rename table ecomp_sdk.cr_remote_schema_info to ecomp_sdk_os.cr_remote_schema_info; +rename table ecomp_sdk.cr_report to ecomp_sdk_os.cr_report; +rename table ecomp_sdk.cr_report_access to ecomp_sdk_os.cr_report_access; +rename table ecomp_sdk.cr_report_dwnld_log to ecomp_sdk_os.cr_report_dwnld_log; +rename table ecomp_sdk.cr_report_email_sent_log to ecomp_sdk_os.cr_report_email_sent_log; +rename table ecomp_sdk.cr_report_file_history to ecomp_sdk_os.cr_report_file_history; +rename table ecomp_sdk.cr_report_log to ecomp_sdk_os.cr_report_log; +rename table ecomp_sdk.cr_report_schedule to ecomp_sdk_os.cr_report_schedule; +rename table ecomp_sdk.cr_report_schedule_users to ecomp_sdk_os.cr_report_schedule_users; +rename table ecomp_sdk.cr_report_template_map to ecomp_sdk_os.cr_report_template_map; +rename table ecomp_sdk.cr_schedule_activity_log to ecomp_sdk_os.cr_schedule_activity_log; +rename table ecomp_sdk.cr_table_join to ecomp_sdk_os.cr_table_join; +rename table ecomp_sdk.cr_table_role to ecomp_sdk_os.cr_table_role; +rename table ecomp_sdk.cr_table_source to ecomp_sdk_os.cr_table_source; +rename table ecomp_sdk.fn_lu_timezone to ecomp_sdk_os.fn_lu_timezone; +rename table ecomp_sdk.fn_user to ecomp_sdk_os.fn_user; +rename table ecomp_sdk.fn_role to ecomp_sdk_os.fn_role; +rename table ecomp_sdk.fn_audit_action to ecomp_sdk_os.fn_audit_action; +rename table ecomp_sdk.fn_audit_action_log to ecomp_sdk_os.fn_audit_action_log; +rename table ecomp_sdk.fn_lu_activity to ecomp_sdk_os.fn_lu_activity; +rename table ecomp_sdk.fn_audit_log to ecomp_sdk_os.fn_audit_log; +rename table ecomp_sdk.fn_broadcast_message to ecomp_sdk_os.fn_broadcast_message; +rename table ecomp_sdk.fn_chat_logs to ecomp_sdk_os.fn_chat_logs; +rename table ecomp_sdk.fn_chat_room to ecomp_sdk_os.fn_chat_room; +rename table ecomp_sdk.fn_chat_users to ecomp_sdk_os.fn_chat_users; +rename table ecomp_sdk.fn_datasource to ecomp_sdk_os.fn_datasource; +rename table ecomp_sdk.fn_function to ecomp_sdk_os.fn_function; +rename table ecomp_sdk.fn_lu_alert_method to ecomp_sdk_os.fn_lu_alert_method; +rename table ecomp_sdk.fn_lu_broadcast_site to ecomp_sdk_os.fn_lu_broadcast_site; +rename table ecomp_sdk.fn_lu_menu_set to ecomp_sdk_os.fn_lu_menu_set; +rename table ecomp_sdk.fn_lu_priority to ecomp_sdk_os.fn_lu_priority; +rename table ecomp_sdk.fn_lu_role_type to ecomp_sdk_os.fn_lu_role_type; +rename table ecomp_sdk.fn_lu_tab_set to ecomp_sdk_os.fn_lu_tab_set; +rename table ecomp_sdk.fn_lu_message_location to ecomp_sdk_os.fn_lu_message_location; +rename table ecomp_sdk.fn_menu to ecomp_sdk_os.fn_menu; +rename table ecomp_sdk.fn_org to ecomp_sdk_os.fn_org; +rename table ecomp_sdk.fn_restricted_url to ecomp_sdk_os.fn_restricted_url; +rename table ecomp_sdk.fn_role_composite to ecomp_sdk_os.fn_role_composite; +rename table ecomp_sdk.fn_role_function to ecomp_sdk_os.fn_role_function; +rename table ecomp_sdk.fn_tab to ecomp_sdk_os.fn_tab; +rename table ecomp_sdk.fn_tab_selected to ecomp_sdk_os.fn_tab_selected; +rename table ecomp_sdk.fn_user_pseudo_role to ecomp_sdk_os.fn_user_pseudo_role; +rename table ecomp_sdk.fn_user_role to ecomp_sdk_os.fn_user_role; +rename table ecomp_sdk.schema_info to ecomp_sdk_os.schema_info; +rename table ecomp_sdk.fn_app to ecomp_sdk_os.fn_app; +rename table ecomp_sdk.fn_workflow to ecomp_sdk_os.fn_workflow; +rename table ecomp_sdk.fn_schedule_workflows to ecomp_sdk_os.fn_schedule_workflows; +rename table ecomp_sdk.demo_bar_chart to ecomp_sdk_os.demo_bar_chart; +rename table ecomp_sdk.demo_bar_chart_inter to ecomp_sdk_os.demo_bar_chart_inter; +rename table ecomp_sdk.demo_line_chart to ecomp_sdk_os.demo_line_chart; +rename table ecomp_sdk.demo_pie_chart to ecomp_sdk_os.demo_pie_chart; +rename table ecomp_sdk.demo_util_chart to ecomp_sdk_os.demo_util_chart; +rename table ecomp_sdk.demo_scatter_chart to ecomp_sdk_os.demo_scatter_chart; +rename table ecomp_sdk.demo_scatter_plot to ecomp_sdk_os.demo_scatter_plot; +rename table ecomp_sdk.fn_qz_job_details to ecomp_sdk_os.fn_qz_job_details; +rename table ecomp_sdk.fn_qz_triggers to ecomp_sdk_os.fn_qz_triggers; +rename table ecomp_sdk.fn_qz_simple_triggers to ecomp_sdk_os.fn_qz_simple_triggers; +rename table ecomp_sdk.fn_qz_cron_triggers to ecomp_sdk_os.fn_qz_cron_triggers; +rename table ecomp_sdk.fn_qz_simprop_triggers to ecomp_sdk_os.fn_qz_simprop_triggers; +rename table ecomp_sdk.fn_qz_blob_triggers to ecomp_sdk_os.fn_qz_blob_triggers; +rename table ecomp_sdk.fn_qz_calendars to ecomp_sdk_os.fn_qz_calendars; +rename table ecomp_sdk.fn_qz_paused_trigger_grps to ecomp_sdk_os.fn_qz_paused_trigger_grps; +rename table ecomp_sdk.fn_qz_fired_triggers to ecomp_sdk_os.fn_qz_fired_triggers; +rename table ecomp_sdk.fn_qz_scheduler_state to ecomp_sdk_os.fn_qz_scheduler_state; +rename table ecomp_sdk.fn_qz_locks to ecomp_sdk_os.fn_qz_locks; +rename table ecomp_sdk.rcloudinvocation to ecomp_sdk_os.rcloudinvocation; +rename table ecomp_sdk.rcloudnotebook to ecomp_sdk_os.rcloudnotebook; -USE ecomp_sdk; +USE ecomp_sdk_os; + +-- +-- NAME: V_URL_ACCESS; TYPE: VIEW +-- +CREATE VIEW v_url_access AS + SELECT DISTINCT M.ACTION AS URL, + M.FUNCTION_CD + FROM FN_MENU M + WHERE (M.ACTION IS NOT NULL) +UNION + SELECT DISTINCT T.ACTION AS URL, + T.FUNCTION_CD + FROM FN_TAB T + WHERE (T.ACTION IS NOT NULL) +UNION + SELECT R.RESTRICTED_URL AS URL, + R.FUNCTION_CD + FROM FN_RESTRICTED_URL R; update fn_menu set image_src = 'ion-home' @@ -58,5 +153,7 @@ alter table fn_user CHANGE COLUMN FIRST_NAME FIRST_NAME VARCHAR(25) NULL DEFAULT NULL , CHANGE COLUMN MIDDLE_NAME MIDDLE_NAME VARCHAR(25) NULL DEFAULT NULL , CHANGE COLUMN LAST_NAME LAST_NAME VARCHAR(25) NULL DEFAULT NULL; - + +drop schema ecomp_sdk; + commit; diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql index c7d448db..c45ad9c5 100644 --- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql +++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql @@ -1,13 +1,109 @@ -- --------------------------------------------------------------------------------------------------------------- -- This script upgrades the OpenSource ECOMP SDK App database from version 1610.2 to 1707. -- change size on 3 name columns from fn_user for the Opensource version --- -- changed DS1 icon names to DS2 icon names --- removed unnecessary fn_menu entries, updated fn_menu actions +-- removed unnecessary fn_menu entries, updated fn_menu actions; changes the schema name from ecomp_sdk_os to ecomp_sdk -- --------------------------------------------------------------------------------------------------------------- +SET FOREIGN_KEY_CHECKS=1; +CREATE DATABASE IF NOT EXISTS ecomp_sdk; + +rename table ecomp_sdk_os.cr_favorite_reports to ecomp_sdk.cr_favorite_reports; +rename table ecomp_sdk_os.cr_filehist_log to ecomp_sdk.cr_filehist_log; +rename table ecomp_sdk_os.cr_folder to ecomp_sdk.cr_folder; +rename table ecomp_sdk_os.cr_folder_access to ecomp_sdk.cr_folder_access; +rename table ecomp_sdk_os.cr_hist_user_map to ecomp_sdk.cr_hist_user_map; +rename table ecomp_sdk_os.cr_lu_file_type to ecomp_sdk.cr_lu_file_type; +rename table ecomp_sdk_os.cr_raptor_action_img to ecomp_sdk.cr_raptor_action_img; +rename table ecomp_sdk_os.cr_raptor_pdf_img to ecomp_sdk.cr_raptor_pdf_img; +rename table ecomp_sdk_os.cr_remote_schema_info to ecomp_sdk.cr_remote_schema_info; +rename table ecomp_sdk_os.cr_report to ecomp_sdk.cr_report; +rename table ecomp_sdk_os.cr_report_access to ecomp_sdk.cr_report_access; +rename table ecomp_sdk_os.cr_report_dwnld_log to ecomp_sdk.cr_report_dwnld_log; +rename table ecomp_sdk_os.cr_report_email_sent_log to ecomp_sdk.cr_report_email_sent_log; +rename table ecomp_sdk_os.cr_report_file_history to ecomp_sdk.cr_report_file_history; +rename table ecomp_sdk_os.cr_report_log to ecomp_sdk.cr_report_log; +rename table ecomp_sdk_os.cr_report_schedule to ecomp_sdk.cr_report_schedule; +rename table ecomp_sdk_os.cr_report_schedule_users to ecomp_sdk.cr_report_schedule_users; +rename table ecomp_sdk_os.cr_report_template_map to ecomp_sdk.cr_report_template_map; +rename table ecomp_sdk_os.cr_schedule_activity_log to ecomp_sdk.cr_schedule_activity_log; +rename table ecomp_sdk_os.cr_table_join to ecomp_sdk.cr_table_join; +rename table ecomp_sdk_os.cr_table_role to ecomp_sdk.cr_table_role; +rename table ecomp_sdk_os.cr_table_source to ecomp_sdk.cr_table_source; +rename table ecomp_sdk_os.fn_lu_timezone to ecomp_sdk.fn_lu_timezone; +rename table ecomp_sdk_os.fn_user to ecomp_sdk.fn_user; +rename table ecomp_sdk_os.fn_role to ecomp_sdk.fn_role; +rename table ecomp_sdk_os.fn_audit_action to ecomp_sdk.fn_audit_action; +rename table ecomp_sdk_os.fn_audit_action_log to ecomp_sdk.fn_audit_action_log; +rename table ecomp_sdk_os.fn_lu_activity to ecomp_sdk.fn_lu_activity; +rename table ecomp_sdk_os.fn_audit_log to ecomp_sdk.fn_audit_log; +rename table ecomp_sdk_os.fn_broadcast_message to ecomp_sdk.fn_broadcast_message; +rename table ecomp_sdk_os.fn_chat_logs to ecomp_sdk.fn_chat_logs; +rename table ecomp_sdk_os.fn_chat_room to ecomp_sdk.fn_chat_room; +rename table ecomp_sdk_os.fn_chat_users to ecomp_sdk.fn_chat_users; +rename table ecomp_sdk_os.fn_datasource to ecomp_sdk.fn_datasource; +rename table ecomp_sdk_os.fn_function to ecomp_sdk.fn_function; +rename table ecomp_sdk_os.fn_lu_alert_method to ecomp_sdk.fn_lu_alert_method; +rename table ecomp_sdk_os.fn_lu_broadcast_site to ecomp_sdk.fn_lu_broadcast_site; +rename table ecomp_sdk_os.fn_lu_menu_set to ecomp_sdk.fn_lu_menu_set; +rename table ecomp_sdk_os.fn_lu_priority to ecomp_sdk.fn_lu_priority; +rename table ecomp_sdk_os.fn_lu_role_type to ecomp_sdk.fn_lu_role_type; +rename table ecomp_sdk_os.fn_lu_tab_set to ecomp_sdk.fn_lu_tab_set; +rename table ecomp_sdk_os.fn_lu_message_location to ecomp_sdk.fn_lu_message_location; +rename table ecomp_sdk_os.fn_menu to ecomp_sdk.fn_menu; +rename table ecomp_sdk_os.fn_org to ecomp_sdk.fn_org; +rename table ecomp_sdk_os.fn_restricted_url to ecomp_sdk.fn_restricted_url; +rename table ecomp_sdk_os.fn_role_composite to ecomp_sdk.fn_role_composite; +rename table ecomp_sdk_os.fn_role_function to ecomp_sdk.fn_role_function; +rename table ecomp_sdk_os.fn_tab to ecomp_sdk.fn_tab; +rename table ecomp_sdk_os.fn_tab_selected to ecomp_sdk.fn_tab_selected; +rename table ecomp_sdk_os.fn_user_pseudo_role to ecomp_sdk.fn_user_pseudo_role; +rename table ecomp_sdk_os.fn_user_role to ecomp_sdk.fn_user_role; +rename table ecomp_sdk_os.schema_info to ecomp_sdk.schema_info; +rename table ecomp_sdk_os.fn_app to ecomp_sdk.fn_app; +rename table ecomp_sdk_os.fn_workflow to ecomp_sdk.fn_workflow; +rename table ecomp_sdk_os.fn_schedule_workflows to ecomp_sdk.fn_schedule_workflows; +rename table ecomp_sdk_os.demo_bar_chart to ecomp_sdk.demo_bar_chart; +rename table ecomp_sdk_os.demo_bar_chart_inter to ecomp_sdk.demo_bar_chart_inter; +rename table ecomp_sdk_os.demo_line_chart to ecomp_sdk.demo_line_chart; +rename table ecomp_sdk_os.demo_pie_chart to ecomp_sdk.demo_pie_chart; +rename table ecomp_sdk_os.demo_util_chart to ecomp_sdk.demo_util_chart; +rename table ecomp_sdk_os.demo_scatter_chart to ecomp_sdk.demo_scatter_chart; +rename table ecomp_sdk_os.demo_scatter_plot to ecomp_sdk.demo_scatter_plot; +rename table ecomp_sdk_os.fn_qz_job_details to ecomp_sdk.fn_qz_job_details; +rename table ecomp_sdk_os.fn_qz_triggers to ecomp_sdk.fn_qz_triggers; +rename table ecomp_sdk_os.fn_qz_simple_triggers to ecomp_sdk.fn_qz_simple_triggers; +rename table ecomp_sdk_os.fn_qz_cron_triggers to ecomp_sdk.fn_qz_cron_triggers; +rename table ecomp_sdk_os.fn_qz_simprop_triggers to ecomp_sdk.fn_qz_simprop_triggers; +rename table ecomp_sdk_os.fn_qz_blob_triggers to ecomp_sdk.fn_qz_blob_triggers; +rename table ecomp_sdk_os.fn_qz_calendars to ecomp_sdk.fn_qz_calendars; +rename table ecomp_sdk_os.fn_qz_paused_trigger_grps to ecomp_sdk.fn_qz_paused_trigger_grps; +rename table ecomp_sdk_os.fn_qz_fired_triggers to ecomp_sdk.fn_qz_fired_triggers; +rename table ecomp_sdk_os.fn_qz_scheduler_state to ecomp_sdk.fn_qz_scheduler_state; +rename table ecomp_sdk_os.fn_qz_locks to ecomp_sdk.fn_qz_locks; +rename table ecomp_sdk_os.rcloudinvocation to ecomp_sdk.rcloudinvocation; +rename table ecomp_sdk_os.rcloudnotebook to ecomp_sdk.rcloudnotebook; + USE ecomp_sdk; +-- +-- NAME: V_URL_ACCESS; TYPE: VIEW +-- +CREATE VIEW v_url_access AS + SELECT DISTINCT M.ACTION AS URL, + M.FUNCTION_CD + FROM FN_MENU M + WHERE (M.ACTION IS NOT NULL) +UNION + SELECT DISTINCT T.ACTION AS URL, + T.FUNCTION_CD + FROM FN_TAB T + WHERE (T.ACTION IS NOT NULL) +UNION + SELECT R.RESTRICTED_URL AS URL, + R.FUNCTION_CD + FROM FN_RESTRICTED_URL R; + update fn_menu set image_src = 'icon-building-home' where menu_id = 2 and label = 'Home'; @@ -53,12 +149,14 @@ where menu_id = 92 and label = 'Import User'; delete from fn_menu where menu_id = 103 and label = 'Broadcast Messages'; -INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (89, 'Import', 8, 140, 'report#/report_import', 'menu_reports', 'Y', null, null, null, null, 'APP', 'N', null); -INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (150022, 'Menus', 10, 60, 'admin#/admin_menu_edit', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', NULL); - alter table fn_user CHANGE COLUMN FIRST_NAME FIRST_NAME VARCHAR(50) NULL DEFAULT NULL , CHANGE COLUMN MIDDLE_NAME MIDDLE_NAME VARCHAR(50) NULL DEFAULT NULL , CHANGE COLUMN LAST_NAME LAST_NAME VARCHAR(50) NULL DEFAULT NULL; +INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (89, 'Import', 8, 140, 'report#/report_import', 'menu_reports', 'Y', null, null, null, null, 'APP', 'N', null); +INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (150022, 'Menus', 10, 60, 'admin#/admin_menu_edit', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', NULL); + +drop schema ecomp_sdk_os; + commit; diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties index 1f8aac82..e5917c6b 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties @@ -33,6 +33,9 @@ db.encrypt_flag = false db.hib.dialect = org.hibernate.dialect.MySQLDialect db.min_pool_size = 5 db.max_pool_size = 10 +#db.test_connection_on_checkout = false +#db.preferred_test_query = SELECT 1 from FN_USER + hb.dialect = org.hibernate.dialect.MySQLDialect # SQL statements are logged to stdout hb.show_sql = true |