Skip to content

Commit 2ef01a9

Browse files
committed
null check
1 parent 667f162 commit 2ef01a9

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hmcts/ccd-case-ui-toolkit",
3-
"version": "7.2.58-exui-3545-rc3",
3+
"version": "7.2.58-exui-3545-rc4",
44
"engines": {
55
"node": ">=18.19.0"
66
},

projects/ccd-case-ui-toolkit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hmcts/ccd-case-ui-toolkit",
3-
"version": "7.2.58-exui-3545-rc3",
3+
"version": "7.2.58-exui-3545-rc4",
44
"engines": {
55
"node": ">=18.19.0"
66
},

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ export class CaseEditComponent implements OnInit, OnDestroy {
262262
const userId = userInfo.id ? userInfo.id : userInfo.uid;
263263
const eventDetails: EventDetails = {eventId, caseId, userId, assignNeeded};
264264
if (this.taskExistsForThisEvent(taskInSessionStorage, taskEventCompletionInfo, eventDetails)) {
265-
this.abstractConfig.logMessage(`task ${taskInSessionStorage.id} exist for this event for caseId and eventId as ${caseId} ${eventId}`);
265+
this.abstractConfig.logMessage(`task ${taskInSessionStorage?.id} exist for this event for caseId and eventId as ${caseId} ${eventId}`);
266266
// Show event completion component to perform event completion checks
267267
this.eventCompletionParams = ({
268268
caseId,
@@ -507,13 +507,13 @@ export class CaseEditComponent implements OnInit, OnDestroy {
507507
const [task, taskToBeCompleted] = userTask ? [userTask.task_data, userTask.complete_task] : [null, false];
508508
const assignNeeded = this.sessionStorageService.getItem('assignNeeded') === 'true';
509509
if (task && assignNeeded && taskToBeCompleted) {
510-
this.abstractConfig.logMessage(`postCompleteTaskIfRequired with assignNeeded: taskId ${task.id} and event name ${this.eventTrigger.name}`);
510+
this.abstractConfig.logMessage(`postCompleteTaskIfRequired with assignNeeded: taskId ${task.id} and event name ${this.eventTrigger?.name}`);
511511
return this.workAllocationService.assignAndCompleteTask(task.id, this.eventTrigger.name);
512512
} else if (task && taskToBeCompleted) {
513-
this.abstractConfig.logMessage(`postCompleteTaskIfRequired: taskId ${task.id} and event name ${this.eventTrigger.name}`);
513+
this.abstractConfig.logMessage(`postCompleteTaskIfRequired: taskId ${task.id} and event name ${this.eventTrigger?.name}`);
514514
return this.workAllocationService.completeTask(task.id, this.eventTrigger.name);
515515
}
516-
this.abstractConfig.logMessage(`postCompleteTaskIfRequired: no task to complete for event name ${this.eventTrigger.name} and caseId ${this.caseDetails.case_id}`);
516+
this.abstractConfig.logMessage(`postCompleteTaskIfRequired: no task to complete for event name ${this.eventTrigger?.name} and caseId ${this.caseDetails?.case_id}`);
517517
return of(true);
518518
}
519519

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/services/event-completion-state-machine.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export class EventCompletionStateMachineService {
8787
const assignNeeded = context.sessionStorageService.getItem('assignNeeded');
8888
context.workAllocationService.getTask(context.task.id).subscribe(
8989
taskResponse => {
90-
this.abstractConfig?.logMessage?.(`entryActionForStateCheckTasksCanBeCompleted: task_state ${taskResponse?.task?.task_state} for task id ${context.task.id}`);
90+
this.abstractConfig?.logMessage?.(`entryActionForStateCheckTasksCanBeCompleted: task_state ${taskResponse?.task?.task_state} for task id ${context?.task?.id}`);
9191
if (taskResponse?.task?.task_state) {
9292
switch (taskResponse.task.task_state.toUpperCase()) {
9393
case TaskState.Unassigned:

projects/ccd-case-ui-toolkit/src/lib/shared/components/event-start/event-guard/event-start.guard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,6 @@ export class EventStartGuard implements CanActivate {
182182
};
183183
this.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
184184
this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
185-
this.abstractConfig.logMessage(`EventStartGuard:setClientContextStorage: set task ${task.id} in client context for caseId ${caseId} and eventId ${eventId}`);
185+
this.abstractConfig.logMessage(`EventStartGuard:setClientContextStorage: set task ${task?.id} in client context for caseId ${caseId} and eventId ${eventId}`);
186186
}
187187
}

projects/ccd-case-ui-toolkit/src/lib/shared/components/event-start/services/event-start-state-machine.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export class EventStartStateMachineService {
188188
}
189189

190190
const taskStr = JSON.stringify(task);
191-
this.abstractConfig?.logMessage?.(`entryActionForStateOneTaskAssignedToUser: task_state ${task?.task_state} for task id ${task.id}`);
191+
this.abstractConfig?.logMessage?.(`entryActionForStateOneTaskAssignedToUser: task_state ${task?.task_state} for task id ${task?.id}`);
192192
console.log('entryActionForStateOneTaskAssignedToUser: setting client context task_data to ' + taskStr);
193193
// Store task to session
194194
const currentLanguage = context.cookieService.getCookie('exui-preferred-language');

0 commit comments

Comments
 (0)