Unassigned Cases

Jenkinsfile_CNP

@@ -199,4 +199,4 @@ withPipeline(type, product, component) {
         ])
     }
 
-}
+}

angular.json

@@ -37,7 +37,12 @@
               "src/styles.scss"
             ],
             "scripts": [],
-            "sourceMap": true
+            "sourceMap": true,
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -74,7 +79,8 @@
             "production": {
               "buildTarget": "rpx-xui-manage-organisations:build:production"
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serveTest": {
           "builder": "@angular-devkit/build-angular:dev-server",

api/caaCaseTypes/caaCaseTypes.util.ts

@@ -1,11 +1,13 @@
 import { CaaCasesPageType } from '../caaCases/enums';
 import { searchCasesString } from './caaCaseTypes.constants';
+import { getConfigValue } from '../configuration';
+import { UNASSIGNED_CASE_TYPES } from '../configuration/references';
 
 export function getRequestBody(organisationID: string, caaCasesPageType: string, caaCasesFilterValue?: string | string[]) {
   const organisationAssignedUsersKey = `supplementary_data.orgs_assigned_users.${organisationID}`;
+  const newCasesKey = `supplementary_data.new_case.${organisationID}`;
   const reference = 'reference.keyword';
   const caseReferenceFilter: any[] = [];
-
   if (caaCasesFilterValue) {
     if (Array.isArray(caaCasesFilterValue)) {
       caaCasesFilterValue.forEach((caseReference) => {
@@ -31,14 +33,45 @@ export function getRequestBody(organisationID: string, caaCasesPageType: string,
           },
           {
             bool: {
-              ...(caaCasesPageType === CaaCasesPageType.AssignedCases && {
+              ...((caaCasesPageType === CaaCasesPageType.AssignedCases && !caaCasesFilterValue) && {
                 must: [
-                  { range: { [organisationAssignedUsersKey]: { gt: 0 } } }
+                  { range: { [organisationAssignedUsersKey]: { gt: 0 } } },
+                  {
+                    bool: {
+                      should: [
+                        { bool: { must_not: { exists: { field: newCasesKey } } } },
+                        { term: { [newCasesKey]: false } }
+                      ],
+                      minimum_should_match: 1
+                    }
+                  }
                 ]
               }),
-              ...(caaCasesPageType === CaaCasesPageType.UnassignedCases && {
-                must_not: [
-                  { range: { [organisationAssignedUsersKey]: { gt: 0 } } }
+              ...((caaCasesPageType === CaaCasesPageType.UnassignedCases && !caaCasesFilterValue) && {
+                must: [
+                  {
+                    bool: {
+                      should: [
+                        { term: { [organisationAssignedUsersKey]: 0 } },
+                        { bool: { must_not: { exists: { field: organisationAssignedUsersKey } } } }
+                      ],
+                      minimum_should_match: 1
+                    }
+                  },
+                  {
+                    bool: {
+                      should: [
+                        { term: { [newCasesKey]: false } },
+                        { bool: { must_not: { exists: { field: newCasesKey } } } }
+                      ],
+                      minimum_should_match: 1
+                    }
+                  }
+                ]
+              }),
+              ...((caaCasesPageType === CaaCasesPageType.NewCasesToAccept && !caaCasesFilterValue) && {
+                must: [
+                  { term: { [newCasesKey]: true } }
                 ]
               })
             }
@@ -68,3 +101,28 @@ export function getRequestBody(organisationID: string, caaCasesPageType: string,
 export function getApiPath(ccdPath: string, caseTypes: string) {
   return `${ccdPath}${searchCasesString}${caseTypes}`;
 }
+
+function setupCaseConfig() {
+  const unassignedCaseConfig = getConfigValue(UNASSIGNED_CASE_TYPES);
+  const caseConfig = unassignedCaseConfig.split('|').reduce((acc, entry) => {
+    const [caseType, newCases, groupAccess] = entry.split(',');
+    acc[caseType] = {
+      new_cases: newCases === 'true',
+      group_access: groupAccess === 'true'
+    };
+    return acc;
+  }, {} as Record<string, { new_cases: boolean; group_access: boolean }>);
+  return caseConfig;
+}
+
+export function addCaseConfiguration(response) {
+  const resData = response.data;
+  const unassignedCaseConfig = setupCaseConfig();
+  console.log(unassignedCaseConfig);
+  resData.case_types_results.forEach((caseTypeResult) => {
+    const { case_type_id } = caseTypeResult;
+    if (unassignedCaseConfig[case_type_id]) {
+      caseTypeResult.caseConfig = unassignedCaseConfig[case_type_id];
+    }
+  });
+}

api/caaCaseTypes/index.ts

@@ -5,7 +5,7 @@ import { RoleAssignmentResponse } from '../caaCases/models/roleAssignmentRespons
 import { getConfigValue } from '../configuration';
 import { CASE_TYPES, SERVICES_MCA_PROXY_API_PATH } from '../configuration/references';
 import { EnhancedRequest } from '../models/enhanced-request.interface';
-import { getApiPath, getRequestBody } from './caaCaseTypes.util';
+import { getApiPath, getRequestBody, addCaseConfiguration } from './caaCaseTypes.util';
 
 export async function handleCaaCaseTypes(req: EnhancedRequest, res: Response, next: NextFunction) {
   const caaCasesPageType = req.query.caaCasesPageType as string;
@@ -31,6 +31,7 @@ export async function handleCaaCaseTypes(req: EnhancedRequest, res: Response, ne
     const payload = getRequestBody(orgId, caaCasesPageType, caaCasesFilterValue);
 
     const response = await req.http.post(path, payload);
+    addCaseConfiguration(response);
     res.send(response.data);
   } catch (error) {
     res.status(500).send({

api/caaCases/caaCases.util.ts

@@ -1,5 +1,5 @@
 import { caseAssignment, caseId, caseTypeStr } from './caaCases.constants';
-import { CaaCasesPageType } from './enums';
+import { CaaCasesFilterType, CaaCasesPageType } from './enums';
 import { CaaCases, CaseHeader, CcdCase, CcdCaseData, CcdColumnConfig } from './interfaces';
 
 export function getApiPath(ccdPath: string, caseTypeId: string) {
@@ -17,11 +17,14 @@ export function mapCcdCases(caseType: string, ccdCase: CcdCase): CaaCases {
   };
 }
 
-export function getRequestBody(organisationID: string, pageNo: number, pageSize: number, caaCasesPageType: string, caaCasesFilterValue?: string | string[]) {
+export function getRequestBody(organisationID: string, pageNo: number, pageSize: number, caaCasesPageType: string, caseFilterType: string, caaCasesFilterValue?: string | string[]) {
   const organisationAssignedUsersKey = `supplementary_data.orgs_assigned_users.${organisationID}`;
+  const newCasesKey = `supplementary_data.new_case.${organisationID}`;
   const reference = 'reference.keyword';
   const caseReferenceFilter: any[] = [];
-
+  if (caseFilterType === CaaCasesFilterType.NewCasesToAccept){
+    caaCasesPageType = CaaCasesPageType.NewCasesToAccept;
+  }
   if (caaCasesFilterValue) {
     if (Array.isArray(caaCasesFilterValue)) {
       caaCasesFilterValue.forEach((caseReference) => {
@@ -46,14 +49,45 @@ export function getRequestBody(organisationID: string, pageNo: number, pageSize:
           },
           {
             bool: {
-              ...(caaCasesPageType === CaaCasesPageType.AssignedCases && {
+              ...((caaCasesPageType === CaaCasesPageType.AssignedCases && !caaCasesFilterValue) && {
+                must: [
+                  { range: { [organisationAssignedUsersKey]: { gt: 0 } } },
+                  {
+                    bool: {
+                      should: [
+                        { bool: { must_not: { exists: { field: newCasesKey } } } },
+                        { term: { [newCasesKey]: false } }
+                      ],
+                      minimum_should_match: 1
+                    }
+                  }
+                ]
+              }),
+              ...((caaCasesPageType === CaaCasesPageType.UnassignedCases && !caaCasesFilterValue) && {
                 must: [
-                  { range: { [organisationAssignedUsersKey]: { gt: 0 } } }
+                  {
+                    bool: {
+                      should: [
+                        { term: { [organisationAssignedUsersKey]: 0 } },
+                        { bool: { must_not: { exists: { field: organisationAssignedUsersKey } } } }
+                      ],
+                      minimum_should_match: 1
+                    }
+                  },
+                  {
+                    bool: {
+                      should: [
+                        { bool: { must_not: { exists: { field: newCasesKey } } } },
+                        { term: { [newCasesKey]: false } }
+                      ],
+                      minimum_should_match: 1
+                    }
+                  }
                 ]
               }),
-              ...(caaCasesPageType === CaaCasesPageType.UnassignedCases && {
-                must_not: [
-                  { range: { [organisationAssignedUsersKey]: { gt: 0 } } }
+              ...((caaCasesPageType === CaaCasesPageType.NewCasesToAccept && !caaCasesFilterValue) && {
+                must: [
+                  { term: { [newCasesKey]: true } }
                 ]
               })
             }

api/caaCases/enums/index.ts

@@ -1,11 +1,14 @@
 export enum CaaCasesPageType {
-  AssignedCases = 'assigned-cases',
-  UnassignedCases = 'unassigned-cases',
+    AssignedCases = 'assigned-cases',
+    UnassignedCases = 'unassigned-cases',
+    NewCasesToAccept = 'new-cases',
 }
 
 export enum CaaCasesFilterType {
-  AllAssignees = 'all-assignees',
-  AssigneeName = 'assignee-name',
-  CaseReferenceNumber = 'case-reference-number',
-  None = 'none',
+    AllAssignees = 'all-assignees',
+    AssigneeName = 'assignee-name',
+    CaseReferenceNumber = 'case-reference-number',
+    NewCasesToAccept = 'new-cases-to-accept',
+    UnassignedCases = 'unassigned-cases',
+    None = 'none',
 }

api/caaCases/index.ts

@@ -17,7 +17,7 @@ export async function handleCaaCases(req: EnhancedRequest, res: Response, next:
   const fromNo: number = page * size;
 
   let caaCasesFilterValue: string | string[] = req.query.caaCasesFilterValue as string;
-
+  const caseFilterType = req.query.caaCasesFilterType as string;
   try {
     if (caaCasesFilterType === CaaCasesFilterType.AssigneeName) {
       const roleAssignments = await handleRoleAssignments(req, next);
@@ -36,7 +36,7 @@ export async function handleCaaCases(req: EnhancedRequest, res: Response, next:
       res.status(errReport.apiStatusCode).send(errReport);
     }
 
-    const payload = getRequestBody(orgId, fromNo, size, caaCasesPageType, caaCasesFilterValue);
+    const payload = getRequestBody(orgId, fromNo, size, caaCasesPageType, caseFilterType, caaCasesFilterValue);
 
     const response = await req.http.post(path, payload);
     if (!objectContainsOnlySafeCharacters(response.data)) {

api/caseshare/index.ts

@@ -35,3 +35,10 @@ export async function assignCasesToUsers(req: EnhancedRequest, res: Response) {
   }
   return realAPI.assignCases(req, res);
 }
+
+export async function acceptNewCasesForOrg(req: EnhancedRequest, res: Response) {
+  // if (stub) {
+  //   return stubAPI.acceptNewCases(req, res);
+  // }
+  return realAPI.acceptNewCases(req, res);
+}

api/caseshare/real-api.ts

@@ -2,7 +2,7 @@ import { AxiosResponse } from 'axios';
 import { NextFunction, Response } from 'express';
 import { handleDelete, handleGet, handlePost } from '../common/crudService';
 import { getConfigValue } from '../configuration';
-import { SERVICES_MCA_PROXY_API_PATH, SERVICES_RD_PROFESSIONAL_API_PATH } from '../configuration/references';
+import { SERVICES_CCD_DATA_STORE_API_PATH, SERVICES_MCA_PROXY_API_PATH, SERVICES_RD_PROFESSIONAL_API_PATH } from '../configuration/references';
 import { EnhancedRequest } from '../models/enhanced-request.interface';
 import { ccdToUserDetails, prdToUserDetails } from './dtos/user-dto';
 import { CaseAssigneeMappingModel } from './models/case-assignee-mapping.model';
@@ -13,6 +13,7 @@ import { UserDetails } from './models/user-details.model';
 
 const prdUrl: string = getConfigValue(SERVICES_RD_PROFESSIONAL_API_PATH);
 const ccdUrl: string = getConfigValue(SERVICES_MCA_PROXY_API_PATH);
+const ccdDsUrl: string = getConfigValue(SERVICES_CCD_DATA_STORE_API_PATH);
 
 export async function getUsers(req: EnhancedRequest, res: Response, next: NextFunction): Promise<Response> {
   try {
@@ -47,6 +48,33 @@ export async function getCases(req: EnhancedRequest, res: Response, next: NextFu
   }
 }
 
+export async function acceptNewCases(req: EnhancedRequest, res: Response): Promise<Response> {
+  const casesToAccept = req.body.sharedCases;
+  const orgIdentifier = req.body.orgIdentifier;
+  const caseIdsToAccept: string[] = [];
+  for (const sharedCase of casesToAccept) {
+    if (sharedCase.caseId) {
+      caseIdsToAccept.push(sharedCase.caseId);
+    }
+  }
+  const path = `${ccdDsUrl}/cases/supplementary-data`;
+  const postData = {
+    'cases': caseIdsToAccept,
+    'supplementary_data_updates': {
+      '$set': {
+        [`new_case.${orgIdentifier}`]: false
+      }
+    }
+  };
+  try {
+    const { status, data }: {status: number, data: any} = await handlePost(path, postData, req);
+    return res.status(status).send(data);
+  } catch (err) {
+    // console.log(err);
+    res.status(500);
+  }
+}
+
 export async function assignCases(req: EnhancedRequest, res: Response): Promise<Response> {
   const shareCases: SharedCase[] = req.body.sharedCases.slice();
 

api/caseshare/routes.ts

@@ -6,3 +6,4 @@ router.get('/users', restAPI.getUsers);
 router.get('/cases', restAPI.getCases);
 router.post('/case-assignments', restAPI.assignCasesToUsers);
 router.get('/case-assignments', restAPI.getCases);
+router.post('/case-users', restAPI.acceptNewCasesForOrg);

api/configuration/references.ts

@@ -77,6 +77,7 @@ export const REDIS_KEY_PREFIX = 'redis.prefix';
 export const SESSION_TIMEOUTS = 'sessionTimeouts';
 
 export const CASE_TYPES = 'caseTypes';
+export const UNASSIGNED_CASE_TYPES = 'unassignedCaseTypes';
 
 // PACT
 export const PACT_BROKER_URL = 'pact.brokerUrl';

charts/xui-mo-webapp/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: xui-mo-webapp
 home: https://github.com/hmcts/rpx-xui-manage-organisations
-version: 1.1.18
+version: 1.1.19
 description: Expert UI
 maintainers:
   - name: HMCTS RPX XUI
@@ -16,4 +16,4 @@ dependencies:
   - name: idam-pr
     version: ~2.3.0
     repository: 'oci://hmctspublic.azurecr.io/helm'
-    condition: idam-pr.enabled
+    condition: idam-pr.enabled

charts/xui-mo-webapp/values.preview.template.yaml

@@ -46,4 +46,4 @@ idam-pr:
   enabled: true
   redirect_uris:
     XUIMO:
-      - https://${SERVICE_FQDN}/oauth2/callback
+      - https://${SERVICE_FQDN}/oauth2/callback

config/custom-environment-variables.json

@@ -50,6 +50,7 @@
       "__format": "json"
     },
     "caseTypes": "CASE_TYPES",
+    "unassignedCaseTypes": "UNASSIGNED_CASE_TYPES",
     "secrets": {
       "rpx": {
         "appinsights-instrumentationkey-mo": "APPINSIGHTS_INSTRUMENTATIONKEY",

package.json

@@ -82,7 +82,7 @@
     "@hmcts/media-viewer": "4.1.0",
     "@hmcts/nodejs-healthcheck": "1.7.0",
     "@hmcts/properties-volume": "0.0.13",
-    "@hmcts/rpx-xui-common-lib": "2.1.1",
+    "@hmcts/rpx-xui-common-lib": "2.1.0-uc-rc1",
     "@hmcts/rpx-xui-node-lib": "2.30.6",
     "@ng-idle/core": "^14.0.0",
     "@ng-idle/keepalive": "^14.0.0",

src/app/app-initializer.ts

@@ -10,6 +10,7 @@ export function initApplication(store: Store<fromApp.State>): VoidFunction {
     store.dispatch(new fromApp.LoadFeatureToggleConfig([AppConstants.FEATURE_NAMES.feeAccount,
       AppConstants.FEATURE_NAMES.editUserPermissions,
       AppConstants.FEATURE_NAMES.caaMenuItems,
+      AppConstants.FEATURE_NAMES.newCasesItems,
       AppConstants.FEATURE_NAMES.newRegisterOrg]));
 
     store.pipe(