diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java index 333f5c8c9..5aef3d9e2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java @@ -35,7 +35,7 @@ public void indexHtml(HttpServletRequest request, HttpServletResponse response) .lines() .collect(Collectors.joining("\n")); - content = content.replaceFirst("", ""); + content = content.replaceFirst("]+>", ""); response.setContentType("text/html"); try (OutputStream writer = response.getOutputStream()) { writer.write(content.getBytes()); diff --git a/ui/build.gradle b/ui/build.gradle index a4c452e90..606663890 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -17,6 +17,12 @@ npm_run_build { outputs.dir 'build' } +npm_run_buildProd { + inputs.dir 'src' + inputs.dir 'public' + outputs.dir 'build' +} + npm_run_start { if (project.hasProperty('npm-args')) { args = project.'npm-args'.tokenize() diff --git a/ui/public/index.html b/ui/public/index.html index 6cc9d0294..6cdabfc57 100644 --- a/ui/public/index.html +++ b/ui/public/index.html @@ -6,10 +6,7 @@ Shibboleth IDP UI - - - diff --git a/ui/src/app/App.js b/ui/src/app/App.js index b3f8a2419..db7a0dbbd 100644 --- a/ui/src/app/App.js +++ b/ui/src/app/App.js @@ -63,6 +63,9 @@ function App() { + + + diff --git a/ui/src/app/admin/container/UserManagement.js b/ui/src/app/admin/container/UserManagement.js index 2d023ab1d..39453eac0 100644 --- a/ui/src/app/admin/container/UserManagement.js +++ b/ui/src/app/admin/container/UserManagement.js @@ -61,12 +61,14 @@ export default function UserManagement({ users, children, reload }) { const deleteUser = (id) => { deleteUserRequest(deleting); setDeleting(null); - } + }; + + console.log(deleting) return (
{children(users, roles, setUserRoleRequest, (id) => setDeleting(id))} - setDeleting(null)}> + setDeleting(null)}> Delete User? @@ -82,7 +84,7 @@ export default function UserManagement({ users, children, reload }) { Cancel - +
); } diff --git a/ui/src/app/core/components/Header.js b/ui/src/app/core/components/Header.js index ac98ec7d1..69b3c7020 100644 --- a/ui/src/app/core/components/Header.js +++ b/ui/src/app/core/components/Header.js @@ -32,10 +32,10 @@ export function Header () { - + - + @@ -44,14 +44,14 @@ export function Header () { - + - - + + - +