Merge branch 'develop' into bugfix/DEVSU-2194-retain-report-text-formatting

bnguyen-bcgsc · web-flow · commit 6181a5a92ada · 2024-02-29T15:29:22.000-08:00
diff --git a/app/context/ResourceContext/index.tsx b/app/context/ResourceContext/index.tsx
@@ -36,7 +36,7 @@ const useResources = (): ResourceContextType => {
         setAdminAccess(true);
       }
 
-      if (checkAccess(groups, [...ADMIN_ACCESS, 'manager'], ADMIN_BLOCK)) {
+      if (checkAccess(groups, [...ADMIN_ACCESS, 'manager', 'Report Manager'], ADMIN_BLOCK)) {
         setReportSettingAccess(true);
         setReportEditAccess(true);
       }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ipr-client",
-  "version": "6.27.0",
+  "version": "6.27.1",
   "keywords": [],
   "license": "GPL-3.0",
   "sideEffects": false,

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ const useResources = (): ResourceContextType => {`
`36`	`36`	`setAdminAccess(true);`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (checkAccess(groups, [...ADMIN_ACCESS, 'manager'], ADMIN_BLOCK)) {`
	`39`	`+ if (checkAccess(groups, [...ADMIN_ACCESS, 'manager', 'Report Manager'], ADMIN_BLOCK)) {`
`40`	`40`	`setReportSettingAccess(true);`
`41`	`41`	`setReportEditAccess(true);`
`42`	`42`	`}`