Skip to content

Commit

Permalink
IVYPORTAL-17427 Remove old statistics Area (#1026)
Browse files Browse the repository at this point in the history
* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove Task Analysis

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove statistic

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove unused cms

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove test

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - change slave

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - remove css, unused js function

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Update css

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Fix test

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove unused css

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - remove unused css

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Fix gui test

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - remove statistic performance

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Remove PortalTaskAnalysis performance test

* feature/IVYPORTAL-17427-Remove-old-statistics-Area - Revert slave build
  • Loading branch information
ntloc-axonivy authored Sep 20, 2024
1 parent 3cfee39 commit 8abc181
Show file tree
Hide file tree
Showing 143 changed files with 124 additions and 21,055 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -446,16 +446,7 @@
"import ch.ivyteam.ivy.security.restricted.permission.IPermissionRepository;",
"import ch.ivyteam.ivy.security.IPermission;",
"",
"IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ADD_DASHBOARD_CHART.getValue());",
" if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());",
" }",
" ",
"iPermission = IPermissionRepository.instance().findByName(PortalPermission.EXPRESS_CREATE_WORKFLOW.getValue());",
" if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());",
" }",
"iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ANALYZE_TASK.getValue());",
"IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.EXPRESS_CREATE_WORKFLOW.getValue());",
" if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());",
" }",
Expand Down Expand Up @@ -603,15 +594,7 @@
"import ch.ivyteam.ivy.security.restricted.permission.IPermissionRepository;",
"import ch.ivyteam.ivy.security.IPermission;",
"",
"IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ADD_DASHBOARD_CHART.getValue());",
" if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());",
" }",
" iPermission = IPermissionRepository.instance().findByName(PortalPermission.EXPRESS_CREATE_WORKFLOW.getValue());",
" if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());",
" }",
" iPermission = IPermissionRepository.instance().findByName(PortalPermission.STATISTIC_ANALYZE_TASK.getValue());",
" IPermission iPermission = IPermissionRepository.instance().findByName(PortalPermission.EXPRESS_CREATE_WORKFLOW.getValue());",
" if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());",
" }",
Expand Down Expand Up @@ -744,11 +727,6 @@
"iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_CASE_LIST.getValue());",
"if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());",
"}",
"",
"iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_STATISTICS_LIST.getValue());",
"if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().denyPermission(iPermission, ivy.session.getSessionUser());",
"}"
]
},
Expand Down Expand Up @@ -787,11 +765,6 @@
"iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_CASE_LIST.getValue());",
"if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());",
"}",
" ",
"iPermission = IPermissionRepository.instance().findByName(PortalPermission.ACCESS_FULL_STATISTICS_LIST.getValue());",
"if (Objects.nonNull(iPermission)){",
" ISecurityContext.current().securityDescriptor().grantPermission(iPermission, ivy.session.getSessionUser());",
"}"
]
},
Expand Down
4,343 changes: 0 additions & 4,343 deletions AxonIvyPortal/PortalTest/jmeter/portal_walkthrough_testplan.jmx

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ public enum PortalVariable {
PASSWORD_VALIDATION("Portal.PasswordValidation"),
ANNOUNCEMENT("Portal.Announcement"),
THIRD_PARTY_APP("Portal.ThirdPartyApplications"),
STATISTIC_CHART("Portal.StatisticCharts"),
WIDGET_FILTER("Portal.Dashboard.WidgetFilters"),
EXTERNAL_LINK("Portal.Processes.ExternalLinks"),
EXPRESS_PROCESS("Portal.Processes.ExpressProcesses"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ var MainMenu = {
["CaseWidget.xhtml", "CASE"],
["PortalCaseDetails.xhtml", "CASE"],
["CaseItemDetails.xhtml", "CASE"],
["PortalDashBoard.xhtml", "DASHBOARD"],
["TaskAnalysis.xhtml", "DASHBOARD"]],
["PortalDashBoard.xhtml", "DASHBOARD"]],

init : function(responsiveToolkit) {
this.highlightMenuItem();
Expand All @@ -219,11 +218,6 @@ var MainMenu = {
var $this = this;
this.$mainMenuToggle.on('click', function(e) {
$this.responsiveToolkit.updateLayoutWithAnimation();

var statisticContainer = $('.js-statistic-widget-container.compact-mode');
if (statisticContainer.length > 0) {
updateStatisticCarousel();
}
});
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function createRedThickOutlineWithOffset($element) {
/***IMPLEMENTATION TO DECORATE PAGES - WHICH ARE CALLED IN SELENIUM****/
function highlightDashboardWidget() {
createRedMediumOutline($("#task-widget"));
createRedMediumOutline($("#statistic-widget-container"));
createRedMediumOutline($("#process-widget"));
}

Expand All @@ -47,9 +46,6 @@ function highlightAndNumberingDashboardSections() {
var taskWidget = $("#task-widget");
createRedMediumOutline(taskWidget);
appendStepAnnotation(taskWidget, "2", 0, taskWidget.width()/2);
var statisticWidget = $("#statistic-widget-container");
createRedMediumOutline(statisticWidget);
appendStepAnnotation(statisticWidget, "3", 0, statisticWidget.width()/2);
}

function numberingTaskFilter() {
Expand Down Expand Up @@ -190,14 +186,6 @@ function highlightProcessMoreMenuButton() {
appendStepAnnotation(processMoreMenuButton, "1", -10, -40);
}

function numberingStatisticWidget() {
var chartInfo = $('.chart-info:eq(0)');
appendStepAnnotation(chartInfo, "1", -10, 25);
var chartCanvas = $('.ui-carousel-items-content');
appendStepAnnotation(chartCanvas, "2", chartCanvas.width()/4, chartCanvas.height()/2 + 10);
appendStepAnnotation(chartCanvas, "3", 15, chartCanvas.width()*0.75);
}

function highlightAdminSettings() {
createRedMediumOutline($("#adminui-menu-item"));
}
Expand All @@ -215,26 +203,6 @@ function highlightShowMoreNoteLink() {
createRedMediumOutline($('a.js-note-show-more-link'));
}

function highlightStatisticNavigation() {
createRedThickOutlineWithOffset($('.layout-menu .STATISTICS'));
}

function highlightTaskAnalysisNavigationLink() {
createRedMediumOutline($("a[id$=':task-analysis-page-navigation-link']"));
}

function numberingChartPanel() {
var chartName = $('.chart-name:eq(1)');
appendStepAnnotation(chartName, "1", -30, -25);
var chartInfo = $('.chart-info:eq(1)');
appendStepAnnotation(chartInfo, "2", -20, 25);
var chartActions = $('.chart-actions-container:eq(0)');
appendStepAnnotation(chartActions, "3", -20, 0);
var chartCanvas = $('.statistic-chart:eq(1)');
appendStepAnnotation(chartCanvas, "4", chartCanvas.width()/4, chartCanvas.height()/2 + 10);
appendStepAnnotation(chartCanvas, "5", 15, chartCanvas.width()*0.8);
}

function highlightCustomCaseList() {
var caseHeader = $("[id$='case-widget:widget-column-header']");
createRedMediumOutline(caseHeader);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -532,65 +532,6 @@
"url": "https://www.google.com/search?q=danang&sca_esv=566561006&sxsrf=AM9HkKlUBz__VtVTES7NouybfOXwwRRccA%3A1695119592162&source=hp&ei=6HgJZZXzBpfj2roPnry2wAo&iflsig=AO6bgOgAAAAAZQmG-HMK6OQuwxM5-TaUgojXdqYC8KL4&oq=da&gs_lp=Egdnd3Mtd2l6IgJkYSoCCAAyBxAjGIoFGCcyBxAjGIoFGCcyBBAjGCcyBxAuGIoFGEMyCxAAGIAEGLEDGIMBMgsQABiABBixAxiDATILEAAYgAQYsQMYgwEyBBAAGAMyBBAAGAMyCxAAGIAEGLEDGIMBSNEKUABYZHAAeACQAQCYAZQBoAGlAqoBAzAuMrgBA8gBAPgBAcICDBAjGIoFGBMYgAQYJw&sclient=gws-wiz"
}
},
{
"type": "statistic",
"id": "statistic_ff821a63a24d49c6a310fb83ce818a46",
"names": [
{
"locale": "en",
"value": "Tasks by Priority"
},
{
"locale": "fr",
"value": "Tasks by Priority"
},
{
"locale": "de",
"value": "Tasks by Priority"
},
{
"locale": "es",
"value": "Tasks by Priority"
}
],
"layout": {
"w": 4,
"h": 8,
"x": 5,
"y": 15
},
"chart": {
"id": "0",
"names": [
{
"locale": "de",
"value": "Aufgaben nach Priorität"
},
{
"locale": "en",
"value": "Tasks by Priority"
},
{
"locale": "fr",
"value": "Tãches par priorité"
},
{
"locale": "es",
"value": "Tareas por prioridad"
}
],
"type": "TASK_BY_PRIORITY",
"filter": {
"timePeriodSelection": "CUSTOM",
"isAllCategoriesSelected": false,
"isAllRolesSelected": true,
"isAllCaseStatesSelected": true,
"isAllTaskPrioritiesSelected": true
},
"position": 0
},
"chartEmpty": true
},
{
"type": "news",
"id": "news_bc977a31c02a446fb2f2cb68a6118344",
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@

import com.axonivy.portal.selenium.page.CaseWidgetPage;
import com.axonivy.portal.selenium.page.ProcessWidgetPage;
import com.axonivy.portal.selenium.page.StatisticWidgetPage;
import com.axonivy.portal.selenium.page.TaskWidgetPage;

public class NavigationHelper {
private static final String TASK_LIST_PAGE_URL = "portal/1549F58C18A6C562/DefaultTaskListPage.ivp";
private static final String CASE_LIST_PAGE_URL = "portal/1549F58C18A6C562/CaseListPage.ivp";
private static final String PROCESS_LIST_PAGE_URL = "portal/1549F58C18A6C562/DefaultProcessStartListPage.ivp";
private static final String STATISTIC_PAGE_URL = "portal/1549F58C18A6C562/StatisticPage.ivp";

public static void navigateToRelativeLink(String relativeProcessStartUrl) {
try {
Expand All @@ -36,8 +34,4 @@ public static ProcessWidgetPage navigateToProcessList() {
return new ProcessWidgetPage();
}

public static StatisticWidgetPage navigateToStatisticPage() {
navigateToRelativeLink(STATISTIC_PAGE_URL);
return new StatisticWidgetPage();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public class ScreenshotUtils {
public static final String CASE_DETAIL_FOLDER = "/case-detail/";
public static final String CASE_DETAIL_CUSTOMIZATION_FOLDER = "/case-detail/customization/";
public static final String STATISTIC_WIDGET_FOLDER = "/statistic/";
public static final String TASK_ANALYSIS_FOLDER = "/statistic/task-analysis/";
public static final String SEARCH_FOLDER = "/search/";
public static final String SETTINGS_FOLDER = "/settings/";
public static final String MY_PROFILE_FOLDER = "/my-profile/";
Expand Down
Loading

0 comments on commit 8abc181

Please sign in to comment.