From fb7a80bb2f4717b29929a375cf117e0855f2754d Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 26 Mar 2024 17:00:37 +0100 Subject: [PATCH 01/13] Implementing the init facility to resolve a public link on an item #27120 --- .classpath | 4 +- .../com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 230 +++++++++++- CHANGELOG.md | 4 + pom.xml | 7 +- .../ConstantsGeoPortalDataEntryApp.java | 4 + .../client/GeoPortalDataEntryApp.java | 327 ++++++++++++------ .../client/InitExecutor.java | 43 +++ .../client/events/GetListOfRecordsEvent.java | 7 +- .../client/events/OperationOnItemEvent.java | 5 + .../client/ui/GeonaMainTabPanel.java | 9 + .../ui/projects/ListOfProjectTablePanel.java | 23 +- .../server/GeoportalDataEntryServiceImpl.java | 16 +- 13 files changed, 552 insertions(+), 129 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/InitExecutor.java diff --git a/.classpath b/.classpath index 59c98da..d0dee6a 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index a6efe72..2533716 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.2.0 +lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.3.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 35cb89c..d10a6f1 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -114,8 +114,54 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -231,7 +277,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + @@ -347,7 +416,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + @@ -463,7 +555,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + @@ -531,7 +646,33 @@ - + + uses + + + + + + + + + + + + + + + + + + + + + + + + + @@ -647,7 +788,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + @@ -763,7 +927,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + @@ -879,7 +1066,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bd1678..66d1c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v3.3.0-SNAPSHOT] - 2024-03-26 + +- Implemented the init facility to resolve a public link on an item [#27120] + ## [v3.2.2] - 2024-01-11 - Improved display of results on multiple fields (in the table) [#26372] diff --git a/pom.xml b/pom.xml index 5dbdb43..62460d1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user geoportal-data-entry-app war - 3.2.2 + 3.3.0-SNAPSHOT GeoPortal Data Entry App The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service @@ -25,11 +25,12 @@ - 2.9.0 + 2.10.0 ${project.build.directory}/${project.build.finalName} UTF-8 UTF-8 + 1.8 1.8 @@ -224,7 +225,7 @@ slf4j-api provided - + junit diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java index e175e9b..82e046d 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java @@ -25,6 +25,10 @@ public class ConstantsGeoPortalDataEntryApp { public static final String DIV_PORTLET_ID = "geoportal-data-entry"; public static final String DIV_LOADERS_ID = "geoportal-loaders"; + + public static final String GET_GEONA_ITEM_TYPE = "git"; + + public static final String GET_GEONA_ITEM_ID = "gid"; public static final String DATE_FORMAT = ConstantsMPFormBuilder.DATE_FORMAT; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 2d5e469..968cc86 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.TreeMap; +import java.util.stream.Collectors; import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences; import org.gcube.application.geoportalcommon.shared.SearchingFilter; @@ -59,6 +60,7 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.card.GeoNaFormCardMo import org.gcube.portlets.user.geoportaldataentry.client.ui.edit.EditModeRecord; import org.gcube.portlets.user.geoportaldataentry.client.ui.edit.UpdateRecord; import org.gcube.portlets.user.geoportaldataentry.client.ui.form.GeonaDataEntryMainForm; +import org.gcube.portlets.user.geoportaldataentry.client.ui.projects.ListOfProjectTablePanel; import org.gcube.portlets.user.geoportaldataentry.client.ui.report.LifecycleInformationPanel; import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML; import org.gcube.portlets.user.geoportaldataentry.client.ui.tree.NodeItem; @@ -103,6 +105,8 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.shared.HandlerManager; +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Anchor; @@ -162,32 +166,19 @@ public class GeoPortalDataEntryApp implements EntryPoint { private GeoPortalClientCaches geoportalCaches; + private String paramGeonaItemType; + + private String paramGeonaItemID; + + private boolean canCreateNewItem = false; + /** * This is the entry point method. */ public void onModuleLoad() { - /* - * ArrayList gnaCardsModels = new - * ArrayList(10); GcubeProfileDV gprofile = new - * GcubeProfileDV(); gprofile.setParentName("$."); - * gprofile.setSectionTitle("Istruzione"); GeoNaFormCardModel fcm = new - * GeoNaFormCardModel(); fcm.setGcubeProfile(gprofile); gnaCardsModels.add(fcm); - * - * for (int i = 0; i < 2; i++) { GcubeProfileDV gprofile1 = new - * GcubeProfileDV(); gprofile1.setParentName("$.livello1"); - * gprofile1.setSectionTitle("Secondaria Superiore "+i); GeoNaFormCardModel fcm1 - * = new GeoNaFormCardModel(); fcm1.setGcubeProfile(gprofile1); - * gnaCardsModels.add(fcm1); } - * - * for (int i = 0; i < 3; i++) { GcubeProfileDV gprofile2 = new - * GcubeProfileDV(); gprofile2.setParentName("$.livello1.livello2"); - * gprofile2.setSectionTitle("Alberghiero di Pisa "+i); GeoNaFormCardModel fcm2 - * = new GeoNaFormCardModel(); fcm2.setGcubeProfile(gprofile2); - * gnaCardsModels.add(fcm2); } - * - * TreeItemPanel tip = new TreeItemPanel("Concessione", gnaCardsModels); - * RootPanel.get(GeoPortalDataEntryApp.DIV_PORTLET_ID).add(tip.getTree()); - */ + + final InitExecutor initExecutor = new InitExecutor(); + geoportalCaches = new GeoPortalClientCaches(); ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.getElement() @@ -198,94 +189,224 @@ public class GeoPortalDataEntryApp implements EntryPoint { geoNaMainForm = new GeonaDataEntryMainForm(appManagerBus); mainTabPanel.addFormPanel(geoNaMainForm); + paramGeonaItemType = Window.Location.getParameter(ConstantsGeoPortalDataEntryApp.GET_GEONA_ITEM_TYPE); + paramGeonaItemID = Window.Location.getParameter(ConstantsGeoPortalDataEntryApp.GET_GEONA_ITEM_ID); + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.add(mainTabPanel); // ROOT_PANEL_DIV_PORTLET.getElement().getStyle().setOpacity(0.3); ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.getElement() .addClassName(ConstantsGeoPortalDataEntryApp.CSS_CLASS_ANIMATE_FADE_IN_OUT); - GeoportalDataEntryServiceAsync.Util.getInstance().getGeonaInitConfig(new AsyncCallback() { + Command commandGeonaInitConfig = new Command() { @Override - public void onFailure(Throwable caught) { - String errorMsg = "Sorry, an error occurred when loading configurations. Please, contact the support"; - Alert alert = new Alert(errorMsg, AlertType.ERROR); - alert.setClose(false); - try { - ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); - } catch (Exception e) { + public void execute() { + GWT.log("Execute commandGeonaInitConfig..."); + GeoportalDataEntryServiceAsync.Util.getInstance() + .getGeonaInitConfig(new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { + String errorMsg = "Sorry, an error occurred when loading configurations. Please, contact the support"; + Alert alert = new Alert(errorMsg, AlertType.ERROR); + alert.setClose(false); + try { + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); + } catch (Exception e) { + + } + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.add(alert); + Window.alert(errorMsg); + initExecutor.execute(); + } + + @Override + public void onSuccess(GeoportalISConfig geoportalISConfig) { + geoportalISConfigs = geoportalISConfig; + + if (geoportalISConfig != null && geoportalISConfig.getScope() != null) { + + loadGeoportalConfigs(geoportalISConfig.getScope()); + } else + Window.alert("Sorry, no scope found in the session. Re-login and try again"); + + initExecutor.execute(); + + } + }); + + } + }; + + Command commandReadDataViewerConfig = new Command() { + + @Override + public void execute() { + GWT.log("Execute commandReadDataViewerConfig..."); + // Loading Geoportal Configurations from IS + GeoportalDataEntryServiceAsync.Util.getInstance() + .readDataViewerConfig(new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support"; + Alert alert = new Alert(errorMsg, AlertType.ERROR); + alert.setClose(false); + try { + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.getElement().removeClassName( + ConstantsGeoPortalDataEntryApp.CSS_CLASS_ANIMATE_FADE_IN_OUT); + } catch (Exception e) { + + } + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.add(alert); + Window.alert(errorMsg); + + initExecutor.execute(); + + } + + @Override + public void onSuccess(GNADataEntryExtendedConfigProfile gNADataEntryConfig) { + GWT.log(GNADataEntryExtendedConfigProfile.class.getSimpleName() + " loaded: " + + gNADataEntryConfig); + + try { + ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); + } catch (Exception e) { + + } + + // PERMISSIONS + myRights = gNADataEntryConfig.getUserRights(); + initGUI(); + GcubeUserRole userRole = myRights.getRoleRights().getUserRole(); + mainTabPanel.setRole(userRole); + // GUI Presentation + mainTabPanel.setGUIPresentation(gNADataEntryConfig.getDataEntryGUIPresentation()); + + RoleRights roleRights = myRights.getRoleRights(); + canCreateNewItem = roleRights.getListPermessions().keySet() + .contains(OPERATION_ON_ITEM.CREATE_NEW_PROJECT); + + if (!canCreateNewItem) { + // removing Tab "Create New Project" + mainTabPanel.removeTab(0); + // activating Tab "List of Project" + mainTabPanel.setTabActive(0); + // mainTabPanel.instanceAndShowListOfProjects(); + } + + initExecutor.execute(); + } + }); + + } + }; + + Command commandInitOnItem = null; + + if (paramGeonaItemType != null && paramGeonaItemID != null) { + + commandInitOnItem = new Command() { + + @Override + public void execute() { + GWT.log("Execute commandInitOnItem..."); + GeoportalDataEntryServiceAsync.Util.getInstance().getResultDocumentFoProjectByID(paramGeonaItemType, + paramGeonaItemID, new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + Window.alert("Error " + caught.getMessage()); + initExecutor.execute(); + + } + + @Override + public void onSuccess(final ResultDocumentDV result) { + GWT.log("commandInitOnItem success: " + result); + Integer attempts = 0; + + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + + @Override + public void execute() { + appManagerBus.fireEvent(new OperationOnItemEvent( + Arrays.asList(result), OPERATION_ON_ITEM.VIEW_PROJECT_AS_DOCUMENT)); + + + Timer timer = new Timer() { + int attempts = 0; + + @Override + public void run() { + attempts++; + GWT.log("commandInitOnItem run timer..."); + List list = mainTabPanel + .getUcdProjectTypesForListingDataView(); + if (list.size() > 0) { + this.cancel(); + + List filterUCD = mainTabPanel + .getUcdProjectTypesForListingDataView().stream() + .filter(u -> u.getId() + .contentEquals(paramGeonaItemType)) + .collect(Collectors.toList()); + + if (filterUCD.size() == 1) { + GWT.log("FilterUCD"); + + UseCaseDescriptorDV ucd = filterUCD.get(0); + + ListOfProjectTablePanel listProjectPanel = mainTabPanel.getListOfProjectTablePanel(); + SearchingFilter searchingFilter = new SearchingFilter(); + searchingFilter.setGetForIDs(result.getProfileID(), result.getProjectID()); + //searchFilter.setConditions(null); + //searchFilter.setGetForIDs(result.getProfileID(), result.getProjectID()); + + GetListOfRecordsEvent event = new GetListOfRecordsEvent(true, ucd.getProfileID(), + searchingFilter, true); + + listProjectPanel.setSearchTypeAndFire(filterUCD.get(0).getName(), event); + } + + if(attempts>30) { + this.cancel(); + } + } + + } + }; + timer.schedule(500); + initExecutor.execute(); + } + }); + + if (canCreateNewItem) { + mainTabPanel.setTabActive(1); + } else + mainTabPanel.setTabActive(0); + } + }); } - ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.add(alert); - Window.alert(errorMsg); + + }; + + } + + try { + initExecutor.putCommand(commandGeonaInitConfig); + initExecutor.putCommand(commandReadDataViewerConfig); + if (commandInitOnItem != null) { + initExecutor.putCommand(commandInitOnItem); } - - @Override - public void onSuccess(GeoportalISConfig geoportalISConfig) { - geoportalISConfigs = geoportalISConfig; - - if (geoportalISConfig != null && geoportalISConfig.getScope() != null) { - - loadGeoportalConfigs(geoportalISConfig.getScope()); - } else - Window.alert("Sorry, no scope found in the session. Re-login and try again"); - - } - }); - - // Loading Geoportal Configurations from IS - GeoportalDataEntryServiceAsync.Util.getInstance() - .readDataViewerConfig(new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support"; - Alert alert = new Alert(errorMsg, AlertType.ERROR); - alert.setClose(false); - try { - ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); - ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.getElement() - .removeClassName(ConstantsGeoPortalDataEntryApp.CSS_CLASS_ANIMATE_FADE_IN_OUT); - } catch (Exception e) { - - } - ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.add(alert); - Window.alert(errorMsg); - - } - - @Override - public void onSuccess(GNADataEntryExtendedConfigProfile gNADataEntryConfig) { - GWT.log(GNADataEntryExtendedConfigProfile.class.getSimpleName() + " loaded: " - + gNADataEntryConfig); - - try { - ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); - } catch (Exception e) { - - } - - // PERMISSIONS - myRights = gNADataEntryConfig.getUserRights(); - initGUI(); - GcubeUserRole userRole = myRights.getRoleRights().getUserRole(); - mainTabPanel.setRole(userRole); - // GUI Presentation - mainTabPanel.setGUIPresentation(gNADataEntryConfig.getDataEntryGUIPresentation()); - - RoleRights roleRights = myRights.getRoleRights(); - boolean canCreateNewItem = roleRights.getListPermessions().keySet() - .contains(OPERATION_ON_ITEM.CREATE_NEW_PROJECT); - - if (!canCreateNewItem) { - // removing Tab "Create New Project" - mainTabPanel.removeTab(0); - // activating Tab "List of Project" - mainTabPanel.setTabActive(0); - // mainTabPanel.instanceAndShowListOfProjects(); - } - } - }); + initExecutor.execute(); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } @@ -790,7 +911,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onGetList(GetListOfRecordsEvent getListOfRecordsEvent) { - GWT.log("Fired: " + getListOfRecordsEvent); + GWT.log("Fired onGetList: " + getListOfRecordsEvent); SearchingFilter searchingFilter = getListOfRecordsEvent.getSearchingFilter(); CacheSearchingFilterParametersFromConfig seachingFilterParameters = geoportalCaches @@ -809,7 +930,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { if (searchingFilter == null || getListOfRecordsEvent.isOnApplicationInit() || getListOfRecordsEvent.isReloadFilteringParameters()) { mainTabPanel.setFilteringParameters(seachingFilterParameters); - searchingFilter = mainTabPanel.getCurrentProjectsSearchingFilter(); + // Searching in the cache if the list of relationship definition is present List listRelationshipsDef = geoportalCaches @@ -835,6 +956,10 @@ public class GeoPortalDataEntryApp implements EntryPoint { } }); } + + if(searchingFilter == null ) { + searchingFilter = mainTabPanel.getCurrentProjectsSearchingFilter(); + } } searchingFilter.setProjection(seachingFilterParameters.getProjection()); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/InitExecutor.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/InitExecutor.java new file mode 100644 index 0000000..13896ae --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/InitExecutor.java @@ -0,0 +1,43 @@ +package org.gcube.portlets.user.geoportaldataentry.client; + +import java.util.LinkedHashMap; + +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.Window; + +public class InitExecutor { + + private LinkedHashMap queueInitStage = new LinkedHashMap<>(); + + public InitExecutor() { + + } + + public synchronized void putCommand(Command command) throws InterruptedException { + queueInitStage.put(queueInitStage.size(), command); + } + + private synchronized Command pollCommand() throws InterruptedException { + for (Integer key : queueInitStage.keySet()) { + Command command = queueInitStage.get(key); + if(command!=null) { + queueInitStage.put(key, null); + return command; + } + } + + return null; + } + + protected void execute() { + try { + Command command = pollCommand(); + if (command != null) + command.execute(); + } catch (InterruptedException e) { + Window.alert("An error occurred while initializing the application. Please contact the support. Error is: " + + e.getMessage()); + } + } + +} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/events/GetListOfRecordsEvent.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/events/GetListOfRecordsEvent.java index 3659853..383942c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/events/GetListOfRecordsEvent.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/events/GetListOfRecordsEvent.java @@ -105,11 +105,6 @@ public class GetListOfRecordsEvent extends GwtEvent extends GwtEvent selectItems; private OPERATION_ON_ITEM action; private Element sourceElement; + private String ucdName; /** * Instantiates a new action on item event. @@ -65,6 +66,10 @@ public class OperationOnItemEvent extends GwtEvent getUcdProjectTypesForListingDataView() { + return ucdProjectTypesForListingDataView; + } } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/projects/ListOfProjectTablePanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/projects/ListOfProjectTablePanel.java index 9747596..112f053 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/projects/ListOfProjectTablePanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/projects/ListOfProjectTablePanel.java @@ -324,17 +324,25 @@ public class ListOfProjectTablePanel extends Composite { if (ucdProjectTypesForListingDataView.size() == 1) { // noProjectSelectionMessage.setVisible(false); UseCaseDescriptorDV singleUCD = ucdProjectTypesForListingDataView.get(0); - alertProjectType.setText(singleUCD.getName()); - // setFilteringParameters(displayFields, sortByFields, searchForFields, - // currentSearchingFilter); - appManagerBus.fireEvent(new GetListOfRecordsEvent(true, singleUCD.getProfileID(), - getCurrentSearchingFilter(), true)); + GetListOfRecordsEvent event = new GetListOfRecordsEvent(true, singleUCD.getProfileID(), + getCurrentSearchingFilter(), true); + setSearchTypeAndFire(singleUCD.getName(), event); } } }); } + + public void setSearchTypeAndFire(String ucdName, GetListOfRecordsEvent event) { + alertProjectType.setText(ucdName); + +// if(event.getSearchingFilter().getProfileID()!=null && event.getSearchingFilter().getProjectID()) { +// +// } +// + appManagerBus.fireEvent(event); + } /** * Built searching filter. @@ -471,5 +479,10 @@ public class ListOfProjectTablePanel extends Composite { ddProjectType.add(link); } + + + public String getSelectedProjectType() { + return alertProjectType.getText(); + } } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index a9b2eed..6e75d23 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -902,6 +902,8 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen searchedData.setTotalItems(totalProjectForProfile); LOG.info("Total Docs read from config: " + totalProjectForProfile); + + boolean isSearchForIds = filter.getProfileID()!=null && filter.getProjectID()!=null; // Saving client PROJECTION LinkedHashMap originalProjection = filter.getProjection(); @@ -928,13 +930,23 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen totalItems = listProjectIDs.size(); searchedData.setTotalItems(totalItems); LOG.info("Total Docs read from query per ID: " + totalItems); + }else if(isSearchForIds) { + //searching one item for IDs + searchedData.setTotalItems(1); } // NOW PERFORMING THE (REAL) SECOND QUERY FROM CLIENT // SETTING ORIGINAL PROJECTION FROM CLIENT filter.setProjection(originalProjection); // LIMIT IS FROM CLIENT - Iterator projects = client.queryOnMongo(theProfileID, totalItems, start, limit, filter); + + Iterator projects = null; + if(!isSearchForIds) { + projects = client.queryOnMongo(theProfileID, totalItems, start, limit, filter); + }else { + Project project = client.getProjectByID(filter.getProfileID(), filter.getProjectID()); + projects = Arrays.asList(project).iterator(); + } searchedData.setClientStartIndex(start); searchedData.setLimit(limit); @@ -1406,7 +1418,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen Project project = projects.getProjectByID(profileID, projectID); ProjectDVBuilder projectBuilder = ProjectDVBuilder.newBuilder().fullDocumentMap(true); ProjectDV projectDV = ConvertToDataValueObjectModel.toProjectDV(project, projectBuilder); - LOG.info("returning: " + projectDV.getId()); + LOG.info("returning ProjectByID: " + projectDV.getId()); return projectDV; } catch (Exception e) { -- 2.17.1 From b86439cba65095edac6c7cf2bc26082e09347ee7 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 27 Mar 2024 10:55:42 +0100 Subject: [PATCH 02/13] added information when resolving shared link --- .../client/GeoPortalDataEntryApp.java | 74 ++++++++++++------ .../client/GeoportalDataEntryService.java | 2 +- .../GeoportalDataEntryServiceAsync.java | 2 +- .../client/resource/Images.java | 3 + .../client/resource/information_icon.png | Bin 0 -> 22484 bytes .../server/GeoportalDataEntryServiceImpl.java | 2 +- src/main/webapp/GeoPortalDataEntryApp.css | 19 ++++- 7 files changed, 76 insertions(+), 26 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/information_icon.png diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 968cc86..8b7c41c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -110,6 +110,7 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Anchor; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; @@ -172,6 +173,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { private boolean canCreateNewItem = false; + private GNADataEntryExtendedConfigProfile gNADataEntryPresentationConfig = null; + /** * This is the entry point method. */ @@ -198,6 +201,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.getElement() .addClassName(ConstantsGeoPortalDataEntryApp.CSS_CLASS_ANIMATE_FADE_IN_OUT); + // Loads Geoportal init configurations Command commandGeonaInitConfig = new Command() { @Override @@ -239,6 +243,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { } }; + // Loads data entry presetentation configurations Command commandReadDataViewerConfig = new Command() { @Override @@ -246,7 +251,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { GWT.log("Execute commandReadDataViewerConfig..."); // Loading Geoportal Configurations from IS GeoportalDataEntryServiceAsync.Util.getInstance() - .readDataViewerConfig(new AsyncCallback() { + .readDataEntryPresentationConfig(new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -272,6 +277,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { GWT.log(GNADataEntryExtendedConfigProfile.class.getSimpleName() + " loaded: " + gNADataEntryConfig); + gNADataEntryPresentationConfig = gNADataEntryConfig; try { ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication); } catch (Exception e) { @@ -307,6 +313,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { Command commandInitOnItem = null; + // Resolves the gid={ITEM_ID}&git={PROFILE_ID} if (paramGeonaItemType != null && paramGeonaItemID != null) { commandInitOnItem = new Command() { @@ -327,19 +334,18 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onSuccess(final ResultDocumentDV result) { GWT.log("commandInitOnItem success: " + result); - Integer attempts = 0; Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { - appManagerBus.fireEvent(new OperationOnItemEvent( - Arrays.asList(result), OPERATION_ON_ITEM.VIEW_PROJECT_AS_DOCUMENT)); - +// appManagerBus.fireEvent(new OperationOnItemEvent( +// Arrays.asList(result), OPERATION_ON_ITEM.VIEW_PROJECT_AS_DOCUMENT)); + Timer timer = new Timer() { int attempts = 0; - + @Override public void run() { attempts++; @@ -357,22 +363,47 @@ public class GeoPortalDataEntryApp implements EntryPoint { if (filterUCD.size() == 1) { GWT.log("FilterUCD"); - + UseCaseDescriptorDV ucd = filterUCD.get(0); - - ListOfProjectTablePanel listProjectPanel = mainTabPanel.getListOfProjectTablePanel(); + + ListOfProjectTablePanel listProjectPanel = mainTabPanel + .getListOfProjectTablePanel(); SearchingFilter searchingFilter = new SearchingFilter(); - searchingFilter.setGetForIDs(result.getProfileID(), result.getProjectID()); - //searchFilter.setConditions(null); - //searchFilter.setGetForIDs(result.getProfileID(), result.getProjectID()); - - GetListOfRecordsEvent event = new GetListOfRecordsEvent(true, ucd.getProfileID(), - searchingFilter, true); - - listProjectPanel.setSearchTypeAndFire(filterUCD.get(0).getName(), event); + searchingFilter.setGetForIDs(result.getProfileID(), + result.getProjectID()); + // searchFilter.setConditions(null); + // searchFilter.setGetForIDs(result.getProfileID(), + // result.getProjectID()); + + GetListOfRecordsEvent event = new GetListOfRecordsEvent( + true, ucd.getProfileID(), searchingFilter, true); + + listProjectPanel.setSearchTypeAndFire( + filterUCD.get(0).getName(), event); + + Modal errorModal = new Modal(true, true); + // errorModal.setWidth("800px"); + errorModal.setCloseVisible(true); + errorModal.setTitle("Information..."); + Image geoportalError = new Image(Images.ICONS.info()); + geoportalError.setWidth("128px"); + FlowPanel errorPanelMsg = new FlowPanel(); + errorPanelMsg.getElement().addClassName("general_info"); + errorPanelMsg.add(geoportalError); + errorPanelMsg.add(new HTML(gNADataEntryPresentationConfig + .getDataEntryGUIPresentation().getHeader() + .getTitle())); + HTML erroMessage = new HTML( + "The List of Projects only shows the

