From 56342f4489c33ddd4a989eb7255fc4549dee13ce Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Tue, 30 Apr 2024 14:35:28 -0300 Subject: [PATCH] Refactor globalVariables.ts to include unavaliableFields in useGlobalVariablesStore --- src/frontend/src/App.tsx | 1 - src/frontend/src/stores/globalVariables.ts | 4 ++++ src/frontend/src/utils/utils.ts | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index d0a74982c..1f3f76ac2 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -96,7 +96,6 @@ export default function App() { refreshFlows(); const res = await getGlobalVariables(); setGlobalVariables(res); - setUnavailableFields(getUnavailableFields(res)); checkHasStore(); fetchApiData(); } catch (error) { diff --git a/src/frontend/src/stores/globalVariables.ts b/src/frontend/src/stores/globalVariables.ts index 5a2a67fa4..7d3113ff0 100644 --- a/src/frontend/src/stores/globalVariables.ts +++ b/src/frontend/src/stores/globalVariables.ts @@ -1,6 +1,7 @@ import { create } from "zustand"; import { GlobalVariablesStore } from "../types/zustand/globalVariables"; import { deleteGlobalVariable } from "../controllers/API"; +import { getUnavailableFields } from "../utils/utils"; export const useGlobalVariablesStore = create( (set, get) => ({ @@ -20,6 +21,7 @@ export const useGlobalVariablesStore = create( set({ globalVariables: variables, globalVariablesEntries: Object.keys(variables), + unavaliableFields: getUnavailableFields(variables) }); }, addGlobalVariable: (name, id, type, default_fields) => { @@ -28,6 +30,7 @@ export const useGlobalVariablesStore = create( set({ globalVariables: newVariables, globalVariablesEntries: Object.keys(newVariables), + unavaliableFields: getUnavailableFields(newVariables) }); }, removeGlobalVariable:async (name) => { @@ -39,6 +42,7 @@ export const useGlobalVariablesStore = create( set({ globalVariables: newVariables, globalVariablesEntries: Object.keys(newVariables), + unavaliableFields: getUnavailableFields(newVariables) }); }, getVariableId: (name) => { diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index 53c61ee77..87aa5e376 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -92,12 +92,12 @@ export function toTitleCase( } export function getUnavailableFields( - variables:{[key: string]: { id: string; type: string,default_fields:string[] }} + variables:{[key: string]: { default_fields?:string[] }} ): Set { const set = new Set(); Object.keys(variables).forEach((key) => { if(variables[key].default_fields){ - variables[key].default_fields.forEach((field) => { + variables[key].default_fields!.forEach((field) => { set.add(field); }); }