Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IVYPORTAL-17183 Adapt process deprecate on LE #1008

Merged
merged 1 commit into from
Sep 9, 2024
Merged

IVYPORTAL-17183 Adapt process deprecate on LE #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ortal-components/src/com/axonivy/portal/components/constant/PortalComponentConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ public final class PortalComponentConstants {

public static final String PORTAL_APPLICATION_NAME = "Portal";
public static final String SECURITY_SERVICE_CALLABLE = "Ivy Data Processes/PortalComponentSecurityService";
public static final String GET_GROUP_ID_CALLABLE = "Functional Processes/GetGroupId";

private PortalComponentConstants() {}
}
10 changes: 0 additions & 10 deletions AxonIvyPortal/portal/dataclasses/ch/ivy/add/portalkit/GetGroupIdData.d.json
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions AxonIvyPortal/portal/processes/Functional Processes/GetGroupId.p.json
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProjectVersionBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package ch.ivy.addon.portalkit.bean;

import static ch.ivy.addon.portalkit.constant.PortalConstants.PORTAL_LIBRARY_ID;

import java.io.Serializable;
import java.util.List;
import java.util.Map;

import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;

import ch.ivy.addon.portalkit.enums.PortalLibrary;
import ch.ivy.addon.portalkit.ivydata.service.impl.LibraryService;
import ch.ivyteam.ivy.application.IApplication;
import ch.ivyteam.ivy.application.ILibrary;
Expand Down Expand Up @@ -42,7 +43,7 @@ public Map<String, List<ILibrary>> getProjectLibraries() {

public void loadProjectVesion() {
engineVersion = ch.ivyteam.ivy.Advisor.getAdvisor().getVersion().toString();
ILibrary portalLibrary = IApplication.current().findReleasedLibrary(PortalLibrary.PORTAL.getValue());
ILibrary portalLibrary = IApplication.current().findReleasedLibrary(PORTAL_LIBRARY_ID);
portalVersion = portalLibrary.getQualifiedVersion().toString();
projectLibraries = retrieveProjectLibraries();
}
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ public final class PortalConstants {
public static final String BUILD_CASE_QUERY_CALLABLE = "Functional Processes/BuildCaseQuery";
public static final String BUILD_TASK_QUERY_CALLABLE = "Functional Processes/BuildTaskQuery";
public static final String ANALYZE_STATISTIC_CALLABLE = "Functional Processes/AnalyzeStatistic";
public static final String GET_GROUP_ID_CALLABLE = "Functional Processes/GetGroupId";
public static final String RESET_TASK_CONFIRMATION_DIALOG = "reset-task-confirmation-dialog";
public static final String PORTAL_LIBRARY_ID = "com.axonivy.portal:portal";
public static final int CUSTOM_STRING_FIELD_MAX_LENGTH = 2000;
public static final Integer[] EXPRESS_INVALID_VERSION = {0};
public static final int EXPRESS_VERSION = 1;
Expand Down
36 changes: 0 additions & 36 deletions AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalLibrary.java
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/LibraryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@

import org.apache.commons.lang3.StringUtils;

import ch.ivy.addon.portalkit.enums.PortalLibrary;
import ch.ivy.addon.portalkit.constant.PortalConstants;
import ch.ivyteam.ivy.application.IApplication;
import ch.ivyteam.ivy.application.ILibrary;
import ch.ivyteam.ivy.application.ReleaseState;
import ch.ivyteam.ivy.application.app.IApplicationRepository;
import ch.ivyteam.ivy.security.ISecurityContext;

public class LibraryService{
final List<String> portalLibraryStrings = Stream.of(PortalLibrary.values()).map(PortalLibrary::getValue)
.collect(Collectors.toList());
final List<String> portalLibraryStrings = Stream.of(PortalConstants.PORTAL_LIBRARY_ID).collect(Collectors.toList());

public Map<String, List<ILibrary>> collectLibraries() {
Map<String, List<ILibrary>> libraries = new HashMap<>();
Expand Down
5 changes: 3 additions & 2 deletions ...IvyPortal/portal/src/ch/ivy/addon/portalkit/service/DeleteFinishedHiddenCasesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package ch.ivy.addon.portalkit.service;

import static ch.ivy.addon.portalkit.constant.PortalConstants.PORTAL_LIBRARY_ID;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

import org.apache.commons.lang3.StringUtils;

import ch.ivy.addon.portalkit.enums.AdditionalProperty;
import ch.ivy.addon.portalkit.enums.PortalLibrary;
import ch.ivyteam.ivy.application.IApplication;
import ch.ivyteam.ivy.application.ILibrary;
import ch.ivyteam.ivy.application.IProcessModel;
Expand All @@ -28,7 +29,7 @@ public void deleteFinishedHiddenCases() {
Ivy.log().info("***Job for deleting finished hidden system cases started at: " + currentDate + " by user: " + Ivy.session().getSessionUserName());

boolean shouldDeleteAllCases = Boolean.parseBoolean(Ivy.var().get(DELETE_ALL_FINISHED_HIDDEN_CASES));
IProcessModelVersion portalPMV = findPortalPMVByLibraryId(IApplication.current(), PortalLibrary.PORTAL.getValue());
IProcessModelVersion portalPMV = findPortalPMVByLibraryId(IApplication.current(), PORTAL_LIBRARY_ID);
if (portalPMV == null) {
Ivy.log().warn("Can not retrieve portal PMV");
return ;
Expand Down
Loading