SP-362 / BIS-246: Show metaproject tags in Web GUI and allow editing them when...

SP-362 / BIS-246: Show metaproject tags in Web GUI and allow editing them when editing an entity - handle a situation when metaprojects are specified in separate lines

SVN: 27487

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectArea.java

@@ -64,7 +64,31 @@ public class MetaprojectArea extends MultilineItemsField
 
     public final String[] tryGetMetaprojects()
     {
-        return tryGetModifiedItemList();
+        return getNotEmptyItems(getItems());
+    }
+
+    public final String[] tryGetModifiedMetaprojects()
+    {
+        return getNotEmptyItems(tryGetModifiedItemList());
+    }
+
+    private String[] getNotEmptyItems(String[] items)
+    {
+        if (items != null)
+        {
+            List<String> notEmptyItems = new ArrayList<String>();
+            for (String item : items)
+            {
+                if (item != null && item.trim().length() > 0)
+                {
+                    notEmptyItems.add(item.trim());
+                }
+            }
+            return notEmptyItems.toArray(new String[notEmptyItems.size()]);
+        } else
+        {
+            return null;
+        }
     }
 
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java

@@ -216,6 +216,11 @@ abstract class AbstractBusinessObject implements IDAOFactory
 
         for (String metaprojectsOrNullItem : metaprojectsOrNull)
         {
+            if (metaprojectsOrNullItem == null)
+            {
+                throw new IllegalArgumentException("Metaproject cannot be null");
+            }
+
             MetaprojectPE metaproject =
                     getMetaprojectDAO().tryFindByOwnerAndName(session.getUserName(),
                             metaprojectsOrNullItem);

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java

@@ -141,7 +141,7 @@ public final class GenericDataSetEditForm extends
             result.setExperimentIdentifierOrNull(extractExperimentIdentifier());
         }
         result.setModifiedParentDatasetCodesOrNull(extractParentDatasetCodes());
-        result.setMetaprojectsOrNull(metaprojectArea.tryGetMetaprojects());
+        result.setMetaprojectsOrNull(metaprojectArea.tryGetModifiedMetaprojects());
         builder.fillUpdates(result);
         return result;
     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java

@@ -101,7 +101,7 @@ public final class GenericExperimentEditForm extends AbstractGenericExperimentRe
         updates.setGenerateCodes(autoGenerateCodes.getValue().booleanValue());
         updates.setRegisterSamples(existingSamplesRadio.getValue() == false);
         updates.setSamplesSessionKey(samplesSessionKey);
-        updates.setMetaprojectsOrNull(metaprojectArea.tryGetMetaprojects());
+        updates.setMetaprojectsOrNull(metaprojectArea.tryGetModifiedMetaprojects());
         viewContext.getService().updateExperiment(updates,
                 new UpdateExperimentCallback(viewContext));
     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java

@@ -104,7 +104,7 @@ public final class GenericExperimentRegistrationForm extends
         newExp.setGenerateCodes(autoGenerateCodes.getValue().booleanValue());
         newExp.setRegisterSamples(existingSamplesRadio.getValue() == false);
         newExp.setAttachments(attachmentsManager.extractAttachments());
-        newExp.setMetaprojectsOrNull(metaprojectArea.tryGetMetaprojects());
+        newExp.setMetaprojectsOrNull(metaprojectArea.tryGetModifiedMetaprojects());
         viewContext.getService().registerExperiment(attachmentsSessionKey, samplesSessionKey,
                 newExp, new RegisterExperimentCallback(viewContext));
     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java

@@ -67,7 +67,7 @@ public final class GenericMaterialEditForm extends
     public final void submitValidForm()
     {
         viewContext.getService().updateMaterial(techIdOrNull, extractProperties(),
-                metaprojectArea.tryGetMetaprojects(), originalMaterial.getModificationDate(),
+                metaprojectArea.tryGetModifiedMetaprojects(), originalMaterial.getModificationDate(),
                 new UpdateMaterialCallback(viewContext));
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java

@@ -75,7 +75,7 @@ public final class GenericSampleEditForm extends AbstractGenericSampleRegisterEd
                 new SampleUpdates(attachmentsSessionKey, techIdOrNull, properties, attachments,
                         experimentIdent, originalSample.getModificationDate(),
                         createSampleIdentifier(), containerOrNull, parents);
-        sampleUpdates.setMetaprojectsOrNull(metaprojectArea.tryGetMetaprojects());
+        sampleUpdates.setMetaprojectsOrNull(metaprojectArea.tryGetModifiedMetaprojects());
 
         viewContext.getService().updateSample(sampleUpdates,
                 enrichWithPostRegistration(new UpdateSampleCallback(viewContext)));

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java

@@ -110,7 +110,7 @@ public final class GenericSampleRegistrationForm extends AbstractGenericSampleRe
         newSample.setProperties(properties.toArray(IEntityProperty.EMPTY_ARRAY));
         newSample.setAttachments(attachmentsManager.extractAttachments());
         newSample.setExperimentIdentifier(experimentIdentifier);
-        newSample.setMetaprojectsOrNull(metaprojectArea.tryGetMetaprojects());
+        newSample.setMetaprojectsOrNull(metaprojectArea.tryGetModifiedMetaprojects());
 
         viewContext.getService().registerSample(attachmentsSessionKey, newSample,
                 enrichWithPostRegistration(new RegisterSampleCallback(viewContext)));