\"" + + result.getFirstEntryOfMap().getValue() + + "\"

project resolved by shared link

To view all projects select Reload Projects button"); + errorPanelMsg.add(erroMessage); + errorModal.add(errorPanelMsg); + errorModal.show(); + } - - if(attempts>30) { + + if (attempts > 20) { this.cancel(); } } @@ -930,7 +961,6 @@ public class GeoPortalDataEntryApp implements EntryPoint { if (searchingFilter == null || getListOfRecordsEvent.isOnApplicationInit() || getListOfRecordsEvent.isReloadFilteringParameters()) { mainTabPanel.setFilteringParameters(seachingFilterParameters); - // Searching in the cache if the list of relationship definition is present List listRelationshipsDef = geoportalCaches @@ -956,8 +986,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { } }); } - - if(searchingFilter == null ) { + + if (searchingFilter == null) { searchingFilter = mainTabPanel.getCurrentProjectsSearchingFilter(); } } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java index af4ed14..306be24 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java @@ -104,7 +104,7 @@ public interface GeoportalDataEntryService extends RemoteService { * @return the GNA data entry ext config profile * @throws Exception the exception */ - GNADataEntryExtendedConfigProfile readDataViewerConfig() throws Exception; + GNADataEntryExtendedConfigProfile readDataEntryPresentationConfig() throws Exception; /** * Gets the list use case descriptors. diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java index 512434d..a07a04a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java @@ -70,7 +70,7 @@ public interface GeoportalDataEntryServiceAsync { void updateRecord(String profileID, String projectID, String jsonUpdate, AsyncCallback callback); - void readDataViewerConfig(AsyncCallback asyncCallback); + void readDataEntryPresentationConfig(AsyncCallback asyncCallback); void getListUseCaseDescriptors(List handlersIds, AsyncCallback> callback); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java index d341e5a..650a74a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java @@ -16,4 +16,7 @@ public interface Images extends ClientBundle { @Source("one-finger-icon.png") ImageResource oneFingerIcon(); + + @Source("information_icon.png") + ImageResource info(); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/information_icon.png b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/information_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f639ed988879905a57afc700e1abc222b4b6e8 GIT binary patch literal 22484 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 Date: Fri, 5 Apr 2024 15:54:09 +0200 Subject: [PATCH 03/13] - Integrated new Uri-Resolver-Manager [#27160] - Added Get Shareable Link facility [#27120] --- .settings/org.eclipse.wst.common.component | 39 ++++++-- CHANGELOG.md | 4 +- .../ConstantsGeoPortalDataEntryApp.java | 6 +- .../client/GeoPortalClientCaches.java | 2 - .../client/GeoPortalDataEntryApp.java | 94 ++++++++++++++++-- .../client/GeoportalDataEntryService.java | 8 +- .../GeoportalDataEntryServiceAsync.java | 4 +- .../client/resource/Images.java | 3 + .../client/resource/warning_error.png | Bin 0 -> 2777 bytes .../client/ui/GeonaMainTabPanel.java | 18 ++++ .../client/ui/GeonaMainTabPanel.ui.xml | 2 + .../ui/report/LifecycleInformationPanel.java | 2 +- .../server/GeoportalDataEntryServiceImpl.java | 39 +++++--- .../shared/ProjectNotFoundException.java | 21 ++++ 14 files changed, 203 insertions(+), 39 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/warning_error.png create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/ProjectNotFoundException.java diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d10a6f1..19e8b2e 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,7 @@ - + + + @@ -138,7 +140,9 @@ - + + + @@ -277,7 +281,9 @@ - + + + @@ -416,7 +422,9 @@ - + + + @@ -555,7 +563,9 @@ - + + + @@ -649,7 +659,12 @@ uses - + + uses + + + + @@ -788,7 +803,9 @@ - + + + @@ -927,7 +944,9 @@ - + + + @@ -1066,7 +1085,9 @@ - + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 66d1c23..c7d2413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v3.3.0-SNAPSHOT] - 2024-03-26 +## [v3.3.0-SNAPSHOT] - 2024-04-05 - Implemented the init facility to resolve a public link on an item [#27120] +- Integrated new Uri-Resolver-Manager [#27160] +- Added Get Shareable Link facility [#27120] ## [v3.2.2] - 2024-01-11 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java index 82e046d..d5438c7 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java @@ -26,9 +26,11 @@ public class ConstantsGeoPortalDataEntryApp { public static final String DIV_LOADERS_ID = "geoportal-loaders"; - public static final String GET_GEONA_ITEM_TYPE = "git"; + public static final String GET_PARAMETER_ITEM_TYPE = "git"; - public static final String GET_GEONA_ITEM_ID = "gid"; + public static final String GET_PARAMETER_ITEM_ID = "gid"; + + public static final String GET_PARAMETER_ACTION = "act"; public static final String DATE_FORMAT = ConstantsMPFormBuilder.DATE_FORMAT; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalClientCaches.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalClientCaches.java index d706354..ee2aa37 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalClientCaches.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalClientCaches.java @@ -28,8 +28,6 @@ public class GeoPortalClientCaches { private TreeMap> mapGcubeProfilePerItemType; - //private Map> mapHandlersConfigurationsForProfileId; - private Map mapUseCaseDescriptor; private Map mapSearchingFilterParametersForProfileId; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 8b7c41c..5ae9c5c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -74,6 +74,7 @@ import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport; import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile; import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject; import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig; +import org.gcube.portlets.user.geoportaldataentry.shared.ProjectNotFoundException; import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node; import org.gcube.portlets.user.geoportaldataentry.shared.UserRights; import org.gcube.portlets.widgets.gdvw.client.GeoportalDataViewerWidget; @@ -192,8 +193,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { geoNaMainForm = new GeonaDataEntryMainForm(appManagerBus); mainTabPanel.addFormPanel(geoNaMainForm); - paramGeonaItemType = Window.Location.getParameter(ConstantsGeoPortalDataEntryApp.GET_GEONA_ITEM_TYPE); - paramGeonaItemID = Window.Location.getParameter(ConstantsGeoPortalDataEntryApp.GET_GEONA_ITEM_ID); + paramGeonaItemType = Window.Location.getParameter(ConstantsGeoPortalDataEntryApp.GET_PARAMETER_ITEM_TYPE); + paramGeonaItemID = Window.Location.getParameter(ConstantsGeoPortalDataEntryApp.GET_PARAMETER_ITEM_ID); ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.add(mainTabPanel); @@ -255,7 +256,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onFailure(Throwable caught) { - String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support"; + String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support. Error is: "+caught.getMessage(); Alert alert = new Alert(errorMsg, AlertType.ERROR); alert.setClose(false); try { @@ -326,7 +327,26 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onFailure(Throwable caught) { - Window.alert("Error " + caught.getMessage()); + + if(caught instanceof ProjectNotFoundException) { + Modal errorModal = new Modal(true, true); + errorModal.setCloseVisible(true); + errorModal.setTitle("Oops..."); + Image geoportalError = new Image(Images.ICONS.warningError()); + FlowPanel errorPanelMsg = new FlowPanel(); + errorPanelMsg.getElement().addClassName("general_warning"); + errorPanelMsg.add(geoportalError); + errorPanelMsg.add(new HTML("D4S GeoPortal")); + HTML erroMessage = new HTML( + "Oops something went wrong, either the project does not exist or you are not authorized to access it"); + errorPanelMsg.add(erroMessage); + errorModal.add(errorPanelMsg); + errorModal.show(); + } + else { + Window.alert("Error " + caught.getMessage()); + } + initExecutor.execute(); } @@ -396,7 +416,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { HTML erroMessage = new HTML( "The List of Projects only shows the

