diff --git a/spiffworkflow-frontend/src/a-spiffui-v3/components/SideNav.tsx b/spiffworkflow-frontend/src/a-spiffui-v3/components/SideNav.tsx index 880edcede..379fa0eae 100644 --- a/spiffworkflow-frontend/src/a-spiffui-v3/components/SideNav.tsx +++ b/spiffworkflow-frontend/src/a-spiffui-v3/components/SideNav.tsx @@ -69,6 +69,8 @@ function SideNav({ selectedTab = 2; } else if (location.pathname === '/newui/messages') { selectedTab = 3; + } else if (location.pathname.startsWith('/newui/configuration')) { + selectedTab = 4; } const versionInfo = appVersionInfo(); @@ -168,6 +170,7 @@ function SideNav({ { text: 'START NEW PROCESS', icon: }, { text: 'DATA STORES' }, { text: 'MESSAGES' }, + { text: 'CONFIGURATION' }, ].map((item, index) => ( { setPageTitle(['Configuration']); let newSelectedTabIndex = 0; - if (location.pathname.match(/^\/configuration\/authentications\b/)) { + if ( + location.pathname.match(/^\/(newui\/)?configuration\/authentications\b/) + ) { newSelectedTabIndex = 1; } setSelectedTabIndex(newSelectedTabIndex); @@ -45,7 +47,7 @@ export default function Configuration({ extensionUxElements }: OwnProps) { uxElement: UiSchemaUxElement, uxElementIndex: number, ) => { - const navItemPage = `/configuration/extension${uxElement.page}`; + const navItemPage = `/newui/configuration/extension${uxElement.page}`; let pagesToCheck = [uxElement.page]; if ( @@ -56,7 +58,7 @@ export default function Configuration({ extensionUxElements }: OwnProps) { } pagesToCheck.forEach((pageToCheck: string) => { - const pageToCheckNavItem = `/configuration/extension${pageToCheck}`; + const pageToCheckNavItem = `/newui/configuration/extension${pageToCheck}`; if (pageToCheckNavItem === location.pathname) { setSelectedTabIndex(uxElementIndex + 2); } @@ -82,13 +84,13 @@ export default function Configuration({ extensionUxElements }: OwnProps) { navigate('/configuration/secrets')} + onClick={() => navigate('/newui/configuration/secrets')} /> navigate('/configuration/authentications')} + onClick={() => navigate('/newui/configuration/authentications')} /> - + {(row as any).id} - + {(row as any).key} @@ -135,7 +135,7 @@ export default function SecretList() {

Secrets

{SecretsDisplayArea()} -
diff --git a/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretNew.tsx b/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretNew.tsx index 60ed8810e..60153e8c0 100644 --- a/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretNew.tsx +++ b/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretNew.tsx @@ -11,11 +11,11 @@ export default function SecretNew() { const navigate = useNavigate(); const navigateToSecret = (_result: any) => { - navigate(`/configuration/secrets/${key}`); + navigate(`/newui/configuration/secrets/${key}`); }; const navigateToSecrets = () => { - navigate(`/configuration/secrets`); + navigate(`/newui/configuration/secrets`); }; const addSecret = (event: any) => { @@ -59,7 +59,11 @@ export default function SecretNew() { label="Key*" value={key} error={keyIsInvalid} - helperText={keyIsInvalid ? "The key must be alphanumeric characters and underscores" : ""} + helperText={ + keyIsInvalid + ? 'The key must be alphanumeric characters and underscores' + : '' + } onChange={(e: any) => setKey(e.target.value)} fullWidth /> @@ -68,7 +72,7 @@ export default function SecretNew() { label="Value*" value={value} error={valueIsInvalid} - helperText={valueIsInvalid ? "The value must be set" : ""} + helperText={valueIsInvalid ? 'The value must be set' : ''} onChange={(e: any) => { setValue(e.target.value); }} diff --git a/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretShow.tsx b/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretShow.tsx index a9d806102..5f7302243 100644 --- a/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretShow.tsx +++ b/spiffworkflow-frontend/src/a-spiffui-v3/views/SecretShow.tsx @@ -68,7 +68,7 @@ export default function SecretShow() { }; const navigateToSecrets = (_result: any) => { - navigate(`/configuration/secrets`); + navigate(`/newui/configuration/secrets`); }; const deleteSecret = () => {