Merge branch 'feat(events_v2)-review-page' of https://github.com/open…

…crvs/opencrvs-core into feat(events_v2)-review-page
opencrvs · Dec 10, 2024 · 1944929 · 1944929
2 parents d0f9efb + 8ba0adf
commit 1944929
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 640 deletions.
diff --git a/packages/auth/src/constants.ts b/packages/auth/src/constants.ts
@@ -26,7 +26,6 @@ export const WEB_USER_JWT_AUDIENCES = [
 export const NOTIFICATION_API_USER_AUDIENCE = 'opencrvs:notification-api-user'
 export const VALIDATOR_API_USER_AUDIENCE = 'opencrvs:validator-api-user'
 export const AGE_VERIFICATION_USER_AUDIENCE = 'opencrvs:age-verification-user'
-export const NATIONAL_ID_USER_AUDIENCE = 'opencrvs:nationalId-api-user'
 export const JWT_ISSUER = 'opencrvs:auth-service'
 export const INVALID_TOKEN_NAMESPACE = 'invalidToken'
 export const DEFAULT_TIMEOUT = 600000
diff --git a/packages/auth/src/features/oauthToken/client-credentials.ts b/packages/auth/src/features/oauthToken/client-credentials.ts
@@ -19,8 +19,7 @@ import {
   JWT_ISSUER,
   NOTIFICATION_API_USER_AUDIENCE,
   VALIDATOR_API_USER_AUDIENCE,
-  AGE_VERIFICATION_USER_AUDIENCE,
-  NATIONAL_ID_USER_AUDIENCE
+  AGE_VERIFICATION_USER_AUDIENCE
 } from '@auth/constants'
 import * as oauthResponse from './responses'
 
@@ -49,7 +48,6 @@ export async function clientCredentialsHandler(
   const isNotificationAPIUser = result.scope.includes('notification-api')
   const isValidatorAPIUser = result.scope.includes('validator-api')
   const isAgeVerificationAPIUser = result.scope.includes('age-verification-api')
-  const isNationalIDAPIUser = result.scope.includes('nationalId')
 
   const token = await createToken(
     result.systemId,
@@ -60,8 +58,6 @@ export async function clientCredentialsHandler(
       ? WEB_USER_JWT_AUDIENCES.concat([VALIDATOR_API_USER_AUDIENCE])
       : isAgeVerificationAPIUser
       ? WEB_USER_JWT_AUDIENCES.concat([AGE_VERIFICATION_USER_AUDIENCE])
-      : isNationalIDAPIUser
-      ? WEB_USER_JWT_AUDIENCES.concat([NATIONAL_ID_USER_AUDIENCE])
       : WEB_USER_JWT_AUDIENCES,
     JWT_ISSUER,
     true

diff --git a/packages/client/graphql.schema.json b/packages/client/graphql.schema.json
@@ -7969,12 +7969,6 @@
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
-          {
-            "name": "MOSIP",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "OTHER",
             "description": null,

diff --git a/packages/client/src/i18n/messages/views/integrations.ts b/packages/client/src/i18n/messages/views/integrations.ts
@@ -127,12 +127,6 @@ const messagesToDefine = {
     description: 'Label for event notification'
   },
 
-  nationalID: {
-    id: 'integrations.type.nationalID',
-    defaultMessage: 'National ID',
-    description: 'Label for national ID system client'
-  },
-
   childDetails: {
     id: 'integrations.childDetails',
     defaultMessage: `Child's details`,
@@ -310,10 +304,6 @@ const messagesToDefine = {
     defaultMessage: 'This will deactivate the client',
     description: 'This will deactivate the client'
   },
-  onlyOneNationalIdError: {
-    id: 'integrations.onlyOneNationalId',
-    defaultMessage: 'Only one National ID integration is allowed.'
-  },
   updatePermissionsMsg: {
     id: 'integrations.updatePermissionsMsg',
     defaultMessage: 'Permissions updated successfully',

diff --git a/packages/client/src/tests/mock-offline-data.ts b/packages/client/src/tests/mock-offline-data.ts
@@ -41,17 +41,6 @@ const systems: System[] = [
       ]
     }
   },
-  {
-    name: 'National Id',
-    status: SystemStatus.Active,
-    type: SystemType.NationalId,
-    _id: '613ddbbe4c0b86e9b9f114e8',
-    shaSecret: '22ea09c2-f964-4562-bdac-8e9ca9b9a81a',
-    clientId: '2f1047bb-af48-4f27-8ab8-993d7b960f92',
-    settings: {
-      openIdProviderClientId: '7b621732-6c1d-4808-81b2-fd67f05f3af3'
-    }
-  },
   {
     _id: '63a01ffe607915acacc2f553',
     clientId: '5923118f-c633-40c6-ba97-c3e3cbb412aa',

diff --git a/packages/client/src/tests/schema.graphql b/packages/client/src/tests/schema.graphql
@@ -863,7 +863,6 @@ type IntegratedSystem {
 }
 
 enum IntegratingSystemType {
-  MOSIP
   OSIA
   OTHER
 }

diff --git a/packages/client/src/utils/gateway.ts b/packages/client/src/utils/gateway.ts
@@ -853,7 +853,6 @@ export type IntegratedSystem = {
 }
 
 export enum IntegratingSystemType {
-  Mosip = 'MOSIP',
   Other = 'OTHER'
 }
 
@@ -2214,7 +2213,6 @@ export enum SystemStatus {
 
 export enum SystemType {
   Health = 'HEALTH',
-  NationalId = 'NATIONAL_ID',
   RecordSearch = 'RECORD_SEARCH',
   Webhook = 'WEBHOOK'
 }

diff --git a/packages/client/src/views/SysAdmin/Config/Systems/Systems.tsx b/packages/client/src/views/SysAdmin/Config/Systems/Systems.tsx
@@ -15,7 +15,6 @@ import { integrationMessages } from '@client/i18n/messages/views/integrations'
 import { EMPTY_STRING } from '@client/utils/constants'
 import {
   EventType,
-  IntegratingSystemType,
   System,
   SystemStatus,
   SystemType,
@@ -141,10 +140,7 @@ export function SystemList() {
     refreshTokenData,
     refreshTokenLoading,
     refreshTokenError,
-    resetData,
-    shouldWarnAboutNationalId,
-    newIntegratingSystemType,
-    setNewIntegratingSystemType
+    resetData
   } = useSystems()
 
   function changeActiveStatusIntl(status: SystemStatus) {
@@ -217,28 +213,12 @@ export function SystemList() {
 
   const systemTypeLabels = {
     HEALTH: intl.formatMessage(integrationMessages.eventNotification),
-    NATIONAL_ID: intl.formatMessage(integrationMessages.nationalID),
     RECORD_SEARCH: intl.formatMessage(integrationMessages.recordSearch),
     WEBHOOK: intl.formatMessage(integrationMessages.webhook)
   }
 
-  const nationalIdLabels = {
-    [IntegratingSystemType.Mosip]: intl.formatMessage(
-      integrationMessages.integratingSystemTypeMosip
-    ),
-    [IntegratingSystemType.Other]: intl.formatMessage(
-      integrationMessages.nationalID
-    )
-  }
-
   const systemToLabel = (system: System) => {
-    if (system.type === SystemType.NationalId) {
-      return nationalIdLabels[
-        system.integratingSystemType ?? IntegratingSystemType.Mosip
-      ]
-    } else {
-      return systemTypeLabels[system.type]
-    }
+    return systemTypeLabels[system.type]
   }
 
   return (
@@ -474,11 +454,7 @@ export function SystemList() {
                 <Button
                   key="submit-client-form"
                   id="submitClientForm"
-                  disabled={
-                    !newSystemType ||
-                    newClientName === EMPTY_STRING ||
-                    shouldWarnAboutNationalId
-                  }
+                  disabled={!newSystemType || newClientName === EMPTY_STRING}
                   onClick={() => {
                     registerSystem()
                   }}
@@ -516,11 +492,7 @@ export function SystemList() {
                 id="name_of_client"
                 touched={false}
                 required={true}
-                label={
-                  newSystemType === SystemType.NationalId
-                    ? intl.formatMessage(integrationMessages.nationalIDName)
-                    : intl.formatMessage(integrationMessages.name)
-                }
+                label={intl.formatMessage(integrationMessages.name)}
               >
                 <TextInput
                   id="client_name"
@@ -550,10 +522,6 @@ export function SystemList() {
                       ),
                       value: SystemType.Health
                     },
-                    {
-                      label: intl.formatMessage(integrationMessages.nationalID),
-                      value: SystemType.NationalId
-                    },
                     {
                       label: intl.formatMessage(
                         integrationMessages.recordSearch
@@ -570,49 +538,6 @@ export function SystemList() {
               </InputField>
             </Field>
 
-            {newSystemType === SystemType.NationalId && (
-              <Field>
-                <InputField
-                  id="integrating-system-type"
-                  touched={false}
-                  label={intl.formatMessage(
-                    integrationMessages.integratingSystemType
-                  )}
-                >
-                  <Select
-                    onChange={(val) => {
-                      setNewIntegratingSystemType(val as IntegratingSystemType)
-                    }}
-                    value={
-                      newIntegratingSystemType ?? IntegratingSystemType.Mosip
-                    }
-                    options={[
-                      {
-                        label: intl.formatMessage(
-                          integrationMessages.integratingSystemTypeMosip
-                        ),
-                        value: IntegratingSystemType.Mosip
-                      },
-                      {
-                        label: intl.formatMessage(
-                          integrationMessages.integratingSystemTypeOther
-                        ),
-                        value: IntegratingSystemType.Other,
-                        disabled: true
-                      }
-                    ]}
-                    id={'integrating-system-select'}
-                  />
-                </InputField>
-              </Field>
-            )}
-
-            {shouldWarnAboutNationalId && (
-              <PaddedAlert type="error">
-                {intl.formatMessage(integrationMessages.onlyOneNationalIdError)}
-              </PaddedAlert>
-            )}
-
             {newSystemType === SystemType.Health && (
               <PaddedAlert type="info">
                 {intl.formatMessage(
@@ -629,27 +554,6 @@ export function SystemList() {
               </PaddedAlert>
             )}
 
-            {newSystemType === SystemType.NationalId && (
-              <PaddedAlert type="info">
-                {newIntegratingSystemType === IntegratingSystemType.Mosip &&
-                  intl.formatMessage(
-                    integrationMessages.integratingSystemTypeAlertMosip
-                  )}
-                {newIntegratingSystemType === IntegratingSystemType.Other &&
-                  intl.formatMessage(
-                    integrationMessages.integratingSystemTypeAlertOther
-                  )}
-                <Link
-                  onClick={() => {
-                    window.open('https://documentation.opencrvs.org/', '_blank')
-                  }}
-                  font="bold16"
-                >
-                  documentation.opencrvs.org
-                </Link>
-              </PaddedAlert>
-            )}
-
             {newSystemType === SystemType.RecordSearch && (
               <PaddedAlert type="info">
                 {intl.formatMessage(

diff --git a/packages/client/src/views/SysAdmin/Config/Systems/useSystems.ts b/packages/client/src/views/SysAdmin/Config/Systems/useSystems.ts
@@ -42,8 +42,6 @@ function useNewSystemDraft() {
   const [newSystemType, setNewSystemType] = useState<SystemType>(
     SystemType.Health
   )
-  const [newIntegratingSystemType, setNewIntegratingSystemType] =
-    useState<IntegratingSystemType>(IntegratingSystemType.Mosip)
 
   const onChangeClientName = (event: React.ChangeEvent<HTMLInputElement>) => {
     const value = String(event.target.value)
@@ -60,8 +58,6 @@ function useNewSystemDraft() {
     setNewClientName,
     newSystemType,
     setNewSystemType,
-    newIntegratingSystemType,
-    setNewIntegratingSystemType,
     onChangeClientName,
     clearNewSystemDraft
   }
@@ -70,9 +66,6 @@ function useNewSystemDraft() {
 /** Handles communication with global state management */
 function useSystemsGlobalState() {
   const { systems: existingSystems } = useSelector(getOfflineData)
-  const doesNationalIdAlreadyExist = existingSystems.some(
-    (system) => system.type === SystemType.NationalId
-  )
   const dispatch = useDispatch()
 
   const dispatchSystemUpdate = (updatedSystem: System) => {
@@ -101,8 +94,7 @@ function useSystemsGlobalState() {
     dispatchSystemUpdate,
     dispatchNewSystem,
     existingSystems,
-    dispatchSystemRemove,
-    doesNationalIdAlreadyExist
+    dispatchSystemRemove
   }
 }
 
@@ -121,16 +113,13 @@ export function useSystems() {
     setNewClientName,
     newSystemType,
     setNewSystemType,
-    newIntegratingSystemType,
-    setNewIntegratingSystemType,
     onChangeClientName,
     clearNewSystemDraft
   } = useNewSystemDraft()
   const {
     dispatchNewSystem,
     dispatchSystemUpdate,
     existingSystems,
-    doesNationalIdAlreadyExist,
     dispatchSystemRemove
   } = useSystemsGlobalState()
 
@@ -301,10 +290,7 @@ export function useSystems() {
         system: {
           type: newSystemType,
           name: newClientName,
-          integratingSystemType:
-            newSystemType === SystemType.NationalId
-              ? newIntegratingSystemType
-              : undefined,
+          integratingSystemType: undefined,
           ...(newSystemType === SystemType.Webhook && {
             settings: {
               dailyQuota: 0,
@@ -342,9 +328,6 @@ export function useSystems() {
     setBirthPermissions(initWebHook(EventType.Birth))
   }
 
-  const shouldWarnAboutNationalId =
-    newSystemType === SystemType.NationalId && doesNationalIdAlreadyExist
-
   return {
     closePermissionModal,
     systemToDeleteData,
@@ -390,9 +373,6 @@ export function useSystems() {
     refreshTokenLoading,
     refreshTokenError,
     resetRefreshTokenData,
-    resetData,
-    shouldWarnAboutNationalId,
-    newIntegratingSystemType,
-    setNewIntegratingSystemType
+    resetData
   }
 }
diff --git a/packages/gateway/src/features/systems/schema.graphql b/packages/gateway/src/features/systems/schema.graphql
@@ -28,7 +28,6 @@ enum SystemType {
 }
 
 enum IntegratingSystemType {
-  MOSIP
   OTHER
 }
 

diff --git a/packages/gateway/src/graphql/schema.d.ts b/packages/gateway/src/graphql/schema.d.ts
@@ -1080,7 +1080,6 @@ export const enum GQLSystemType {
 }
 
 export const enum GQLIntegratingSystemType {
-  MOSIP = 'MOSIP',
   OTHER = 'OTHER'
 }
 

diff --git a/packages/gateway/src/graphql/schema.graphql b/packages/gateway/src/graphql/schema.graphql
@@ -1193,7 +1193,6 @@ enum SystemType {
 }
 
 enum IntegratingSystemType {
-  MOSIP
   OTHER
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -863,7 +863,6 @@ type IntegratedSystem { @@
     }
     enum IntegratingSystemType {
-      MOSIP
       OSIA
       OTHER
     }
@@ Expand Down @@