\"" + result.getFirstEntryOfMap().getValue() - + "\"

project resolved by shared link

To view all projects select Reload Projects button"); + + "\"

project resolved by shareable link

To view all projects select Reload Projects button"); errorPanelMsg.add(erroMessage); errorModal.add(errorPanelMsg); errorModal.show(); @@ -1620,7 +1640,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { modal.add(hpGetLink); GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(resultDocumentDV.getId(), - resultDocumentDV.getProfileID(), new AsyncCallback() { + resultDocumentDV.getProfileID(), GeoportalItemReferences.SHARE_LINK_TO.DATA_VIEWER, new AsyncCallback() { @Override public void onFailure(Throwable caught) { try { @@ -1631,7 +1651,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { } Alert alert = new Alert(caught.getMessage(), AlertType.ERROR); alert.setClose(false); - hpGetLink.add(alert); + modal.add(alert); // newBrowserWindow.close(); } @@ -1668,6 +1688,66 @@ public class GeoPortalDataEntryApp implements EntryPoint { break; } + + case GET_SHAREABLE_LINK: { + + final Modal modal = new Modal(true, true); + modal.setTitle("Share the Project by link..."); + modal.setCloseVisible(true); + final HorizontalPanel hpGetLink = new HorizontalPanel(); + final LoaderIcon lc = new LoaderIcon("Just moment getting link..."); + hpGetLink.add(lc); + modal.add(hpGetLink); + + GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(resultDocumentDV.getId(), + resultDocumentDV.getProfileID(), GeoportalItemReferences.SHARE_LINK_TO.DATA_ENTRY, new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { + try { + hpGetLink.setVisible(false); + modal.remove(hpGetLink); + } catch (Exception e) { + // TODO: handle exception + } + Alert alert = new Alert(caught.getMessage(), AlertType.ERROR); + alert.setClose(false); + modal.add(alert); + // newBrowserWindow.close(); + } + + @Override + public void onSuccess(GeoportalItemReferences result) { + try { + hpGetLink.setVisible(false); + modal.remove(hpGetLink); + } catch (Exception e) { + // TODO: handle exception + } + String theURL = result.getRestrictedLink().getShortURL() != null + ? result.getRestrictedLink().getShortURL() + : result.getRestrictedLink().getCompleteURL(); + // newBrowserWindow.setUrl(theURL); + + Anchor anchor = new Anchor(theURL); + anchor.setHref(theURL); + anchor.setTarget("_blank"); + anchor.setTitle( + "Shareable link of the project with id: " + resultDocumentDV.getId()); + com.github.gwtbootstrap.client.ui.Label label = new com.github.gwtbootstrap.client.ui.Label( + "Shareable link"); + label.setType(LabelType.SUCCESS); + + modal.add(label); + modal.add(new HTML("
")); + modal.add(anchor); + + } + }); + + modal.show(); + + break; + } case VIEW_REPORT: { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java index 306be24..fd7afe5 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java @@ -3,6 +3,7 @@ package org.gcube.portlets.user.geoportaldataentry.client; import java.util.List; import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences; +import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences.SHARE_LINK_TO; import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData; import org.gcube.application.geoportalcommon.shared.SearchingFilter; import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV; @@ -56,12 +57,13 @@ public interface GeoportalDataEntryService extends RemoteService { /** * Gets the links for. * - * @param itemId the item id + * @param itemId the item id is the mongoId * @param profileID the profile ID + * @param shareLinkTo the share link to * @return the links for * @throws Exception the exception */ - GeoportalItemReferences getLinksFor(String itemId, String profileID) throws Exception; + GeoportalItemReferences getLinksFor(String itemId, String profileID, SHARE_LINK_TO shareLinkTo) throws Exception; /** * Gets the list projects. @@ -237,4 +239,6 @@ public interface GeoportalDataEntryService extends RemoteService { ProjectView getProjectView(String profileID, String projectID) throws Exception; + + } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java index a07a04a..35412ee 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java @@ -3,6 +3,7 @@ package org.gcube.portlets.user.geoportaldataentry.client; import java.util.List; import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences; +import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences.SHARE_LINK_TO; import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData; import org.gcube.application.geoportalcommon.shared.SearchingFilter; import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV; @@ -59,7 +60,8 @@ public interface GeoportalDataEntryServiceAsync { void getGeonaInitConfig(AsyncCallback callback); - void getLinksFor(String itemId, String profileID, AsyncCallback callback); + void getLinksFor(String itemId, String profileID, SHARE_LINK_TO shareLinkTo, + AsyncCallback callback); void getListProjects(String theProfileID, Integer start, Integer limit, SearchingFilter filter, boolean reloadFromService, AsyncCallback callback); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java index 650a74a..8b2ae69 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java @@ -19,4 +19,7 @@ public interface Images extends ClientBundle { @Source("information_icon.png") ImageResource info(); + + @Source("warning_error.png") + ImageResource warningError(); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/warning_error.png b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/warning_error.png new file mode 100644 index 0000000000000000000000000000000000000000..801a01be3f0bcc88f9d503e3b3706b0e0a85f44e GIT binary patch literal 2777 zcmV;~3MTc5P)PSHcEExmHGqwPapay<1jsjm!QjVC{$~}!Y0R5}q z4NL;d3cl?Eun+iFk}_*XGe2mw0puAi;1KW-(5fKfC%|1zHi9Z&N)YH@{z2gDRR5gg zz$02#BWbJw0C%GXzb-q09RhN^q>)oVp0OGD3$R>B0ia59A2|cOFQjvVU_5}{@1Mlq!3UK%G8t0h zNHB^5A4BcI`_4@$U4tNqDIm{Sj&l81xYng0uLJK-QqH+nq#vPpfO`pN@BywurKWk0 z_Z}e6xCA%`tZ}VNNlu}{!vDHfWHAO@D^P&_$PfMu@NeLMs3ej#sL*ni;4{{ubpMi| zOmV#S0C~o>s4ZWq6z?Ob%%K-LH*EA_&MMT_@&l+voW%5a4)|b_a#TQ;5xg}39ZLNU zRnA?P^Qd3r!%52d0?)k-codnF#utH)_U)Fsqp0|DK7#K3Ov7s${BE(x3C~y8US!Vut7l1tH5_^ zbo}@ss&hzP)}ua?cX+o3$TNmer+pGD@-#{LX-$1@27WD|%M9?|B;}-lEHS+D0D3ik z0GYu*13W7r=l7^^u`a9dFn!D`13)EKd{#)--%&xbc&l( zoEkt!D>rEu3(5o3K19-s)5~gWGoL}=kn8j@*B)RDxW$m{L1YGQC2)y=oL)FjA9H2^ zIux43?19u(0y0K0_dT^xNu-h;%}OiaigCC7rt4ZuNl&j9uE3RYt-0_bKr4yuZ5djJ>JJ#`jwCL@4eY{Ohw+!JdbPKP>^HlL}v zvc`LDx&JmT)aH=2`bV3CaW`(Nd+Kgy$<5@izsWGqG_5f}6 z0`zXK!-MWntskAR1M_@kw2m?!{@Njeaxr< zSZ?CH7*z~lJ#GtU22kl^Ms+al0d7I2w5u*vwsT#%|4z0dmn7R0V+No@nMqUfOH#!H z_+S8FxT?sc2e=crGpDZsKhm~4xE1)2v`|q4Fi_ni zNtyMCFKd@hS{SG*lJ)@GF<_-ayt~9}eKY`27h;Y}3KTN{-PGZblsp5JnbUoV0D7@s zvZ_eZ1MJ4Hg;O`fB^FUWe~xtsHl-FZ0DX6lu~=1zAqs5m>L|u%0|3~mE2?T!+W&p8~#NU$x4d0xnO|YK^Sw7{Eco`l6c5cY*t=^hByO1?ZD0FB=~&QFc(V zgsrpzbX?hLqNziq8kMVxs(64g{J63;axou8HJm6#sWpHOIbO!ETRS7~Fa=zfq{Z9X zm5txW34icsQ7h+@ywgi?B`RxZ9bxPNEW`+^^7`STZz${m^a<2)>{ZK3GmGjS{B7V! z_r(!~{JynwA`qw>;juGaf@C53Xk_E%Uejn;i!X5mRsCxqIG6nooK#mLg_F-Po0Cd>r zq;;7PM3fC<8l`2pS%l;!pPzkOJ=*+fqR$TLQOo#u41 z!lE~XmL$YTpp)BCH3jpSX8;{xUx@K4t^m_`u=r*7V&2T{*MFLt3a6a9tiCoUG@5tfy;j zH@6X_Z|?dRVdTUYWfu5ElJc7>Z_YEe0ly{OL!n;G02`B(Q*f~dn4npM59;$hk!QVE zz>AS*YzCgDS%VKMES%flNnkF?^ElzJ{1;*d_#*JjB1fe9!ssXPtILTb=Ygw}l&Q7{ z_zKM(d{6`VH1J%WabvIEdwE7H<@!eg^!C<_k6N^=c*8uQm`=LgX0g66Ou4bMkhU z%<`_kpu9?V7R>+)AG7v){ZgUbudo-Ly$ct5{kg8c=TX1(6Q~5AKLKy(g?=Owi9{li fNF)-8L?ZtOlUW;}PvV$_00000NkvXXu0mjf@FNUS literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java index 6a85def..7873d82 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java @@ -106,6 +106,9 @@ public class GeonaMainTabPanel extends Composite { @UiField NavLink navShowOnMap; + + @UiField + NavLink navShareLink; @UiField NavLink navShowReport; @@ -249,6 +252,21 @@ public class GeonaMainTabPanel extends Composite { } }); + + navShareLink.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + List listDocuments = null; + if (grpw != null && grpw.getSelectItems() != null) { + listDocuments = grpw.getSelectItems(); + } + + appManagerBus + .fireEvent(new OperationOnItemEvent(listDocuments, OPERATION_ON_ITEM.GET_SHAREABLE_LINK)); + + } + }); navViewAsDocument.addClickHandler(new ClickHandler() { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml index 479d943..93cec0f 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml @@ -107,6 +107,8 @@ Show on Map + Get Shareable link Publication Report diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/LifecycleInformationPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/LifecycleInformationPanel.java index 6a85ea7..49528d4 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/LifecycleInformationPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/LifecycleInformationPanel.java @@ -78,7 +78,7 @@ public class LifecycleInformationPanel extends FlowPanel { final LoaderIcon lc = new LoaderIcon("Get link..."); hpGetLink.add(lc); add(hpGetLink); - GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(projectID, profileID, + GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(projectID, profileID, GeoportalItemReferences.SHARE_LINK_TO.DATA_VIEWER, new AsyncCallback() { @Override diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 6743d63..e020dfe 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -71,6 +71,7 @@ import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport; import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile; import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject; import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig; +import org.gcube.portlets.user.geoportaldataentry.shared.ProjectNotFoundException; import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node; import org.gcube.portlets.user.geoportaldataentry.shared.UserRights; import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean; @@ -361,7 +362,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen } // Registering fileset in the section according to mapFilesToRegistrer - if (mapFilesToRegistrer != null && mapFilesToRegistrer.size()>0) { + if (mapFilesToRegistrer != null && mapFilesToRegistrer.size() > 0) { LOG.info("Cluster of fileset per fieldDefinition is: " + mapFilesToRegistrer); String theJSONDocument = currentProject.getTheDocument().toJson(); MongoServiceUtil mongoService = new MongoServiceUtil(); @@ -844,19 +845,22 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen /** * Gets the links for. * - * @param itemId the item id is the mongoId - * @param profileID the profile ID + * @param itemId the item id is the mongoId + * @param profileID the profile ID + * @param shareLinkTo the share link to * @return the links for * @throws Exception the exception */ @Override - public GeoportalItemReferences getLinksFor(String itemId, String profileID) throws Exception { + public GeoportalItemReferences getLinksFor(String itemId, String profileID, + GeoportalItemReferences.SHARE_LINK_TO shareLinkTo) throws Exception { LOG.info("getLinksFor called"); String scope = SessionUtil.getCurrentContext(this.getThreadLocalRequest(), true); - //GNADataViewerConfigProfile grViewerProfile = SessionUtil.getGeportalViewerResourceProfile(getThreadLocalRequest()); + // GNADataViewerConfigProfile grViewerProfile = + // SessionUtil.getGeportalViewerResourceProfile(getThreadLocalRequest()); GeoportalCommon gc = new GeoportalCommon(); - GeoportalItemReferences item = new GeoportalItemReferences(itemId, profileID); + GeoportalItemReferences item = new GeoportalItemReferences(itemId, profileID, shareLinkTo); item = gc.getPublicLinksFor(scope, item, true); LOG.info("Returning: " + item); return item; @@ -902,8 +906,8 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen searchedData.setTotalItems(totalProjectForProfile); LOG.info("Total Docs read from config: " + totalProjectForProfile); - - boolean isSearchForIds = filter.getProfileID()!=null && filter.getProjectID()!=null; + + boolean isSearchForIds = filter.getProfileID() != null && filter.getProjectID() != null; // Saving client PROJECTION LinkedHashMap originalProjection = filter.getProjection(); @@ -930,8 +934,8 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen totalItems = listProjectIDs.size(); searchedData.setTotalItems(totalItems); LOG.info("Total Docs read from query per ID: " + totalItems); - }else if(isSearchForIds) { - //searching one item for IDs + } else if (isSearchForIds) { + // searching one item for IDs searchedData.setTotalItems(1); } @@ -939,11 +943,11 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen // SETTING ORIGINAL PROJECTION FROM CLIENT filter.setProjection(originalProjection); // LIMIT IS FROM CLIENT - + Iterator projects = null; - if(!isSearchForIds) { + if (!isSearchForIds) { projects = client.queryOnMongo(theProfileID, totalItems, start, limit, filter); - }else { + } else { Project project = client.getProjectByID(filter.getProfileID(), filter.getProjectID()); projects = Arrays.asList(project).iterator(); } @@ -1446,14 +1450,21 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen SessionUtil.getCurrentContext(getThreadLocalRequest(), true); ProjectsCaller projects = GeoportalClientCaller.projects(); Project project = projects.getProjectByID(profileID, projectID); + if (project == null) { + throw new ProjectNotFoundException( + "Project with coordinates id: " + projectID + " and type: " + profileID + " not found"); + } ResultDocumentDV documentDV = ConvertToDataValueObjectModel.toResultDocumentDV(project); LOG.info("returning: " + documentDV.getId()); return documentDV; + } catch (ProjectNotFoundException e) { + LOG.error(ProjectNotFoundException.class.getSimpleName(), e); + throw e; } catch (Exception e) { String error = "Error occurred on reading the project with id: " + projectID; LOG.error(error, e); - throw new Exception( + throw new ProjectNotFoundException( error + ". Error: " + e.getMessage() + ". Refresh and try again or contact the support"); } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/ProjectNotFoundException.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/ProjectNotFoundException.java new file mode 100644 index 0000000..f4c11aa --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/ProjectNotFoundException.java @@ -0,0 +1,21 @@ +package org.gcube.portlets.user.geoportaldataentry.shared; + +public class ProjectNotFoundException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 4918313646452701634L; + + public ProjectNotFoundException() { + } + + public ProjectNotFoundException(String error){ + super(error); + } + + public ProjectNotFoundException(Throwable error){ + super(error); + } + +} -- 2.17.1 From 140856db0330328d7672ed7e66fad84b68ead940 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 8 Apr 2024 17:18:29 +0200 Subject: [PATCH 04/13] - Added optional message when performing lifecycle step [#27192] --- .settings/org.eclipse.wst.common.component | 30 +++++--- CHANGELOG.md | 1 + .../client/GeoPortalDataEntryApp.java | 38 +++------- .../client/GeoportalDataEntryService.java | 16 +++-- .../GeoportalDataEntryServiceAsync.java | 2 +- .../client/ui/action/DeleteViewPanel.java | 60 ++++++++++++++++ .../client/ui/action/DeleteViewPanel.ui.xml | 33 +++++++++ .../client/ui/action/StepViewPanel.java | 72 +++++++++++++++++++ .../client/ui/action/StepViewPanel.ui.xml | 46 ++++++++++++ .../client/ui/utils/ModalConfirm.java | 7 +- .../server/GeoportalDataEntryServiceImpl.java | 8 ++- 11 files changed, 265 insertions(+), 48 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.ui.xml create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 19e8b2e..e3f5ed7 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -140,7 +141,8 @@ - + + @@ -281,7 +283,8 @@ - + + @@ -422,7 +425,8 @@ - + + @@ -563,7 +567,8 @@ - + + @@ -662,7 +667,11 @@ uses - + + uses + + + @@ -803,7 +812,8 @@ - + + @@ -944,7 +954,8 @@ - + + @@ -1085,7 +1096,8 @@ - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index c7d2413..e239a92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Implemented the init facility to resolve a public link on an item [#27120] - Integrated new Uri-Resolver-Manager [#27160] - Added Get Shareable Link facility [#27120] +- Added optional message when performing lifecycle step [#27192] ## [v3.2.2] - 2024-01-11 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 5ae9c5c..3d2eb98 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -56,13 +56,14 @@ import org.gcube.portlets.user.geoportaldataentry.client.resource.Images; import org.gcube.portlets.user.geoportaldataentry.client.ui.GeonaMainTabPanel; import org.gcube.portlets.user.geoportaldataentry.client.ui.GeonaRecordsPaginatedView; import org.gcube.portlets.user.geoportaldataentry.client.ui.ModalWindow; +import org.gcube.portlets.user.geoportaldataentry.client.ui.action.DeleteViewPanel; +import org.gcube.portlets.user.geoportaldataentry.client.ui.action.StepViewPanel; import org.gcube.portlets.user.geoportaldataentry.client.ui.card.GeoNaFormCardModel; import org.gcube.portlets.user.geoportaldataentry.client.ui.edit.EditModeRecord; import org.gcube.portlets.user.geoportaldataentry.client.ui.edit.UpdateRecord; import org.gcube.portlets.user.geoportaldataentry.client.ui.form.GeonaDataEntryMainForm; import org.gcube.portlets.user.geoportaldataentry.client.ui.projects.ListOfProjectTablePanel; import org.gcube.portlets.user.geoportaldataentry.client.ui.report.LifecycleInformationPanel; -import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML; import org.gcube.portlets.user.geoportaldataentry.client.ui.tree.NodeItem; import org.gcube.portlets.user.geoportaldataentry.client.ui.tree.TreeItemPanel; import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.DialogInform; @@ -1338,21 +1339,11 @@ public class GeoPortalDataEntryApp implements EntryPoint { final ResultDocumentDV resultDocumentDV = (ResultDocumentDV) item; - String htmlMsg = "Going to perform the step/s " + wActionOnItem.getAction().getCallSteps() - + " on the project with:"; - htmlMsg += "
    "; - htmlMsg += "
  • id: " + resultDocumentDV.getId() + "
    • "; - htmlMsg += "
  • profile: " + resultDocumentDV.getProfileID() + "
    • "; - htmlMsg += "
  • " + resultDocumentDV.getFirstEntryOfMap().getKey() + ": " - + resultDocumentDV.getFirstEntryOfMap().getValue() + "
    • "; - htmlMsg += "
