From 1e4188c75904b0232fa412eedffee399355f474b Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Fri, 21 Mar 2025 11:34:02 +0100
Subject: [PATCH] REFACTOR: Sort and use consistent button names
---
.../src/ext/js/ext_samplemanagement.js | 41 ++++++++++---------
.../src/ext/js/ext_stockmanagement.js | 4 +-
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
index d4956df..322e9d3 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
+++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
@@ -19,11 +19,11 @@
const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, sample_management_reference_resolver) {
const logger = log.getLogger("samplemanagement_form");
const tool_box = "Sample Management"
- const upload_sample_template_title = "Upload sample template"; // title of the form and text in the toolbox
+ const upload_sample_template_title = "Update sample"; // title of the form and text in the toolbox
const upload_sample_template_panel_id = "upload_sample_template_form_panel";
- const register_new_samples_title = "Register new samples"; // title of the form and text in the toolbox
+ const register_new_samples_title = "Register samples"; // title of the form and text in the toolbox
const register_new_samples_panel_id = "register_new_samples_form_panel";
- const registerNewChildSamplesTitle = "Register new child samples"; // title of the form and text in the toolbox
+ const registerNewChildSamplesTitle = "Register child samples"; // title of the form and text in the toolbox
const registerNewChildSamplesPanelId = "register_new_children_form_panel";
const upload_pdf_id = "upload_pdf_form_panel";
const upload_pdf_title = "Upload PDF file";
@@ -46,8 +46,8 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
"Parent LinkAhead ID",
];
const non_sample_rt_column_names = [
- "Latitude start",
- "Storage ID",
+ "Latitude start",
+ "Storage ID",
"Biome",
"Campaign",
"Device",
@@ -64,7 +64,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
"Longitude stop",
"PDFReport",
"Parent LinkAhead ID",
- "Sample name",
+ "Sample name",
"Sphere",
"Start date",
"Start date",
@@ -264,9 +264,9 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
const column_names = $(a[0]).find(".caosdb-property-name").toArray().map(e => e.textContent);
var options = [...new Set(allColumnNames.concat(column_names))];
options = options.filter(n => !(unused_property_names.includes(n) || requiredColumnNames.includes(n))).sort();
- if (sorted == true) {
- options.sort();
- }
+ if (sorted == true) {
+ options.sort();
+ }
return options.map(e => ({
value: e,
label: e
@@ -307,12 +307,6 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
*/
const init_show_samplemanagement_panel_button = async function() {
//var form_wrapper = form_elements.make_form(config);
- navbar.add_tool(upload_sample_template_title, tool_box, {
- callback: form_panel.create_show_form_callback(
- upload_sample_template_panel_id,
- upload_sample_template_title,
- upload_sample_template_form_config)
- });
navbar.add_tool(register_new_samples_title, tool_box, {
callback: form_panel.create_show_form_callback(
register_new_samples_panel_id,
@@ -327,12 +321,11 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
undefined,
initRegisterChildSamplesForm)
});
- navbar.add_tool("Create sample template", tool_box, {
+ navbar.add_tool(upload_sample_template_title, tool_box, {
callback: form_panel.create_show_form_callback(
- "create-sample-template",
- "Create sample template",
- undefined,
- initRegisterTemplateForm)
+ upload_sample_template_panel_id,
+ upload_sample_template_title,
+ upload_sample_template_form_config)
});
// Set auto_focus=false because of WebUI bug: https://gitlab.com/linkahead/linkahead-webui/-/issues/258
navbar.add_tool(upload_pdf_title, tool_box, {
@@ -361,6 +354,14 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
input_field.addEventListener("blur", check_pattern);
}
});
+
+ navbar.add_tool("Create sample template", tool_box, {
+ callback: form_panel.create_show_form_callback(
+ "create-sample-template",
+ "Create sample template",
+ undefined,
+ initRegisterTemplateForm)
+ });
};
diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js
index 4775b9d..4463cfb 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js
+++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_stockmanagement.js
@@ -16,7 +16,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel,
const tool_box = "Storage Management" // The item that is shown in the top-navbar
///////////////// REGISTER NEW CONTAINERS START
- const register_new_containers_title = "Register new Containers";
+ const register_new_containers_title = "Register containers";
const register_new_containers_panel_id = "register_new_containers_form_panel";
const container_id_label = ("${BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL}" != "") ? "${BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL}" : "Container ID";
const register_new_containers_form_config = {
@@ -109,7 +109,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel,
///////////////// EXPORT CONTAINER CSV START
const export_csv_id = "export_container_csv";
- const export_csv_title = "Export existing containers to CSV";
+ const export_csv_title = "Export containers to CSV";
const export_csv_form_config = {
script: "export_container_csv.py",
--
GitLab