Merge

Provincie-Zuid-Holland · Jan 30, 2024 · 5482382 · 5482382
2 parents 131bd60 + 919ea10
commit 5482382
Show file tree

Hide file tree

Showing 6 changed files with 599 additions and 608 deletions.
diff --git a/package.json b/package.json
@@ -6,10 +6,10 @@
     "type": "module",
     "dependencies": {
         "@headlessui/react": "^1.7.17",
-        "@pzh-ui/components": "^0.0.461",
+        "@pzh-ui/components": "^0.0.463",
         "@pzh-ui/config": "^0.0.56",
         "@pzh-ui/css": "^0.0.79",
-        "@pzh-ui/icons": "^0.0.48",
+        "@pzh-ui/icons": "^0.0.50",
         "@react-hookz/web": "^24.0.2",
         "@tanstack/react-query": "^5.14.2",
         "axios": "^1.6.2",

diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js
@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.1.1).
+ * Mock Service Worker (2.1.5).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

diff --git a/src/App/Routes/AppRoutes.tsx b/src/App/Routes/AppRoutes.tsx
@@ -393,7 +393,7 @@ const AppRoutes = () => {
                             element: (
                                 <ProtectedRoute
                                     permissions={{
-                                        canCreateUser: true,
+                                        canCreatePublicationTemplates: true,
                                     }}
                                     redirectTo="/muteer">
                                     <PublicationTemplateOverview />
@@ -405,7 +405,7 @@ const AppRoutes = () => {
                             element: (
                                 <ProtectedRoute
                                     permissions={{
-                                        canCreateUser: true,
+                                        canCreatePublicationTemplates: true,
                                     }}
                                     redirectTo="/muteer">
                                     <PublicationTemplateEdit />
@@ -417,7 +417,7 @@ const AppRoutes = () => {
                             element: (
                                 <ProtectedRoute
                                     permissions={{
-                                        canCreateUser: true,
+                                        canCreatePublicationTemplates: true,
                                     }}
                                     redirectTo="/muteer">
                                     <PublicationTemplateCreate />

diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx
@@ -1,5 +1,5 @@
 import { Text } from '@pzh-ui/components'
-import { House, Users } from '@pzh-ui/icons'
+import { FileInvoice, House, Users } from '@pzh-ui/icons'
 import classNames from 'classnames'
 import { useState } from 'react'
 import { Link } from 'react-router-dom'
@@ -9,7 +9,7 @@ import { ModelType } from '@/config/objects/types'
 import usePermissions from '@/hooks/usePermissions'
 
 const Sidebar = () => {
-    const { canEditUser } = usePermissions()
+    const { canEditUser, canCreatePublicationTemplates } = usePermissions()
 
     const [expanded, setExpanded] = useState(false)
 
@@ -91,6 +91,17 @@ const Sidebar = () => {
                             />
                         </>
                     )}
+
+                    {canCreatePublicationTemplates && (
+                        <MenuItem
+                            name="Publicatietemplates"
+                            path="/muteer/publicatietemplates"
+                            icon={FileInvoice}
+                            expanded={expanded}
+                            onHover={endAndStartTimer}
+                            onClick={() => window.clearTimeout(timer)}
+                        />
+                    )}
                 </div>
             </div>
         </div>

diff --git a/src/hooks/usePermissions.ts b/src/hooks/usePermissions.ts
@@ -12,6 +12,7 @@ export interface Permissions {
     canCreateUser: boolean
     canEditUser: boolean
     canResetUserPassword: boolean
+    canCreatePublicationTemplates: boolean
 }
 
 const usePermissions = (): Permissions => {
@@ -29,6 +30,7 @@ const usePermissions = (): Permissions => {
         canCreateUser: false,
         canEditUser: false,
         canResetUserPassword: false,
+        canCreatePublicationTemplates: false,
     }
 
     switch (role) {
@@ -51,6 +53,7 @@ const usePermissions = (): Permissions => {
                 canCreateUser: true,
                 canEditUser: true,
                 canResetUserPassword: true,
+                canCreatePublicationTemplates: true,
             }
         case 'Behandelend Ambtenaar':
             return {