Adding new role to show all comment status (#1983)

bcgov · Aug 10, 2023 · 3d1046d · 3d1046d
1 parent bf30746
commit 3d1046d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/met-api/src/met_api/utils/roles.py b/met-api/src/met_api/utils/roles.py
@@ -53,3 +53,4 @@ class Role(Enum):
     VIEW_UNAPPROVED_COMMENTS = 'view_unapproved_comments'
     VIEW_FEEDBACKS = 'view_feedbacks'
     VIEW_ALL_ENGAGEMENTS = 'view_all_engagements'  # Allows user access to all engagements including draft
+    SHOW_ALL_COMMENT_STATUS = 'show_all_comment_status'  # Allows user to see all comment status
diff --git a/met-web/src/components/engagement/listing/index.tsx b/met-web/src/components/engagement/listing/index.tsx
@@ -73,6 +73,8 @@ const EngagementListing = () => {
 
     const canViewPrivateEngagements = roles.includes(USER_ROLES.VIEW_PRIVATE_ENGAGEMENTS);
 
+    const canViewAllCommentStatus = roles.includes(USER_ROLES.SHOW_ALL_COMMENT_STATUS);
+
     const { page, size, sort_key, nested_sort_key, sort_order } = paginationOptions;
 
     useEffect(() => {
@@ -257,7 +259,8 @@ const EngagementListing = () => {
             renderCell: (row: Engagement) => {
                 if (
                     !submissionHasBeenOpened(row) ||
-                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id)))
+                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id))) ||
+                    !canViewAllCommentStatus
                 ) {
                     return <></>;
                 }
@@ -300,7 +303,8 @@ const EngagementListing = () => {
             renderCell: (row: Engagement) => {
                 if (
                     !submissionHasBeenOpened(row) ||
-                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id)))
+                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id))) ||
+                    !canViewAllCommentStatus
                 ) {
                     return <></>;
                 }
@@ -343,7 +347,8 @@ const EngagementListing = () => {
             renderCell: (row: Engagement) => {
                 if (
                     !submissionHasBeenOpened(row) ||
-                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id)))
+                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id))) ||
+                    !canViewAllCommentStatus
                 ) {
                     return <></>;
                 }

diff --git a/met-web/src/components/survey/listing/Surveys.tsx b/met-web/src/components/survey/listing/Surveys.tsx
@@ -51,6 +51,8 @@ const Surveys = () => {
 
     const canViewPrivateEngagements = roles.includes(USER_ROLES.VIEW_PRIVATE_ENGAGEMENTS);
 
+    const canViewAllCommentStatus = roles.includes(USER_ROLES.SHOW_ALL_COMMENT_STATUS);
+
     const submissionHasBeenOpened = (survey: Survey) => {
         return (
             !!survey.engagement &&
@@ -253,7 +255,8 @@ const Surveys = () => {
             renderCell: (row: Survey) => {
                 if (
                     !submissionHasBeenOpened(row) ||
-                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id)))
+                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.engagement_id))) ||
+                    !canViewAllCommentStatus
                 ) {
                     return <></>;
                 }
@@ -295,7 +298,8 @@ const Surveys = () => {
             renderCell: (row: Survey) => {
                 if (
                     !submissionHasBeenOpened(row) ||
-                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id)))
+                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.engagement_id))) ||
+                    !canViewAllCommentStatus
                 ) {
                     return <></>;
                 }
@@ -337,7 +341,8 @@ const Surveys = () => {
             renderCell: (row: Survey) => {
                 if (
                     !submissionHasBeenOpened(row) ||
-                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.id)))
+                    (!canViewPrivateEngagements && !assignedEngagements.includes(Number(row.engagement_id))) ||
+                    !canViewAllCommentStatus
                 ) {
                     return <></>;
                 }

diff --git a/met-web/src/routes/AuthenticatedRoutes.tsx b/met-web/src/routes/AuthenticatedRoutes.tsx
@@ -36,22 +36,10 @@ const AuthenticatedRoutes = () => {
                 <Route path="/surveys/:surveyId/build" element={<SurveyFormBuilder />} />
                 <Route path="/surveys/:surveyId/submit" element={<SurveySubmit />} />
                 <Route path="/surveys/:surveyId/report" element={<ReportSettings />} />
-                <Route
-                    element={
-                        <AuthGate
-                            allowedRoles={[USER_ROLES.VIEW_UNAPPROVED_COMMENTS, USER_ROLES.VIEW_APPROVED_COMMENTS]}
-                        />
-                    }
-                >
+                <Route element={<AuthGate allowedRoles={[USER_ROLES.VIEW_APPROVED_COMMENTS]} />}>
                     <Route path="/surveys/:surveyId/comments" element={<CommentReviewListing />} />
                 </Route>
-                <Route
-                    element={
-                        <AuthGate
-                            allowedRoles={[USER_ROLES.VIEW_UNAPPROVED_COMMENTS, USER_ROLES.VIEW_APPROVED_COMMENTS]}
-                        />
-                    }
-                >
+                <Route element={<AuthGate allowedRoles={[USER_ROLES.VIEW_APPROVED_COMMENTS]} />}>
                     <Route path="/surveys/:surveyId/comments/all" element={<CommentTextListing />} />
                 </Route>
                 <Route element={<AuthGate allowedRoles={[USER_ROLES.REVIEW_COMMENTS]} />}>

diff --git a/met-web/src/services/userService/constants.ts b/met-web/src/services/userService/constants.ts
@@ -26,8 +26,8 @@ export const USER_ROLES = {
     EDIT_CLOSED_ENGAGEMENT: 'edit_closed_engagement',
     VIEW_ASSIGNED_ENGAGEMENTS: 'view_assigned_engagements',
     VIEW_APPROVED_COMMENTS: 'view_approved_comments',
-    VIEW_UNAPPROVED_COMMENTS: 'view_unapproved_comments',
     APP_ADMIN: 'app-admin',
     VIEW_SURVEYS: 'view_surveys',
     VIEW_FEEDBACKS: 'view_feedbacks',
+    SHOW_ALL_COMMENT_STATUS: 'show_all_comment_status',
 };
diff --git a/met-web/tests/unit/components/comment/CommentListing.test.tsx b/met-web/tests/unit/components/comment/CommentListing.test.tsx
@@ -68,7 +68,7 @@ jest.mock('react-redux', () => ({
     ...jest.requireActual('react-redux'),
     useSelector: jest.fn(() => {
         return {
-            roles: [USER_ROLES.REVIEW_COMMENTS, USER_ROLES.VIEW_UNAPPROVED_COMMENTS],
+            roles: [USER_ROLES.REVIEW_COMMENTS],
             assignedEngagements: [mockSurveyOne.engagement_id],
         };
     }),