"; - htmlMsg += "
"; - htmlMsg += "Would you like to proceed?"; - final ModalConfirm dialog = new ModalConfirm(null, - "Step/s " + wActionOnItem.getAction().getTitle() + ", Confirm?", htmlMsg); - dialog.addToCenterPanel( - new ReportTemplateToHTML("Project", resultDocumentDV.getDocumentAsJSON(), false)); + "Step/s " + wActionOnItem.getAction().getTitle() + ", Confirm?", null); + + final StepViewPanel stvp = new StepViewPanel(resultDocumentDV, wActionOnItem.getAction()); + dialog.addToCenterPanel(stvp); dialog.getYesButton().addClickHandler(new ClickHandler() { @@ -1374,7 +1365,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { modal.add(modalContainerPanel); GeoportalDataEntryServiceAsync.Util.getInstance().performActionSteps( - resultDocumentDV.getProfileID(), resultDocumentDV.getId(), + resultDocumentDV.getProfileID(), resultDocumentDV.getId(),stvp.getOptionalMessage(), wActionOnItem.getAction(), new AsyncCallback() { @Override @@ -1945,19 +1936,10 @@ public class GeoPortalDataEntryApp implements EntryPoint { case DELETE_PROJECT: { - String htmlMsg = "Going to delete the project with:"; - htmlMsg += "
    "; - htmlMsg += "
  • id: " + resultDocumentDV.getId() + "
    • "; - htmlMsg += "
  • profile: " + resultDocumentDV.getProfileID() + "
    • "; - htmlMsg += "
  • " + resultDocumentDV.getFirstEntryOfMap().getKey() + ": " - + resultDocumentDV.getFirstEntryOfMap().getValue() + "
    • "; - htmlMsg += "
