(User roles) Remove legacy scopes from client

packages/auth/src/features/refresh/handler.test.ts

@@ -81,7 +81,6 @@ describe('authenticate handler receives a request', () => {
         SCOPES.USER_CREATE,
         SCOPES.USER_READ,
         SCOPES.USER_UPDATE,
-        SCOPES.ORGANISATION_READ,
         SCOPES.ORGANISATION_READ_LOCATIONS,
         SCOPES.PERFORMANCE_READ,
         SCOPES.PERFORMANCE_READ_DASHBOARDS,

packages/auth/src/features/verifyCode/handler.test.ts

@@ -77,7 +77,6 @@ describe('authenticate handler receives a request', () => {
         SCOPES.USER_CREATE,
         SCOPES.USER_READ,
         SCOPES.USER_UPDATE,
-        SCOPES.ORGANISATION_READ,
         SCOPES.ORGANISATION_READ_LOCATIONS,
         SCOPES.PERFORMANCE_READ,
         SCOPES.PERFORMANCE_READ_DASHBOARDS,

packages/client/src/App.tsx

@@ -385,7 +385,7 @@ export function App(props: IAppProps) {
                                             <ProtectedRoute
                                               exact
                                               scopes={[
-                                                SCOPES.RECORD_PRINT_RECORDS
+                                                SCOPES.RECORD_REGISTRATION_PRINT
                                               ]}
                                               path={routes.VERIFY_COLLECTOR}
                                               component={VerifyCollector}
@@ -510,10 +510,7 @@ export function App(props: IAppProps) {
                                             />
                                             <ProtectedRoute
                                               exact
-                                              scopes={[
-                                                SCOPES.PERFORMANCE_READ,
-                                                SCOPES.PERFORMANCE_READ_MY_OFFICE
-                                              ]}
+                                              scopes={[SCOPES.PERFORMANCE_READ]}
                                               path={routes.PERFORMANCE_HOME}
                                               component={PerformanceHome}
                                             />

packages/client/src/components/form/ReviewActionComponent.tsx

@@ -20,6 +20,9 @@ import styled from 'styled-components'
 import React, { useState } from 'react'
 import { Button } from '@opencrvs/components/lib/Button'
 import { Icon } from '@opencrvs/components/lib/Icon'
+import ProtectedComponent from '@client/components/ProtectedComponent'
+import { SCOPES } from '@client/utils/gateway'
+import { usePermissions } from '@client/hooks/useAuthorization'
 
 interface IReviewActionProps extends React.HTMLAttributes<HTMLDivElement> {
   id?: string
@@ -89,12 +92,12 @@ const ActionContainer = styled.div`
   flex-flow: row wrap;
   align-items: center;
 
-  button:first-child {
-    margin-right: 16px;
-  }
+  button {
+    margin: 0 16px 8px 0;
 
-  & > button {
-    margin-bottom: 8px;
+    &:last-child {
+      margin-right: 0;
+    }
   }
 `
 
@@ -295,8 +298,6 @@ const ACTION_TO_CONTENT_MAP_SKELETON: (
 
 const ReviewActionComponent = ({
   id,
-  declarationToBeValidated,
-  declarationToBeRegistered,
   alreadyRejectedDeclaration,
   completeDeclaration,
   totalFileSizeExceeded,
@@ -308,6 +309,13 @@ const ReviewActionComponent = ({
   hasErrorsOnFields
 }: IReviewActionProps & IntlShapeProps) => {
   const [showSubmitModal, setShowSubmitModal] = useState(false)
+  const { hasAnyScope, hasScope } = usePermissions()
+
+  const declarationToBeRegistered = hasScope(SCOPES.RECORD_REGISTER)
+  const declarationToBeValidated = hasAnyScope([
+    SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+    SCOPES.RECORD_SUBMIT_FOR_UPDATES
+  ])
 
   const toggleSubmitModalOpen = () => {
     setShowSubmitModal(!showSubmitModal)
@@ -336,6 +344,7 @@ const ReviewActionComponent = ({
         String(draftDeclaration || alreadyRejectedDeclaration)
       ].completionStatus[String(completeDeclaration)]) ||
     null
+
   return !actionContent ? null : (
     <Container id={id}>
       <UnderLayBackground background={background} />
@@ -354,44 +363,62 @@ const ReviewActionComponent = ({
         </Description>
         <ActionContainer>
           {declarationToBeRegistered ? (
-            <Button
-              type="positive"
-              size="large"
-              id="registerDeclarationBtn"
-              onClick={toggleSubmitModalOpen}
-              disabled={!completeDeclaration || totalFileSizeExceeded}
-            >
-              <Icon name="Check" />
-              {intl.formatMessage(buttonMessages.register)}
-            </Button>
+            <ProtectedComponent scopes={[SCOPES.RECORD_REGISTER]}>
+              <Button
+                type="positive"
+                size="large"
+                id="registerDeclarationBtn"
+                onClick={toggleSubmitModalOpen}
+                disabled={!completeDeclaration || totalFileSizeExceeded}
+              >
+                <Icon name="Check" />
+                {intl.formatMessage(buttonMessages.register)}
+              </Button>
+            </ProtectedComponent>
           ) : declarationToBeValidated ? (
-            <Button
-              type="positive"
-              size="large"
-              id="validateDeclarationBtn"
-              onClick={toggleSubmitModalOpen}
-              disabled={!completeDeclaration || totalFileSizeExceeded}
-            >
-              <Icon name="PaperPlaneTilt" />
-              {intl.formatMessage(buttonMessages.sendForApproval)}
-            </Button>
+            <ProtectedComponent scopes={[SCOPES.RECORD_SUBMIT_FOR_APPROVAL]}>
+              <Button
+                type="positive"
+                size="large"
+                id="validateDeclarationBtn"
+                onClick={toggleSubmitModalOpen}
+                disabled={!completeDeclaration || totalFileSizeExceeded}
+              >
+                <Icon name="PaperPlaneTilt" />
+                {intl.formatMessage(buttonMessages.sendForApproval)}
+              </Button>
+            </ProtectedComponent>
           ) : (
-            <Button
-              type="primary"
-              size="large"
-              id="submit_form"
-              onClick={toggleSubmitModalOpen}
-              disabled={hasErrorsOnFields || totalFileSizeExceeded}
-            >
-              <Upload />
-              {intl.formatMessage(
-                completeDeclaration
-                  ? buttonMessages.sendForReview
-                  : buttonMessages.sendIncomplete
-              )}
-            </Button>
+            <>
+              <ProtectedComponent scopes={[SCOPES.RECORD_SUBMIT_INCOMPLETE]}>
+                <Button
+                  type="primary"
+                  size="large"
+                  id="submit_incomplete"
+                  onClick={toggleSubmitModalOpen}
+                  disabled={hasErrorsOnFields || totalFileSizeExceeded}
+                >
+                  <Upload />
+                  {intl.formatMessage(buttonMessages.sendIncomplete)}
+                </Button>
+              </ProtectedComponent>
+              <ProtectedComponent
+                scopes={[SCOPES.RECORD_SUBMIT_FOR_REVIEW]}
+                denyScopes={[SCOPES.RECORD_SUBMIT_INCOMPLETE]}
+              >
+                <Button
+                  type="primary"
+                  size="large"
+                  id="submit_for_review"
+                  onClick={toggleSubmitModalOpen}
+                  disabled={hasErrorsOnFields || totalFileSizeExceeded}
+                >
+                  <Upload />
+                  {intl.formatMessage(buttonMessages.sendForReview)}
+                </Button>
+              </ProtectedComponent>
+            </>
           )}
-
           {rejectDeclarationAction && !alreadyRejectedDeclaration && (
             <Button
               type="negative"

packages/client/src/components/interface/Navigation.test.tsx

@@ -328,7 +328,7 @@ describe('Given a user with scopes views Navigation', () => {
   describe('Requires update', async () => {
     const id = `#navigation_${WORKQUEUE_TABS.requiresUpdate}`
 
-    const requiredScopes = [SCOPES.RECORD_DECLARATION_REVIEW] as Scope[]
+    const requiredScopes = [SCOPES.RECORD_SUBMIT_FOR_UPDATES] as Scope[]
 
     const allOtherScopes = allScopes.filter(
       (scope) => !requiredScopes.includes(scope)
@@ -350,7 +350,10 @@ describe('Given a user with scopes views Navigation', () => {
   describe('Ready for review', async () => {
     const id = `#navigation_${WORKQUEUE_TABS.readyForReview}`
 
-    const requiredScopes = [SCOPES.RECORD_DECLARATION_REVIEW] as Scope[]
+    const requiredScopes = [
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ] as Scope[]
 
     const allOtherScopes = allScopes.filter(
       (scope) => !requiredScopes.includes(scope)
@@ -446,15 +449,30 @@ describe('Given a user with scopes views Navigation', () => {
   describe('Outbox', async () => {
     const id = `#navigation_${WORKQUEUE_TABS.outbox}`
 
-    const excludedScopes = [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
+    const requiredScopes = [
+      SCOPES.RECORD_DECLARE_BIRTH,
+      SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION,
+      SCOPES.RECORD_DECLARE_DEATH,
+      SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION,
+      SCOPES.RECORD_DECLARE_MARRIAGE,
+      SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION,
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES,
+      SCOPES.RECORD_REVIEW_DUPLICATES,
+      SCOPES.RECORD_REGISTER,
+      SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
+      SCOPES.RECORD_REGISTRATION_CORRECT,
+      SCOPES.RECORD_DECLARATION_ARCHIVE,
+      SCOPES.RECORD_DECLARATION_REINSTATE,
+      SCOPES.RECORD_REGISTRATION_REVOKE
+    ] as Scope[]
 
-    const anyOtherScope = allScopes.filter(
-      (scope) => !excludedScopes.includes(scope)
+    const allOtherScopes = allScopes.filter(
+      (scope) => !requiredScopes.includes(scope)
     )
     const tests = [
-      [[excludedScopes[0]], false],
-      [[excludedScopes[1]], false],
-      [anyOtherScope, true]
+      [requiredScopes, true],
+      [allOtherScopes, false]
     ]
 
     tests.forEach(([scopes, exists]) => {
@@ -468,9 +486,9 @@ describe('Given a user with scopes views Navigation', () => {
 
   describe('and user has organisation scopes', async () => {
     const orgScopes = [
-      SCOPES.ORGANISATION_READ,
       SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE
+      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
+      SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION
     ] as Scope[]
 
     describe('Performance', async () => {
@@ -506,7 +524,7 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Organisation', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.organisation}`
 
-      const requiredScopes = [SCOPES.ORGANISATION_READ] as Scope[]
+      const requiredScopes = [SCOPES.ORGANISATION_READ_LOCATIONS] as Scope[]
 
       const allOtherScopes = allScopes.filter(
         (scope) => !requiredScopes.includes(scope)
@@ -556,20 +574,14 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Config', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.config}_main`
 
-      const requiredScopes = [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const allOtherScopes = allScopes.filter(
         (scope) => !requiredScopes.includes(scope)
       )
 
       const tests = [
-        [[requiredScopes[0], orgScopes[0]], true],
-        [[requiredScopes[0], orgScopes[1]], true],
-        [[requiredScopes[0], orgScopes[2]], true],
-        [[requiredScopes[1], orgScopes[0]], true],
-        [[requiredScopes[1], orgScopes[1]], true],
-        [[requiredScopes[1], orgScopes[2]], true],
-        [requiredScopes, false],
+        [requiredScopes, true],
         [allOtherScopes, false]
       ]
 
@@ -585,9 +597,7 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Systems', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.systems}`
 
-      const requiredScopes = (
-        [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
-      ).concat(orgScopes)
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const tests = [[requiredScopes, true]]
 
@@ -608,20 +618,14 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Communications', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.communications}_main`
 
-      const requiredScopes = [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const allOtherScopes = allScopes.filter(
         (scope) => !requiredScopes.includes(scope)
       )
 
       const tests = [
-        [[requiredScopes[0], orgScopes[0]], true],
-        [[requiredScopes[0], orgScopes[1]], true],
-        [[requiredScopes[0], orgScopes[2]], true],
-        [[requiredScopes[1], orgScopes[0]], true],
-        [[requiredScopes[1], orgScopes[1]], true],
-        [[requiredScopes[1], orgScopes[2]], true],
-        [requiredScopes, false],
+        [requiredScopes, true],
         [allOtherScopes, false]
       ]
 
@@ -637,9 +641,7 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Email all users', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.emailAllUsers}`
 
-      const requiredScopes = (
-        [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
-      ).concat(orgScopes)
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const tests = [[requiredScopes, true]]