SSDM-2597 : Delete works again for samples, now using v3 API.

SVN: 37292

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js

@@ -362,8 +362,33 @@ function ServerFacade(openbisServer) {
 		this.openbisServer.deleteDataSets(datasetIds, reason, "TRASH", callback);
 	}
 	
-	this.deleteSamples = function(sampleIds, reason, callback) {
-		this.openbisServer.deleteSamples(sampleIds, reason, "TRASH", callback);
+	this.deleteSamples = function(samplePermIds, reason, callback) {
+		require([ 'openbis', "as/dto/sample/id/SamplePermId", "as/dto/sample/delete/SampleDeletionOptions" ], 
+		        function(openbis, SamplePermId, SampleDeletionOptions) {
+					//Boilerplate
+					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 v3Api = new openbis(testApiUrl);
+					v3Api._private.sessionToken = mainController.serverFacade.getSession();
+			
+		            var samplePermIdsObj = [];
+		            for(var sPIdx = 0; sPIdx < samplePermIds.length; sPIdx++) {
+		            	samplePermIdsObj.push(new SamplePermId(samplePermIds[sPIdx]));
+		            }
+		 
+		            var deletionOptions = new SampleDeletionOptions();
+		            deletionOptions.setReason(reason);
+		 
+		            // logical deletion (move objects to the trash can)
+		            v3Api.deleteSamples(samplePermIdsObj, deletionOptions).done(function(deletionId) {
+		            	callback(deletionId);
+		            });
+		 });
 	}
 	
 	this.deleteExperiments = function(experimentIds, reason, callback) {

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js

@@ -81,14 +81,14 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
 					Util.showError("Please select at least one sample to delete!");
 				} else {
 					var warningText = "The next " + ELNDictionary.samples + " will be deleted: ";
-					var sampleTechIds = [];
+					var samplePermIds = [];
 					for(var sIdx = 0; sIdx < selected.length; sIdx++) {
-						sampleTechIds.push(selected[sIdx].id);
+						samplePermIds.push(selected[sIdx].permId);
 						warningText += selected[sIdx].identifier + " ";
 					}
 					
 					var modalView = new DeleteEntityController(function(reason) {
-						mainController.serverFacade.deleteSamples(sampleTechIds, reason, function(data) {
+						mainController.serverFacade.deleteSamples(samplePermIds, reason, function(data) {
 							if(data.error) {
 								Util.showError(data.error.message);
 							} else {