From 854afe02acb989b135155000dd9624c2ef82f538 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Tue, 30 Apr 2024 14:37:12 -0300 Subject: [PATCH] code format --- src/frontend/src/App.tsx | 5 ++-- .../addNewVariableButton.tsx | 19 +++++++++++---- .../components/dropdownComponent/index.tsx | 10 ++++++-- .../components/inputGlobalComponent/index.tsx | 4 ++-- src/frontend/src/controllers/API/index.ts | 8 +++---- src/frontend/src/pages/SettingsPage/index.tsx | 20 ++++++++-------- .../pages/GlobalVariablesPage/index.tsx | 23 +++++++++++++------ .../pages/ShortcutsPage/index.tsx | 4 +--- src/frontend/src/routes.tsx | 1 - src/frontend/src/stores/flowsManagerStore.ts | 20 ++++++++++++---- src/frontend/src/stores/globalVariables.ts | 12 +++++----- src/frontend/src/stores/typesStore.ts | 13 ++++++++--- .../types/zustand/globalVariables/index.ts | 7 +++++- src/frontend/src/utils/reactflowUtils.ts | 9 +++++--- src/frontend/src/utils/utils.ts | 8 +++---- 15 files changed, 106 insertions(+), 57 deletions(-) diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 1f3f76ac2..396906e91 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -22,7 +22,6 @@ import useFlowsManagerStore from "./stores/flowsManagerStore"; import { useGlobalVariablesStore } from "./stores/globalVariables"; import { useStoreStore } from "./stores/storeStore"; import { useTypesStore } from "./stores/typesStore"; -import { getUnavailableFields } from "./utils/utils"; export default function App() { const removeFromTempNotificationList = useAlertStore( (state) => state.removeFromTempNotificationList @@ -48,7 +47,9 @@ export default function App() { const setGlobalVariables = useGlobalVariablesStore( (state) => state.setGlobalVariables ); - const setUnavailableFields = useGlobalVariablesStore((state) => state.setUnavaliableFields); + const setUnavailableFields = useGlobalVariablesStore( + (state) => state.setUnavaliableFields + ); const checkHasStore = useStoreStore((state) => state.checkHasStore); const navigate = useNavigate(); const dark = useDarkStore((state) => state.dark); diff --git a/src/frontend/src/components/addNewVariableButtonComponent/addNewVariableButton.tsx b/src/frontend/src/components/addNewVariableButtonComponent/addNewVariableButton.tsx index abacdb6a8..d1e6c7ffa 100644 --- a/src/frontend/src/components/addNewVariableButtonComponent/addNewVariableButton.tsx +++ b/src/frontend/src/components/addNewVariableButtonComponent/addNewVariableButton.tsx @@ -3,6 +3,7 @@ import { registerGlobalVariable } from "../../controllers/API"; import BaseModal from "../../modals/baseModal"; import useAlertStore from "../../stores/alertStore"; import { useGlobalVariablesStore } from "../../stores/globalVariables"; +import { useTypesStore } from "../../stores/typesStore"; import { ResponseErrorDetailAPI } from "../../types/api"; import ForwardedIconComponent from "../genericIconComponent"; import InputComponent from "../inputComponent"; @@ -10,7 +11,6 @@ import { Button } from "../ui/button"; import { Input } from "../ui/input"; import { Label } from "../ui/label"; import { Textarea } from "../ui/textarea"; -import { useTypesStore } from "../../stores/typesStore"; //TODO IMPLEMENT FORM LOGIC @@ -22,18 +22,27 @@ export default function AddNewVariableButton({ children }): JSX.Element { const [open, setOpen] = useState(false); const setErrorData = useAlertStore((state) => state.setErrorData); const componentFields = useTypesStore((state) => state.ComponentFields); - const unavaliableFields = useGlobalVariablesStore((state) => state.unavaliableFields); - const availableFields = Array.from(componentFields).filter((field) => !unavaliableFields.has(field)); + const unavaliableFields = useGlobalVariablesStore( + (state) => state.unavaliableFields + ); + const availableFields = Array.from(componentFields).filter( + (field) => !unavaliableFields.has(field) + ); const addGlobalVariable = useGlobalVariablesStore( (state) => state.addGlobalVariable ); function handleSaveVariable() { - let data: { name: string; value: string; type?: string; default_fields?: string[] } = { + let data: { + name: string; + value: string; + type?: string; + default_fields?: string[]; + } = { name: key, type, value, - default_fields: fields + default_fields: fields, }; registerGlobalVariable(data) .then((res) => { diff --git a/src/frontend/src/components/dropdownComponent/index.tsx b/src/frontend/src/components/dropdownComponent/index.tsx index c3407aba8..b17332268 100644 --- a/src/frontend/src/components/dropdownComponent/index.tsx +++ b/src/frontend/src/components/dropdownComponent/index.tsx @@ -33,7 +33,9 @@ export default function Dropdown({ const refButton = useRef(null); - const PopoverContentDropdown = children ? PopoverContent : PopoverContentWithoutPortal; + const PopoverContentDropdown = children + ? PopoverContent + : PopoverContentWithoutPortal; return ( <> @@ -77,7 +79,11 @@ export default function Dropdown({ )} diff --git a/src/frontend/src/components/inputGlobalComponent/index.tsx b/src/frontend/src/components/inputGlobalComponent/index.tsx index b2052ab84..0d1b0ea40 100644 --- a/src/frontend/src/components/inputGlobalComponent/index.tsx +++ b/src/frontend/src/components/inputGlobalComponent/index.tsx @@ -1,5 +1,4 @@ import { useEffect } from "react"; -import { deleteGlobalVariable } from "../../controllers/API"; import DeleteConfirmationModal from "../../modals/DeleteConfirmationModal"; import useAlertStore from "../../stores/alertStore"; import { useGlobalVariablesStore } from "../../stores/globalVariables"; @@ -43,7 +42,8 @@ export default function InputGlobalComponent({ function handleDelete(key: string) { const id = getVariableId(key); if (id !== undefined) { - removeGlobalVariable(key).then((_) => { + removeGlobalVariable(key) + .then((_) => { if ( data?.node?.template[name].value === key && data?.node?.template[name].load_from_db diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts index 8770f1b5e..36c1d0fed 100644 --- a/src/frontend/src/controllers/API/index.ts +++ b/src/frontend/src/controllers/API/index.ts @@ -860,14 +860,14 @@ export async function requestLogout() { } export async function getGlobalVariables(): Promise<{ - [key: string]: { id: string; type: string,default_fields:string[] }; + [key: string]: { id: string; type: string; default_fields: string[] }; }> { const globalVariables = {}; (await api.get(`${BASE_URL_API}variables/`)).data.forEach((element) => { globalVariables[element.name] = { id: element.id, type: element.type, - default_fields:element.default_fields + default_fields: element.default_fields, }; }); return globalVariables; @@ -877,7 +877,7 @@ export async function registerGlobalVariable({ name, value, type, - default_fields=[], + default_fields = [], }: { name: string; value: string; @@ -888,7 +888,7 @@ export async function registerGlobalVariable({ name, value, type, - default_fields:default_fields + default_fields: default_fields, }); } diff --git a/src/frontend/src/pages/SettingsPage/index.tsx b/src/frontend/src/pages/SettingsPage/index.tsx index 86d47cd34..554be79b6 100644 --- a/src/frontend/src/pages/SettingsPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/index.tsx @@ -16,16 +16,16 @@ export default function SettingsPage(): JSX.Element { const sidebarNavItems = [ { - title: "General", - href: "/settings/general", - icon: ( - - ), - }, - /* { + title: "General", + href: "/settings/general", + icon: ( + + ), + }, + /* { title: "Theme", href: "/settings/theme", icon: ( diff --git a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx index 802663924..266712881 100644 --- a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx @@ -34,19 +34,29 @@ export default function GlobalVariablesPage() { ); }; - - const [rowData, setRowData] = useState<{ type: string | undefined; - id: string; name: string; default_fields:string | undefined }[]>(); + const [rowData, setRowData] = + useState< + { + type: string | undefined; + id: string; + name: string; + default_fields: string | undefined; + }[] + >(); useEffect(() => { - const rows:Array<{type: string | undefined; id: string; - name: string;default_fields:string | undefined}> = []; + const rows: Array<{ + type: string | undefined; + id: string; + name: string; + default_fields: string | undefined; + }> = []; globalVariablesEntries.forEach((e) => { const globalVariableObj = globalVariables[e]; rows.push({ type: globalVariableObj.type, id: globalVariableObj.id, - default_fields: (globalVariableObj.default_fields??[]).join(", "), + default_fields: (globalVariableObj.default_fields ?? []).join(", "), name: e, }); }); @@ -92,7 +102,6 @@ export default function GlobalVariablesPage() { flex: 1, editable: false, }, - ]); const [selectedRows, setSelectedRows] = useState([]); diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx index 1dac8d095..adcfcefef 100644 --- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx @@ -124,9 +124,7 @@ export default function ShortcutsPage() { Flow - - Shortcuts relating to the flow. - + Shortcuts relating to the flow. ((set, get) => ({ ); useTypesStore.setState((state) => ({ data: { ...state.data, ["saved_components"]: data }, - ComponentFields: extractFieldsFromComponenents({...state.data, ["saved_components"]: data }), + ComponentFields: extractFieldsFromComponenents({ + ...state.data, + ["saved_components"]: data, + }), })); set({ isLoading: false }); resolve(); @@ -199,7 +202,10 @@ const useFlowsManagerStore = create((set, get) => ({ set({ isLoading: false }); useTypesStore.setState((state) => ({ data: { ...state.data, ["saved_components"]: data }, - ComponentFields: extractFieldsFromComponenents({...state.data, ["saved_components"]: data }), + ComponentFields: extractFieldsFromComponenents({ + ...state.data, + ["saved_components"]: data, + }), })); }, 200); // addFlowToLocalState(newFlow); @@ -222,7 +228,10 @@ const useFlowsManagerStore = create((set, get) => ({ set({ isLoading: false }); useTypesStore.setState((state) => ({ data: { ...state.data, ["saved_components"]: data }, - ComponentFields: extractFieldsFromComponenents({...state.data, ["saved_components"]: data }), + ComponentFields: extractFieldsFromComponenents({ + ...state.data, + ["saved_components"]: data, + }), })); // Return the id @@ -252,7 +261,10 @@ const useFlowsManagerStore = create((set, get) => ({ set({ isLoading: false }); useTypesStore.setState((state) => ({ data: { ...state.data, ["saved_components"]: data }, - ComponentFields: extractFieldsFromComponenents({...state.data, ["saved_components"]: data }), + ComponentFields: extractFieldsFromComponenents({ + ...state.data, + ["saved_components"]: data, + }), })); resolve(); }); diff --git a/src/frontend/src/stores/globalVariables.ts b/src/frontend/src/stores/globalVariables.ts index 7d3113ff0..d67da5079 100644 --- a/src/frontend/src/stores/globalVariables.ts +++ b/src/frontend/src/stores/globalVariables.ts @@ -1,6 +1,6 @@ import { create } from "zustand"; -import { GlobalVariablesStore } from "../types/zustand/globalVariables"; import { deleteGlobalVariable } from "../controllers/API"; +import { GlobalVariablesStore } from "../types/zustand/globalVariables"; import { getUnavailableFields } from "../utils/utils"; export const useGlobalVariablesStore = create( @@ -21,7 +21,7 @@ export const useGlobalVariablesStore = create( set({ globalVariables: variables, globalVariablesEntries: Object.keys(variables), - unavaliableFields: getUnavailableFields(variables) + unavaliableFields: getUnavailableFields(variables), }); }, addGlobalVariable: (name, id, type, default_fields) => { @@ -30,19 +30,19 @@ export const useGlobalVariablesStore = create( set({ globalVariables: newVariables, globalVariablesEntries: Object.keys(newVariables), - unavaliableFields: getUnavailableFields(newVariables) + unavaliableFields: getUnavailableFields(newVariables), }); }, - removeGlobalVariable:async (name) => { + removeGlobalVariable: async (name) => { const id = get().globalVariables[name]?.id; if (id === undefined) return; - await deleteGlobalVariable(id) + await deleteGlobalVariable(id); const newVariables = { ...get().globalVariables }; delete newVariables[name]; set({ globalVariables: newVariables, globalVariablesEntries: Object.keys(newVariables), - unavaliableFields: getUnavailableFields(newVariables) + unavaliableFields: getUnavailableFields(newVariables), }); }, getVariableId: (name) => { diff --git a/src/frontend/src/stores/typesStore.ts b/src/frontend/src/stores/typesStore.ts index f2539a8d3..c92236e03 100644 --- a/src/frontend/src/stores/typesStore.ts +++ b/src/frontend/src/stores/typesStore.ts @@ -2,7 +2,11 @@ import { create } from "zustand"; import { getAll } from "../controllers/API"; import { APIDataType } from "../types/api"; import { TypesStoreType } from "../types/zustand/types"; -import { extractFieldsFromComponenents, templatesGenerator, typesGenerator } from "../utils/reactflowUtils"; +import { + extractFieldsFromComponenents, + templatesGenerator, + typesGenerator, +} from "../utils/reactflowUtils"; import useAlertStore from "./alertStore"; import useFlowsManagerStore from "./flowsManagerStore"; @@ -28,7 +32,10 @@ export const useTypesStore = create((set, get) => ({ set((old) => ({ types: typesGenerator(data), data: { ...old.data, ...data }, - ComponentFields: extractFieldsFromComponenents({ ...old.data, ...data }), + ComponentFields: extractFieldsFromComponenents({ + ...old.data, + ...data, + }), templates: templatesGenerator(data), })); setLoading(false); @@ -50,7 +57,7 @@ export const useTypesStore = create((set, get) => ({ }, setData: (change: APIDataType | ((old: APIDataType) => APIDataType)) => { let newChange = typeof change === "function" ? change(get().data) : change; - set({ data: newChange}); + set({ data: newChange }); get().setComponentFields(extractFieldsFromComponenents(newChange)); }, })); diff --git a/src/frontend/src/types/zustand/globalVariables/index.ts b/src/frontend/src/types/zustand/globalVariables/index.ts index 45fda27cd..b69952993 100644 --- a/src/frontend/src/types/zustand/globalVariables/index.ts +++ b/src/frontend/src/types/zustand/globalVariables/index.ts @@ -9,7 +9,12 @@ export type GlobalVariablesStore = { }; }; setGlobalVariables: (variables: { - [name: string]: { id: string; type?: string; default_fields?: string[],value?: string }; + [name: string]: { + id: string; + type?: string; + default_fields?: string[]; + value?: string; + }; }) => void; addGlobalVariable: ( name: string, diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts index df56e0711..deb470f80 100644 --- a/src/frontend/src/utils/reactflowUtils.ts +++ b/src/frontend/src/utils/reactflowUtils.ts @@ -1234,13 +1234,16 @@ export function templatesGenerator(data: APIObjectType) { }, {}); } -export function extractFieldsFromComponenents(data:APIObjectType ) { +export function extractFieldsFromComponenents(data: APIObjectType) { const fields = new Set(); Object.keys(data).forEach((key) => { Object.keys(data[key]).forEach((kind) => { Object.keys(data[key][kind].template).forEach((field) => { - if(data[key][kind].template[field].display_name && data[key][kind].template[field].show) - fields.add(data[key][kind].template[field].display_name!); + if ( + data[key][kind].template[field].display_name && + data[key][kind].template[field].show + ) + fields.add(data[key][kind].template[field].display_name!); }); }); }); diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index 87aa5e376..3dafc3877 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -91,12 +91,12 @@ export function toTitleCase( .join(" "); } -export function getUnavailableFields( - variables:{[key: string]: { default_fields?:string[] }} -): Set { +export function getUnavailableFields(variables: { + [key: string]: { default_fields?: string[] }; +}): Set { const set = new Set(); Object.keys(variables).forEach((key) => { - if(variables[key].default_fields){ + if (variables[key].default_fields) { variables[key].default_fields!.forEach((field) => { set.add(field); });