"; - htmlMsg += "
"; - htmlMsg += "This operation cannot be undone. Would you like to proceed?"; + DeleteViewPanel dvp = new DeleteViewPanel(resultDocumentDV); - final ModalConfirm dialog = new ModalConfirm(null, "Delete Confirm?", htmlMsg); - dialog.addToCenterPanel( - new ReportTemplateToHTML("Project", resultDocumentDV.getDocumentAsJSON(), false)); + final ModalConfirm dialog = new ModalConfirm(null, "Delete Confirm?", null); + dialog.addToCenterPanel(dvp); dialog.show(); dialog.getYesButton().addClickHandler(new ClickHandler() { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java index fd7afe5..0d3e054 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java @@ -142,11 +142,11 @@ public interface GeoportalDataEntryService extends RemoteService { * * @param profileID the profile ID * @param projectID the project ID - * @param action the action + * @param optionalMessage the optional message + * @param action the action * @return the project DV - * @throws Exception the exception */ - ProjectDV performActionSteps(String profileID, String projectID, ActionDefinitionDV action) throws Exception; + ProjectDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) throws Exception; /** * Gets the relationships definition. @@ -237,8 +237,14 @@ public interface GeoportalDataEntryService extends RemoteService { CommitReport updateGeportalDataForm(String profileID, String projectID, GeoNaFormDataObject section, String sectionPath, List listFilePaths) throws Exception; + /** + * Gets the project view. + * + * @param profileID the profile ID + * @param projectID the project ID + * @return the project view + * @throws Exception the exception + */ ProjectView getProjectView(String profileID, String projectID) throws Exception; - - } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java index 35412ee..e861ee0 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java @@ -79,7 +79,7 @@ public interface GeoportalDataEntryServiceAsync { void getLifecycleInfoForProjectId(String profileID, String projectID, AsyncCallback callback); - void performActionSteps(String profileID, String projectID, ActionDefinitionDV action, + void performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action, AsyncCallback callback); void getRelationshipsDefinition(String profileID, AsyncCallback> callback); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.java new file mode 100644 index 0000000..a454684 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.java @@ -0,0 +1,60 @@ +package org.gcube.portlets.user.geoportaldataentry.client.ui.action; + +import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV; +import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML; + +import com.github.gwtbootstrap.client.ui.AccordionGroup; +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.Widget; + +public class DeleteViewPanel extends Composite { + + private static DeleteViewPanelUiBinder uiBinder = GWT.create(DeleteViewPanelUiBinder.class); + + interface DeleteViewPanelUiBinder extends UiBinder { + } + + @UiField + FlowPanel principalPanel; + + @UiField + AccordionGroup accordionProjectDetails; + + @UiField + FlowPanel confirmProceedPanel; + + private ResultDocumentDV resultDocumentDV; + + public DeleteViewPanel(ResultDocumentDV resultDocumentDV) { + initWidget(uiBinder.createAndBindUi(this)); + this.resultDocumentDV = resultDocumentDV; + builtUI(); + } + + private void builtUI() { + String htmlMsg = "

