From 0528293da4fe6956654cac1c528511b2e18bdcd9 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Mon, 27 Jan 2025 16:14:20 +0100
Subject: [PATCH] MAINT: Remove bis from names of js modules
---
..._bis_samplemanagemet.js => ext_samplemanagement.js} | 8 ++++----
.../caosdb-webui/src/ext/js/ext_stockmanagement.js | 10 +++++-----
...lver.js => sample_management_reference_resolver.js} | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
rename sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/{ext_bis_samplemanagemet.js => ext_samplemanagement.js} (98%)
rename sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/{bis_custom_reference_resolver.js => sample_management_reference_resolver.js} (96%)
diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
similarity index 98%
rename from sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js
rename to sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
index 27a9494..afa88df 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js
+++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
@@ -16,7 +16,7 @@
* @requires nothing yet
* (pass the dependencies as arguments)
*/
-const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) {
+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
@@ -182,7 +182,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
name: "responsible_person",
label: "Main user",
query: "FIND RECORD Person",
- make_desc: bis_custom_reference_resolver.resolve_person_reference,
+ make_desc: sample_management_reference_resolver.resolve_person_reference,
required: true
},
{
@@ -263,7 +263,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
name: "main_user",
label: "Main user",
query: "FIND RECORD Person",
- make_desc: bis_custom_reference_resolver.resolve_person_reference,
+ make_desc: sample_management_reference_resolver.resolve_person_reference,
required: true
}, {
type: "select",
@@ -417,7 +417,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
return {
init: init,
};
-}($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver);
+}($, navbar, log, form_elements, form_panel, sample_management_reference_resolver);
// this will be replaced by require.js in the future.
$(document).ready(function() {
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 8afbebb..4775b9d 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
@@ -9,9 +9,9 @@
* @module ext_stockmanagement
* @version 0.2
*
- * @requires($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver)
+ * @requires($, navbar, log, form_elements, form_panel, sample_management_reference_resolver)
*/
-const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) {
+const ext_stockmanagement = function($, navbar, log, form_elements, form_panel, sample_management_reference_resolver) {
const tool_box = "Storage Management" // The item that is shown in the top-navbar
@@ -35,7 +35,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel,
name: "responsible_entity",
label: "Responsible entity",
query: "FIND RECORD Responsible",
- make_desc: bis_custom_reference_resolver.resolve_person_reference,
+ make_desc: sample_management_reference_resolver.resolve_person_reference,
required: true
},
{
@@ -77,7 +77,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel,
name: "parent_id",
label: "Parent container",
query: "FIND RECORD Container",
- make_desc: bis_custom_reference_resolver.resolve_default,
+ make_desc: sample_management_reference_resolver.resolve_default,
required: false
},
],
@@ -203,7 +203,7 @@ const ext_stockmanagement = function($, navbar, log, form_elements, form_panel,
return {
init: init,
};
-}($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver); // this will be replaced by require.js in the future.
+}($, navbar, log, form_elements, form_panel, sample_management_reference_resolver); // this will be replaced by require.js in the future.
$(document).ready(function() {
// use a variable starting with `BUILD_MODULE_` to this module
diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/bis_custom_reference_resolver.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/sample_management_reference_resolver.js
similarity index 96%
rename from sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/bis_custom_reference_resolver.js
rename to sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/sample_management_reference_resolver.js
index 7059cb5..ec82f14 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/bis_custom_reference_resolver.js
+++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/sample_management_reference_resolver.js
@@ -1,4 +1,4 @@
-var bis_custom_reference_resolver = new function (getEntityID, getEntityName, getParents, getProperty, query) {
+var sample_management_reference_resolver = new function (getEntityID, getEntityName, getParents, getProperty, query) {
const lastname_prop_name = "last_name";
const firstname_prop_name = "first_name";
--
GitLab