diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/AdminTests.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/AdminTests.js
index b9ef1e42f4615e02436a204b9185fbdc3392ff46..5d07c73be797f5198196883ba2ac8bf0c8f89aa8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/AdminTests.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/AdminTests.js
@@ -86,8 +86,6 @@ var AdminTests = new function() {
testChain = Promise.resolve();
testChain.then(() => e.waitForId("USER_MANAGER"))
.then(() => e.click("USER_MANAGER"))
- .then(() => e.waitForId("optionsMenu"))
- .then(() => e.click("optionsMenu"))
.then(() => e.waitForId("createUser"))
.then(() => e.click("createUser"))
.then(() => e.waitForId("userId"))
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js
index aa8dde9adbb4b384aaf6f013338d606aa6b36b09..76329d6030fbffb5e2e1ce2b4270c213899066ff 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js
@@ -66,36 +66,48 @@ var UserTests = new function() {
this.createBacteria = function(code, name) {
return new Promise(function executor(resolve, reject) {
var e = EventUtil;
+ var testChain = Promise.resolve();
var richText = '<p><span style="color:#000080;"><strong>F- tonA21 thi-1 thr-1 leuB6 lacY1</strong></span><strong> </strong><span style="color:#008000;"><i><strong>glnV44 rfbC1 fhuA1 ?? mcrB e14-(mcrA-)</strong></i></span><i><strong> </strong></i><span style="color:#cc99ff;"><strong><u>hsdR(rK -mK +) λ-</u></strong></span></p>';
- Promise.resolve().then(() => e.waitForId("_MATERIALS_BACTERIA_BACTERIA_COLLECTION"))
- .then(() => e.click("_MATERIALS_BACTERIA_BACTERIA_COLLECTION"))
- .then(() => e.waitForId("create-btn"))
- .then(() => e.click("create-btn"))
- .then(() => e.waitForId("sampleFormTitle"))
- .then(() => e.equalTo("sampleFormTitle", "Create Object Bacteria", true, false))
- .then(() => e.waitForId("codeId"))
- .then(() => e.waitForFill("codeId"))
- .then(() => e.equalTo("codeId", code, true, false))
- .then(() => e.waitForId("NAME"))
- .then(() => e.change("NAME", name, false))
- //Paste from Word
- .then(() => TestUtil.ckeditorSetData("BACTERIA.GENOTYPE", richText))
- .then(() => e.waitForId("save-btn"))
- .then(() => e.click("save-btn"))
- //Check saving results
- .then(() => e.waitForId("edit-btn"))
- .then(() => e.waitForId("NAME"))
- .then(() => e.equalTo("NAME", name, true, false))
- .then(() => TestUtil.ckeditorTestData("BACTERIA.GENOTYPE", richText))
- .then(() => resolve());
+ testChain.then(() => e.waitForId("_MATERIALS_BACTERIA_BACTERIA_COLLECTION"))
+ .then(() => e.click("_MATERIALS_BACTERIA_BACTERIA_COLLECTION"))
+ .then(() => e.waitForId("create-btn"))
+ .then(() => e.click("create-btn"))
+ .then(() => e.waitForId("sampleFormTitle"))
+ .then(() => e.equalTo("sampleFormTitle", "New Bacteria", true, false));
+
+ if (code === "BAC1") {
+ // Show Code
+ testChain.then(() => e.waitForId("options-menu-btn"))
+ .then(() => e.click("options-menu-btn"))
+ .then(() => e.waitForId("options-menu-btn-identification-info"))
+ .then(() => e.click("options-menu-btn-identification-info"));
+ }
+
+ testChain.then(() => e.waitForId("codeId"))
+ .then(() => e.waitForFill("codeId"))
+ .then(() => e.equalTo("codeId", code, true, false))
+ .then(() => e.waitForId("NAME"))
+ .then(() => e.change("NAME", name, false))
+ //Paste from Word
+ .then(() => e.waitForCkeditor("BACTERIA.GENOTYPE"))
+ .then(() => TestUtil.ckeditorSetData("BACTERIA.GENOTYPE", richText))
+ .then(() => e.waitForId("save-btn"))
+ .then(() => e.click("save-btn"))
+ //Check saving results
+ .then(() => e.waitForId("edit-btn"))
+ .then(() => e.waitForId("NAME"))
+ .then(() => e.equalTo("NAME", name, true, false))
+ .then(() => TestUtil.ckeditorTestData("BACTERIA.GENOTYPE", richText))
+ .then(() => resolve());
});
}
this.importsAutomaticCodes = function() {
var baseURL = location.protocol + '//' + location.host + location.pathname;
var pathToResource = "js/test/resources/bacteria_for_test_without_identifier.tsv";
+
return new Promise(function executor(resolve, reject) {
var e = EventUtil;
Promise.resolve().then(() => UserTests.importBacteriasFromFile(baseURL + pathToResource))
@@ -111,6 +123,7 @@ var UserTests = new function() {
this.importsGivenCodes = function() {
var baseURL = location.protocol + '//' + location.host + location.pathname;
var pathToResource = "js/test/resources/bacteria_for_test_with_identifier.tsv";
+
return new Promise(function executor(resolve, reject) {
var e = EventUtil;
Promise.resolve().then(() => UserTests.importBacteriasFromFile(baseURL + pathToResource))
@@ -157,6 +170,7 @@ var UserTests = new function() {
// we wait for the save-button, cause page contains add-storage-btn
// even when page can't be edit. So we wait when page be reloaded.
.then(() => e.waitForId("save-btn"))
+ .then(() => e.sleep(2000))
.then(() => e.waitForId("add-storage-btn"))
.then(() => e.click("add-storage-btn"))
.then(() => e.waitForId("storage-drop-down-id"))
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js
index abe3051fd51783e5fba9f2a70b0d48fa7ea9c0d2..72ed6eed4cc456e8bcbfa8a4c6aa590a8b28152f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js
@@ -115,6 +115,17 @@ var EventUtil = new function() {
});
};
+ this.waitForCkeditor = function(id, data) {
+ return new Promise(function executor(resolve, reject) {
+ editor = CKEditorManager.getEditorById(id);
+ if(editor === undefined) {
+ setTimeout(executor.bind(null, resolve, reject), DEFAULT_TIMEOUT_STEP);
+ } else {
+ resolve();
+ }
+ });
+ }
+
this.checkTimeout = function(elementId, timeout, ignoreError, resolve, reject) {
if (!timeout) {
timeout = DEFAULT_TIMEOUT;
@@ -131,6 +142,10 @@ var EventUtil = new function() {
return timeout;
}
+ this.sleep = function(ms) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+ }
+
this.dragAndDrop = function(dragId, dropId, ignoreError) {
return new Promise(function executor(resolve, reject) {
try {
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 da14841aa4ecf0e44f6c4c88fc89635f4e9e0cae..8de7a6160668297ac71fdbb13df44ccde4d0a3ce 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
@@ -1050,7 +1050,8 @@ var FormUtil = new function() {
var $section = $(option.section);
$section.toggle(shown);
var $label = $("<span>").append((shown ? "Hide " : "Show ") + option.label);
- var $dropdownElement = $("<li>", { 'role' : 'presentation' }).append($("<a>").append($label));
+ var id = 'options-menu-btn-' + option.label.split(" ").join("-").toLowerCase();
+ var $dropdownElement = $("<li>", { 'role' : 'presentation' }).append($("<a>", { 'id' : id }).append($label));
var action = function(event) {
var option = event.data.option;
var $label = event.data.label;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 2082287015c8e340fb9e0089cd0f4dc88a5dbfc7..9822b930f7d2f07f8c23fe641d42cd276c2a8ac0 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -13,7 +13,8 @@ var SampleDataGridUtil = new function() {
sortable : false,
render : function(data) {
var nameToUse = Util.getNameOrCode(data);
- return (isLinksDisabled)?nameToUse:FormUtil.getFormLink(nameToUse, "Sample", data.permId);
+ var codeId = data.code.toLowerCase() + "-column-id";
+ return (isLinksDisabled)?nameToUse:FormUtil.getFormLink(nameToUse, "Sample", data.permId, null, codeId);
}
});
@@ -191,8 +192,7 @@ var SampleDataGridUtil = new function() {
}
}
}
- var codeId = data.code.toLowerCase() + "-column-id";
- return (isLinksDisabled)?data.code:FormUtil.getFormLink(data.code, "Sample", data.permId, paginationInfo, codeId);
+ return (isLinksDisabled)?data.code:FormUtil.getFormLink(data.code, "Sample", data.permId, paginationInfo);
},
filter : function(data, filter) {
return data.identifier.toLowerCase().indexOf(filter) !== -1;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js
index 015007f543e161c13b21799dd3e2ce421f6851e7..9a123a8c257b98165948379e856efc28a276cdfe 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserManager/UserManagerView.js
@@ -40,10 +40,10 @@ function UserManagerView(userManagerController, userManagerModel) {
var $toolbox = $("<div>", { 'id' : 'toolBoxContainer', class : 'toolBox'});
var $createUser = FormUtil.getButtonWithIcon("glyphicon-plus", function() {
_this._userManagerController.showCreateNewUserModal();
- }, "New User");
+ }, "New User", null, "createUser");
$toolbox.append($createUser);
$header.append($toolbox);
-
+
//
// Data Grid
//