Going to permanently delete the:

"; + // TODO Auto-generated method stub + principalPanel.add(new HTML(htmlMsg)); + ReportTemplateToHTML rt = new ReportTemplateToHTML("Project", resultDocumentDV.getDocumentAsJSON(), false); + rt.showAsJSON(false); + principalPanel.add(rt); + + String projectDetails = "
    "; + projectDetails += "
  • id: " + resultDocumentDV.getId() + "
    • "; + projectDetails += "
  • profile: " + resultDocumentDV.getProfileID() + "
    • "; + projectDetails += "
  • " + resultDocumentDV.getFirstEntryOfMap().getKey() + ": " + + resultDocumentDV.getFirstEntryOfMap().getValue() + "
    • "; + projectDetails += "
"; + + accordionProjectDetails.add(new HTML(projectDetails)); + + String confirmMessage = "This operation cannot be undone. Would you like to proceed?"; + confirmProceedPanel.add(new HTML(confirmMessage)); + } + +} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.ui.xml new file mode 100644 index 0000000..e32baaf --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.ui.xml @@ -0,0 +1,33 @@ + + + + + .important { + font-weight: bold; + } + + .accordion-no-border { + border: 0px !important; + } + .text-are-size { + width: 80%; + height: 50px; + } + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.java new file mode 100644 index 0000000..1ec02c9 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.java @@ -0,0 +1,72 @@ +package org.gcube.portlets.user.geoportaldataentry.client.ui.action; + +import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV; +import org.gcube.application.geoportalcommon.shared.geoportal.config.ActionDefinitionDV; +import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML; + +import com.github.gwtbootstrap.client.ui.AccordionGroup; +import com.github.gwtbootstrap.client.ui.TextArea; +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.Widget; + +public class StepViewPanel extends Composite { + + private static StepViewPanelUiBinder uiBinder = GWT.create(StepViewPanelUiBinder.class); + + interface StepViewPanelUiBinder extends UiBinder { + } + + @UiField + FlowPanel principalPanel; + + @UiField + AccordionGroup accordionProjectDetails; + + @UiField + FlowPanel confirmProceedPanel; + + @UiField + TextArea txtOptionalMessage; + + private ResultDocumentDV resultDocumentDV; + + private ActionDefinitionDV actionDefinitionDV; + + public StepViewPanel(ResultDocumentDV resultDocumentDV, ActionDefinitionDV actionDefinitionDV) { + initWidget(uiBinder.createAndBindUi(this)); + this.resultDocumentDV = resultDocumentDV; + this.actionDefinitionDV = actionDefinitionDV; + builtUI(); + } + + private void builtUI() { + String htmlMsg = "

Going to perform the step/s " + actionDefinitionDV.getCallSteps() + " on the:

"; + // TODO Auto-generated method stub + principalPanel.add(new HTML(htmlMsg)); + ReportTemplateToHTML rt = new ReportTemplateToHTML("Project", resultDocumentDV.getDocumentAsJSON(), false); + rt.showAsJSON(false); + principalPanel.add(rt); + + String projectDetails = "
    "; + projectDetails += "
  • id: " + resultDocumentDV.getId() + "
    • "; + projectDetails += "
  • profile: " + resultDocumentDV.getProfileID() + "
    • "; + projectDetails += "
  • " + resultDocumentDV.getFirstEntryOfMap().getKey() + ": " + + resultDocumentDV.getFirstEntryOfMap().getValue() + "
    • "; + projectDetails += "
