From 2a2eabfce762a5f35af47c88f8d65ca03de9dae7 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 11 Dec 2017 18:24:42 +0000 Subject: [PATCH] ref 10187: Enhance SAI https://support.d4science.org/issues/10187 Delete the Create button, only publish button is now available. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@160309 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +-- distro/changelog.xml | 4 ++ pom.xml | 2 +- .../client/StatAlgoImporterController.java | 18 ++++----- .../client/maindata/MainDataPanel.java | 1 - .../client/project/ProjectManager.java | 39 +++++-------------- .../client/ribbon/HomeToolBar.java | 32 +++------------ .../tools/explorer/ExplorerProjectPanel.java | 1 - .../tools/input/InputVariablePanel.java | 1 - .../client/type/ProjectStatusEventType.java | 2 +- .../type/StatAlgoImporterRibbonType.java | 1 - 11 files changed, 31 insertions(+), 76 deletions(-) diff --git a/.classpath b/.classpath index 8e1ee7c..3271d99 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -45,5 +45,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 50e903a..75f2e50 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Fixed Set Main behavior in case of R [ticket #10523] + Only publish button is available [ticket #10187] + Updated Tools panel diff --git a/pom.xml b/pom.xml index 87057aa..331e7ff 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user statistical-algorithms-importer - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT war diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java index 956d53d..0eef35f 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/StatAlgoImporterController.java @@ -275,11 +275,8 @@ public class StatAlgoImporterController { case RESOURCE_GITHUB: showGitHubWizard(); break; - case SOFTWARE_CREATE: - softwareCreateRequest(); - break; case SOFTWARE_PUBLISH: - softwarePublish(); + softwareCreateRequest(); break; case SOFTWARE_REPACKAGE: softwareRepackage(); @@ -360,9 +357,11 @@ public class StatAlgoImporterController { private void softwareCreateRequest() { - final ConfirmMessageBox mb = new ConfirmMessageBox("Warning", - "The creation of new software will overwrite the possible" - + " previous version and will require publication again." + " Do you want to proceed anyway?"); + final ConfirmMessageBox mb = new ConfirmMessageBox("Attention", + "The creation of new software will overwrite the possible previous version, moreover" + + " the compiled software will be notified to the Infrastructure Administrators" + + " and will be published in the suggested VREs. The source code will not be shared." + + " Do you confirm the submission?"); mb.addDialogHideHandler(new DialogHideHandler() { @Override @@ -387,10 +386,7 @@ public class StatAlgoImporterController { mb.show(); } - private void softwarePublish() { - pm.softwarePublish(); - - } + private void softwareRepackage() { pm.softwareRepackage(); diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java index 4e9ec8a..0b6e7d2 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/maindata/MainDataPanel.java @@ -74,7 +74,6 @@ public class MainDataPanel extends SimpleContainer { case SAVE: case START: case UPDATE: - case SOFTWARE_CREATED: case SOFTWARE_PUBLISH: case SOFTWARE_REPACKAGE: case ADD_RESOURCE: diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java index 7f8af48..ab150be 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/project/ProjectManager.java @@ -412,11 +412,10 @@ public class ProjectManager { @Override public void onSuccess(Project p) { + Log.info("Software Created!"); project = p; - monitor.hide(); - fireProjectStatusSoftwareCreatedEvent(); - UtilsGXT3.info("Create Software", "Software Created!"); - + softwarePublish(monitor); + } @Override @@ -756,30 +755,12 @@ public class ProjectManager { }); } - public void softwarePublish() { + private void softwarePublish(final StatAlgoImporterMonitor monitor) { if (project != null) { - final ConfirmMessageBox mb = new ConfirmMessageBox("Attention", - "The compiled software will be notified to the Infrastructure Administrators and will be published in the suggested VREs. The source code will not be shared. Do you confirm the submission?"); - mb.addDialogHideHandler(new DialogHideHandler() { - - @Override - public void onDialogHide(DialogHideEvent event) { - switch (event.getHideButton()) { - case NO: - break; - case YES: - softwarePublishOnServer(); - break; - default: - break; - } - - } - }); - mb.setWidth(300); - mb.show(); - + softwarePublishOnServer(monitor); + } else { + monitor.hide(); Log.error("Project not open: " + project); UtilsGXT3.alert("Error", "Project not open!"); } @@ -787,8 +768,7 @@ public class ProjectManager { } // TODO - private void softwarePublishOnServer() { - final StatAlgoImporterMonitor monitor = new StatAlgoImporterMonitor(); + private void softwarePublishOnServer(final StatAlgoImporterMonitor monitor) { StatAlgoImporterServiceAsync.INSTANCE.publishSoftware(new AsyncCallback() { public void onFailure(Throwable caught) { @@ -1040,13 +1020,14 @@ public class ProjectManager { eventBus.fireEvent(projectStatusEvent); } + /* private void fireProjectStatusSoftwareCreatedEvent() { ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent(ProjectStatusEventType.SOFTWARE_CREATED, project); Log.debug("Project Manager ProjectStatusEvent fire! " + projectStatusEvent); eventBus.fireEvent(projectStatusEvent); - } + }*/ private void fireProjectStatusSoftwarePublishEvent() { ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent(ProjectStatusEventType.SOFTWARE_PUBLISH, diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/ribbon/HomeToolBar.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/ribbon/HomeToolBar.java index 8626a03..b5966d0 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/ribbon/HomeToolBar.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/ribbon/HomeToolBar.java @@ -49,7 +49,7 @@ public class HomeToolBar { //Software - private TextButton btnCreateSoftware; + //private TextButton btnCreateSoftware; private TextButton btnPublishSoftware; private TextButton btnRepackageSoftware; @@ -211,26 +211,6 @@ public class HomeToolBar { FlexTable softwareLayout = new FlexTable(); softwareGroup.add(softwareLayout); - btnCreateSoftware = new TextButton(msgs.btnCreateSoftwareText(), - StatAlgoImporterResources.INSTANCE.algorithm24()); - btnCreateSoftware.setId("createSoftwareButton"); - btnCreateSoftware.setScale(ButtonScale.SMALL); - btnCreateSoftware.setIconAlign(IconAlign.LEFT); - btnCreateSoftware.setArrowAlign(ButtonArrowAlign.BOTTOM); - btnCreateSoftware.setToolTip(msgs.btnCreateSoftwareToolTip()); - btnCreateSoftware.getElement().setMargins(new Margins(0, 4, 0, 0)); - btnCreateSoftware.disable(); - btnCreateSoftware.addSelectHandler(new SelectHandler() { - - public void onSelect(SelectEvent event) { - eventBus.fireEvent(new StatAlgoImporterRibbonEvent( - StatAlgoImporterRibbonType.SOFTWARE_CREATE)); - } - }); - - softwareLayout.setWidget(0, 0, btnCreateSoftware); - softwareLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); - btnPublishSoftware = new TextButton(msgs.btnPublishSoftwareText(), StatAlgoImporterResources.INSTANCE.publish24()); btnPublishSoftware.setId("publishSofwareButton"); @@ -248,8 +228,8 @@ public class HomeToolBar { } }); - softwareLayout.setWidget(0, 1, btnPublishSoftware); - softwareLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); + softwareLayout.setWidget(0, 0, btnPublishSoftware); + softwareLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); btnRepackageSoftware = new TextButton(msgs.btnRepackageSoftwareText(), @@ -268,8 +248,8 @@ public class HomeToolBar { } }); - softwareLayout.setWidget(0, 2, btnRepackageSoftware); - softwareLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); + softwareLayout.setWidget(0, 1, btnRepackageSoftware); + softwareLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); @@ -417,7 +397,6 @@ public class HomeToolBar { btnSaveProject.disable(); btnAddResource.disable(); btnGitHubResource.disable(); - btnCreateSoftware.disable(); btnPublishSoftware.disable(); btnRepackageSoftware.disable(); btnHelp.enable(); @@ -433,7 +412,6 @@ public class HomeToolBar { btnSaveProject.enable(); btnAddResource.enable(); btnGitHubResource.enable(); - btnCreateSoftware.enable(); btnPublishSoftware.enable(); btnRepackageSoftware.enable(); btnHelp.enable(); diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java index 3a8b56b..52cc71e 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/explorer/ExplorerProjectPanel.java @@ -124,7 +124,6 @@ public class ExplorerProjectPanel extends ContentPanel { case SAVE: case MAIN_CODE_SET: case BINARY_CODE_SET: - case SOFTWARE_CREATED: case SOFTWARE_PUBLISH: case SOFTWARE_REPACKAGE: case EXPLORER_REFRESH: diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java index 23961cf..c284ee9 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/tools/input/InputVariablePanel.java @@ -109,7 +109,6 @@ public class InputVariablePanel extends ContentPanel { + event.toString()); switch (event.getProjectStatusEventType()) { case SAVE: - case SOFTWARE_CREATED: case SOFTWARE_PUBLISH: case SOFTWARE_REPACKAGE: case START: diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java index a9c8358..f6f5e3a 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/ProjectStatusEventType.java @@ -8,6 +8,6 @@ package org.gcube.portlets.user.statisticalalgorithmsimporter.client.type; */ public enum ProjectStatusEventType { START, OPEN, MAIN_CODE_SET, BINARY_CODE_SET, UPDATE, - ADD_RESOURCE, DELETE_RESOURCE, DELETE_MAIN_CODE,DELETE_BINARY_CODE, SOFTWARE_CREATED, + ADD_RESOURCE, DELETE_RESOURCE, DELETE_MAIN_CODE,DELETE_BINARY_CODE, SOFTWARE_PUBLISH, SOFTWARE_REPACKAGE, EXPLORER_REFRESH, SAVE; } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/StatAlgoImporterRibbonType.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/StatAlgoImporterRibbonType.java index 73d7f78..8496d41 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/StatAlgoImporterRibbonType.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/type/StatAlgoImporterRibbonType.java @@ -12,7 +12,6 @@ public enum StatAlgoImporterRibbonType { PROJECT_SAVE, RESOURCE_ADD, RESOURCE_GITHUB, - SOFTWARE_CREATE, SOFTWARE_PUBLISH, SOFTWARE_REPACKAGE, HELP;