diff --git a/ui/src/app/admin/component/UserMaintenance.js b/ui/src/app/admin/component/UserMaintenance.js
index e9a7b8c33..eba2150cd 100644
--- a/ui/src/app/admin/component/UserMaintenance.js
+++ b/ui/src/app/admin/component/UserMaintenance.js
@@ -3,6 +3,7 @@ import React from 'react';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faTrash } from '@fortawesome/free-solid-svg-icons';
import Button from 'react-bootstrap/Button';
+import Form from 'react-bootstrap/Form';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';
@@ -41,7 +42,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
| {group.name} |
{group.description || ''} |
-
+ |
diff --git a/ui/src/app/admin/container/NewGroup.js b/ui/src/app/admin/container/NewGroup.js
index dfa53bfc1..433990acf 100644
--- a/ui/src/app/admin/container/NewGroup.js
+++ b/ui/src/app/admin/container/NewGroup.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { Prompt, useHistory } from 'react-router';
+import { Prompt, useHistory } from 'react-router-dom';
import Translate from '../../i18n/components/translate';
import { useGroups } from '../hooks';
import { Schema } from '../../form/Schema';
@@ -55,7 +55,7 @@ export function NewGroup() {
- Add a new group
+ Add a new group
@@ -64,13 +64,15 @@ export function NewGroup() {
{(schema) =>
{(data, errors) =>
-
+ save(data)}
- onCancel={() => cancel()} />}
+ onCancel={() => cancel()} />
+ }
}
diff --git a/ui/src/app/admin/container/NewRole.js b/ui/src/app/admin/container/NewRole.js
index fff718ea7..4a323c9c9 100644
--- a/ui/src/app/admin/container/NewRole.js
+++ b/ui/src/app/admin/container/NewRole.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { Prompt, useHistory } from 'react-router';
+import { Prompt, useHistory } from 'react-router-dom';
import Translate from '../../i18n/components/translate';
import { useRoles } from '../hooks';
import { Schema } from '../../form/Schema';
@@ -55,7 +55,7 @@ export function NewRole() {
- Add a new role
+ Add a new role
diff --git a/ui/src/app/admin/container/RoleList.js b/ui/src/app/admin/container/RoleList.js
index 96278d0b4..4bec939e8 100644
--- a/ui/src/app/admin/container/RoleList.js
+++ b/ui/src/app/admin/container/RoleList.js
@@ -47,7 +47,7 @@ export function RoleList({ roles, onDelete }) {
{(roles?.length > 0) ? roles.map((role, i) =>
| {role.name} |
-
+ |
diff --git a/ui/src/app/admin/container/UserManagement.js b/ui/src/app/admin/container/UserManagement.js
index 29f4a8108..3d5db9d5b 100644
--- a/ui/src/app/admin/container/UserManagement.js
+++ b/ui/src/app/admin/container/UserManagement.js
@@ -85,7 +85,7 @@ export default function UserManagement({ users, children, reload}) {
setDeleting(null)}>
Delete User?
-
+
You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?
diff --git a/ui/src/app/admin/hooks.js b/ui/src/app/admin/hooks.js
index 66922a97c..b2c63a7c3 100644
--- a/ui/src/app/admin/hooks.js
+++ b/ui/src/app/admin/hooks.js
@@ -33,7 +33,7 @@ export function useGroupUiSchema () {
export function useGroupUiValidator() {
return (formData, errors) => {
- if (!isNil(formData?.validationRegex)) {
+ if (!isNil(formData?.validationRegex) && formData?.validationRegex !== '') {
const isValid = isValidRegex(formData.validationRegex);
if (!isValid) {
errors.validationRegex.addError('message.invalid-regex-pattern');
diff --git a/ui/src/app/core/components/AdminRoute.js b/ui/src/app/core/components/AdminRoute.js
deleted file mode 100644
index 1b8783ec8..000000000
--- a/ui/src/app/core/components/AdminRoute.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import { Redirect, Route } from 'react-router';
-
-import { useIsAdmin } from '../user/UserContext';
-
-export function AdminRoute({ children, ...rest }) {
- const isAdmin = useIsAdmin();
- return (
-
- isAdmin ? (
- children
- ) : (
-
- )
- }
- />
- );
-}
\ No newline at end of file
diff --git a/ui/src/app/core/components/DeleteConfirmation.js b/ui/src/app/core/components/DeleteConfirmation.js
index ac699063e..4c57adf1d 100644
--- a/ui/src/app/core/components/DeleteConfirmation.js
+++ b/ui/src/app/core/components/DeleteConfirmation.js
@@ -35,13 +35,13 @@ export function DeleteConfirmation({ children, body, title }) {
onCancelClick()}>
{title && Delete Metadata Source?}
-
+
You are deleting an entity. This cannot be undone. Continue?
- | |