From b3b9ef6e712adfa24ff0751f08394a41028fead9 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Fri, 22 Sep 2023 11:09:01 +0200
Subject: [PATCH] refactor: improve naming

---
 ...get-complete-state-for-work-context.util.ts |  6 +++---
 .../features/worklog/worklog.component.html    |  2 +-
 src/app/features/worklog/worklog.model.ts      |  2 +-
 src/app/features/worklog/worklog.service.ts    | 18 ++++++------------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/app/features/worklog/util/get-complete-state-for-work-context.util.ts b/src/app/features/worklog/util/get-complete-state-for-work-context.util.ts
index b2b3c659925..046beebb15b 100644
--- a/src/app/features/worklog/util/get-complete-state-for-work-context.util.ts
+++ b/src/app/features/worklog/util/get-complete-state-for-work-context.util.ts
@@ -9,7 +9,7 @@ export const getCompleteStateForWorkContext = (
   archive: EntityState<Task>,
 ): {
   completeStateForWorkContext: EntityState<Task>;
-  unarchivedIds: string[];
+  nonArchiveTaskIds: string[];
 } => {
   const wid = workContext.id;
 
@@ -22,7 +22,7 @@ export const getCompleteStateForWorkContext = (
           ...taskState.entities,
         },
       },
-      unarchivedIds: taskState.ids as string[],
+      nonArchiveTaskIds: taskState.ids as string[],
     };
   }
 
@@ -47,7 +47,7 @@ export const getCompleteStateForWorkContext = (
         ...archivedEntities,
       },
     },
-    unarchivedIds,
+    nonArchiveTaskIds: unarchivedIds,
   };
 };
 
diff --git a/src/app/features/worklog/worklog.component.html b/src/app/features/worklog/worklog.component.html
index f5747db9961..6b65fbae735 100644
--- a/src/app/features/worklog/worklog.component.html
+++ b/src/app/features/worklog/worklog.component.html
@@ -157,7 +157,7 @@ <h3 class="week-title mat-h4">
                               <td class="actions">
                                 <button
                                   (click)="restoreTask(logEntry.task);"
-                                  *ngIf="!logEntry.task?.parentId && !logEntry.isNoRestore"
+                                  *ngIf="!logEntry.task?.parentId && !logEntry.isNonArchiveTask"
                                   [title]="T.F.WORKLOG.CMP.RESTORE_TASK_FROM_ARCHIVE|translate"
                                   aria-label="restore"
                                   color=""
diff --git a/src/app/features/worklog/worklog.model.ts b/src/app/features/worklog/worklog.model.ts
index 1474e722a5a..57ac58455e6 100644
--- a/src/app/features/worklog/worklog.model.ts
+++ b/src/app/features/worklog/worklog.model.ts
@@ -6,7 +6,7 @@ export interface WorklogDataForDay {
   timeSpent: number;
   task: WorklogTask;
   parentId: string;
-  isNoRestore?: boolean;
+  isNonArchiveTask?: boolean;
 }
 
 export interface WorklogDay {
diff --git a/src/app/features/worklog/worklog.service.ts b/src/app/features/worklog/worklog.service.ts
index 8ecbb3e7e4f..86bd1258497 100644
--- a/src/app/features/worklog/worklog.service.ts
+++ b/src/app/features/worklog/worklog.service.ts
@@ -219,11 +219,8 @@ export class WorklogService {
       createEmptyEntity();
 
     // console.time('calcTime');
-    const { completeStateForWorkContext, unarchivedIds } = getCompleteStateForWorkContext(
-      workContext,
-      taskState,
-      archive,
-    );
+    const { completeStateForWorkContext, nonArchiveTaskIds } =
+      getCompleteStateForWorkContext(workContext, taskState, archive);
     // console.timeEnd('calcTime');
 
     const startEnd = {
@@ -234,7 +231,7 @@ export class WorklogService {
     if (completeStateForWorkContext) {
       const { worklog, totalTimeSpent } = mapArchiveToWorklog(
         completeStateForWorkContext,
-        unarchivedIds,
+        nonArchiveTaskIds,
         startEnd,
         this._dateAdapter.getFirstDayOfWeek(),
       );
@@ -259,11 +256,8 @@ export class WorklogService {
       createEmptyEntity();
 
     // console.time('calcTime');
-    const { completeStateForWorkContext, unarchivedIds } = getCompleteStateForWorkContext(
-      workContext,
-      taskState,
-      archive,
-    );
+    const { completeStateForWorkContext, nonArchiveTaskIds } =
+      getCompleteStateForWorkContext(workContext, taskState, archive);
     // console.timeEnd('calcTime');
 
     const startEnd = {
@@ -274,7 +268,7 @@ export class WorklogService {
     if (completeStateForWorkContext) {
       return mapArchiveToWorklogWeeks(
         completeStateForWorkContext,
-        unarchivedIds,
+        nonArchiveTaskIds,
         startEnd,
         this._dateAdapter.getFirstDayOfWeek(),
       );