From 20a6be5d735cc75fd75e4210884d85f57d63b0e1 Mon Sep 17 00:00:00 2001
From: Tim Kreuzer <t.kreuzer@fz-juelich.de>
Date: Wed, 5 Feb 2025 22:49:24 +0100
Subject: [PATCH] fix flavor, fix kube check
---
templates/macros/table/config/home.jinja | 1 -
templates/macros/table/config/workshop.jinja | 1 -
templates/macros/table/config/workshop_manager.jinja | 1 -
templates/macros/table/table_js.jinja | 10 +++++-----
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/templates/macros/table/config/home.jinja b/templates/macros/table/config/home.jinja
index 3d2f24e..4b05d89 100644
--- a/templates/macros/table/config/home.jinja
+++ b/templates/macros/table/config/home.jinja
@@ -423,7 +423,6 @@
"input": {
"type": "select",
"options": {
- "group": "kube",
"enabled": true
}
},
diff --git a/templates/macros/table/config/workshop.jinja b/templates/macros/table/config/workshop.jinja
index c8ce3bf..5309d26 100644
--- a/templates/macros/table/config/workshop.jinja
+++ b/templates/macros/table/config/workshop.jinja
@@ -423,7 +423,6 @@
"input": {
"type": "select",
"options": {
- "group": "kube",
"enabled": true
}
},
diff --git a/templates/macros/table/config/workshop_manager.jinja b/templates/macros/table/config/workshop_manager.jinja
index 2602a84..29c6bfc 100644
--- a/templates/macros/table/config/workshop_manager.jinja
+++ b/templates/macros/table/config/workshop_manager.jinja
@@ -715,7 +715,6 @@
"input": {
"type": "select",
"options": {
- "group": "kube",
"enabled": false
}
},
diff --git a/templates/macros/table/table_js.jinja b/templates/macros/table/table_js.jinja
index cf95279..64c0474 100644
--- a/templates/macros/table/table_js.jinja
+++ b/templates/macros/table/table_js.jinja
@@ -19,7 +19,7 @@
const backendServicesConfig = {{ custom_config.backendServices | tojson }};
const notAllowedKeys = ["secret_keys", "defaultvalues", "attachvalues"];
- const mappingDict = {}
+ const mappingDict = {};
const globalUserOptions = {};
const globalFillingOrder = {};
@@ -1213,8 +1213,8 @@
{# WorkshopManager.default.kube.flavor --> #}
function homeTriggerFlavor(trigger, serviceId, rowId, tabId, elementId, elementOptions) {
const systems = val(getInputElement(serviceId, rowId, "system"));
- const systemTypes = getSystemTypes(serviceId, rowId);
- if ( systemTypes.includes("kube") ){
+
+ if ( systems.some(item => kubeSystems.includes(item)) ) {
const selectInput = getInputElement(serviceId, rowId, "flavor");
fillSelect(elementId, selectInput, getAvailableKubeFlavorsS(systems), {}, getUnavailableKubeFlavorsS(systems), "maximum reached");
// selectInput.trigger("change");
@@ -1317,8 +1317,8 @@
function homeTriggerFlavorInfo(trigger, serviceId, rowId, tabId, elementId, elementOptions) {
const systems = val(getInputElement(serviceId, rowId, "system"));
- const systemTypes = getSystemTypes(serviceId, rowId);
- if ( systemTypes.includes("kube") && systems.length == 1 ){
+
+ if ( systems.some(item => kubeSystems.includes(item)) && systems.length == 1 ){
setFlavorInfo(serviceId, rowId, systems[0]);
// $(`[id^='${serviceId}-${rowId}-'][id$='-flavorinfo-info-div']`).show();
}
--
GitLab