SEBSERV-877 fixed TODO, removed left-overs

Author: anhefti

client/src/components/views/seb-server/exam-template/wizard/components/stepNaming/composables/useFormFields.ts

@@ -7,7 +7,6 @@ import { useStepNamingStore } from "./store/useStepNamingStore";
 import { useRules } from "vuetify/labs/rules";
 import { useScreenProctoringStore } from "@/components/views/seb-server/exam-template/wizard/composables/store/useScreenProctoringStore";
 import i18n from "@/i18n";
-//import { useConfigurationTemplateNames } from "@/composables/useConfigurationTemplateNames";
 import { useClientConfigurationNames } from "@/composables/useClientConfigurationNames";
 
 export const useFormFields = () => {

client/src/components/views/seb-server/exam-template/wizard/components/stepSEBSettings/composables/api/useGetTemporaryConfigTemplate.ts

@@ -1,4 +1,3 @@
-import { onMounted } from "vue";
 import { useFetch } from "@/composables/useFetch";
 import { createTemporaryConfigurationTemplate } from "@/services/seb-server/examTemplateService";
 import { getConfigurationTemplateName } from "@/services/seb-server/configurationNodeService";
@@ -7,18 +6,18 @@ import { useStepNamingStore } from "@/components/views/seb-server/exam-template/
 const stepNamingStore = useStepNamingStore();
 
 export const getTemporaryConfigTemplate = () => {
-    const temporaryConfigTemplate = useFetch(() => {
-        // if temporary configuration template is not created yet create one
-        if (!stepNamingStore.configurationTemplate) {
-            return createTemporaryConfigurationTemplate();
-        } else {
-            // otherwise just request the existing one
-            return getConfigurationTemplateName(
-                stepNamingStore.configurationTemplate,
-            );
-        }
-    });
-    // TODO @andreas: use immediate=true instead
-    onMounted(temporaryConfigTemplate.fetchData);
-    return temporaryConfigTemplate;
+    return useFetch(
+        () => {
+            // if temporary configuration template is not created yet create one
+            if (!stepNamingStore.configurationTemplate) {
+                return createTemporaryConfigurationTemplate();
+            } else {
+                // otherwise just request the existing one
+                return getConfigurationTemplateName(
+                    stepNamingStore.configurationTemplate,
+                );
+            }
+        },
+        { immediate: true },
+    );
 };

client/src/composables/useConfigurationTemplateNames.ts

@@ -1,8 +1,3 @@
-export type ConfigurationTemplateName = {
-    modelId: string;
-    name: string;
-};
-
 export type ConfigurationTemplateKey = {
     id: string;
     name: string;

client/src/models/seb-server/configurationNode.ts

@@ -1,26 +1,12 @@
 import * as apiService from "@/services/apiService";
 import {
-    ConfigurationTemplateName,
     ConfigurationTemplateKey,
     SEBSettingsImport,
     ConfigurationKey,
 } from "@/models/seb-server/configurationNode";
 
 const baseUrl = "/configuration-node" as const;
 
-export const getConfigurationTemplateNamesActive = async (): Promise<
-    ConfigurationTemplateName[]
-> =>
-    (
-        await apiService.getRequest({
-            url: `${baseUrl}/names`,
-            options: {
-                _authType: "seb",
-                params: { type: "TEMPLATE", active: "true" },
-            },
-        })
-    ).data;
-
 export const getConfigurationTemplateName = async (
     id: string,
 ): Promise<ConfigurationTemplateKey> =>