diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts index 8c5cc6892..8770f1b5e 100644 --- a/src/frontend/src/controllers/API/index.ts +++ b/src/frontend/src/controllers/API/index.ts @@ -860,13 +860,14 @@ export async function requestLogout() { } export async function getGlobalVariables(): Promise<{ - [key: string]: { id: string; type: 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 }; }); return globalVariables; diff --git a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx index d0d786985..cc65efcdb 100644 --- a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx +++ b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx @@ -33,18 +33,25 @@ export default function GlobalVariablesPage() {
); }; - const [rowData, setRowData] = useState<{ type: string | undefined; id: string; name: string; }[]>(); + + + 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}> = []; + const rows:Array<{type: string | undefined; id: string; + name: string;default_fields:string | undefined}> = []; globalVariablesEntries.forEach((e) => { const globalVariableObj = globalVariables[e]; + console.log(globalVariableObj); rows.push({ type: globalVariableObj.type, id: globalVariableObj.id, + default_fields: (globalVariableObj.default_fields??[]).join(", "), name: e, }); }); + console.log(rows); setRowData(rows); }, [globalVariables]); @@ -75,15 +82,15 @@ export default function GlobalVariablesPage() { flex: 1, editable: false, }, - { - field: "value", - cellEditor: "agLargeTextCellEditor", - flex: 2, - editable: false, - }, + // { + // field: "value", + // cellEditor: "agLargeTextCellEditor", + // flex: 2, + // editable: false, + // }, { headerName: "Apply To Fields", - field: "defaultFields", + field: "default_fields", flex: 1, editable: false, },