Merge branch 'master' into imprv/vrt-tests

packages/app/src/components/Admin/UserGroup/UserGroupPage.tsx

@@ -134,7 +134,7 @@ const UserGroupPage: FC<Props> = (props: Props) => {
           headerLabel={t('admin:user_group_management.group_list')}
           userGroups={userGroups}
           childUserGroups={childUserGroups}
-          isAclEnabled={isAclEnabled}
+          isAclEnabled={isAclEnabled ?? false}
           onDelete={showDeleteModal}
           userGroupRelations={userGroupRelations}
         />

packages/app/src/components/Admin/UserGroup/UserGroupTable.tsx

@@ -80,7 +80,7 @@ const UserGroupTable: FC<Props> = (props: Props) => {
     }
 
     props.onDelete(group);
-  }, [props.userGroups, props.onDelete]);
+  }, [props]);
 
   /*
    * useEffect

packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -206,7 +206,7 @@ const UserGroupDetailPage: FC = () => {
         <UserGroupTable
           userGroups={childUserGroups}
           childUserGroups={grandChildUserGroups}
-          isAclEnabled={isAclEnabled}
+          isAclEnabled={isAclEnabled ?? false}
           onDelete={showDeleteModal}
           userGroupRelations={childUserGroupRelations}
         />