From 90c49f8e5cacdfdc2cd6e8c3046b0eb0bef3b7b7 Mon Sep 17 00:00:00 2001 From: jasquat Date: Fri, 9 Feb 2024 10:39:45 -0500 Subject: [PATCH] a better fix. just set the extensionUxElements to a blank array instead of creating a new state --- .../src/ContainerForExtensions.tsx | 18 +++++------------- .../src/routes/BaseRoutes.tsx | 8 ++------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/spiffworkflow-frontend/src/ContainerForExtensions.tsx b/spiffworkflow-frontend/src/ContainerForExtensions.tsx index 22797e41f..ec62e7474 100644 --- a/spiffworkflow-frontend/src/ContainerForExtensions.tsx +++ b/spiffworkflow-frontend/src/ContainerForExtensions.tsx @@ -22,12 +22,9 @@ import NavigationBar from './components/NavigationBar'; export default function ContainerForExtensions() { const [backendIsUp, setBackendIsUp] = useState(null); - const [extensionUxElements, setExtensionNavigationItems] = useState< + const [extensionUxElements, setExtensionUxElements] = useState< UiSchemaUxElement[] | null >(null); - const [canLoadExtensions, setCanLoadExtensions] = useState( - null - ); let contentClassName = 'main-site-body-centered'; if (window.location.pathname.startsWith('/editor/')) { @@ -70,7 +67,7 @@ export default function ContainerForExtensions() { }) .flat(); if (eni) { - setExtensionNavigationItems(eni); + setExtensionUxElements(eni); } }; @@ -80,13 +77,13 @@ export default function ContainerForExtensions() { return; } if (ability.can('GET', targetUris.extensionListPath)) { - setCanLoadExtensions(true); HttpService.makeCallToBackend({ path: targetUris.extensionListPath, successCallback: processExtensionResult, }); } else { - setCanLoadExtensions(false); + // set to an empty array so we know that it loaded + setExtensionUxElements([]); } }; @@ -107,12 +104,7 @@ export default function ContainerForExtensions() { - } + element={} /> } /> } /> diff --git a/spiffworkflow-frontend/src/routes/BaseRoutes.tsx b/spiffworkflow-frontend/src/routes/BaseRoutes.tsx index 519beac5f..335c33f69 100644 --- a/spiffworkflow-frontend/src/routes/BaseRoutes.tsx +++ b/spiffworkflow-frontend/src/routes/BaseRoutes.tsx @@ -19,14 +19,10 @@ import { ExtensionUxElementMap } from '../components/ExtensionUxElementForDispla import Extension from './Extension'; type OwnProps = { - canLoadExtensions: boolean | null; extensionUxElements?: UiSchemaUxElement[] | null; }; -export default function BaseRoutes({ - canLoadExtensions, - extensionUxElements, -}: OwnProps) { +export default function BaseRoutes({ extensionUxElements }: OwnProps) { const elementCallback = (uxElement: UiSchemaUxElement) => { return (