add pattern to groupname (#339)

* add pattern to groupname * adjust groupname pattern, fix routing * adjust pattern * adjust name max length * fix: regex --------- Co-authored-by: Andreas Scheibal <[email protected]>
corona-warn-app · Feb 27, 2023 · 6e559cd · 6e559cd
1 parent 3c88ec3
commit 6e559cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/components/modals/group-modal.component.tsx b/src/components/modals/group-modal.component.tsx
@@ -365,7 +365,8 @@ const GroupModal = (props: any) => {
                   updateGroupProp('name', evt.target.value);
                   props.resetError();
                 }}
-                maxLength={45}
+                pattern={'^[A-Za-z0-9\\säöüÄÜÖß\\-_]*$'}
+                maxLength={50}
                 isInvalid={props.isCreationError}
                 InvalidText={t('translation:group-conflict-error')}
               />

diff --git a/src/components/modules/private-route.component.tsx b/src/components/modules/private-route.component.tsx
@@ -28,7 +28,7 @@ import AppContext from '../../store/app-context';
 
 interface PrivateRouteProps {
   roles?: string[];
-  enabled?: boolean;
+  disabled?: boolean;
 }
 
 const PrivateRoute = (props: PrivateRouteProps) => {
@@ -38,7 +38,7 @@ const PrivateRoute = (props: PrivateRouteProps) => {
   const [isInit, setIsInit] = React.useState(false);
   const [isAuthorized, setIsAuthorized] = React.useState(false);
 
-  const { roles, enabled } = props;
+  const { roles, disabled } = props;
 
   React.useEffect(() => {
     if (keycloak) {
@@ -66,7 +66,7 @@ const PrivateRoute = (props: PrivateRouteProps) => {
   return (
     <>
       {isInit &&
-        (isAuthorized && enabled ? (
+        (isAuthorized && !disabled ? (
           <Outlet />
         ) : (
           <Navigate

diff --git a/src/routing.component.tsx b/src/routing.component.tsx
@@ -133,7 +133,7 @@ const Routing = () => {
             element={
               <PrivateRoute
                 roles={['c19_quick_test_admin']}
-                enabled={userManagementRouteIsEnabled}
+                disabled={!userManagementRouteIsEnabled}
               />
             }
           >