From 3ad390a650764257b12d070b2484158d2bd7231c Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Sun, 16 Apr 2023 11:39:32 +0200
Subject: [PATCH] SSDM-13120: Enable/disable showing semantic annotations by
settings flag 'Show Semantic Annotations'
---
.../1/as/webapps/eln-lims/html/etc/InstanceProfile.js | 1 +
.../1/as/webapps/eln-lims/html/js/config/SettingsManager.js | 4 ++--
.../1/as/webapps/eln-lims/html/js/server/ServerFacade.js | 2 +-
.../eln-lims/html/js/views/SampleForm/SampleFormView.js | 5 ++++-
.../html/js/views/SettingsForm/SettingsFormController.js | 3 +++
.../eln-lims/html/js/views/SettingsForm/SettingsFormView.js | 5 +++++
6 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc/InstanceProfile.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc/InstanceProfile.js
index ee60632ee6d..c30511b0e86 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc/InstanceProfile.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc/InstanceProfile.js
@@ -15,6 +15,7 @@ $.extend(InstanceProfile.prototype, StandardProfile.prototype, {
// this.singleSignOnLinkLabel = "Login with SWITCHaai";
// END ANSIBLE MANAGED BLOCK (sso)
this.hideSectionsByDefault = true;
+ this.showSemanticAnnotations = true;
this.minBarcodeLength = 10;
this.barcodePattern = /^[-a-z0-9]+$/i
this.docuBaseUrl = "https://unlimited.ethz.ch/display/openBISDoc2010";
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js
index c17f5213636..0926b446573 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js
@@ -236,11 +236,11 @@ function SettingsManager(serverFacade) {
}
// Miscellaneous
- var miscellaneousFields = ["hideSectionsByDefault", "showDatasetArchivingButton"]
+ var miscellaneousFields = ["hideSectionsByDefault", "showSemanticAnnotations", "showDatasetArchivingButton"]
for(var miscellaneousField of miscellaneousFields) {
if(isMergeGroup && targetProfile[miscellaneousField] != undefined) { // Merge found values
targetProfile[miscellaneousField] = targetProfile[miscellaneousField] || settings[miscellaneousField];
- } else { // Replaces or sets value
+ } else if (settings[miscellaneousField] != undefined) { // Replaces or sets value
targetProfile[miscellaneousField] = settings[miscellaneousField];
}
}
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 32377af9d1e..ce5999ac69a 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -2754,7 +2754,7 @@ function ServerFacade(openbisServer) {
var fetchOptions = new SampleFetchOptions();
fetchOptions.withSpace();
fetchOptions.withType();
- if (fechOptions["withSemanticAnnotations"]) {
+ if (fechOptions["withSemanticAnnotations"] && profile.showSemanticAnnotations != false) {
fetchOptions.withType().withSemanticAnnotations();
fetchOptions.withType().withPropertyAssignments().withSemanticAnnotations();
fetchOptions.withType().withPropertyAssignments().withPropertyType().withSemanticAnnotations();
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 8cbea659f91..e7a9d22e87d 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -675,11 +675,14 @@ function SampleFormView(sampleFormController, sampleFormModel) {
$legend.remove();
}
+ var showSemanticAnnotations = profile.showSemanticAnnotations;
var propertyGroupPropertiesOnForm = 0;
for(var j = 0; j < propertyTypeGroup.propertyTypes.length; j++) {
var propertyType = propertyTypeGroup.propertyTypes[j];
var propertyTypeV3 = profile.getPropertyTypeFromSampleTypeV3(this._sampleFormModel.sampleType, propertyType.code);
- var semanticAnnotations = this._renderPropertyTypeSemanticAnnotations(this._sampleFormModel.sample.propertyTypesSemanticAnnotations[propertyTypeV3.code]);
+ if (this._sampleFormModel.sample.propertyTypesSemanticAnnotations) {
+ var semanticAnnotations = this._renderPropertyTypeSemanticAnnotations(this._sampleFormModel.sample.propertyTypesSemanticAnnotations[propertyTypeV3.code]);
+ }
FormUtil.fixStringPropertiesForForm(propertyTypeV3, this._sampleFormModel.sample);
if(!propertyType.showInEditViews && (this._sampleFormModel.mode === FormMode.EDIT || this._sampleFormModel.mode === FormMode.CREATE) && propertyType.code !== "$XMLCOMMENTS") { //Skip
continue;
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormController.js
index c206fd160ac..46323c4f285 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormController.js
@@ -39,6 +39,9 @@ function SettingsFormController(mainController, settingsSample, mode) {
newProfile["inventorySpacesReadOnly"] = profile.inventorySpacesReadOnlyPostFixes;
profileToEdit = newProfile;
}
+ if (!("showSemanticAnnotations" in profileToEdit)) {
+ profileToEdit["showSemanticAnnotations"] = profile.showSemanticAnnotations;
+ }
require(["as/dto/sample/id/SampleIdentifier"], function(SampleIdentifier) {
var sampId = new SampleIdentifier(settingsSample.identifier);
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
index 562ecd9ad41..69d51b36cad 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
@@ -129,6 +129,7 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
mainMenu : this._mainMenuItemsTableModel.getValues(),
sampleTypeDefinitionsExtension : this._getSampleTypeDefinitionsExtension(),
showDatasetArchivingButton : this._miscellaneousTableModel.getValues()["Show Dataset archiving button"],
+ showSemanticAnnotations : this._miscellaneousTableModel.getValues()["Show Semantic Annotations"],
hideSectionsByDefault : this._miscellaneousTableModel.getValues()["Hide sections by default"],
inventorySpaces : this._inventorySpacesTableModel.getValues(),
inventorySpacesReadOnly : this._inventorySpacesReadOnlyTableModel.getValues()
@@ -556,6 +557,10 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
label : "Show Dataset archiving button",
enabled : this._profileToEdit.showDatasetArchivingButton
});
+ tableModel.addRow({
+ label : "Show Semantic Annotations",
+ enabled : this._profileToEdit.showSemanticAnnotations
+ });
tableModel.addRow({
label : "Hide sections by default",
enabled : this._profileToEdit.hideSectionsByDefault
--
GitLab