"; + + accordionProjectDetails.add(new HTML(projectDetails)); + + String confirmMessage = "Would you like to proceed?"; + confirmProceedPanel.add(new HTML(confirmMessage)); + } + + public String getOptionalMessage() { + return txtOptionalMessage.getText(); + } + +} diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml new file mode 100644 index 0000000..5fbae1b --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml @@ -0,0 +1,46 @@ + + + + + .important { + font-weight: bold; + } + + .accordion-no-border { + border: 0px !important; + } + .text-are-size { + width: 80%; + height: 70px; + } + + + + + + + + + + + + + + + Message + + + + You can add an optional message... + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/ModalConfirm.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/ModalConfirm.java index a69be58..108d01e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/ModalConfirm.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/ModalConfirm.java @@ -29,6 +29,7 @@ import com.google.gwt.user.client.ui.Widget; */ public class ModalConfirm extends Modal implements ClickHandler { + private static final int modal_width = 800; private DockPanel dock = new DockPanel(); private Button yesButton; private VerticalPanel vpContainer; @@ -44,7 +45,7 @@ public class ModalConfirm extends Modal implements ClickHandler { * @param text the text */ public ModalConfirm(Image img, String caption, String text) { - setWidth(800); + setWidth(modal_width); setAnimation(true); // getElement().setClassName("gwt-DialogBoxNew"); dock.setSpacing(4); @@ -65,7 +66,9 @@ public class ModalConfirm extends Modal implements ClickHandler { vpContainer = new VerticalPanel(); vpContainer.getElement().getStyle().setMargin(20.0, Unit.PX); - vpContainer.add(new HTML(text)); + vpContainer.setWidth((modal_width - 70) + "px"); + if (text != null) + vpContainer.add(new HTML(text)); hpButtons = new HorizontalPanel(); hpButtons.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); // hpButtons.getElement().getStyle().setMarginTop(20.0, Unit.PX); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index e020dfe..d15b04a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -136,6 +136,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen * Save geona data forms. * * @param profileID the profile ID + * @param optionalMessage the optional message * @param tree_Node the tree node * @param stepsOnPostCreation the steps on post creation * @return the commit report @@ -195,7 +196,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen LOG.info("stepsOnPostCreation are {}", stepsOnPostCreation); for (String stepID : stepsOnPostCreation) { LOG.info("calling step OnPostCreation are {}", stepID); - theProject = client.performStep(theProject.getProfileID(), theProject.getId(), stepID, null); + theProject = client.performStep(theProject.getProfileID(), theProject.getId(), stepID, null, null); } } catch (Exception e) { @@ -1265,12 +1266,13 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen * * @param profileID the profile ID * @param projectID the project ID + * @param optionalMessage the optional message * @param action the action * @return the project DV * @throws Exception the exception */ @Override - public ProjectDV performActionSteps(String profileID, String projectID, ActionDefinitionDV action) + public ProjectDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) throws Exception { LOG.info("performActionSteps called for profileID {}, projectID {}, action: " + action, profileID, projectID); @@ -1285,7 +1287,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen Project project = null; for (String stepID : action.getCallSteps()) { LOG.info("calling stepID {} on projectID {}", stepID, projectID); - project = client.performStep(profileID, projectID, stepID, null); + project = client.performStep(profileID, projectID, stepID, optionalMessage, null); } ProjectDVBuilder projectBuilder = ProjectDVBuilder.newBuilder().fullDocumentMap(true); -- 2.17.1 From 63816fe6480de775ef03b8ecffbebdd5885b2f7b Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 11 Apr 2024 11:04:54 +0200 Subject: [PATCH 05/13] integrated new bean StepPerformedResultDV --- .settings/org.eclipse.wst.common.component | 48 +++++++++---- .../client/GeoPortalDataEntryApp.java | 72 +++++++++++++------ .../client/GeoportalDataEntryService.java | 3 +- .../GeoportalDataEntryServiceAsync.java | 3 +- .../client/ui/action/StepViewPanel.ui.xml | 2 +- .../server/GeoportalDataEntryServiceImpl.java | 16 +++-- 6 files changed, 104 insertions(+), 40 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index e3f5ed7..077df57 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,8 @@ - + + + + @@ -141,7 +144,10 @@ - + + + + @@ -283,7 +289,10 @@ - + + + + @@ -425,7 +434,10 @@ - + + + + @@ -567,7 +579,10 @@ - + + + + @@ -667,10 +682,10 @@ uses - - uses - - + + + + @@ -812,7 +827,10 @@ - + + + + @@ -954,7 +972,10 @@ - + + + + @@ -1096,7 +1117,10 @@ - + + + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 3d2eb98..11c4639 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -21,8 +21,9 @@ import org.gcube.application.geoportalcommon.shared.geoportal.config.GcubeProfil import org.gcube.application.geoportalcommon.shared.geoportal.config.ItemFieldDV; import org.gcube.application.geoportalcommon.shared.geoportal.materialization.innerobject.FilesetDV; import org.gcube.application.geoportalcommon.shared.geoportal.materialization.innerobject.PayloadDV; +import org.gcube.application.geoportalcommon.shared.geoportal.project.BasicLifecycleInformationDV.Status; import org.gcube.application.geoportalcommon.shared.geoportal.project.LifecycleInformationDV; -import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV; +import org.gcube.application.geoportalcommon.shared.geoportal.step.StepPerformedResultDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA_HANDLER; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.HandlerDeclarationDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV; @@ -257,7 +258,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onFailure(Throwable caught) { - String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support. Error is: "+caught.getMessage(); + String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support. Error is: " + + caught.getMessage(); Alert alert = new Alert(errorMsg, AlertType.ERROR); alert.setClose(false); try { @@ -328,8 +330,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onFailure(Throwable caught) { - - if(caught instanceof ProjectNotFoundException) { + + if (caught instanceof ProjectNotFoundException) { Modal errorModal = new Modal(true, true); errorModal.setCloseVisible(true); errorModal.setTitle("Oops..."); @@ -343,11 +345,10 @@ public class GeoPortalDataEntryApp implements EntryPoint { errorPanelMsg.add(erroMessage); errorModal.add(errorPanelMsg); errorModal.show(); - } - else { + } else { Window.alert("Error " + caught.getMessage()); } - + initExecutor.execute(); } @@ -1365,8 +1366,9 @@ public class GeoPortalDataEntryApp implements EntryPoint { modal.add(modalContainerPanel); GeoportalDataEntryServiceAsync.Util.getInstance().performActionSteps( - resultDocumentDV.getProfileID(), resultDocumentDV.getId(),stvp.getOptionalMessage(), - wActionOnItem.getAction(), new AsyncCallback() { + resultDocumentDV.getProfileID(), resultDocumentDV.getId(), + stvp.getOptionalMessage(), wActionOnItem.getAction(), + new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -1382,7 +1384,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { } @Override - public void onSuccess(final ProjectDV result) { + public void onSuccess(final StepPerformedResultDV result) { modal.setTitle("Step/s performed"); modal.setCloseVisible(true); try { @@ -1396,22 +1398,50 @@ public class GeoPortalDataEntryApp implements EntryPoint { String stepsToString = ""; for (String step : wActionOnItem.getAction().getCallSteps()) { - stepsToString += step + ", "; + stepsToString += step + " "; + } + + Status status = Status.NOT_SPECIFIED; + AlertType alertType = AlertType.INFO; + String statusMsg = "status " + status.getLabel(); + try { + status = result.getLifecycleInfoDV().getLastOperationStatus(); + switch (status) { + case OK: + alertType = AlertType.SUCCESS; + statusMsg = "performed with " + status.getLabel().toUpperCase()+"!"; + break; + case WARNING: + alertType = AlertType.WARNING; + statusMsg = "performed with " + status.getLabel().toUpperCase()+"!"; + break; + case ERROR: + alertType = AlertType.ERROR; + statusMsg = "performed with " + status.getLabel().toUpperCase()+"!"; + break; + default: + alertType = AlertType.INFO; + statusMsg = "performed. Current status " + status.getLabel(); + break; + } + } catch (Exception e) { + // silent } Alert alert = new Alert( - stepString + " " + stepsToString + "performed correclty!"); - alert.setType(AlertType.INFO); + stepString + " " + stepsToString + " " + statusMsg); + alert.setType(alertType); alert.setClose(false); modal.add(alert); GeoportalDataEntryServiceAsync.Util.getInstance() .getResultDocumentFoProjectByID(result.getProfileID(), - result.getId(), new AsyncCallback() { + result.getProjectId(), + new AsyncCallback() { @Override public void onFailure(Throwable caught) { - // TODO Auto-generated method stub + Window.alert("Error: " + caught.getMessage()); } @@ -1631,7 +1661,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { modal.add(hpGetLink); GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(resultDocumentDV.getId(), - resultDocumentDV.getProfileID(), GeoportalItemReferences.SHARE_LINK_TO.DATA_VIEWER, new AsyncCallback() { + resultDocumentDV.getProfileID(), GeoportalItemReferences.SHARE_LINK_TO.DATA_VIEWER, + new AsyncCallback() { @Override public void onFailure(Throwable caught) { try { @@ -1679,7 +1710,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { break; } - + case GET_SHAREABLE_LINK: { final Modal modal = new Modal(true, true); @@ -1691,7 +1722,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { modal.add(hpGetLink); GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(resultDocumentDV.getId(), - resultDocumentDV.getProfileID(), GeoportalItemReferences.SHARE_LINK_TO.DATA_ENTRY, new AsyncCallback() { + resultDocumentDV.getProfileID(), GeoportalItemReferences.SHARE_LINK_TO.DATA_ENTRY, + new AsyncCallback() { @Override public void onFailure(Throwable caught) { try { @@ -1722,8 +1754,8 @@ public class GeoPortalDataEntryApp implements EntryPoint { Anchor anchor = new Anchor(theURL); anchor.setHref(theURL); anchor.setTarget("_blank"); - anchor.setTitle( - "Shareable link of the project with id: " + resultDocumentDV.getId()); + anchor.setTitle("Shareable link of the project with id: " + + resultDocumentDV.getId()); com.github.gwtbootstrap.client.ui.Label label = new com.github.gwtbootstrap.client.ui.Label( "Shareable link"); label.setType(LabelType.SUCCESS); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java index 0d3e054..c52839b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java @@ -12,6 +12,7 @@ import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.LifecycleInformationDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.TemporalReferenceDV; +import org.gcube.application.geoportalcommon.shared.geoportal.step.StepPerformedResultDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV; import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView; @@ -146,7 +147,7 @@ public interface GeoportalDataEntryService extends RemoteService { * @param action the action * @return the project DV */ - ProjectDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) throws Exception; + StepPerformedResultDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) throws Exception; /** * Gets the relationships definition. diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java index e861ee0..20b337c 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java @@ -12,6 +12,7 @@ import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.LifecycleInformationDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.TemporalReferenceDV; +import org.gcube.application.geoportalcommon.shared.geoportal.step.StepPerformedResultDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV; import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView; @@ -80,7 +81,7 @@ public interface GeoportalDataEntryServiceAsync { AsyncCallback callback); void performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action, - AsyncCallback callback); + AsyncCallback callback); void getRelationshipsDefinition(String profileID, AsyncCallback> callback); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml index 5fbae1b..01bd0d1 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml @@ -36,7 +36,7 @@ - You can add an optional message... + You can optionally add a message... diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index d15b04a..4349754 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -55,6 +55,7 @@ import org.gcube.application.geoportalcommon.shared.geoportal.config.GcubeProfil import org.gcube.application.geoportalcommon.shared.geoportal.project.LifecycleInformationDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV; import org.gcube.application.geoportalcommon.shared.geoportal.project.TemporalReferenceDV; +import org.gcube.application.geoportalcommon.shared.geoportal.step.StepPerformedResultDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA_HANDLER; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV; import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV; @@ -1272,7 +1273,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen * @throws Exception the exception */ @Override - public ProjectDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) + public StepPerformedResultDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) throws Exception { LOG.info("performActionSteps called for profileID {}, projectID {}, action: " + action, profileID, projectID); @@ -1289,11 +1290,16 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen LOG.info("calling stepID {} on projectID {}", stepID, projectID); project = client.performStep(profileID, projectID, stepID, optionalMessage, null); } + + LifecycleInformationDV lifecycleInfo = getLifecycleInfoForProjectId(profileID, projectID); + lifecycleInfo.getLastOperationStatus(); - ProjectDVBuilder projectBuilder = ProjectDVBuilder.newBuilder().fullDocumentMap(true); - ProjectDV theProject = ConvertToDataValueObjectModel.toProjectDV(project, projectBuilder); - LOG.info("performActionSteps returning theProject with ID {}", projectID); - return theProject; + StepPerformedResultDV sprv = new StepPerformedResultDV(profileID, projectID, lifecycleInfo); + +// ProjectDVBuilder projectBuilder = ProjectDVBuilder.newBuilder().fullDocumentMap(true); +// ProjectDV theProject = ConvertToDataValueObjectModel.toProjectDV(project, projectBuilder); + LOG.info("performActionSteps returning theProject with ID {}", sprv); + return sprv; } catch (Exception e) { String error = "Error occurred on performing the workflow step/s on the project id " + projectID; LOG.error(error, e); -- 2.17.1 From ed5b39d106f58859c2449e79217c14662c6d3c90 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 11 Apr 2024 12:22:58 +0200 Subject: [PATCH 06/13] updated CSS --- .../client/ui/action/StepViewPanel.ui.xml | 4 ++-- .../client/ui/report/ReportTemplateToHTML.java | 1 + .../client/ui/report/ReportTemplateToHTML.ui.xml | 8 ++++++-- src/main/webapp/GeoPortalDataEntryApp.css | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml index 01bd0d1..eda62c9 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml @@ -12,8 +12,8 @@ border: 0px !important; } .text-are-size { - width: 80%; - height: 70px; + width: 80% !important; + height: 70px !important; } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.java index 700ceb3..73f1e30 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.java @@ -76,6 +76,7 @@ public class ReportTemplateToHTML extends Composite { boolean openJSONReport) { initWidget(uiBinder.createAndBindUi(this)); vpContainer.setVisible(false); + vpContainer.setWidth("95%"); showReportAsJSON.setDefaultOpen(openJSONReport); showReportAsTable.setDefaultOpen(openTableReport); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.ui.xml index 606c17d..75e4321 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.ui.xml @@ -10,13 +10,17 @@ .margin-top-10 { margin-top: 10px; } + .table-style { + margin-top: 10px; + width: 95%; + } + addStyleNames="{style.table-style}"> Report: + addStyleNames="{style.table-style}"> diff --git a/src/main/webapp/GeoPortalDataEntryApp.css b/src/main/webapp/GeoPortalDataEntryApp.css index 7494363..76a5bcb 100644 --- a/src/main/webapp/GeoPortalDataEntryApp.css +++ b/src/main/webapp/GeoPortalDataEntryApp.css @@ -49,6 +49,7 @@ h1 { margin-left: 10px; margin-bottom: 10px; margin-right: 5px; + width: 100%; } .my-html-table td { -- 2.17.1 From 4a1b26128cc74156af6928661cda17572ea34d46 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 15 Apr 2024 12:35:16 +0200 Subject: [PATCH 07/13] commented test --- .settings/org.eclipse.wst.common.component | 41 ++++++++++++++----- .../ui/form/GeonaDataEntryMainForm.java | 2 +- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 077df57..7489de0 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,7 @@ - + + + @@ -144,7 +146,9 @@ - + + + @@ -289,7 +293,9 @@ - + + + @@ -434,7 +440,9 @@ - + + + @@ -579,7 +587,9 @@ - + + + @@ -679,10 +689,15 @@ uses - + uses - + + uses + + + + @@ -827,7 +842,9 @@ - + + + @@ -972,7 +989,9 @@ - + + + @@ -1117,7 +1136,9 @@ - + + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java index 1ea47da..1311659 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java @@ -248,7 +248,7 @@ public class GeonaDataEntryMainForm extends Composite { appManagerBus.fireEvent(new SaveGeonaDataFormsEvent(treeItemPanel.getProfileID(), treeNode)); TreeVisitUtil.preOrderVisit(treeNode); - showAlertOnSaveAction("Andiamo a salvare", AlertType.INFO, true); + //showAlertOnSaveAction("Andiamo a salvare", AlertType.INFO, true); } else { showAlertOnSaveAction("Detected errors, please fix it/them", AlertType.ERROR, true); -- 2.17.1 From 89ddb6bc5fde4cde9bb033d9932113225648a1d5 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 16 Apr 2024 11:22:38 +0200 Subject: [PATCH 08/13] updated title --- .settings/org.eclipse.wst.common.component | 9 --------- .../client/ui/GeonaMainTabPanel.ui.xml | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 7489de0..604e800 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -686,15 +686,6 @@ - - uses - - - uses - - - uses - diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml index 93cec0f..3010f13 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml @@ -107,7 +107,7 @@ Show on Map - Get Shareable link Date: Fri, 10 May 2024 12:25:20 +0200 Subject: [PATCH 09/13] Enforced deleteProject method --- .settings/org.eclipse.wst.common.component | 120 ++++++++++++++++-- CHANGELOG.md | 1 + .../server/GeoportalDataEntryServiceImpl.java | 12 ++ 3 files changed, 124 insertions(+), 9 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 604e800..5420fc3 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,16 @@ - + + + + + + + + + + + + @@ -146,7 +157,18 @@ - + + + + + + + + + + + + @@ -293,7 +315,18 @@ - + + + + + + + + + + + + @@ -440,7 +473,18 @@ - + + + + + + + + + + + + @@ -587,7 +631,18 @@ - + + + + + + + + + + + + @@ -686,7 +741,21 @@ - + + uses + + + + + + + + + + + + + @@ -833,7 +902,18 @@ - + + + + + + + + + + + + @@ -980,7 +1060,18 @@ - + + + + + + + + + + + + @@ -1127,7 +1218,18 @@ - + + + + + + + + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index e239a92..53fd7bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Integrated new Uri-Resolver-Manager [#27160] - Added Get Shareable Link facility [#27120] - Added optional message when performing lifecycle step [#27192] +- Enforced deleteProject method ## [v3.2.2] - 2024-01-11 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 4349754..141e5d7 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -1010,6 +1010,18 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen SessionUtil.getCurrentContext(getThreadLocalRequest(), true); client.deleteProject(profileID, projectID, true); + + try { + Project deletedP = client.getProjectByID(profileID, projectID); + if(deletedP!=null) { + String error = "The project with id: "+projectID+" still exists"; + LOG.error(error +". Sending exception.."); + throw new Exception(error); + } + }catch (Exception e) { + throw e; + } + // Updating count of Documents in session per profileID Integer totalProjectForProfile = client.getTotalDocument(profileID); SessionUtil.setTotalDocumentForProfileID(getThreadLocalRequest(), profileID, totalProjectForProfile); -- 2.17.1 From c3a923eb694149c2700c933448b2d297ab3b7f35 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 10 May 2024 12:29:33 +0200 Subject: [PATCH 10/13] updated exception message --- .../server/GeoportalDataEntryServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 141e5d7..7889e1e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -1029,8 +1029,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen } catch (Exception e) { LOG.error("Error on deleting the project with id: " + projectID, e); - throw new Exception( - "Error occurred on deleting the project with id: " + projectID + ". Error: " + e.getMessage()); + throw new Exception(e.getMessage()); } } -- 2.17.1 From 54545e70488d015de5d82487e85754fba3a3eb8e Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 10 May 2024 12:50:51 +0200 Subject: [PATCH 11/13] Enforced deleteProject UX --- CHANGELOG.md | 2 +- .../client/GeoPortalDataEntryApp.java | 35 +++++++++++++++++-- .../server/GeoportalDataEntryServiceImpl.java | 4 +-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53fd7bd..7020671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Integrated new Uri-Resolver-Manager [#27160] - Added Get Shareable Link facility [#27120] - Added optional message when performing lifecycle step [#27192] -- Enforced deleteProject method +- Enforced deleteProject method/UX ## [v3.2.2] - 2024-01-11 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 11c4639..dd94c31 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -1409,15 +1409,18 @@ public class GeoPortalDataEntryApp implements EntryPoint { switch (status) { case OK: alertType = AlertType.SUCCESS; - statusMsg = "performed with " + status.getLabel().toUpperCase()+"!"; + statusMsg = "performed with " + status.getLabel().toUpperCase() + + "!"; break; case WARNING: alertType = AlertType.WARNING; - statusMsg = "performed with " + status.getLabel().toUpperCase()+"!"; + statusMsg = "performed with " + status.getLabel().toUpperCase() + + "!"; break; case ERROR: alertType = AlertType.ERROR; - statusMsg = "performed with " + status.getLabel().toUpperCase()+"!"; + statusMsg = "performed with " + status.getLabel().toUpperCase() + + "!"; break; default: alertType = AlertType.INFO; @@ -2003,6 +2006,32 @@ public class GeoPortalDataEntryApp implements EntryPoint { alert.setClose(false); hp.add(alert); + VerticalPanel vp = new VerticalPanel(); + vp.getElement().getStyle().setMarginTop(20, Unit.PX); + vp.add(new Label("Check outcome in the Publication Report")); + Button buttonShowPublicationReport = new Button( + "Show Publication Report"); + buttonShowPublicationReport.setType(ButtonType.INFO); + buttonShowPublicationReport.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + modal.hide(); + appManagerBus + .fireEvent(new OperationOnItemEvent( + Arrays.asList(resultDocumentDV), + OPERATION_ON_ITEM.VIEW_REPORT)); + + } + }); + buttonShowPublicationReport.getElement().getStyle().setMarginTop(10, + Unit.PX); + buttonShowPublicationReport.getElement().getStyle() + .setMarginBottom(20, Unit.PX); + vp.add(buttonShowPublicationReport); + + modal.add(vp); + } @Override diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 7889e1e..43c1cbb 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -1014,7 +1014,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen try { Project deletedP = client.getProjectByID(profileID, projectID); if(deletedP!=null) { - String error = "The project with id: "+projectID+" still exists"; + String error = "The project with id "+projectID+" still exists"; LOG.error(error +". Sending exception.."); throw new Exception(error); } @@ -1029,7 +1029,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen } catch (Exception e) { LOG.error("Error on deleting the project with id: " + projectID, e); - throw new Exception(e.getMessage()); + throw new Exception("Error occurred on the server side when deleting the project"); } } -- 2.17.1 From bb323df98ad747a4fbcc86b222c7c07eb4ee7e9e Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 22 May 2024 15:34:23 +0200 Subject: [PATCH 12/13] updated logs --- .settings/org.eclipse.wst.common.component | 50 +++++++++++++++---- .../client/GeoPortalDataEntryApp.java | 2 +- .../server/GeoportalDataEntryServiceImpl.java | 8 +-- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 5420fc3..4cb3434 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,8 @@ - + + + + @@ -157,7 +160,10 @@ - + + + + @@ -315,7 +321,10 @@ - + + + + @@ -473,7 +482,10 @@ - + + + + @@ -631,7 +643,10 @@ - + + + + @@ -741,10 +756,16 @@ - + uses - + + uses + + + + + @@ -902,7 +923,10 @@ - + + + + @@ -1060,7 +1084,10 @@ - + + + + @@ -1218,7 +1245,10 @@ - + + + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index dd94c31..289b160 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -258,7 +258,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { @Override public void onFailure(Throwable caught) { - String errorMsg = "Sorry, an error occurred on istancing the application. Please, contact the support. Error is: " + String errorMsg = "Sorry, an error occurred on instancing the application. Please, contact the support. Error is: " + caught.getMessage(); Alert alert = new Alert(errorMsg, AlertType.ERROR); alert.setClose(false); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 43c1cbb..6db6e51 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -824,7 +824,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen */ @Override public GeoportalISConfig getGeonaInitConfig() { - LOG.info("getConfig called"); + LOG.info("getGeonaInitConfig called"); String scope = SessionUtil.getCurrentContext(this.getThreadLocalRequest(), false); String theSecondaryType; @@ -1106,7 +1106,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen */ @Override public GNADataEntryExtendedConfigProfile readDataEntryPresentationConfig() throws Exception { - LOG.info("readDataViewerConfig called"); + LOG.info("readDataEntryPresentationConfig called"); GCubeUser user = null; GNADataEntryExtendedConfigProfile gnaDEExtConfig = new GNADataEntryExtendedConfigProfile(); @@ -1138,7 +1138,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen long groupId = pContext.getCurrentGroupId(this.getThreadLocalRequest()); if (user == null || scope == null) { - LOG.warn("called getMyRightsInTheContext with invalid parameter user: " + user + ", in the scope: " + LOG.warn("called readDataEntryPresentationConfig with invalid parameter user: " + user + ", in the scope: " + scope, ", returning null"); return null; } @@ -1183,7 +1183,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen gnaDEExtConfig.setUserRights(userRights); return gnaDEExtConfig; } catch (UserRetrievalFault | GroupRetrievalFault | GNAConfigException e) { - LOG.error("An error occurred during getMyRightsInTheContext: " + user, e); + LOG.error("An error occurred during readDataEntryPresentationConfig: " + user, e); Map permissions = new HashMap(); RoleRights roleRights = new RoleRights(permissions, GcubeUserRole.DATA_MEMBER); -- 2.17.1 From 40ad3ee2cf69de92766e453995b354d23ec6805c Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 20 Jun 2024 17:50:44 +0200 Subject: [PATCH 13/13] updated typo --- .settings/org.eclipse.wst.common.component | 63 ++++++++++++++++--- .../client/GeoPortalDataEntryApp.java | 2 +- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 4cb3434..a47cb55 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,10 @@ - + + + + + + @@ -160,7 +165,12 @@ - + + + + + + @@ -321,7 +331,12 @@ - + + + + + + @@ -482,7 +497,12 @@ - + + + + + + @@ -643,7 +663,12 @@ - + + + + + + @@ -762,7 +787,12 @@ uses - + + + + + + @@ -923,7 +953,12 @@ - + + + + + + @@ -1084,7 +1119,12 @@ - + + + + + + @@ -1245,7 +1285,12 @@ - + + + + + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index 289b160..452088b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -1354,7 +1354,7 @@ public class GeoPortalDataEntryApp implements EntryPoint { final Modal modal = new Modal(true, true); modal.setCloseVisible(false); - modal.setTitle("Perfoming Steps..."); + modal.setTitle("Performing Steps..."); modal.hide(false); modal.setWidth(800); modal.setMaxHeigth("650px"); -- 2.17.1