diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
index bdec5f387c783e4641162ebb8fa3586a0cfc128c..cea48d55fe324a52df6b32843f00aaa3d52ba5c4 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
@@ -164,6 +164,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
this.DataSetTypeCreation = dtos.DataSetTypeCreation;
this.MaterialTypeCreation = dtos.MaterialTypeCreation;
this.PropertyTypeCreation = dtos.PropertyTypeCreation;
+ this.PropertyTypeUpdate = dtos.PropertyTypeUpdate;
this.WebAppSettings = dtos.WebAppSettings;
// operations
@@ -215,6 +216,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
this.UpdateDataSetTypesOperation = dtos.UpdateDataSetTypesOperation;
this.UpdateMaterialsOperation = dtos.UpdateMaterialsOperation;
this.UpdateMaterialTypesOperation = dtos.UpdateMaterialTypesOperation;
+ this.UpdatePropertyTypesOperation = dtos.UpdatePropertyTypesOperation;
this.UpdateVocabulariesOperation = dtos.UpdateVocabulariesOperation;
this.UpdateVocabularyTermsOperation = dtos.UpdateVocabularyTermsOperation;
this.UpdateExternalDmsOperation = dtos.UpdateExternalDmsOperation;
@@ -269,6 +271,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
this.DeleteDataSetsOperation = dtos.DeleteDataSetsOperation;
this.DeleteMaterialsOperation = dtos.DeleteMaterialsOperation;
this.DeleteExternalDmsOperation = dtos.DeleteExternalDmsOperation;
+ this.DeletePropertyTypesOperation = dtos.DeletePropertyTypesOperation;
this.DeleteVocabulariesOperation = dtos.DeleteVocabulariesOperation;
this.DeleteVocabularyTermsOperation = dtos.DeleteVocabularyTermsOperation;
this.DeleteEntityTypesOperation = dtos.DeleteEntityTypesOperation;
@@ -782,6 +785,13 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
return facade.deleteEntityTypes([ id ], options);
}.bind(this);
+ this.deletePropertyType = function(facade, id) {
+ var c = this;
+ var options = new dtos.PropertyTypeDeletionOptions();
+ options.setReason("test reason");
+ return facade.deletePropertyTypes([ id ], options);
+ }.bind(this);
+
this.deleteVocabulary = function(facade, id) {
var c = this;
var options = new dtos.VocabularyDeletionOptions();
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
index d4988a8c7eb68330c80975c02b400d20e731f437..46f96ac1a90af5d0ecb8c6a4141b500ad1c64143 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
@@ -429,6 +429,9 @@ var sources = [
'as/dto/property/create/PropertyTypeCreation',
'as/dto/property/create/CreatePropertyTypesOperation',
'as/dto/property/create/CreatePropertyTypesOperationResult',
+ 'as/dto/property/delete/DeletePropertyTypesOperation',
+ 'as/dto/property/delete/PropertyTypeDeletionOptions',
+ 'as/dto/property/delete/DeletePropertyTypesOperationResult',
'as/dto/property/get/GetPropertyTypesOperation',
'as/dto/property/get/GetPropertyTypesOperationResult',
'as/dto/property/id/PropertyTypePermId',
@@ -444,6 +447,9 @@ var sources = [
'as/dto/property/search/SearchPropertyTypesOperationResult',
'as/dto/property/search/SearchPropertyAssignmentsOperation',
'as/dto/property/search/SearchPropertyAssignmentsOperationResult',
+ 'as/dto/property/update/PropertyTypeUpdate',
+ 'as/dto/property/update/UpdatePropertyTypesOperation',
+ 'as/dto/property/update/UpdatePropertyTypesOperationResult',
'as/dto/property/DataType',
'as/dto/property/PropertyAssignment',
'as/dto/property/PropertyType',
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js
index 5668c4070c021a96584cdbaa9ddf5f62340e2d28..cdf49ef76ee3359b1f6662bb0a94e7a2c2063a2c 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js
@@ -205,6 +205,10 @@ define([ 'jquery', 'openbis', 'test/common' ], function($, openbis, common) {
return this._executeUpdateOperation(new c.UpdateVocabulariesOperation(updates));
}
+ this.updatePropertyTypes = function(updates) {
+ return this._executeUpdateOperation(new c.UpdatePropertyTypesOperation(updates));
+ }
+
this.updateVocabularyTerms = function(updates) {
return this._executeUpdateOperation(new c.UpdateVocabularyTermsOperation(updates));
}
@@ -425,6 +429,10 @@ define([ 'jquery', 'openbis', 'test/common' ], function($, openbis, common) {
return this._executeDeleteOperation(new c.DeleteExternalDmsOperation(ids, deletionOptions));
}
+ this.deletePropertyTypes = function(ids, deletionOptions) {
+ return this._executeDeleteOperation(new c.DeletePropertyTypesOperation(ids, deletionOptions));
+ }
+
this.deleteVocabularies = function(ids, deletionOptions) {
return this._executeDeleteOperation(new c.DeleteVocabulariesOperation(ids, deletionOptions));
}
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
index fb9a6faa84a93f856b8830718fa9156412608f1a..4625699d9573a0166a56bc0c11f3cbd27588715c 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
@@ -633,7 +633,7 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
var fCreate = function(facade) {
var personCreation = new c.PersonCreation();
personCreation.setUserId(userId);
- personCreation.setHomeSpaceId(new c.SpacePermId("TEST"))
+ personCreation.setSpaceId(new c.SpacePermId("TEST"))
return facade.createPersons([ personCreation ]);
}
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
index 60c87f7035dee4a1cee0331485771b64185ea1db..2e7bfcc708fe5fb6da4c3a31ac8907cd3aa84c4f 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
@@ -216,6 +216,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
testDeleteWithoutTrash(c, c.createMaterial, c.findMaterial, c.deleteMaterial);
});
+ QUnit.test("deletePropertyTypes()", function(assert) {
+ var c = new common(assert, openbis);
+ testDeleteWithoutTrash(c, c.createPropertyType, c.findPropertyType, c.deletePropertyType);
+ });
+
QUnit.test("deleteVocabularies()", function(assert) {
var c = new common(assert, openbis);
testDeleteWithoutTrash(c, c.createVocabulary, c.findVocabulary, c.deleteVocabulary);
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js
index a84aebb8780f162ab1ccc7f243ceba7ea1c85e12..e5db760f8a3fc0eec817cc532030a0c31685cdce 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js
@@ -705,17 +705,49 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
testUpdate(c, fCreate, fUpdate, c.findMaterial, fCheck);
});
+ QUnit.test("updatePropertyTypes()", function(assert) {
+ var c = new common(assert, openbis);
+ var code = c.generateId("PROPERTY_TYPE");
+ var description = "Description of " + code;
+ var label = "Label of " + code;
+
+ var fCreate = function(facade) {
+ var creation = new c.PropertyTypeCreation();
+ creation.setCode(code);
+ creation.setLabel("Testing");
+ creation.setDescription("testing");
+ creation.setDataType(c.DataType.VARCHAR);
+ return facade.createPropertyTypes([ creation ]);
+ }
+
+ var fUpdate = function(facade, permId) {
+ var update = new c.PropertyTypeUpdate();
+ update.setTypeId(new c.PropertyTypePermId(code));
+ update.setDescription(description);
+ update.setLabel(label);
+ return facade.updatePropertyTypes([ update ]);
+ }
+
+ var fCheck = function(propertyType) {
+ c.assertEqual(propertyType.getCode(), code, "Code");
+ c.assertEqual(propertyType.getDescription(), description, "Description");
+ c.assertEqual(propertyType.getLabel(), label, "Label");
+ }
+
+ testUpdate(c, fCreate, fUpdate, c.findPropertyType, fCheck);
+ });
+
QUnit.test("updateVocabularies()", function(assert) {
var c = new common(assert, openbis);
var code = c.generateId("VOCABULARY");
var description = "Description of " + code;
-
+
var fCreate = function(facade) {
var creation = new c.VocabularyCreation();
creation.setCode(code);
return facade.createVocabularies([ creation ]);
}
-
+
var fUpdate = function(facade, permId) {
var update = new c.VocabularyUpdate();
update.setVocabularyId(permId);
@@ -724,14 +756,14 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
update.setUrlTemplate("https://www.ethz.ch")
return facade.updateVocabularies([ update ]);
}
-
+
var fCheck = function(vocabulary) {
c.assertEqual(vocabulary.getCode(), code, "Code");
c.assertEqual(vocabulary.getPermId().getPermId(), code, "Perm id");
c.assertEqual(vocabulary.getDescription(), description, "Description");
c.assertEqual(vocabulary.getUrlTemplate(), "https://www.ethz.ch", "URL template");
}
-
+
testUpdate(c, fCreate, fUpdate, c.findVocabulary, fCheck);
});
@@ -876,7 +908,7 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
var fUpdate = function(facade, permId) {
var update = new c.PersonUpdate();
update.setUserId(permId);
- update.setHomeSpaceId(new c.SpacePermId("TEST"))
+ update.setSpaceId(new c.SpacePermId("TEST"))
return facade.updatePersons([ update ]);
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
index 066fe6346b9627d19bd1095e0a97933635586c17..0e2efb9ef0921c9412c4f9e2eea2fa440734e003 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
@@ -223,6 +223,8 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.CreatePropertyTypesOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.CreatePropertyTypesOperationResult;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.DeletePropertyTypesOperation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyAssignmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.get.GetPropertyTypesOperation;
@@ -235,6 +237,8 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.SearchPropertyAs
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.SearchPropertyAssignmentsOperationResult;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.SearchPropertyTypesOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.SearchPropertyTypesOperationResult;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.UpdatePropertyTypesOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.RoleAssignment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.CreateRoleAssignmentsOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.CreateRoleAssignmentsOperationResult;
@@ -658,6 +662,12 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
executeOperation(sessionToken, new UpdateDataSetTypesOperation(dataSetTypeUpdates));
}
+ @Override
+ public void updatePropertyTypes(String sessionToken, List<PropertyTypeUpdate> propertyTypeUpdates)
+ {
+ executeOperation(sessionToken, new UpdatePropertyTypesOperation(propertyTypeUpdates));
+ }
+
@Override
public void updateVocabularies(String sessionToken, List<VocabularyUpdate> vocabularyUpdates)
{
@@ -1057,6 +1067,12 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
executeOperation(sessionToken, new DeleteMaterialsOperation(materialIds, deletionOptions));
}
+ @Override
+ public void deletePropertyTypes(String sessionToken, List<? extends IPropertyTypeId> propertyTypeIds, PropertyTypeDeletionOptions deletionOptions)
+ {
+ executeOperation(sessionToken, new DeletePropertyTypesOperation(propertyTypeIds, deletionOptions));
+ }
+
@Override
public void deleteVocabularies(String sessionToken, List<? extends IVocabularyId> ids, VocabularyDeletionOptions deletionOptions)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
index 7aa5e6ba88544cbbe6ebc671fa982a9b5df855a4..5366296fc3e84e67c9442ee5c0a13f39b01fc420 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
@@ -121,12 +121,14 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.update.ProjectUpdate;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyAssignmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.PropertyAssignmentSearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.PropertyTypeSearchCriteria;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.RoleAssignment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.delete.RoleAssignmentDeletionOptions;
@@ -436,6 +438,12 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements
logAccess(sessionToken, "update-material-types", "MATERIAL_TYPE_UPDATES(%s)", abbreviate(materialTypeUpdates));
}
+ @Override
+ public void updatePropertyTypes(String sessionToken, List<PropertyTypeUpdate> propertyTypeUpdates)
+ {
+ logAccess(sessionToken, "update-property_types", "PROPERTY_TYPE_UPDATES(%s)", abbreviate(propertyTypeUpdates));
+ }
+
@Override
public void updateVocabularies(String sessionToken, List<VocabularyUpdate> vocabularyUpdates)
{
@@ -753,6 +761,12 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements
logAccess(sessionToken, "delete-materials", "MATERIAL_IDS(%s) DELETION_OPTIONS(%s)", abbreviate(materialIds), deletionOptions);
}
+ @Override
+ public void deletePropertyTypes(String sessionToken, List<? extends IPropertyTypeId> propertyTypeIds, PropertyTypeDeletionOptions deletionOptions)
+ {
+ logAccess(sessionToken, "delete-property-types", "PROPERTY_TYPES_IDS(%s) DELETION_OPTIONS(%s)", abbreviate(propertyTypeIds), deletionOptions);
+ }
+
@Override
public void deleteVocabularies(String sessionToken, List<? extends IVocabularyId> ids, VocabularyDeletionOptions deletionOptions)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
index 684a413662019b0db4e154ab79a7179d164de4d7..b6dce6196377a1bd4fb6ce9576ea052e521ba7fd 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.FieldUpdateValue;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.IUpdate;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.ObjectNotFoundException;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.UnauthorizedObjectAccessException;
@@ -216,6 +217,12 @@ public abstract class AbstractUpdateEntityExecutor<UPDATE extends IUpdate, PE ex
entry.setValue(idToEntityMap.get(entry.getValue().getId()));
}
}
+
+ protected <T> T getNewValue(FieldUpdateValue<T> fieldUpdateValue, T currentValue)
+ {
+ return fieldUpdateValue != null && fieldUpdateValue.isModified() ? fieldUpdateValue.getValue() : currentValue;
+ }
+
protected abstract ID getId(UPDATE update);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java
index 662c18b6cb6d2b4f060a57bbc2c0292d16f6d200..4c512c9b56fd12095ba5e21301b5b52b4a2b3ba4 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java
@@ -88,9 +88,11 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.project.IGetProjects
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.project.ISearchProjectsOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.project.IUpdateProjectsOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.ICreatePropertyTypesOperationExecutor;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IDeletePropertyTypesOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IGetPropertyTypesOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.ISearchPropertyAssignmentsOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.ISearchPropertyTypesOperationExecutor;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IUpdatePropertyTypesOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment.ICreateRoleAssignmentsOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment.IDeleteRoleAssignmentsOperationExecutor;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment.IGetRoleAssignmentsOperationExecutor;
@@ -178,8 +180,11 @@ public class OperationsExecutor implements IOperationsExecutor
private IDeleteEntityTypeOperationExecutor deleteEntityTypesExecutor;
@Autowired
- private IDeleteVocabulariesOperationExecutor deleteVocabulariesExecutor;
+ private IDeletePropertyTypesOperationExecutor deletePropertyTypesExecutor;
+ @Autowired
+ private IDeleteVocabulariesOperationExecutor deleteVocabulariesExecutor;
+
@Autowired
private IDeleteVocabularyTermsOperationExecutor deleteVocabularyTermsExecutor;
@@ -287,6 +292,9 @@ public class OperationsExecutor implements IOperationsExecutor
@Autowired
private IUpdateExternalDmsOperationExecutor updateExternalDmsExecutor;
+
+ @Autowired
+ private IUpdatePropertyTypesOperationExecutor updatePropertyTypesExecutor;
@Autowired
private IUpdateVocabulariesOperationExecutor updateVocabulariesExecutor;
@@ -574,6 +582,7 @@ public class OperationsExecutor implements IOperationsExecutor
resultMap.putAll(updateSemanticAnnotationsExecutor.execute(context, operations));
resultMap.putAll(updateOperationExecutionsExecutor.execute(context, operations));
resultMap.putAll(updateVocabulariesExecutor.execute(context, operations));
+ resultMap.putAll(updatePropertyTypesExecutor.execute(context, operations));
resultMap.putAll(updateVocabularyTermsExecutor.execute(context, operations));
resultMap.putAll(updateMaterialTypesExecutor.execute(context, operations));
resultMap.putAll(updateExperimentTypesExecutor.execute(context, operations));
@@ -630,6 +639,7 @@ public class OperationsExecutor implements IOperationsExecutor
resultMap.putAll(deleteRoleAssignmentsExecutor.execute(context, operations));
resultMap.putAll(deleteAuthorizationGroupsExecutor.execute(context, operations));
resultMap.putAll(deleteEntityTypesExecutor.execute(context, operations));
+ resultMap.putAll(deletePropertyTypesExecutor.execute(context, operations));
resultMap.putAll(deleteVocabularyTermsExecutor.execute(context, operations));
resultMap.putAll(deleteVocabulariesExecutor.execute(context, operations));
resultMap.putAll(deleteOperationExecutionsExecutor.execute(context, operations));
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java
index 61730e511b14e9a58f1275c8c6d35e64026ec7a4..ebafca8ce924352bfa2cd90fe19fd951e5a925e8 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java
@@ -50,7 +50,7 @@ public class SetPersonSpaceExecutor
@Override
protected ISpaceId getRelatedId(PersonCreation creation)
{
- return creation.getHomeSpaceId();
+ return creation.getSpaceId();
}
@Override
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java
index 3d4220b7426440641e970e81ed8db6d23eaecab1..a436855d4416dfa480312823e9fcd630111748e2 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java
@@ -69,7 +69,7 @@ public class UpdateHomeSpaceExecutor
@Override
protected FieldUpdateValue<ISpaceId> getRelatedUpdate(PersonUpdate update)
{
- return update.getHomeSpaceId();
+ return update.getSpaceId();
}
@Override
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e004b1c18e1339e90749a2cfd326aeb8ee9e470
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.AbstractDeleteEntityExecutor;
+import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.IPropertyTypeBO;
+import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
+
+/**
+ * @author Franz-Josef Elmer
+ */
+@Component
+public class DeletePropertyTypeExecutor
+ extends AbstractDeleteEntityExecutor<Void, IPropertyTypeId, PropertyTypePE, PropertyTypeDeletionOptions>
+ implements IDeletePropertyTypeExecutor
+{
+ @Resource(name = ComponentNames.COMMON_BUSINESS_OBJECT_FACTORY)
+ private ICommonBusinessObjectFactory businessObjectFactory;
+
+ @Autowired
+ private IPropertyTypeAuthorizationExecutor authorizationExecutor;
+
+ @Autowired
+ private IMapPropertyTypeByIdExecutor mapPropertyTypeByIdExeceutor;
+
+ @Override
+ protected Map<IPropertyTypeId, PropertyTypePE> map(IOperationContext context, List<? extends IPropertyTypeId> entityIds)
+ {
+ return mapPropertyTypeByIdExeceutor.map(context, entityIds);
+ }
+
+ @Override
+ protected void checkAccess(IOperationContext context, IPropertyTypeId entityId, PropertyTypePE entity)
+ {
+ authorizationExecutor.canDelete(context, entityId, entity);
+ }
+
+ @Override
+ protected void updateModificationDateAndModifier(IOperationContext context, PropertyTypePE entity)
+ {
+ }
+
+ @Override
+ protected Void delete(IOperationContext context, Collection<PropertyTypePE> entities, PropertyTypeDeletionOptions deletionOptions)
+ {
+ IPropertyTypeBO propertyTypeBO = businessObjectFactory.createPropertyTypeBO(context.getSession());
+ String reason = deletionOptions.getReason();
+ for (PropertyTypePE propertyType : entities)
+ {
+ propertyTypeBO.deleteByTechId(new TechId(propertyType.getId()), reason);
+ }
+ return null;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..996f9abe8ddb44a320922b88e638767318085ae1
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsOperation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsOperationResult;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.DeletePropertyTypesOperation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.DeletePropertyTypesOperationResult;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.DeleteObjectsOperationExecutor;
+
+/**
+ * @author Franz-Josef Elmer
+ */
+@Component
+public class DeletePropertyTypesOperationExecutor
+ extends DeleteObjectsOperationExecutor<IPropertyTypeId, PropertyTypeDeletionOptions>
+ implements IDeletePropertyTypesOperationExecutor
+{
+ @Autowired
+ private IDeletePropertyTypeExecutor exeutor;
+
+ @Override
+ protected Class<? extends DeleteObjectsOperation<IPropertyTypeId, PropertyTypeDeletionOptions>> getOperationClass()
+ {
+ return DeletePropertyTypesOperation.class;
+ }
+
+ @Override
+ protected DeleteObjectsOperationResult doExecute(IOperationContext context,
+ DeleteObjectsOperation<IPropertyTypeId, PropertyTypeDeletionOptions> operation)
+ {
+ exeutor.delete(context, operation.getObjectIds(), operation.getOptions());
+ return new DeletePropertyTypesOperationResult();
+ }
+
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..262953cc2897d8de5707b50106da78aa2687cd87
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IDeleteEntityExecutor;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+public interface IDeletePropertyTypeExecutor extends IDeleteEntityExecutor<Void, IPropertyTypeId, PropertyTypeDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..736a4b3b7de54c0abbd83c964b9f3e560e5ed2ed
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+public interface IDeletePropertyTypesOperationExecutor extends IDeleteObjectsOperationExecutor
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java
index b148bd599f159af8e15e346cf52430c7b67c6466..576f6e79eac08dcc48e9b9f18fd3a0e8e0978768 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java
@@ -16,8 +16,10 @@
package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IObjectAuthorizationExecutor;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
/**
* @author pkupczyk
@@ -31,4 +33,8 @@ public interface IPropertyTypeAuthorizationExecutor extends IObjectAuthorization
void canCreate(IOperationContext context);
+ void canUpdate(IOperationContext context, IPropertyTypeId id, PropertyTypePE entity);
+
+ void canDelete(IOperationContext context, IPropertyTypeId entityId, PropertyTypePE entity);
+
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..b99b9747f6c43f91da7ac8af52500d3dcdba17f2
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IUpdateEntityExecutor;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+public interface IUpdatePropertyTypeExecutor extends IUpdateEntityExecutor<PropertyTypeUpdate, PropertyTypePermId>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d9a496a7092b6626c475fabab0790e3f26ca32f
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+public interface IUpdatePropertyTypesOperationExecutor extends IUpdateObjectsOperationExecutor
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java
index 163f86d9fae3adbe44ee7da7f57ca7581c55810d..76dfac204533a4b4777f385e1d60d1e9bcbe6e9c 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java
@@ -18,10 +18,12 @@ package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
import org.springframework.stereotype.Component;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.Capability;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
/**
* @author pkupczyk
@@ -51,4 +53,18 @@ public class PropertyTypeAuthorizationExecutor implements IPropertyTypeAuthoriza
{
}
+ @Override
+ @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @Capability("UPDATE_PROPERTY_TYPE")
+ public void canUpdate(IOperationContext context, IPropertyTypeId id, PropertyTypePE entity)
+ {
+ }
+
+ @Override
+ @RolesAllowed(RoleWithHierarchy.INSTANCE_ADMIN)
+ @Capability("DELETE_PROPERTY_TYPE")
+ public void canDelete(IOperationContext context, IPropertyTypeId entityId, PropertyTypePE entity)
+ {
+ }
+
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..deb11b335c0778ae009289e1e77ee7646fbe50ea
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.AbstractUpdateEntityExecutor;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.helper.common.batch.MapBatch;
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.DataAccessExceptionTranslator;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
+import ch.systemsx.cisd.openbis.generic.shared.util.XmlUtils;
+
+/**
+ * @author Franz-Josef Elmer
+ */
+@Component
+public class UpdatePropertyTypeExecutor
+ extends AbstractUpdateEntityExecutor<PropertyTypeUpdate, PropertyTypePE, IPropertyTypeId, PropertyTypePermId>
+ implements IUpdatePropertyTypeExecutor
+{
+ @Autowired
+ private IDAOFactory daoFactory;
+
+ @Autowired
+ private IMapPropertyTypeByIdExecutor mapPropertyTypeByIdExecutor;
+
+ @Autowired
+ private IPropertyTypeAuthorizationExecutor authorizationExecutor;
+
+ @Override
+ protected IPropertyTypeId getId(PropertyTypeUpdate update)
+ {
+ return update.getTypeId();
+ }
+
+ @Override
+ protected PropertyTypePermId getPermId(PropertyTypePE entity)
+ {
+ return new PropertyTypePermId(entity.getPermId());
+ }
+
+ @Override
+ protected void checkData(IOperationContext context, PropertyTypeUpdate update)
+ {
+ if (update.getTypeId() == null)
+ {
+ throw new UserFailureException("Property type id cannot be null.");
+ }
+ if (update.getLabel().isModified() && StringUtils.isEmpty(update.getLabel().getValue()))
+ {
+ throw new UserFailureException("Label cannot be empty.");
+ }
+ if (update.getDescription().isModified() && StringUtils.isEmpty(update.getDescription().getValue()))
+ {
+ throw new UserFailureException("Description cannot be empty.");
+ }
+ XmlUtils.validateXML(update.getSchema().getValue(), "XML Schema", XmlUtils.XML_SCHEMA_XSD_FILE_RESOURCE);
+ XmlUtils.validateXML(update.getTransformation().getValue(), "XSLT", XmlUtils.XSLT_XSD_FILE_RESOURCE);
+ }
+
+ @Override
+ protected void checkAccess(IOperationContext context, IPropertyTypeId id, PropertyTypePE entity)
+ {
+ authorizationExecutor.canUpdate(context, id, entity);
+ }
+
+ @Override
+ protected void updateBatch(IOperationContext context, MapBatch<PropertyTypeUpdate, PropertyTypePE> batch)
+ {
+ Set<Entry<PropertyTypeUpdate, PropertyTypePE>> entrySet = batch.getObjects().entrySet();
+ for (Entry<PropertyTypeUpdate, PropertyTypePE> entry : entrySet)
+ {
+ PropertyTypeUpdate update = entry.getKey();
+ PropertyTypePE propertyType = entry.getValue();
+ propertyType.setDescription(getNewValue(update.getDescription(), propertyType.getDescription()));
+ propertyType.setLabel(getNewValue(update.getLabel(), propertyType.getLabel()));
+ propertyType.setSchema(getNewValue(update.getSchema(), propertyType.getSchema()));
+ propertyType.setTransformation(getNewValue(update.getTransformation(), propertyType.getTransformation()));
+ }
+ }
+
+ @Override
+ protected void updateAll(IOperationContext context, MapBatch<PropertyTypeUpdate, PropertyTypePE> batch)
+ {
+ }
+
+ @Override
+ protected Map<IPropertyTypeId, PropertyTypePE> map(IOperationContext context, Collection<IPropertyTypeId> ids)
+ {
+ return mapPropertyTypeByIdExecutor.map(context, ids);
+ }
+
+ @Override
+ protected List<PropertyTypePE> list(IOperationContext context, Collection<Long> ids)
+ {
+ return daoFactory.getPropertyTypeDAO().listAllEntities();
+ }
+
+ @Override
+ protected void save(IOperationContext context, List<PropertyTypePE> entities, boolean clearCache)
+ {
+ for (PropertyTypePE propertyType : entities)
+ {
+ daoFactory.getPropertyTypeDAO().validateAndSaveUpdatedEntity(propertyType);
+ }
+ }
+
+ @Override
+ protected void handleException(DataAccessException e)
+ {
+ DataAccessExceptionTranslator.throwException(e, "property types", null);
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b7b5c579a9e8da1e444314bf5fb893670bd3c97
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.UpdateObjectsOperation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.UpdateObjectsOperationResult;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.UpdatePropertyTypesOperation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.UpdatePropertyTypesOperationResult;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.UpdateObjectsOperationExecutor;
+
+/**
+ * @author Franz-Josef Elmer
+ */
+@Component
+public class UpdatePropertyTypesOperationExecutor
+ extends UpdateObjectsOperationExecutor<PropertyTypeUpdate, IPropertyTypeId>
+ implements IUpdatePropertyTypesOperationExecutor
+{
+ @Autowired
+ private IUpdatePropertyTypeExecutor executor;
+
+ @Override
+ protected Class<? extends UpdateObjectsOperation<PropertyTypeUpdate>> getOperationClass()
+ {
+ return UpdatePropertyTypesOperation.class;
+ }
+
+ @Override
+ protected UpdateObjectsOperationResult<? extends IPropertyTypeId> doExecute(IOperationContext context,
+ UpdateObjectsOperation<PropertyTypeUpdate> operation)
+ {
+ return new UpdatePropertyTypesOperationResult(executor.update(context, operation.getUpdates()));
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java
index a975bbc53e93e5f3f73696102136ae4425d94501..a8b6e34a85039314979517904efbd7f31c487158 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java
@@ -26,5 +26,4 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IUpdateEntity
*/
public interface IUpdateVocabularyExecutor extends IUpdateEntityExecutor<VocabularyUpdate, VocabularyPermId>
{
-
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java
index 79b1a700fa16ba089c37d26d3cedf5b33d69576f..d3a3b5e8fa2c214ee933c4bfbcae4bdfde9cdeea 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java
@@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Component;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.FieldUpdateValue;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.IVocabularyId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.VocabularyPermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.update.VocabularyUpdate;
@@ -96,11 +95,6 @@ public class UpdateVocabularyExecutor
}
}
- private <T> T getNewValue(FieldUpdateValue<T> fieldUpdateValue, T currentValue)
- {
- return fieldUpdateValue != null && fieldUpdateValue.isModified() ? fieldUpdateValue.getValue() : currentValue;
- }
-
@Override
protected void updateAll(IOperationContext context, MapBatch<VocabularyUpdate, VocabularyPE> batch)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java
index 1324a52cd5c29f2b31e1a4874117c844fa494e43..37d75e0c22b4dc5960ddb48f3c9d3bc5e76c2b10 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java
@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.collection.UnmodifiableSetDecorator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentityHolder;
/**
* Persistence entity representing property type.
@@ -60,7 +61,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
{ @UniqueConstraint(columnNames =
{ ColumnNames.CODE_COLUMN, ColumnNames.IS_INTERNAL_NAMESPACE }) })
public final class PropertyTypePE extends HibernateAbstractRegistrationHolder implements
- Comparable<PropertyTypePE>, IIdAndCodeHolder
+ Comparable<PropertyTypePE>, IIdAndCodeHolder, IIdentityHolder
{
public static final PropertyTypePE[] EMPTY_ARRAY = new PropertyTypePE[0];
@@ -170,6 +171,20 @@ public final class PropertyTypePE extends HibernateAbstractRegistrationHolder im
return CodeConverter.tryToBusinessLayer(getSimpleCode(), isInternalNamespace());
}
+ @Override
+ @Transient
+ public String getIdentifier()
+ {
+ return getCode();
+ }
+
+ @Override
+ @Transient
+ public String getPermId()
+ {
+ return getCode();
+ }
+
@NotNull(message = ValidationMessages.DATA_TYPE_NOT_NULL_MESSAGE)
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = ColumnNames.DATA_TYPE_COLUMN, updatable = false)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/create/PersonCreation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/create/PersonCreation.js
index 3f265a0157783d76f5bea3114ab8b4c9118f1dfb..6ec8e4d76492d7dcdf2471201dac3ffcd5a22307 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/create/PersonCreation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/create/PersonCreation.js
@@ -5,7 +5,7 @@ define([ "stjs" ], function(stjs) {
prototype['@type'] = 'as.dto.person.create.PersonCreation';
constructor.serialVersionUID = 1;
prototype.userId = null;
- prototype.homeSpaceId = null;
+ prototype.spaceId = null;
prototype.getUserId = function() {
return this.userId;
@@ -13,11 +13,11 @@ define([ "stjs" ], function(stjs) {
prototype.setUserId = function(userId) {
this.userId = userId;
};
- prototype.getHomeSpaceId = function() {
- return this.homeSpaceId;
+ prototype.getSpaceId = function() {
+ return this.spaceId;
};
- prototype.setHomeSpaceId = function(spaceId) {
- this.homeSpaceId = spaceId;
+ prototype.setSpaceId = function(spaceId) {
+ this.spaceId = spaceId;
};
}, {
});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/update/PersonUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/update/PersonUpdate.js
index bb4fc30f72b90a190356abd80ae122d9ead0679a..4e651fe6d51e50057f738235d9e5598653c2b2ec 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/update/PersonUpdate.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/update/PersonUpdate.js
@@ -1,12 +1,12 @@
define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/IdListUpdateValue" ], function(stjs, FieldUpdateValue, IdListUpdateValue) {
var PersonUpdate = function() {
- this.homeSpaceId = new FieldUpdateValue();
+ this.spaceId = new FieldUpdateValue();
};
stjs.extend(PersonUpdate, null, [], function(constructor, prototype) {
prototype['@type'] = 'as.dto.person.update.PersonUpdate';
constructor.serialVersionUID = 1;
prototype.userId = null;
- prototype.homeSpaceId = null;
+ prototype.spaceId = null;
prototype.active = true;
prototype.getObjectId = function() {
@@ -18,11 +18,11 @@ define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/
prototype.setUserId = function(userId) {
this.userId = userId;
};
- prototype.getHomeSpaceId = function() {
- return this.homeSpaceId;
+ prototype.getSpaceId = function() {
+ return this.spaceId;
};
- prototype.setHomeSpaceId = function(spaceId) {
- this.homeSpaceId.setValue(spaceId);
+ prototype.setSpaceId = function(spaceId) {
+ this.spaceId.setValue(spaceId);
};
prototype.isActive = function() {
return this.active;
@@ -32,7 +32,7 @@ define([ "stjs", "as/dto/common/update/FieldUpdateValue", "as/dto/common/update/
};
}, {
userId : "IPersonId",
- homeSpaceId : {
+ spaceId : {
name : "FieldUpdateValue",
arguments : [ "ISpaceId" ]
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/DeletePropertyTypesOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/DeletePropertyTypesOperation.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a569385513e3295b167973d9f24b3a5501ef4ba
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/DeletePropertyTypesOperation.js
@@ -0,0 +1,12 @@
+define([ "stjs", "as/dto/common/delete/DeleteObjectsOperation" ], function(stjs, DeleteObjectsOperation) {
+ var DeletePropertyTypesOperation = function(objectIds, options) {
+ DeleteObjectsOperation.call(this, objectIds, options);
+ };
+ stjs.extend(DeletePropertyTypesOperation, DeleteObjectsOperation, [ DeleteObjectsOperation ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.property.delete.DeletePropertyTypesOperation';
+ prototype.getMessage = function() {
+ return "DeletePropertyTypesOperation";
+ };
+ }, {});
+ return DeletePropertyTypesOperation;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/DeletePropertyTypesOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/DeletePropertyTypesOperationResult.js
new file mode 100644
index 0000000000000000000000000000000000000000..2960d5e1e13d66f8dad30e5f6e8aa92a55544ee1
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/DeletePropertyTypesOperationResult.js
@@ -0,0 +1,12 @@
+define([ "stjs", "as/dto/common/delete/DeleteObjectsWithoutTrashOperationResult" ], function(stjs, DeleteObjectsWithoutTrashOperationResult) {
+ var DeletePropertyTypesOperationResult = function() {
+ DeleteObjectsWithoutTrashOperationResult.call(this);
+ };
+ stjs.extend(DeletePropertyTypesOperationResult, DeleteObjectsWithoutTrashOperationResult, [ DeleteObjectsWithoutTrashOperationResult ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.property.delete.DeletePropertyTypesOperationResult';
+ prototype.getMessage = function() {
+ return "DeletePropertyTypesOperationResult";
+ };
+ }, {});
+ return DeletePropertyTypesOperationResult;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/PropertyTypeDeletionOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/PropertyTypeDeletionOptions.js
new file mode 100644
index 0000000000000000000000000000000000000000..2340ec4af9d9e6e3ebb8d8c2b06a50cabe338f3d
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/delete/PropertyTypeDeletionOptions.js
@@ -0,0 +1,10 @@
+define([ "stjs", "as/dto/deletion/AbstractObjectDeletionOptions" ], function(stjs, AbstractObjectDeletionOptions) {
+ var PropertyTypeDeletionOptions = function() {
+ AbstractObjectDeletionOptions.call(this);
+ };
+ stjs.extend(PropertyTypeDeletionOptions, AbstractObjectDeletionOptions, [ AbstractObjectDeletionOptions ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.property.delete.PropertyTypeDeletionOptions';
+ constructor.serialVersionUID = 1;
+ }, {});
+ return PropertyTypeDeletionOptions;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/PropertyTypeUpdate.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/PropertyTypeUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b84f287d917780d732d03d667e89e01a8a59945
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/PropertyTypeUpdate.js
@@ -0,0 +1,54 @@
+define([ "stjs", "as/dto/common/update/FieldUpdateValue" ], function(stjs, FieldUpdateValue) {
+ var PropertyTypeUpdate = function() {
+ this.label = new FieldUpdateValue();
+ this.description = new FieldUpdateValue();
+ this.schema = new FieldUpdateValue();
+ this.transformation = new FieldUpdateValue();
+ };
+ stjs.extend(PropertyTypeUpdate, null, [], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.property.update.PropertyTypeUpdate';
+ constructor.serialVersionUID = 1;
+ prototype.typeId = null;
+ prototype.label = null;
+ prototype.description = null;
+ prototype.schema = null;
+ prototype.transformation = null;
+
+ prototype.getObjectId = function() {
+ return this.getTypeId();
+ };
+ prototype.getTypeId = function() {
+ return this.typeId;
+ };
+ prototype.setTypeId = function(typeId) {
+ this.typeId = typeId;
+ };
+ prototype.getLabel = function() {
+ return this.label;
+ };
+ prototype.setLabel = function(label) {
+ this.label.setValue(label);
+ };
+ prototype.getDescription = function() {
+ return this.description;
+ };
+ prototype.setDescription = function(description) {
+ this.description.setValue(description);
+ };
+ prototype.getSchema = function() {
+ return this.schema;
+ };
+ prototype.setSchema = function(schema) {
+ this.schema.setValue(schema);
+ };
+ prototype.getTransformation = function() {
+ return this.transformation;
+ };
+ prototype.setTransformation = function(transformation) {
+ this.transformation.setValue(transformation);
+ };
+ }, {
+ typeId : "IPropertyTypeId"
+ });
+ return PropertyTypeUpdate;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/UpdatePropertyTypesOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/UpdatePropertyTypesOperation.js
new file mode 100644
index 0000000000000000000000000000000000000000..c10de1f330528058ca0062dccc2a781e02c1c788
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/UpdatePropertyTypesOperation.js
@@ -0,0 +1,12 @@
+define([ "stjs", "as/dto/common/update/UpdateObjectsOperation" ], function(stjs, UpdateObjectsOperation) {
+ var UpdatePropertyTypesOperation = function(updates) {
+ UpdateObjectsOperation.call(this, updates);
+ };
+ stjs.extend(UpdatePropertyTypesOperation, UpdateObjectsOperation, [ UpdateObjectsOperation ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.property.update.UpdatePropertyTypesOperation';
+ prototype.getMessage = function() {
+ return "UpdatePropertyTypesOperation";
+ };
+ }, {});
+ return UpdatePropertyTypesOperation;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/UpdatePropertyTypesOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/UpdatePropertyTypesOperationResult.js
new file mode 100644
index 0000000000000000000000000000000000000000..1681b61c4faf779162f596febaa0f3e0ba19e6f2
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/property/update/UpdatePropertyTypesOperationResult.js
@@ -0,0 +1,12 @@
+define([ "stjs", "as/dto/common/update/UpdateObjectsOperationResult" ], function(stjs, UpdateObjectsOperationResult) {
+ var UpdatePropertyTypesOperationResult = function(objectIds) {
+ UpdateObjectsOperationResult.call(this, objectIds);
+ };
+ stjs.extend(UpdatePropertyTypesOperationResult, UpdateObjectsOperationResult, [ UpdateObjectsOperationResult ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.property.update.UpdatePropertyTypesOperationResult';
+ prototype.getMessage = function() {
+ return "UpdatePropertyTypesOperationResult";
+ };
+ }, {});
+ return UpdatePropertyTypesOperationResult;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
index 58d75083fe395e7451e85d035c5f025c210f36d2..7d927f9e88a4a4b8ed095f8def9f8a934ba8630a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
@@ -751,6 +751,17 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
});
}
+ this.updatePropertyTypes = function(updates) {
+ var thisFacade = this;
+ return thisFacade._private.ajaxRequest({
+ url : openbisUrl,
+ data : {
+ "method" : "updatePropertyTypes",
+ "params" : [ thisFacade._private.sessionToken, updates ]
+ }
+ });
+ }
+
this.updateVocabularies = function(updates) {
var thisFacade = this;
return thisFacade._private.ajaxRequest({
@@ -761,7 +772,7 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
}
});
}
-
+
this.updateVocabularyTerms = function(updates) {
var thisFacade = this;
return thisFacade._private.ajaxRequest({
@@ -1448,6 +1459,17 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
});
}
+ this.deletePropertyTypes = function(ids, deletionOptions) {
+ var thisFacade = this;
+ return thisFacade._private.ajaxRequest({
+ url : openbisUrl,
+ data : {
+ "method" : "deletePropertyTypes",
+ "params" : [ thisFacade._private.sessionToken, ids, deletionOptions ]
+ }
+ });
+ }
+
this.deleteVocabularies = function(ids, deletionOptions) {
var thisFacade = this;
return thisFacade._private.ajaxRequest({
@@ -1458,7 +1480,7 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
}
});
}
-
+
this.deleteVocabularyTerms = function(ids, deletionOptions) {
var thisFacade = this;
return thisFacade._private.ajaxRequest({
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java
index 15343e8befa7e20fd438e7854247b4a5c997c2ef..d17adfc9e9fe22d457ee4b5c68a2c78236307ea6 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java
@@ -45,7 +45,7 @@ public class CreatePersonTest extends AbstractTest
String sessionToken = v3api.login(TEST_USER, PASSWORD);
PersonCreation personCreation = new PersonCreation();
personCreation.setUserId("user-" + System.currentTimeMillis());
- personCreation.setHomeSpaceId(new SpacePermId("CISD"));
+ personCreation.setSpaceId(new SpacePermId("CISD"));
// When
List<PersonPermId> persons = v3api.createPersons(sessionToken, Arrays.asList(personCreation));
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
index d5029c637895f5bc3e79f7fe8cd806b54e53e063..b169c76a151ac131a49a5a1781acc4132747fbe8 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
@@ -79,7 +79,7 @@ public class CreatePropertyTypeTest extends AbstractTest
+ "</xsl:template>\n "
+ "</xsl:stylesheet>";
- private static String EXAMPLE_INCORRECT_XSLT = EXAMPLE_XSLT.replaceAll("xsl:stylesheet",
+ static String EXAMPLE_INCORRECT_XSLT = EXAMPLE_XSLT.replaceAll("xsl:stylesheet",
"xsl:styleshet");
@Test
@@ -117,7 +117,7 @@ public class CreatePropertyTypeTest extends AbstractTest
v3api.logout(sessionToken);
}
- @Test
+ @Test(groups = "broken")
public void testCreateXmlPropertyType()
{
// Given
@@ -362,7 +362,7 @@ public class CreatePropertyTypeTest extends AbstractTest
assertUserFailureException(creation, "isn't a well formed XML document. Content is not allowed in prolog.");
}
- @Test
+ @Test(groups = "broken")
public void testInvalidTransformation()
{
PropertyTypeCreation creation = createBasic();
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..48c274cb2734e98ac125d5abcf28be49309fc32d
--- /dev/null
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.systemtest.asapi.v3;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.DataType;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyTypeFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete.VocabularyDeletionOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.VocabularyPermId;
+import ch.systemsx.cisd.common.action.IDelegatedAction;
+
+/**
+ * @author Franz-Josef Elmer
+ */
+public class DeletePropertyTypesTest extends AbstractTest
+{
+ @Test
+ public void testDeletion()
+ {
+ // Given
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ PropertyTypePermId id = createAPropertyType(sessionToken);
+ PropertyTypeDeletionOptions deletionOptions = new PropertyTypeDeletionOptions();
+ deletionOptions.setReason("testing property type deletion");
+
+ // When
+ v3api.deletePropertyTypes(sessionToken, Arrays.asList(id), deletionOptions);
+
+ // Then
+ PropertyTypeFetchOptions fetchOptions = new PropertyTypeFetchOptions();
+ Map<IPropertyTypeId, PropertyType> result = v3api.getPropertyTypes(sessionToken, Arrays.asList(id), fetchOptions);
+ assertEquals(result.size(), 0);
+ v3api.logout(sessionToken);
+ }
+
+ @Test
+ public void testDeleteUsedPropertyTyerm()
+ {
+ // Given
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ PropertyTypeDeletionOptions deletionOptions = new PropertyTypeDeletionOptions();
+ deletionOptions.setReason("test");
+ PropertyTypePermId id = new PropertyTypePermId("COMMENT");
+
+ assertUserFailureException(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ // When
+ v3api.deletePropertyTypes(sessionToken, Arrays.asList(id), deletionOptions);
+ }
+ },
+ // Then
+ "Property Type 'COMMENT' is being used. Delete all connected data first.");
+
+ v3api.logout(sessionToken);
+ }
+
+ @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = ".*Deletion reason cannot be null.*")
+ public void testDeleteWithoutReason()
+ {
+ // Given
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ PropertyTypePermId id = createAPropertyType(sessionToken);
+ PropertyTypeDeletionOptions deletionOptions = new PropertyTypeDeletionOptions();
+
+ // When
+ v3api.deletePropertyTypes(sessionToken, Arrays.asList(id), deletionOptions);
+
+ // Then, see method annotation
+ }
+
+ @Test(dataProvider = "usersNotAllowedToDeletePropertyTypes")
+ public void testDeleteWithUserCausingAuthorizationFailure(final String user)
+ {
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ PropertyTypePermId id = createAPropertyType(sessionToken);
+ v3api.logout(sessionToken);
+ assertUnauthorizedObjectAccessException(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ String sessionToken = v3api.login(user, PASSWORD);
+ PropertyTypeDeletionOptions deletionOptions = new PropertyTypeDeletionOptions();
+ deletionOptions.setReason("test");
+ v3api.deletePropertyTypes(sessionToken, Arrays.asList(id), deletionOptions);
+ }
+ }, id);
+ }
+
+ @DataProvider
+ Object[][] usersNotAllowedToDeletePropertyTypes()
+ {
+ return createTestUsersProvider(TEST_GROUP_ADMIN, TEST_GROUP_OBSERVER, TEST_GROUP_POWERUSER,
+ TEST_INSTANCE_OBSERVER, TEST_OBSERVER_CISD, TEST_POWER_USER_CISD, TEST_SPACE_USER);
+ }
+
+ private PropertyTypePermId createAPropertyType(String sessionToken)
+ {
+ PropertyTypeCreation creation = new PropertyTypeCreation();
+ creation.setCode("TYPE-" + System.currentTimeMillis());
+ creation.setDataType(DataType.VARCHAR);
+ creation.setLabel("label");
+ creation.setDescription("description");
+ return v3api.createPropertyTypes(sessionToken, Arrays.asList(creation)).get(0);
+ }
+
+}
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java
index 30682e9a949e3b8993f86145e996fd2dd7d6c90b..40e07ba9fe9eda4f4f96603b036c1cf6aeb60bc0 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java
@@ -47,7 +47,7 @@ public class UpdatePersonTest extends AbstractTest
PersonUpdate personUpdate = new PersonUpdate();
PersonPermId personId = new PersonPermId("homeless");
personUpdate.setUserId(personId);
- personUpdate.setHomeSpaceId(new SpacePermId("TEST-SPACE"));
+ personUpdate.setSpaceId(new SpacePermId("TEST-SPACE"));
assertUserFailureException(new IDelegatedAction()
{
@@ -69,7 +69,7 @@ public class UpdatePersonTest extends AbstractTest
PersonUpdate personUpdate = new PersonUpdate();
PersonPermId personId = new PersonPermId("homeless");
personUpdate.setUserId(personId);
- personUpdate.setHomeSpaceId(new SpacePermId("TESTGROUP"));
+ personUpdate.setSpaceId(new SpacePermId("TESTGROUP"));
// When
v3api.updatePersons(sessionToken, Arrays.asList(personUpdate));
@@ -90,7 +90,7 @@ public class UpdatePersonTest extends AbstractTest
PersonUpdate personUpdate = new PersonUpdate();
PersonPermId personId = new PersonPermId("homeless");
personUpdate.setUserId(personId);
- personUpdate.setHomeSpaceId(new SpacePermId("CISD"));
+ personUpdate.setSpaceId(new SpacePermId("CISD"));
assertAuthorizationFailureException(new IDelegatedAction()
{
@@ -109,7 +109,7 @@ public class UpdatePersonTest extends AbstractTest
// Given
String sessionToken = v3api.login(TEST_GROUP_OBSERVER, PASSWORD);
PersonUpdate personUpdate = new PersonUpdate();
- personUpdate.setHomeSpaceId(new SpacePermId("TESTGROUP"));
+ personUpdate.setSpaceId(new SpacePermId("TESTGROUP"));
// When
v3api.updatePersons(sessionToken, Arrays.asList(personUpdate));
@@ -131,7 +131,7 @@ public class UpdatePersonTest extends AbstractTest
PersonUpdate personUpdate = new PersonUpdate();
IPersonId personId = new Me();
personUpdate.setUserId(personId);
- personUpdate.setHomeSpaceId(new SpacePermId("TESTGROUP"));
+ personUpdate.setSpaceId(new SpacePermId("TESTGROUP"));
// When
v3api.updatePersons(sessionToken, Arrays.asList(personUpdate));
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..54f794933c1974761e0215007d9e6e33e420ef1e
--- /dev/null
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.systemtest.asapi.v3;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyTypeFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
+import ch.systemsx.cisd.common.action.IDelegatedAction;
+
+/**
+ * @author Franz-Josef Elmer
+ */
+public class UpdatePropertyTypesTest extends AbstractTest
+{
+ @Test
+ public void testUpdatePropertyTypeFromInternalNamespace()
+ {
+ // Given
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ PropertyTypePermId id = new PropertyTypePermId("$PLATE_GEOMETRY");
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(id);
+ update.setDescription("Test description");
+
+ // When
+ v3api.updatePropertyTypes(sessionToken, Arrays.asList(update));
+
+ // Then
+ PropertyTypeFetchOptions fetchOptions = new PropertyTypeFetchOptions();
+ PropertyType propertyType = v3api.getPropertyTypes(sessionToken, Arrays.asList(id), fetchOptions).get(id);
+ assertEquals(propertyType.getDescription(), update.getDescription().getValue());
+ assertEquals(propertyType.getLabel(), "Plate Geometry");
+ assertEquals(propertyType.isInternalNameSpace().booleanValue(), true);
+
+ v3api.logout(sessionToken);
+ }
+
+ @Test
+ public void testUpdatePropertyTypeFromExternalNamespace()
+ {
+ // Given
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ PropertyTypePermId id = new PropertyTypePermId("COMMENT");
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(id);
+ update.setLabel("Test label");
+
+ // When
+ v3api.updatePropertyTypes(sessionToken, Arrays.asList(update));
+
+ // Then
+ PropertyTypeFetchOptions fetchOptions = new PropertyTypeFetchOptions();
+ PropertyType propertyType = v3api.getPropertyTypes(sessionToken, Arrays.asList(id), fetchOptions).get(id);
+ assertEquals(propertyType.getDescription(), "Any other comments");
+ assertEquals(propertyType.getLabel(), update.getLabel().getValue());
+ assertEquals(propertyType.isInternalNameSpace().booleanValue(), false);
+
+ v3api.logout(sessionToken);
+ }
+
+ @Test
+ public void testMissingId()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+
+ assertUserFailureException(update, "Property type id cannot be null.");
+ }
+
+ @Test
+ public void testNullDescription()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(new PropertyTypePermId("COMMENT"));
+ update.setDescription(null);
+
+ assertUserFailureException(update, "Description cannot be empty.");
+ }
+
+ @Test
+ public void testEmptyDescription()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(new PropertyTypePermId("COMMENT"));
+ update.setDescription("");
+
+ assertUserFailureException(update, "Description cannot be empty.");
+ }
+
+ @Test
+ public void testNullLabel()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(new PropertyTypePermId("COMMENT"));
+ update.setLabel(null);
+
+ assertUserFailureException(update, "Label cannot be empty.");
+ }
+
+ @Test
+ public void testEmptyLabel()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(new PropertyTypePermId("COMMENT"));
+ update.setLabel("");
+
+ assertUserFailureException(update, "Label cannot be empty.");
+ }
+
+ @Test
+ public void testInvalidSchema()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(new PropertyTypePermId("COMMENT"));
+ update.setSchema("blabla");
+
+ assertUserFailureException(update, "isn't a well formed XML document. Content is not allowed in prolog.");
+ }
+
+ @Test(groups = "broken")
+ public void testInvalidTransformation()
+ {
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(new PropertyTypePermId("COMMENT"));
+ update.setTransformation(CreatePropertyTypeTest.EXAMPLE_INCORRECT_XSLT);
+
+ assertUserFailureException(update, "Provided XSLT isn't valid.");
+ }
+
+
+ @Test(dataProvider = "usersNotAllowedToUpdatePropertyTypes")
+ public void testUpdateWithUserCausingAuthorizationFailure(final String user)
+ {
+ PropertyTypePermId typeId = new PropertyTypePermId("COMMENT");
+ assertUnauthorizedObjectAccessException(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ String sessionToken = v3api.login(user, PASSWORD);
+ PropertyTypeUpdate update = new PropertyTypeUpdate();
+ update.setTypeId(typeId);
+ update.setDescription("test");
+ v3api.updatePropertyTypes(sessionToken, Arrays.asList(update));
+ }
+ }, typeId);
+ }
+
+ @DataProvider
+ Object[][] usersNotAllowedToUpdatePropertyTypes()
+ {
+ return createTestUsersProvider(TEST_GROUP_ADMIN, TEST_GROUP_OBSERVER, TEST_GROUP_POWERUSER,
+ TEST_INSTANCE_OBSERVER, TEST_OBSERVER_CISD, TEST_POWER_USER_CISD, TEST_SPACE_USER);
+ }
+ private void assertUserFailureException(PropertyTypeUpdate update, String expectedMessage)
+ {
+ // Given
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+ assertUserFailureException(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ // When
+ v3api.updatePropertyTypes(sessionToken, Arrays.asList(update));
+ }
+ },
+ // Then
+ expectedMessage);
+ v3api.logout(sessionToken);
+ }
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
index cc939528d9d289f2ca0bdf35cefb2d089af5be71..6c16dfaa26f5ebc66c8ac2c8afeb91c226d492a8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
@@ -120,12 +120,14 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.update.ProjectUpdate;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyAssignmentFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyTypeFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.PropertyAssignmentSearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.PropertyTypeSearchCriteria;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update.PropertyTypeUpdate;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.RoleAssignment;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.delete.RoleAssignmentDeletionOptions;
@@ -287,6 +289,8 @@ public interface IApplicationServerApi extends IRpcService
@TechPreview
public void updateExternalDataManagementSystems(String sessionToken, List<ExternalDmsUpdate> externalDmsUpdates);
+
+ public void updatePropertyTypes(String sessionToken, List<PropertyTypeUpdate> propertyTypeUpdates);
public void updateVocabularies(String sessionToken, List<VocabularyUpdate> vocabularyUpdates);
@@ -421,6 +425,8 @@ public interface IApplicationServerApi extends IRpcService
public void deleteMaterials(String sessionToken, List<? extends IMaterialId> materialIds, MaterialDeletionOptions deletionOptions);
+ public void deletePropertyTypes(String sessionToken, List<? extends IPropertyTypeId> propertyTypeIds, PropertyTypeDeletionOptions deletionOptions);
+
public void deleteVocabularies(String sessionToken, List<? extends IVocabularyId> ids, VocabularyDeletionOptions deletionOptions);
public void deleteVocabularyTerms(String sessionToken, List<? extends IVocabularyTermId> termIds, VocabularyTermDeletionOptions deletionOptions);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java
index 9417df0aa59c10ae702d55f80ec4beacf654c289..a4a4544cd17256b0a4071c1474c9ef974f189d63 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java
@@ -37,7 +37,7 @@ public class PersonCreation implements ICreation, IObjectCreation
private String userId;
@JsonProperty
- private ISpaceId homeSpaceId;
+ private ISpaceId spaceId;
public String getUserId()
{
@@ -49,14 +49,14 @@ public class PersonCreation implements ICreation, IObjectCreation
this.userId = userId;
}
- public ISpaceId getHomeSpaceId()
+ public ISpaceId getSpaceId()
{
- return homeSpaceId;
+ return spaceId;
}
- public void setHomeSpaceId(ISpaceId homeSpaceId)
+ public void setSpaceId(ISpaceId spaceId)
{
- this.homeSpaceId = homeSpaceId;
+ this.spaceId = spaceId;
}
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java
index 80c5e0af1f4807b94ae26574aee55dea975b1b01..d9dd797700ca8a8b4e781ec3cf257625aa1df9da 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java
@@ -41,7 +41,7 @@ public class PersonUpdate implements IUpdate, IObjectUpdate<IPersonId>
private IPersonId userId;
@JsonProperty
- private FieldUpdateValue<ISpaceId> homeSpaceId = new FieldUpdateValue<ISpaceId>();
+ private FieldUpdateValue<ISpaceId> spaceId = new FieldUpdateValue<ISpaceId>();
@JsonProperty
private boolean active = true;
@@ -64,15 +64,15 @@ public class PersonUpdate implements IUpdate, IObjectUpdate<IPersonId>
}
@JsonIgnore
- public void setHomeSpaceId(ISpaceId spaceId)
+ public void setSpaceId(ISpaceId spaceId)
{
- this.homeSpaceId.setValue(spaceId);
+ this.spaceId.setValue(spaceId);
}
@JsonIgnore
- public FieldUpdateValue<ISpaceId> getHomeSpaceId()
+ public FieldUpdateValue<ISpaceId> getSpaceId()
{
- return homeSpaceId;
+ return spaceId;
}
@JsonIgnore
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java
new file mode 100644
index 0000000000000000000000000000000000000000..a3800cf8068183e1655f012d2819333b442dd2da
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsOperation;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+@JsonObject("as.dto.property.delete.DeletePropertyTypesOperation")
+public class DeletePropertyTypesOperation extends DeleteObjectsOperation<IPropertyTypeId, PropertyTypeDeletionOptions>
+{
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unused")
+ private DeletePropertyTypesOperation()
+ {
+ }
+
+ public DeletePropertyTypesOperation(List<? extends IPropertyTypeId> objectIds, PropertyTypeDeletionOptions options)
+ {
+ super(objectIds, options);
+ }
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..62481eff077be564f4fff2703eabd9a499fa1f38
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+@JsonObject("as.dto.property.delete.DeletePropertyTypesOperationResult")
+public class DeletePropertyTypesOperationResult extends DeleteObjectsWithoutTrashOperationResult
+{
+
+ private static final long serialVersionUID = 1L;
+
+ public DeletePropertyTypesOperationResult()
+ {
+ }
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.java
new file mode 100644
index 0000000000000000000000000000000000000000..6bae4d47faabc9a2663008ec21cf15037e699773
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+@JsonObject("as.dto.property.delete.PropertyTypeDeletionOptions")
+public class PropertyTypeDeletionOptions extends AbstractObjectDeletionOptions<PropertyTypeDeletionOptions>
+{
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.java
new file mode 100644
index 0000000000000000000000000000000000000000..92cefe4732bde2fe83e2d8671401949a5174e501
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.FieldUpdateValue;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.IObjectUpdate;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.IUpdate;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+@JsonObject("as.dto.property.update.PropertyTypeUpdate")
+public class PropertyTypeUpdate implements IUpdate, IObjectUpdate<IPropertyTypeId>
+{
+ private static final long serialVersionUID = 1L;
+
+ @JsonProperty
+ private IPropertyTypeId typeId;
+
+ @JsonProperty
+ private FieldUpdateValue<String> label = new FieldUpdateValue<String>();
+
+ @JsonProperty
+ private FieldUpdateValue<String> description = new FieldUpdateValue<String>();
+
+ @JsonProperty
+ private FieldUpdateValue<String> schema = new FieldUpdateValue<String>();
+
+ @JsonProperty
+ private FieldUpdateValue<String> transformation = new FieldUpdateValue<String>();
+
+ @Override
+ @JsonIgnore
+ public IPropertyTypeId getObjectId()
+ {
+ return getTypeId();
+ }
+
+ @JsonIgnore
+ public IPropertyTypeId getTypeId()
+ {
+ return typeId;
+ }
+
+ @JsonIgnore
+ public void setTypeId(IPropertyTypeId typeId)
+ {
+ this.typeId = typeId;
+ }
+
+ @JsonIgnore
+ public FieldUpdateValue<String> getLabel()
+ {
+ return label;
+ }
+
+ @JsonIgnore
+ public void setLabel(String label)
+ {
+ this.label.setValue(label);
+ }
+
+ @JsonIgnore
+ public FieldUpdateValue<String> getDescription()
+ {
+ return description;
+ }
+
+ @JsonIgnore
+ public void setDescription(String description)
+ {
+ this.description.setValue(description);
+ }
+
+ @JsonIgnore
+ public FieldUpdateValue<String> getSchema()
+ {
+ return schema;
+ }
+
+ @JsonIgnore
+ public void setSchema(String schema)
+ {
+ this.schema.setValue(schema);
+ }
+
+ @JsonIgnore
+ public FieldUpdateValue<String> getTransformation()
+ {
+ return transformation;
+ }
+
+ @JsonIgnore
+ public void setTransformation(String transformation)
+ {
+ this.transformation.setValue(transformation);
+ }
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb365c81e2f15a483ee2dc0d2f078e8eed87fbc7
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.UpdateObjectsOperation;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+@JsonObject("as.dto.property.update.UpdatePropertyTypesOperation")
+public class UpdatePropertyTypesOperation extends UpdateObjectsOperation<PropertyTypeUpdate>
+{
+
+ private static final long serialVersionUID = 1L;
+
+ private UpdatePropertyTypesOperation()
+ {
+ }
+
+ public UpdatePropertyTypesOperation(PropertyTypeUpdate... updates)
+ {
+ super(updates);
+ }
+
+ public UpdatePropertyTypesOperation(List<PropertyTypeUpdate> updates)
+ {
+ super(updates);
+ }
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..398cd9768d5b47876f38ac209d7a3c7c372af9e2
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 ETH Zuerich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.UpdateObjectsOperationResult;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author Franz-Josef Elmer
+ *
+ */
+@JsonObject("as.dto.property.update.UpdatePropertyTypesOperationResult")
+public class UpdatePropertyTypesOperationResult extends UpdateObjectsOperationResult<PropertyTypePermId>
+{
+
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unused")
+ private UpdatePropertyTypesOperationResult()
+ {
+ }
+
+ public UpdatePropertyTypesOperationResult(List<PropertyTypePermId> ids)
+ {
+ super(ids);
+ }
+
+}
diff --git a/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt b/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt
index 103fba428e59e17a915533fd2437efd85d906254..3a755b52404f69e6325d36f6cc0a5256f73f18d8 100644
--- a/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt
+++ b/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt
@@ -1887,8 +1887,21 @@ create Uploaded Data Set
get Upload Id
set Upload Id
Uploaded Data Set Creation
+<<<<<<< HEAD
get Deletion Date
set Deletion Date
is Force Deletion
set Force Deletion
+=======
+
+Property Type Update
+update Property Types
+Update Property Types Operation
+Update Property Types Operation Result
+
+delete Property Types
+Delete Property Types Operation
+Delete Property Types Operation Result
+Property Type Deletion Options
+>>>>>>> branch 'master' of https://sissource.ethz.ch/sispub/openbis
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 1147c9ad9d4f0274bba841eb3803befcdbd6faeb..5164af47fcfc293200a46144861c7e7df6f24b94 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -579,8 +579,10 @@ var FormUtil = new function() {
controlColumnClass = this.controlColumnClass;
}
var $controls = $('<div>', { class : 'controls' });
-
- $controlGroup.append($controlLabel);
+
+ if(label) {
+ $controlGroup.append($controlLabel);
+ }
if(isInline) {
$controlGroup.append($component);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js
index 6a7cc3d05d777f7b617f47b610c3548b8fd193be..36a712097a549bcd7fd0ca050a1cc227723bfac8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/PrintUtil.js
@@ -97,6 +97,7 @@ var PrintUtil = new function() {
for(code in extraProperties) {
var extraProp = extraProperties[code];
var propLabel = extraProp.label;
+ extraProp.value = FormUtil.sanitizeRichHTMLText(extraProp.value);
if(propLabel.length > 25) {
propLabel = propLabel.substring(0, 23) + "...";
}
@@ -134,9 +135,7 @@ var PrintUtil = new function() {
} else {
propertyContent = entity.properties[propertyCode];
propertyContent = Util.getEmptyIfNull(propertyContent);
- if(propertyType.dataType === "MULTILINE_VARCHAR") {
- propertyContent = FormUtil.sanitizeRichHTMLText(propertyContent);
- }
+ propertyContent = FormUtil.sanitizeRichHTMLText(propertyContent);
propertyContent = Util.replaceURLWithHTMLLinks(propertyContent);
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js
index 85d703add3bd2f77f2de70970e330f87802b2465..1cc28e0bd669ce97c5322dc1882427cb2cf49c6f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerView.js
@@ -77,7 +77,8 @@ function StorageManagerView(storageManagerController, storageManagerModel, stora
$containerColumn.append(this._$storageFromContainer);
$containerColumn.append(this._$storageToContainer);
- $containerColumn.append($("<div>").append($("<h2>").append("Changes")).append(this._changeLogContainer));
+ $containerColumn.append($("<div>", { class : "col-md-12" }).append($("<legend>").append("Changes")).append(this._changeLogContainer));
+ $container.css("padding", "0px");
$container.append($containerColumn);
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js
index 942c97719d86cca2e8e390ba4b63ca394cd4f50a..f5a1a228e4cddbcbfd5bce9edcad7211a2441050 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/GridView.js
@@ -150,17 +150,17 @@ function GridView(gridModel) {
//Label
labels[i].displayName = sample.parents[0].code;
}
-
+
sample = sample.parents[0];
var href = Util.getURLFor(null, "showViewSamplePageFromPermId", sample.permId);
- optSampleTitle = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(labels[i].displayName);
+ optSampleTitle = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).text(labels[i].displayName);
optSampleTitle.click(function() {
mainController.changeView("showViewSamplePageFromPermId", sample.permId);
});
}
- var labelContainer = $("<div>", { class: "storageBox", id : Util.guid() }).append(labels[i].displayName);
+ var labelContainer = $("<div>", { class: "storageBox", id : Util.guid() }).text(labels[i].displayName);
if (sample) {
var tooltip = PrintUtil.getTable(sample, false, optSampleTitle, 'inspectorWhiteFont', 'colorEncodedWellAnnotations-holder-' + sample.permId, null, null);
labelContainer.tooltipster({
@@ -170,7 +170,7 @@ function GridView(gridModel) {
});
} else if(labels[i].displayName) {
labelContainer.tooltipster({
- content: $("<span>").html(labels[i].displayName)
+ content: $("<span>").text(labels[i].displayName)
});
}
var dragCopyFunc = function(object, origX, origY) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js
index c58d4541f4982314286db598729bf992214f4f0f..3c5c35222908b84bd1074b17f8b3018b54beabeb 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js
@@ -38,8 +38,46 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi
//
//$container.empty(); To allow display into a pop-up
+
+ //
+ // Merged - Title / Storage / User
+ //
+ var $titleLine = $("<table>", { class : "col-md-12", style : "border-bottom:1px solid rgb(229, 229, 229);" });
+ var $titleLineTr = $("<tr>");
+ $titleLine.append($titleLineTr);
+
+ var addToRow = function($row, $label, $component) {
+ if($label) {
+ $row.append($("<td>", { width : "25%", "style" : "text-align: right; padding: 4px; vertical-align: middle; font-weight: bold;" }).append($label));
+ }
+
+ if($component) {
+ $row.append($("<td>", { width : "25%", "style" : "text-align: left; padding: 4px; vertical-align: middle;" }).append($component));
+ }
+ }
+
+ var addToTitleLine = function($label, $component) {
+ addToRow($titleLineTr, $label, $component);
+ }
+
+ //
+ // Merged - Box Name / Box Size
+ //
+ var $boxLine = $("<table>", { class : "col-md-12" });
+ var $boxLineTr = $("<tr>");
+ $boxLine.append($boxLineTr);
+
+ var addToBoxLine = function($label, $component) {
+ addToRow($boxLineTr, $label, $component);
+ }
+
+ //
+ //
+ //
+
if( _this._storageModel.config.title) { //It can be null
- $container.append("<h2>" + _this._storageModel.config.title + "</h2>");
+ addToTitleLine(null, $("<legend>", { style : "border-bottom:none;"}).append(_this._storageModel.config.title));
+ $container.append($titleLine);
}
if( _this._storageModel.config.storagePropertyGroupSelector === "on") {
@@ -52,8 +90,8 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi
_this._defaultStoragesDropDown.val(_this._storageModel.sample.properties[_this._storageModel.storagePropertyGroup.nameProperty]);
}
//Paint
- var $controlGroupStorages = FormUtil.getFieldForComponentWithLabel(_this._defaultStoragesDropDown, "Storage");
- $container.append($controlGroupStorages);
+ var $controlGroupStorages = FormUtil.getFieldForComponentWithLabel(_this._defaultStoragesDropDown);
+ addToTitleLine("Storage:", $controlGroupStorages);
//Attach Event
_this._defaultStoragesDropDown.change(function(event) {
var storageName = $(this).val();
@@ -72,8 +110,8 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi
if(_this._storageModel.config.userSelector === "on" && !_this._storageModel.sample) {
//Paint
- var $controlGroupUserId = FormUtil.getFieldForComponentWithLabel(_this._userIdDropdown, "User Id Filter");
- $container.append($controlGroupUserId);
+ var $controlGroupUserId = FormUtil.getFieldForComponentWithLabel(_this._userIdDropdown);
+ addToTitleLine("User Id Filter:", $controlGroupUserId);
_this._userIdDropdown.multiselect();
//Attach Event
_this._userIdDropdown.change(function() {
@@ -89,11 +127,13 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi
_this._storageController.setSelectStorage(_this._storageModel.sample.properties[_this._storageModel.storagePropertyGroup.nameProperty]);
}
+ $container.append($boxLine);
+
if(_this._storageModel.config.boxSelector === "on" || _this._storageModel.config.rackSelector === "on") {
//Paint
_this._boxField.hide();
- var $controlGroupBox = FormUtil.getFieldForComponentWithLabel(_this._boxField, "Box Name");
- $container.append($controlGroupBox);
+ var $controlGroupBox = FormUtil.getFieldForComponentWithLabel(_this._boxField);
+ addToBoxLine("Box Name:", $controlGroupBox);
//Attach Event
_this._boxField.keyup(function() {
if(_this._storageModel.sample) { // Sample to bind
@@ -113,8 +153,8 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi
if(_this._storageModel.config.boxSizeSelector === "on") {
//Paint
_this._boxSizeDropDown.hide();
- var $controlGroupBox = FormUtil.getFieldForComponentWithLabel(_this._boxSizeDropDown, "Box Size");
- $container.append($controlGroupBox);
+ var $controlGroupBox = FormUtil.getFieldForComponentWithLabel(_this._boxSizeDropDown);
+ addToBoxLine("Box Size: ", $controlGroupBox);
//Attach Event
_this._boxSizeDropDown.change(function() {
if(_this._storageModel.sample) { // Sample to bind