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 f45a7d2e12602f5c48fa3775cddda2b8de7f268b..5e8ff6dfa4f1534ce9fde78cedd7349d2ff6c979 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
@@ -11,514 +11,522 @@ define([ 'jquery', 'openbis', 'as/dto/space/create/SpaceCreation', 'as/dto/proje
'as/dto/dataset/fetchoptions/DataSetFetchOptions', 'as/dto/material/fetchoptions/MaterialFetchOptions', 'as/dto/deletion/fetchoptions/DeletionFetchOptions',
'as/dto/deletion/search/DeletionSearchCriteria', 'as/dto/service/search/CustomASServiceSearchCriteria', 'as/dto/service/fetchoptions/CustomASServiceFetchOptions',
'as/dto/service/id/CustomASServiceCode', 'as/dto/service/CustomASServiceExecutionOptions', 'as/dto/global/search/GlobalSearchCriteria',
- 'as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions' ],
- function($, openbis, SpaceCreation, ProjectCreation, ExperimentCreation, SampleCreation, MaterialCreation, AttachmentCreation, SpaceUpdate, ProjectUpdate, ExperimentUpdate, SampleUpdate,
- DataSetUpdate, PhysicalDataUpdate, MaterialUpdate, SpaceDeletionOptions, ProjectDeletionOptions, ExperimentDeletionOptions, SampleDeletionOptions, DataSetDeletionOptions,
- MaterialDeletionOptions, EntityTypePermId, SpacePermId, ProjectPermId, ProjectIdentifier, ExperimentPermId, ExperimentIdentifier, SamplePermId, DataSetPermId, FileFormatTypePermId,
- MaterialPermId, TagCode, SpaceSearchCriteria, ProjectSearchCriteria, ExperimentSearchCriteria, SampleSearchCriteria, DataSetSearchCriteria, MaterialSearchCriteria, SpaceFetchOptions,
- ProjectFetchOptions, ExperimentFetchOptions, SampleFetchOptions, DataSetFetchOptions, MaterialFetchOptions, DeletionFetchOptions, DeletionSearchCriteria,
- CustomASServiceSearchCriteria, CustomASServiceFetchOptions, CustomASServiceCode, CustomASServiceExecutionOptions, GlobalSearchCriteria, GlobalSearchObjectFetchOptions) {
-
- /*
- * These tests should be run against openBIS instance with screening
- * sprint server database version
- */
-
- var testProtocol = window.location.protocol;
- var testHost = window.location.hostname;
- var testPort = window.location.port;
- var testUrl = testProtocol + "//" + testHost + ":" + testPort;
- var testApiUrl = testUrl + "/openbis/openbis/rmi-application-server-v3.json";
-
- var testUserId = "openbis_test_js";
- var testUserPassword = "password";
-
- var Common = function(assert) {
- this.assert = assert;
-
- this.SpaceCreation = SpaceCreation;
- this.ProjectCreation = ProjectCreation;
- this.ExperimentCreation = ExperimentCreation;
- this.SampleCreation = SampleCreation;
- this.MaterialCreation = MaterialCreation;
- this.AttachmentCreation = AttachmentCreation;
- this.SpaceUpdate = SpaceUpdate;
- this.ProjectUpdate = ProjectUpdate;
- this.ExperimentUpdate = ExperimentUpdate;
- this.SampleUpdate = SampleUpdate;
- this.DataSetUpdate = DataSetUpdate;
- this.PhysicalDataUpdate = PhysicalDataUpdate;
- this.MaterialUpdate = MaterialUpdate;
- this.SpaceDeletionOptions = SpaceDeletionOptions;
- this.ProjectDeletionOptions = ProjectDeletionOptions;
- this.ExperimentDeletionOptions = ExperimentDeletionOptions;
- this.SampleDeletionOptions = SampleDeletionOptions;
- this.DataSetDeletionOptions = DataSetDeletionOptions;
- this.MaterialDeletionOptions = MaterialDeletionOptions;
- this.EntityTypePermId = EntityTypePermId;
- this.SpacePermId = SpacePermId;
- this.ProjectPermId = ProjectPermId;
- this.ProjectIdentifier = ProjectIdentifier;
- this.ExperimentPermId = ExperimentPermId;
- this.ExperimentIdentifier = ExperimentIdentifier;
- this.SamplePermId = SamplePermId;
- this.DataSetPermId = DataSetPermId;
- this.FileFormatTypePermId = FileFormatTypePermId;
- this.MaterialPermId = MaterialPermId;
- this.TagCode = TagCode;
- this.SpaceSearchCriteria = SpaceSearchCriteria;
- this.ProjectSearchCriteria = ProjectSearchCriteria;
- this.ExperimentSearchCriteria = ExperimentSearchCriteria;
- this.SampleSearchCriteria = SampleSearchCriteria;
- this.DataSetSearchCriteria = DataSetSearchCriteria;
- this.MaterialSearchCriteria = MaterialSearchCriteria;
- this.SpaceFetchOptions = SpaceFetchOptions;
- this.ProjectFetchOptions = ProjectFetchOptions;
- this.ExperimentFetchOptions = ExperimentFetchOptions;
- this.SampleFetchOptions = SampleFetchOptions;
- this.DataSetFetchOptions = DataSetFetchOptions;
- this.MaterialFetchOptions = MaterialFetchOptions;
- this.DeletionFetchOptions = DeletionFetchOptions;
- this.DeletionSearchCriteria = DeletionSearchCriteria;
- this.CustomASServiceSearchCriteria = CustomASServiceSearchCriteria;
- this.CustomASServiceFetchOptions = CustomASServiceFetchOptions;
- this.CustomASServiceCode = CustomASServiceCode;
- this.CustomASServiceExecutionOptions = CustomASServiceExecutionOptions;
- this.GlobalSearchCriteria = GlobalSearchCriteria;
- this.GlobalSearchObjectFetchOptions = GlobalSearchObjectFetchOptions;
-
- this.generateId = function(base) {
- var date = new Date();
- var parts = [ "V3", base, date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), Math.random() ];
- return parts.join("_");
- },
-
- this.createSpace = function(facade) {
- var c = this;
- var creation = new SpaceCreation();
- creation.setCode(c.generateId("SPACE"));
- return facade.createSpaces([ creation ]).then(function(permIds) {
- return permIds[0];
- });
- }.bind(this);
-
- this.createProject = function(facade) {
- var c = this;
- return c.createSpace(facade).then(function(spacePermId) {
- var creation = new ProjectCreation();
- creation.setCode(c.generateId("PROJECT"));
- creation.setSpaceId(spacePermId);
- return facade.createProjects([ creation ]).then(function(permIds) {
- return permIds[0];
- });
- });
- }.bind(this);
-
- this.createExperiment = function(facade) {
- var c = this;
- return c.createProject(facade).then(function(projectPermId) {
- var creation = new ExperimentCreation();
- creation.setCode(c.generateId("EXPERIMENT"));
- creation.setTypeId(new EntityTypePermId("UNKNOWN"));
- creation.setProjectId(projectPermId);
- return facade.createExperiments([ creation ]).then(function(permIds) {
- return permIds[0];
- });
- });
- }.bind(this);
-
- this.createSample = function(facade) {
- var c = this;
- return c.createSpace(facade).then(function(spacePermId) {
- var creation = new SampleCreation();
- creation.setCode(c.generateId("SAMPLE"));
- creation.setTypeId(new EntityTypePermId("UNKNOWN"));
- creation.setSpaceId(spacePermId);
- return facade.createSamples([ creation ]).then(function(permIds) {
- return permIds[0];
- });
- });
- }.bind(this);
-
- this.createDataSet = function(facade) {
- var c = this;
- return this.getResponseFromJSTestAggregationService(facade, {}, function(response) {
- return new DataSetPermId(response.result.rows[0][0].value);
- });
- }.bind(this);
-
- this.getResponseFromJSTestAggregationService = function(facade, params, callback) {
- var c = this;
- return $.ajax({
- "url" : "http://localhost:20001/datastore_server/rmi-dss-api-v1.json",
- "type" : "POST",
- "processData" : false,
- "dataType" : "json",
- "data" : JSON.stringify({
- "method" : "createReportFromAggregationService",
- "params" : [ facade._private.sessionToken, "js-test", params ],
- "id" : "1",
- "jsonrpc" : "2.0"
- })
- }).then(callback);
- }.bind(this);
-
- this.createMaterial = function(facade) {
- var c = this;
- var creation = new MaterialCreation();
- creation.setCode(c.generateId("MATERIAL"));
- creation.setTypeId(new EntityTypePermId("COMPOUND"));
- return facade.createMaterials([ creation ]).then(function(permIds) {
- return permIds[0];
- });
- }.bind(this);
-
- this.findSpace = function(facade, id) {
- var c = this;
- return facade.mapSpaces([ id ], c.createSpaceFetchOptions()).then(function(spaces) {
- return spaces[id];
- });
- }.bind(this);
-
- this.findProject = function(facade, id) {
- var c = this;
- return facade.mapProjects([ id ], c.createProjectFetchOptions()).then(function(projects) {
- return projects[id];
- });
- }.bind(this);
-
- this.findExperiment = function(facade, id) {
- var c = this;
- return facade.mapExperiments([ id ], c.createExperimentFetchOptions()).then(function(experiments) {
- return experiments[id];
- });
- }.bind(this);
-
- this.findSample = function(facade, id) {
- var c = this;
- return facade.mapSamples([ id ], c.createSampleFetchOptions()).then(function(samples) {
- return samples[id];
- });
- }.bind(this);
-
- this.findDataSet = function(facade, id) {
- var c = this;
- return facade.mapDataSets([ id ], c.createDataSetFetchOptions()).then(function(dataSets) {
- return dataSets[id];
- });
- }.bind(this);
-
- this.findMaterial = function(facade, id) {
- var c = this;
- return facade.mapMaterials([ id ], c.createMaterialFetchOptions()).then(function(materials) {
- return materials[id];
- });
- }.bind(this);
-
- this.deleteSpace = function(facade, id) {
- var c = this;
- var options = new SpaceDeletionOptions();
- options.setReason("test reason");
- return facade.deleteSpaces([ id ], options);
- }.bind(this);
-
- this.deleteProject = function(facade, id) {
- var c = this;
- var options = new ProjectDeletionOptions();
- options.setReason("test reason");
- return facade.deleteProjects([ id ], options);
- }.bind(this);
-
- this.deleteExperiment = function(facade, id) {
- var c = this;
- var options = new ExperimentDeletionOptions();
- options.setReason("test reason");
- return facade.deleteExperiments([ id ], options);
- }.bind(this);
-
- this.deleteSample = function(facade, id) {
- var c = this;
- var options = new SampleDeletionOptions();
- options.setReason("test reason");
- return facade.deleteSamples([ id ], options);
- }.bind(this);
-
- this.deleteDataSet = function(facade, id) {
- var c = this;
- var options = new DataSetDeletionOptions();
- options.setReason("test reason");
- return facade.deleteDataSets([ id ], options);
- }.bind(this);
-
- this.deleteMaterial = function(facade, id) {
- var c = this;
- var options = new MaterialDeletionOptions();
- options.setReason("test reason");
- return facade.deleteMaterials([ id ], options);
- }.bind(this);
-
- this.getObjectProperty = function(object, propertyName) {
- var propertyNames = propertyName.split('.');
- for ( var pn in propertyNames) {
- object = object[propertyNames[pn]];
- }
- return object;
- };
-
- this.createFacade = function() {
- var dfd = $.Deferred();
- dfd.resolve(new openbis(testApiUrl));
- return dfd.promise();
- };
-
- this.createFacadeAndLogin = function() {
- var dfd = $.Deferred();
-
- this.createFacade().then(function(facade) {
- facade.login(testUserId, testUserPassword).done(function() {
- dfd.resolve(facade);
- }).fail(function() {
- dfd.reject(arguments);
- });
- });
-
- return dfd.promise();
- };
-
- this.createSpaceFetchOptions = function() {
- var fo = new SpaceFetchOptions();
- fo.withProjects();
- fo.withSamples();
- fo.withRegistrator();
- return fo;
- };
-
- this.createProjectFetchOptions = function() {
- var fo = new ProjectFetchOptions();
- fo.withSpace();
- fo.withExperiments();
- fo.withRegistrator();
- fo.withModifier();
- fo.withLeader();
- fo.withAttachments().withContent();
- return fo;
- };
-
- this.createExperimentFetchOptions = function() {
- var fo = new ExperimentFetchOptions();
- fo.withType();
- fo.withProject().withSpace();
- fo.withDataSets();
- fo.withSamples();
- fo.withHistory();
- fo.withProperties();
- fo.withMaterialProperties();
- fo.withTags();
- fo.withRegistrator();
- fo.withModifier();
- fo.withAttachments().withContent();
- return fo;
- };
-
- this.createSampleFetchOptions = function() {
- var fo = new SampleFetchOptions();
- fo.withType();
- fo.withExperiment().withProject().withSpace();
- fo.withSpace();
- fo.withProperties();
- fo.withMaterialProperties();
- fo.withParents();
- fo.withChildren();
- fo.withContainer();
- fo.withComponents();
- fo.withDataSets();
- fo.withHistory();
- fo.withTags();
- fo.withRegistrator();
- fo.withModifier();
- fo.withAttachments().withContent();
- fo.withChildrenUsing(fo);
- return fo;
- };
-
- this.createDataSetFetchOptions = function() {
- var fo = new DataSetFetchOptions();
- fo.withType();
- fo.withExperiment().withProject().withSpace();
- fo.withSample();
- fo.withProperties();
- fo.withMaterialProperties();
- fo.withParents();
- fo.withChildren();
- fo.withContainers();
- fo.withComponents();
- fo.withPhysicalData().withFileFormatType();
- fo.withPhysicalData().withLocatorType();
- fo.withPhysicalData().withStorageFormat();
- fo.withHistory();
- fo.withTags();
- fo.withRegistrator();
- fo.withModifier();
- return fo;
- };
-
- this.createMaterialFetchOptions = function() {
- var fo = new MaterialFetchOptions();
- fo.withType();
- fo.withHistory();
- fo.withRegistrator();
- fo.withProperties();
- fo.withMaterialProperties();
- fo.withTags();
- return fo;
- };
-
- this.createGlobalSearchObjectFetchOptions = function() {
- var fo = new GlobalSearchObjectFetchOptions();
- fo.withExperiment();
- fo.withSample();
- fo.withDataSet();
- fo.withMaterial();
- return fo;
- };
-
- this.assertNull = function(actual, msg) {
- this.assertEqual(actual, null, msg)
- };
-
- this.assertNotNull = function(actual, msg) {
- this.assertNotEqual(actual, null, msg);
- };
-
- this.assertTrue = function(actual, msg) {
- this.assertEqual(actual, true, msg);
- };
-
- this.assertFalse = function(actual, msg) {
- this.assertEqual(actual, false, msg);
- };
-
- this.assertEqual = function(actual, expected, msg) {
- this.assert.equal(actual, expected, msg);
- };
-
- this.assertNotEqual = function(actual, expected, msg) {
- this.assert.notEqual(actual, expected, msg);
- };
-
- this.assertDate = function(millis, msg, year, month, day, hour, minute) {
- var date = new Date(millis);
- var actual = "";
- var expected = "";
-
- if (year) {
- actual += date.getUTCFullYear();
- expected += year;
- }
- if (month) {
- actual += "-" + (date.getUTCMonth() + 1);
- expected += "-" + month;
- }
- if (day) {
- actual += "-" + date.getUTCDate();
- expected += "-" + day;
- }
- if (hour) {
- actual += " " + date.getUTCHours();
- expected += " " + hour;
- }
- if (minute) {
- actual += ":" + date.getUTCMinutes();
- expected += ":" + minute;
- }
-
- this.assertEqual(actual, expected, msg);
- };
-
- this.assertToday = function(millis, msg) {
- var today = new Date();
- this.assertDate(millis, msg, today.getUTCFullYear(), today.getUTCMonth() + 1, today.getUTCDate());
- };
-
- this.assertObjectsCount = function(objects, count) {
- this.assertEqual(objects.length, count, 'Got ' + count + ' object(s)');
- };
-
- this.assertObjectsWithValues = function(objects, propertyName, propertyValues) {
- var thisCommon = this;
- var values = {};
-
- $.each(objects, function(index, object) {
- var value = thisCommon.getObjectProperty(object, propertyName);
- if (value in values == false) {
- values[value] = true;
- }
- });
-
- this.assert.deepEqual(Object.keys(values).sort(), propertyValues.sort(), 'Objects have correct ' + propertyName + ' values')
- };
-
- this.assertObjectsWithOrWithoutCollections = function(objects, accessor, checker) {
- var theObjects = null;
-
- if ($.isArray(objects)) {
- theObjects = objects;
- } else {
- theObjects = [ objects ];
- }
-
- var theAccessor = null;
-
- if ($.isFunction(accessor)) {
- theAccessor = accessor;
- } else {
- theAccessor = function(object) {
- return object[accessor];
- }
- }
-
- checker(theObjects, theAccessor);
- };
-
- this.assertObjectsWithCollections = function(objects, accessor) {
- var thisCommon = this;
- this.assertObjectsWithOrWithoutCollections(objects, accessor, function(objects, accessor) {
- thisCommon.assert.ok(objects.some(function(object) {
- var value = accessor(object);
- return value && Object.keys(value).length > 0;
- }), 'Objects have non-empty collections accessed via: ' + accessor);
- });
- };
-
- this.assertObjectsWithoutCollections = function(objects, accessor) {
- var thisCommon = this;
- this.assertObjectsWithOrWithoutCollections(objects, accessor, function(objects, accessor) {
- thisCommon.assert.ok(objects.every(function(object) {
- var value = accessor(object);
- return !value || Object.keys(value).length == 0;
- }), 'Objects have empty collections accessed via: ' + accessor);
- });
- };
-
- this.start = function() {
- this.done = this.assert.async();
- };
-
- this.finish = function() {
- if (this.done) {
- this.done();
- }
- };
-
- this.ok = function(msg) {
- this.assert.ok(true, msg);
- };
-
- this.fail = function(msg) {
- this.assert.ok(false, msg);
- };
-
- };
-
- return Common;
- })
+ 'as/dto/global/fetchoptions/GlobalSearchObjectFetchOptions', 'as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria',
+ 'as/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions' ], function($, openbis, SpaceCreation, ProjectCreation, ExperimentCreation, SampleCreation, MaterialCreation,
+ AttachmentCreation, SpaceUpdate, ProjectUpdate, ExperimentUpdate, SampleUpdate, DataSetUpdate, PhysicalDataUpdate, MaterialUpdate, SpaceDeletionOptions, ProjectDeletionOptions,
+ ExperimentDeletionOptions, SampleDeletionOptions, DataSetDeletionOptions, MaterialDeletionOptions, EntityTypePermId, SpacePermId, ProjectPermId, ProjectIdentifier, ExperimentPermId,
+ ExperimentIdentifier, SamplePermId, DataSetPermId, FileFormatTypePermId, MaterialPermId, TagCode, SpaceSearchCriteria, ProjectSearchCriteria, ExperimentSearchCriteria, SampleSearchCriteria,
+ DataSetSearchCriteria, MaterialSearchCriteria, SpaceFetchOptions, ProjectFetchOptions, ExperimentFetchOptions, SampleFetchOptions, DataSetFetchOptions, MaterialFetchOptions,
+ DeletionFetchOptions, DeletionSearchCriteria, CustomASServiceSearchCriteria, CustomASServiceFetchOptions, CustomASServiceCode, CustomASServiceExecutionOptions, GlobalSearchCriteria,
+ GlobalSearchObjectFetchOptions, ObjectKindModificationSearchCriteria, ObjectKindModificationFetchOptions) {
+
+ /*
+ * These tests should be run against openBIS instance with screening sprint
+ * server database version
+ */
+
+ var testProtocol = window.location.protocol;
+ var testHost = window.location.hostname;
+ var testPort = window.location.port;
+ var testUrl = testProtocol + "//" + testHost + ":" + testPort;
+ var testApiUrl = testUrl + "/openbis/openbis/rmi-application-server-v3.json";
+
+ var testUserId = "openbis_test_js";
+ var testUserPassword = "password";
+
+ var Common = function(assert) {
+ this.assert = assert;
+
+ this.SpaceCreation = SpaceCreation;
+ this.ProjectCreation = ProjectCreation;
+ this.ExperimentCreation = ExperimentCreation;
+ this.SampleCreation = SampleCreation;
+ this.MaterialCreation = MaterialCreation;
+ this.AttachmentCreation = AttachmentCreation;
+ this.SpaceUpdate = SpaceUpdate;
+ this.ProjectUpdate = ProjectUpdate;
+ this.ExperimentUpdate = ExperimentUpdate;
+ this.SampleUpdate = SampleUpdate;
+ this.DataSetUpdate = DataSetUpdate;
+ this.PhysicalDataUpdate = PhysicalDataUpdate;
+ this.MaterialUpdate = MaterialUpdate;
+ this.SpaceDeletionOptions = SpaceDeletionOptions;
+ this.ProjectDeletionOptions = ProjectDeletionOptions;
+ this.ExperimentDeletionOptions = ExperimentDeletionOptions;
+ this.SampleDeletionOptions = SampleDeletionOptions;
+ this.DataSetDeletionOptions = DataSetDeletionOptions;
+ this.MaterialDeletionOptions = MaterialDeletionOptions;
+ this.EntityTypePermId = EntityTypePermId;
+ this.SpacePermId = SpacePermId;
+ this.ProjectPermId = ProjectPermId;
+ this.ProjectIdentifier = ProjectIdentifier;
+ this.ExperimentPermId = ExperimentPermId;
+ this.ExperimentIdentifier = ExperimentIdentifier;
+ this.SamplePermId = SamplePermId;
+ this.DataSetPermId = DataSetPermId;
+ this.FileFormatTypePermId = FileFormatTypePermId;
+ this.MaterialPermId = MaterialPermId;
+ this.TagCode = TagCode;
+ this.SpaceSearchCriteria = SpaceSearchCriteria;
+ this.ProjectSearchCriteria = ProjectSearchCriteria;
+ this.ExperimentSearchCriteria = ExperimentSearchCriteria;
+ this.SampleSearchCriteria = SampleSearchCriteria;
+ this.DataSetSearchCriteria = DataSetSearchCriteria;
+ this.MaterialSearchCriteria = MaterialSearchCriteria;
+ this.SpaceFetchOptions = SpaceFetchOptions;
+ this.ProjectFetchOptions = ProjectFetchOptions;
+ this.ExperimentFetchOptions = ExperimentFetchOptions;
+ this.SampleFetchOptions = SampleFetchOptions;
+ this.DataSetFetchOptions = DataSetFetchOptions;
+ this.MaterialFetchOptions = MaterialFetchOptions;
+ this.DeletionFetchOptions = DeletionFetchOptions;
+ this.DeletionSearchCriteria = DeletionSearchCriteria;
+ this.CustomASServiceSearchCriteria = CustomASServiceSearchCriteria;
+ this.CustomASServiceFetchOptions = CustomASServiceFetchOptions;
+ this.CustomASServiceCode = CustomASServiceCode;
+ this.CustomASServiceExecutionOptions = CustomASServiceExecutionOptions;
+ this.GlobalSearchCriteria = GlobalSearchCriteria;
+ this.GlobalSearchObjectFetchOptions = GlobalSearchObjectFetchOptions;
+ this.ObjectKindModificationSearchCriteria = ObjectKindModificationSearchCriteria;
+ this.ObjectKindModificationFetchOptions = ObjectKindModificationFetchOptions;
+
+ this.generateId = function(base) {
+ var date = new Date();
+ var parts = [ "V3", base, date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), Math.random() ];
+ return parts.join("_");
+ },
+
+ this.createSpace = function(facade) {
+ var c = this;
+ var creation = new SpaceCreation();
+ creation.setCode(c.generateId("SPACE"));
+ return facade.createSpaces([ creation ]).then(function(permIds) {
+ return permIds[0];
+ });
+ }.bind(this);
+
+ this.createProject = function(facade) {
+ var c = this;
+ return c.createSpace(facade).then(function(spacePermId) {
+ var creation = new ProjectCreation();
+ creation.setCode(c.generateId("PROJECT"));
+ creation.setSpaceId(spacePermId);
+ return facade.createProjects([ creation ]).then(function(permIds) {
+ return permIds[0];
+ });
+ });
+ }.bind(this);
+
+ this.createExperiment = function(facade) {
+ var c = this;
+ return c.createProject(facade).then(function(projectPermId) {
+ var creation = new ExperimentCreation();
+ creation.setCode(c.generateId("EXPERIMENT"));
+ creation.setTypeId(new EntityTypePermId("UNKNOWN"));
+ creation.setProjectId(projectPermId);
+ return facade.createExperiments([ creation ]).then(function(permIds) {
+ return permIds[0];
+ });
+ });
+ }.bind(this);
+
+ this.createSample = function(facade) {
+ var c = this;
+ return c.createSpace(facade).then(function(spacePermId) {
+ var creation = new SampleCreation();
+ creation.setCode(c.generateId("SAMPLE"));
+ creation.setTypeId(new EntityTypePermId("UNKNOWN"));
+ creation.setSpaceId(spacePermId);
+ return facade.createSamples([ creation ]).then(function(permIds) {
+ return permIds[0];
+ });
+ });
+ }.bind(this);
+
+ this.createDataSet = function(facade) {
+ var c = this;
+ return this.getResponseFromJSTestAggregationService(facade, {}, function(response) {
+ return new DataSetPermId(response.result.rows[0][0].value);
+ });
+ }.bind(this);
+
+ this.getResponseFromJSTestAggregationService = function(facade, params, callback) {
+ var c = this;
+ return $.ajax({
+ "url" : "http://localhost:20001/datastore_server/rmi-dss-api-v1.json",
+ "type" : "POST",
+ "processData" : false,
+ "dataType" : "json",
+ "data" : JSON.stringify({
+ "method" : "createReportFromAggregationService",
+ "params" : [ facade._private.sessionToken, "js-test", params ],
+ "id" : "1",
+ "jsonrpc" : "2.0"
+ })
+ }).then(callback);
+ }.bind(this);
+
+ this.createMaterial = function(facade) {
+ var c = this;
+ var creation = new MaterialCreation();
+ creation.setCode(c.generateId("MATERIAL"));
+ creation.setTypeId(new EntityTypePermId("COMPOUND"));
+ return facade.createMaterials([ creation ]).then(function(permIds) {
+ return permIds[0];
+ });
+ }.bind(this);
+
+ this.findSpace = function(facade, id) {
+ var c = this;
+ return facade.mapSpaces([ id ], c.createSpaceFetchOptions()).then(function(spaces) {
+ return spaces[id];
+ });
+ }.bind(this);
+
+ this.findProject = function(facade, id) {
+ var c = this;
+ return facade.mapProjects([ id ], c.createProjectFetchOptions()).then(function(projects) {
+ return projects[id];
+ });
+ }.bind(this);
+
+ this.findExperiment = function(facade, id) {
+ var c = this;
+ return facade.mapExperiments([ id ], c.createExperimentFetchOptions()).then(function(experiments) {
+ return experiments[id];
+ });
+ }.bind(this);
+
+ this.findSample = function(facade, id) {
+ var c = this;
+ return facade.mapSamples([ id ], c.createSampleFetchOptions()).then(function(samples) {
+ return samples[id];
+ });
+ }.bind(this);
+
+ this.findDataSet = function(facade, id) {
+ var c = this;
+ return facade.mapDataSets([ id ], c.createDataSetFetchOptions()).then(function(dataSets) {
+ return dataSets[id];
+ });
+ }.bind(this);
+
+ this.findMaterial = function(facade, id) {
+ var c = this;
+ return facade.mapMaterials([ id ], c.createMaterialFetchOptions()).then(function(materials) {
+ return materials[id];
+ });
+ }.bind(this);
+
+ this.deleteSpace = function(facade, id) {
+ var c = this;
+ var options = new SpaceDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteSpaces([ id ], options);
+ }.bind(this);
+
+ this.deleteProject = function(facade, id) {
+ var c = this;
+ var options = new ProjectDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteProjects([ id ], options);
+ }.bind(this);
+
+ this.deleteExperiment = function(facade, id) {
+ var c = this;
+ var options = new ExperimentDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteExperiments([ id ], options);
+ }.bind(this);
+
+ this.deleteSample = function(facade, id) {
+ var c = this;
+ var options = new SampleDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteSamples([ id ], options);
+ }.bind(this);
+
+ this.deleteDataSet = function(facade, id) {
+ var c = this;
+ var options = new DataSetDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteDataSets([ id ], options);
+ }.bind(this);
+
+ this.deleteMaterial = function(facade, id) {
+ var c = this;
+ var options = new MaterialDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteMaterials([ id ], options);
+ }.bind(this);
+
+ this.getObjectProperty = function(object, propertyName) {
+ var propertyNames = propertyName.split('.');
+ for ( var pn in propertyNames) {
+ object = object[propertyNames[pn]];
+ }
+ return object;
+ };
+
+ this.createFacade = function() {
+ var dfd = $.Deferred();
+ dfd.resolve(new openbis(testApiUrl));
+ return dfd.promise();
+ };
+
+ this.createFacadeAndLogin = function() {
+ var dfd = $.Deferred();
+
+ this.createFacade().then(function(facade) {
+ facade.login(testUserId, testUserPassword).done(function() {
+ dfd.resolve(facade);
+ }).fail(function() {
+ dfd.reject(arguments);
+ });
+ });
+
+ return dfd.promise();
+ };
+
+ this.createSpaceFetchOptions = function() {
+ var fo = new SpaceFetchOptions();
+ fo.withProjects();
+ fo.withSamples();
+ fo.withRegistrator();
+ return fo;
+ };
+
+ this.createProjectFetchOptions = function() {
+ var fo = new ProjectFetchOptions();
+ fo.withSpace();
+ fo.withExperiments();
+ fo.withRegistrator();
+ fo.withModifier();
+ fo.withLeader();
+ fo.withAttachments().withContent();
+ return fo;
+ };
+
+ this.createExperimentFetchOptions = function() {
+ var fo = new ExperimentFetchOptions();
+ fo.withType();
+ fo.withProject().withSpace();
+ fo.withDataSets();
+ fo.withSamples();
+ fo.withHistory();
+ fo.withProperties();
+ fo.withMaterialProperties();
+ fo.withTags();
+ fo.withRegistrator();
+ fo.withModifier();
+ fo.withAttachments().withContent();
+ return fo;
+ };
+
+ this.createSampleFetchOptions = function() {
+ var fo = new SampleFetchOptions();
+ fo.withType();
+ fo.withExperiment().withProject().withSpace();
+ fo.withSpace();
+ fo.withProperties();
+ fo.withMaterialProperties();
+ fo.withParents();
+ fo.withChildren();
+ fo.withContainer();
+ fo.withComponents();
+ fo.withDataSets();
+ fo.withHistory();
+ fo.withTags();
+ fo.withRegistrator();
+ fo.withModifier();
+ fo.withAttachments().withContent();
+ fo.withChildrenUsing(fo);
+ return fo;
+ };
+
+ this.createDataSetFetchOptions = function() {
+ var fo = new DataSetFetchOptions();
+ fo.withType();
+ fo.withExperiment().withProject().withSpace();
+ fo.withSample();
+ fo.withProperties();
+ fo.withMaterialProperties();
+ fo.withParents();
+ fo.withChildren();
+ fo.withContainers();
+ fo.withComponents();
+ fo.withPhysicalData().withFileFormatType();
+ fo.withPhysicalData().withLocatorType();
+ fo.withPhysicalData().withStorageFormat();
+ fo.withHistory();
+ fo.withTags();
+ fo.withRegistrator();
+ fo.withModifier();
+ return fo;
+ };
+
+ this.createMaterialFetchOptions = function() {
+ var fo = new MaterialFetchOptions();
+ fo.withType();
+ fo.withHistory();
+ fo.withRegistrator();
+ fo.withProperties();
+ fo.withMaterialProperties();
+ fo.withTags();
+ return fo;
+ };
+
+ this.createGlobalSearchObjectFetchOptions = function() {
+ var fo = new GlobalSearchObjectFetchOptions();
+ fo.withExperiment();
+ fo.withSample();
+ fo.withDataSet();
+ fo.withMaterial();
+ return fo;
+ };
+
+ this.createObjectKindModificationFetchOptions = function() {
+ var fo = new ObjectKindModificationFetchOptions();
+ return fo;
+ };
+
+ this.assertNull = function(actual, msg) {
+ this.assertEqual(actual, null, msg)
+ };
+
+ this.assertNotNull = function(actual, msg) {
+ this.assertNotEqual(actual, null, msg);
+ };
+
+ this.assertTrue = function(actual, msg) {
+ this.assertEqual(actual, true, msg);
+ };
+
+ this.assertFalse = function(actual, msg) {
+ this.assertEqual(actual, false, msg);
+ };
+
+ this.assertEqual = function(actual, expected, msg) {
+ this.assert.equal(actual, expected, msg);
+ };
+
+ this.assertNotEqual = function(actual, expected, msg) {
+ this.assert.notEqual(actual, expected, msg);
+ };
+
+ this.assertDate = function(millis, msg, year, month, day, hour, minute) {
+ var date = new Date(millis);
+ var actual = "";
+ var expected = "";
+
+ if (year) {
+ actual += date.getUTCFullYear();
+ expected += year;
+ }
+ if (month) {
+ actual += "-" + (date.getUTCMonth() + 1);
+ expected += "-" + month;
+ }
+ if (day) {
+ actual += "-" + date.getUTCDate();
+ expected += "-" + day;
+ }
+ if (hour) {
+ actual += " " + date.getUTCHours();
+ expected += " " + hour;
+ }
+ if (minute) {
+ actual += ":" + date.getUTCMinutes();
+ expected += ":" + minute;
+ }
+
+ this.assertEqual(actual, expected, msg);
+ };
+
+ this.assertToday = function(millis, msg) {
+ var today = new Date();
+ this.assertDate(millis, msg, today.getUTCFullYear(), today.getUTCMonth() + 1, today.getUTCDate());
+ };
+
+ this.assertObjectsCount = function(objects, count) {
+ this.assertEqual(objects.length, count, 'Got ' + count + ' object(s)');
+ };
+
+ this.assertObjectsWithValues = function(objects, propertyName, propertyValues) {
+ var thisCommon = this;
+ var values = {};
+
+ $.each(objects, function(index, object) {
+ var value = thisCommon.getObjectProperty(object, propertyName);
+ if (value in values == false) {
+ values[value] = true;
+ }
+ });
+
+ this.assert.deepEqual(Object.keys(values).sort(), propertyValues.sort(), 'Objects have correct ' + propertyName + ' values')
+ };
+
+ this.assertObjectsWithOrWithoutCollections = function(objects, accessor, checker) {
+ var theObjects = null;
+
+ if ($.isArray(objects)) {
+ theObjects = objects;
+ } else {
+ theObjects = [ objects ];
+ }
+
+ var theAccessor = null;
+
+ if ($.isFunction(accessor)) {
+ theAccessor = accessor;
+ } else {
+ theAccessor = function(object) {
+ return object[accessor];
+ }
+ }
+
+ checker(theObjects, theAccessor);
+ };
+
+ this.assertObjectsWithCollections = function(objects, accessor) {
+ var thisCommon = this;
+ this.assertObjectsWithOrWithoutCollections(objects, accessor, function(objects, accessor) {
+ thisCommon.assert.ok(objects.some(function(object) {
+ var value = accessor(object);
+ return value && Object.keys(value).length > 0;
+ }), 'Objects have non-empty collections accessed via: ' + accessor);
+ });
+ };
+
+ this.assertObjectsWithoutCollections = function(objects, accessor) {
+ var thisCommon = this;
+ this.assertObjectsWithOrWithoutCollections(objects, accessor, function(objects, accessor) {
+ thisCommon.assert.ok(objects.every(function(object) {
+ var value = accessor(object);
+ return !value || Object.keys(value).length == 0;
+ }), 'Objects have empty collections accessed via: ' + accessor);
+ });
+ };
+
+ this.start = function() {
+ this.done = this.assert.async();
+ };
+
+ this.finish = function() {
+ if (this.done) {
+ this.done();
+ }
+ };
+
+ this.ok = function(msg) {
+ this.assert.ok(true, msg);
+ };
+
+ this.fail = function(msg) {
+ this.assert.ok(false, msg);
+ };
+
+ };
+
+ return Common;
+})
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
index 011ad1d362a9e3476158b62f7c9da30259d8610f..73dc905e61dab4706e73e15ed092efbb756c30c0 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-search.js
@@ -642,5 +642,30 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common', 'test/naturalsort' ],
testSearch(c, fSearch, fCheck);
});
+ QUnit.test("searchObjectKindModifications()", function(assert) {
+ var c = new common(assert);
+
+ var fSearch = function(facade) {
+ var criteria = new c.ObjectKindModificationSearchCriteria();
+ criteria.withObjectKind().thatIn([ "SAMPLE", "EXPERIMENT" ]);
+ criteria.withOperationKind().thatIn([ "CREATE_OR_DELETE" ]);
+ return facade.searchObjectKindModifications(criteria, c.createObjectKindModificationFetchOptions());
+ }
+
+ var fCheck = function(facade, objects) {
+ c.assertEqual(objects.length, 2);
+
+ var object0 = objects[0];
+ c.assertEqual(object0.getObjectKind(), "SAMPLE", "ObjectKind");
+ c.assertNotNull(object0.getLastModificationTimeStamp(), "LastModificationTimeStamp");
+
+ var object1 = objects[1];
+ c.assertEqual(object1.getObjectKind(), "EXPERIMENT", "ObjectKind");
+ c.assertNotNull(object1.getLastModificationTimeStamp(), "LastModificationTimeStamp");
+ }
+
+ testSearch(c, fSearch, fCheck);
+ });
+
}
});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js
new file mode 100644
index 0000000000000000000000000000000000000000..81d70604495a57a56e0cdaa890084e79135f65ed
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindCriteria.js
@@ -0,0 +1,23 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractSearchCriteria" ], function(require, stjs, exceptions, AbstractSearchCriteria) {
+ var ObjectKindCriteria = function() {
+ this.objectKinds = [];
+ };
+
+ stjs.extend(ObjectKindCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.objectKinds = null;
+
+ prototype.thatIn = function(objectKinds) {
+ this.objectKinds = objectKinds;
+ };
+ prototype.getObjectKinds = function() {
+ return this.objectKinds;
+ };
+ prototype.toString = function() {
+ return "with object kinds " + this.objectKinds;
+ }
+ }, {});
+
+ return ObjectKindCriteria;
+})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
index 078a84a00b1721723a22c5c1932122c774c687db..b31733f524eeef1ec5dff7cd9793acb162cc536e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.js
@@ -1,28 +1,30 @@
/**
- *
- *
* @author Franz-Josef Elmer
*/
-define([ "stjs", "as/dto/common/search/ISearchCriteria" ], function(stjs, ISearchCriteria) {
- var ObjectKindModificationSearchCriteria = function() {
- this.objectKinds = [];
- this.operationKinds = [];
- };
- stjs.extend(ObjectKindModificationSearchCriteria, null, [ ISearchCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindModificationSearchCriteria';
- constructor.serialVersionUID = 1;
- prototype.withObjectKinds = function(objectKinds) {
- this.objectKinds = objectKinds;
- }
- prototype.withOperationKinds = function(operationKinds) {
- this.operationKinds = operationKinds;
- }
- prototype.getObjectKinds = function() {
- return this.objectKinds;
- }
- prototype.getOperationKinds = function() {
- return this.operationKinds;
- }
- }, {});
- return ObjectKindModificationSearchCriteria;
-})
+define([ "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria", "as/dto/objectkindmodification/search/ObjectKindCriteria", "as/dto/objectkindmodification/search/OperationKindCriteria" ],
+ function(stjs, AbstractCompositeSearchCriteria, ObjectKindCriteria, OperationKindCriteria) {
+ var ObjectKindModificationSearchCriteria = function() {
+ AbstractCompositeSearchCriteria.call(this);
+ };
+ stjs.extend(ObjectKindModificationSearchCriteria, AbstractCompositeSearchCriteria, [ AbstractCompositeSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.objectkindmodification.search.ObjectKindModificationSearchCriteria';
+ constructor.serialVersionUID = 1;
+
+ prototype.withObjectKind = function() {
+ var ObjectKindCriteria = require("as/dto/objectkindmodification/search/ObjectKindCriteria");
+ return this.addCriteria(new ObjectKindCriteria());
+ };
+
+ prototype.withOperationKind = function() {
+ var OperationKindCriteria = require("as/dto/objectkindmodification/search/OperationKindCriteria");
+ return this.addCriteria(new OperationKindCriteria());
+ };
+
+ }, {
+ criteria : {
+ name : "Collection",
+ arguments : [ "ISearchCriteria" ]
+ }
+ });
+ return ObjectKindModificationSearchCriteria;
+ })
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js
new file mode 100644
index 0000000000000000000000000000000000000000..0af3fc8399fbb7dd7787f9b3b0d85225dee44426
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/objectkindmodification/search/OperationKindCriteria.js
@@ -0,0 +1,23 @@
+define([ "require", "stjs", "util/Exceptions", "as/dto/common/search/AbstractSearchCriteria" ], function(require, stjs, exceptions, AbstractSearchCriteria) {
+ var OperationKindCriteria = function() {
+ this.operationKinds = [];
+ };
+
+ stjs.extend(OperationKindCriteria, AbstractSearchCriteria, [ AbstractSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.objectkindmodification.search.OperationKindCriteria';
+ constructor.serialVersionUID = 1;
+ prototype.operationKinds = null;
+
+ prototype.thatIn = function(operationKinds) {
+ this.operationKinds = operationKinds;
+ };
+ prototype.getOperationKinds = function() {
+ return this.operationKinds;
+ };
+ prototype.toString = function() {
+ return "with operation kinds " + this.operationKinds;
+ }
+ }, {});
+
+ return OperationKindCriteria;
+})