diff --git a/AxonIvyPortal/portal-components/cms/cms.yaml b/AxonIvyPortal/portal-components/cms/cms.yaml index 7937cedf8fd..4b6dfbc4b17 100644 --- a/AxonIvyPortal/portal-components/cms/cms.yaml +++ b/AxonIvyPortal/portal-components/cms/cms.yaml @@ -22,7 +22,6 @@ Dialogs: ProcessIsHidden: The current process is hidden! ProcessType: CASE_MAP: Case Map - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Business Process Labels: diff --git a/AxonIvyPortal/portal-components/cms/cms_de.yaml b/AxonIvyPortal/portal-components/cms/cms_de.yaml index 2e25b8cd3ca..d0d5b7d2792 100644 --- a/AxonIvyPortal/portal-components/cms/cms_de.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_de.yaml @@ -82,7 +82,6 @@ Dialogs: ProcessNotFound: Der definierte Process kann nicht gefunden werden. ProcessType: CASE_MAP: Fall Karte - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Geschäftsprozess ProcessViewerIFrameTitle: Prozessbetrachterrahmen diff --git a/AxonIvyPortal/portal-components/cms/cms_en.yaml b/AxonIvyPortal/portal-components/cms/cms_en.yaml index 806525ae6a0..67acf16aed0 100644 --- a/AxonIvyPortal/portal-components/cms/cms_en.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_en.yaml @@ -83,7 +83,6 @@ Dialogs: ProcessNotFound: The defined process cannot be found. ProcessType: CASE_MAP: Case Map - EXPRESS_PROCESS: Express Workflow EXTERNAL_LINK: External Link IVY_PROCESS: Business Process ProcessViewerIFrameTitle: Process viewer frame diff --git a/AxonIvyPortal/portal-components/cms/cms_es.yaml b/AxonIvyPortal/portal-components/cms/cms_es.yaml index 15b03f3efda..5e726ec7ebb 100644 --- a/AxonIvyPortal/portal-components/cms/cms_es.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_es.yaml @@ -83,7 +83,6 @@ Dialogs: ProcessNotFound: No se encuentra el proceso definido. ProcessType: CASE_MAP: Mapa del caso - EXPRESS_PROCESS: Flujo de trabajo exprés EXTERNAL_LINK: Link externo IVY_PROCESS: Proceso de negocio ProcessViewerIFrameTitle: Marco del visor de procesos diff --git a/AxonIvyPortal/portal-components/cms/cms_fr.yaml b/AxonIvyPortal/portal-components/cms/cms_fr.yaml index 59a7e3eaa35..a218ebfd9e1 100644 --- a/AxonIvyPortal/portal-components/cms/cms_fr.yaml +++ b/AxonIvyPortal/portal-components/cms/cms_fr.yaml @@ -83,7 +83,6 @@ Dialogs: ProcessNotFound: Le processus défini est introuvable. ProcessType: CASE_MAP: Carte de cas - EXPRESS_PROCESS: Flux de travail express EXTERNAL_LINK: Lien externe IVY_PROCESS: Processus d'entreprise ProcessViewerIFrameTitle: Cadre de visualisation du processus diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java index 567ee0b34aa..ac82f64fca6 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/constant/CustomFields.java @@ -1,7 +1,6 @@ package com.axonivy.portal.components.constant; public class CustomFields { - public static final String IS_EXPRESS_PROCESS = "isExpress"; public static final String IS_DASHBOARD_PROCESS = "isDashboardProcess"; public static final String BUSINESS_DETAILS = "businessDetails"; } diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java index d3fcb1cbc05..da1bfa9ce3b 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/PortalVariable.java @@ -7,7 +7,6 @@ public enum PortalVariable { STATISTIC_CHART("Portal.StatisticCharts"), WIDGET_FILTER("Portal.Dashboard.WidgetFilters"), EXTERNAL_LINK("Portal.Processes.ExternalLinks"), - EXPRESS_PROCESS("Portal.Processes.ExpressProcesses"), TASK_DETAIL("Portal.TaskDetails"), CASE_DETAIL("Portal.CaseDetails"), DASHBOARD("Portal.Dashboard"), diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java index c82a29c3d91..4476822caaf 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/enums/ProcessType.java @@ -7,7 +7,6 @@ import ch.ivyteam.ivy.environment.Ivy; public enum ProcessType { - EXPRESS_PROCESS("ExpressProcess"), EXTERNAL_LINK("ExternalLink"), CASE_MAP("casemap"), IVY_PROCESS("process-start"); diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java index 2878713fb26..6de97e0fb89 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/service/CaseDocumentService.java @@ -30,7 +30,6 @@ public class CaseDocumentService { - public static final String EXPRESS_UPLOAD_FOLDER = "AxonIvyExpress"; private ICase iCase; private CaseDocumentService(ICase iCase) { @@ -51,15 +50,7 @@ public IDocument upload(String filename, InputStream content) { } public List getAll() { - List documents = new ArrayList<>(getAllDocumentsOf(iCase)); - List expressDocs = new ArrayList<>(); - for (IDocument doc : documents) { - if (doc.getPath().asString().contains(EXPRESS_UPLOAD_FOLDER)) { - expressDocs.add(doc); - } - } - documents.removeAll(expressDocs); - return new ArrayList<>(documents); + return new ArrayList<>(getAllDocumentsOf(iCase)); } /** @@ -74,7 +65,7 @@ public StreamedContent download(IvyDocument document) { public boolean doesDocumentExist(String filename) { IDocument document = documentsOf(iCase).get(new Path(filename)); - return document != null && !document.getPath().asString().contains(EXPRESS_UPLOAD_FOLDER); + return document != null; } public static boolean isDocumentTypeValid(String filename, String allowedFileTypes) { diff --git a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java index ced7c4a9102..228a5620f9f 100644 --- a/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java +++ b/AxonIvyPortal/portal-components/src/com/axonivy/portal/components/util/ProcessViewerUtils.java @@ -7,10 +7,8 @@ import java.util.function.Predicate; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; -import com.axonivy.portal.components.constant.CustomFields; import com.axonivy.portal.components.dto.ProcessViewerDTO; import com.axonivy.portal.components.service.impl.ProcessService; @@ -132,11 +130,6 @@ private static List getWebStartables() { return Optional.ofNullable(webStartables).orElse(new ArrayList<>()); } - public static boolean isExpressCase(ICase iCase) { - return iCase != null - && BooleanUtils.toBoolean(iCase.customFields().stringField(CustomFields.IS_EXPRESS_PROCESS).getOrNull()); - } - public static ICaseMap findCaseMapByCase(ICase caze) { if (Objects.isNull(caze)) { return null; @@ -149,7 +142,7 @@ public static boolean hasCaseMap(IBusinessCase businessCase) { } public static boolean isViewerAllowed(ICase caze) { - if (caze == null || isExpressCase(caze) || !caze.isBusinessCase()) { + if (caze == null || !caze.isBusinessCase()) { return false; } else if (hasCaseMap(caze.getBusinessCase())) { return true;