diff --git a/.classpath b/.classpath index 3e9559a..57c104b 100644 --- a/.classpath +++ b/.classpath @@ -20,7 +20,6 @@ - diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java index 12810d5..ab2bcd5 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java @@ -91,6 +91,7 @@ public class CreateDatasetForm extends Composite{ @UiField Button createButton; @UiField Button resetButton; @UiField AlertBlock infoBlock; + @UiField AlertBlock alertNoResources; @UiField AlertBlock onContinueAlertBlock; @UiField AlertBlock onCreateAlertBlock; @UiField VerticalPanel metadataFieldsPanel; @@ -326,15 +327,16 @@ public class CreateDatasetForm extends Composite{ resourcesControlGroup.setVisible(true); addResourcesCheckBox.getElement().getStyle().setDisplay(Display.INLINE_BLOCK); resourcesTable = new ResourcesTable(bean.getResources()); - - + + // if there are not resources, for now just checked it ( and hide so that the step will be skipped) TODO - if(bean.getResources() == null || bean.getResources().isEmpty()){ - +// if(bean.getResources() == null || bean.getResources().isEmpty()){ + resourcesControlGroup.setVisible(false); - - } - + alertNoResources.setType(AlertType.WARNING); + alertNoResources.setVisible(true); +// } + // try to retrieve the licenses setAlertBlock("Retrieving licenses, please wait...", AlertType.INFO, true); ckanServices.getLicenses(new AsyncCallback() { @@ -358,7 +360,7 @@ public class CreateDatasetForm extends Composite{ licenseListbox.setItemSelected(i, true); } - + // everything went ok setAlertBlock("", AlertType.ERROR, false); continueButton.setEnabled(true); @@ -827,6 +829,13 @@ public class CreateDatasetForm extends Composite{ return errorMessage; } + // check if version is a number + try{ + Integer.valueOf(versionTextbox.getText()); + }catch(Exception e){ + return errorMessage = "Version must be a natural number"; + } + // check if metadata profile is different from none and its mandatory fields have been fulfilled if(checkSelectedMetaDataProfile()){ errorMessage = "You must select a metadata profile different frome none"; @@ -911,7 +920,7 @@ public class CreateDatasetForm extends Composite{ field.freeze(); } - + // freeze table of resources if(resourcesTable != null) resourcesTable.freezeTable(); diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml index ebec215..e64dead 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml @@ -226,9 +226,15 @@ + + + + + visible="false" ui:field="onContinueAlertBlock"> Create - - Go + + Go Back getWorkspaceResourcesInformation( + private List getWorkspaceResourcesInformation( List resourceIds, Workspace ws, String username) { List toReturn = null; @@ -689,14 +689,16 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C for (String resourceId : resourceIds) { + logger.debug("RESOURCE ID IS " + resourceId); + ResourceBeanWrapper newResource = new ResourceBeanWrapper(); - FolderItem item = (FolderItem)ws.getItem(resourceId); + WorkspaceItem item = ws.getItem(resourceId); newResource.setDescription(item.getDescription()); newResource.setId(item.getId()); newResource.setUrl(item.getPublicLink(true)); newResource.setName(item.getName()); newResource.setToBeAdded(true); // default is true - newResource.setMimeType(item.getMimeType()); + newResource.setMimeType(((FolderItem)item).getMimeType()); newResource.setOwner(username); toReturn.add(newResource);