Fix #4124: Boards: Hide tasks from hidden projects

src/app/core-ui/side-nav/side-nav.component.ts

@@ -47,7 +47,6 @@ import {
   selectUnarchivedHiddenProjectIds,
   selectUnarchivedVisibleProjects,
 } from '../../features/project/store/project.selectors';
-import { updateProject } from '../../features/project/store/project.actions';
 import { SideNavItemComponent } from './side-nav-item/side-nav-item.component';
 import { RouterLink, RouterLinkActive } from '@angular/router';
 import { MatIcon } from '@angular/material/icon';
@@ -277,14 +276,7 @@ export class SideNavComponent implements OnDestroy {
   }
 
   toggleProjectVisibility(project: Project): void {
-    this._store.dispatch(
-      updateProject({
-        project: {
-          id: project.id,
-          changes: { isHiddenFromMenu: !project.isHiddenFromMenu },
-        },
-      }),
-    );
+    this.projectService.projectHideFromMenu(project);
   }
 
   async dropOnProjectList(

src/app/features/boards/board-panel/board-panel.component.ts

@@ -15,7 +15,7 @@ import {
 } from '../boards.model';
 import { select, Store } from '@ngrx/store';
 import {
-  selectAllTasks,
+  selectAllAvailableTasksWithSubTasks,
   selectTaskById,
   selectTaskByIdWithSubTaskData,
 } from '../../tasks/store/task.selectors';
@@ -75,7 +75,7 @@ export class BoardPanelComponent {
   plannerService = inject(PlannerService);
   _matDialog = inject(MatDialog);
 
-  allTasks$ = this.store.select(selectAllTasks);
+  allTasks$ = this.store.select(selectAllAvailableTasksWithSubTasks);
   allTasks = toSignal(this.allTasks$, {
     initialValue: [],
   });

src/app/features/project/project.service.ts

@@ -18,6 +18,7 @@ import {
   updateProject,
   updateProjectOrder,
   upsertProject,
+  toggleHideFromMenu,
 } from './store/project.actions';
 import { DEFAULT_PROJECT } from './project.const';
 import {
@@ -177,4 +178,31 @@ export class ProjectService {
   updateOrder(ids: string[]): void {
     this._store$.dispatch(updateProjectOrder({ ids }));
   }
+
+  async projectHideFromMenu(project: Project): Promise<void> {
+    const taskState = await this._store$
+      .select(selectTaskFeatureState)
+      .pipe(take(1))
+      .toPromise();
+    const subTaskIdsForProject: string[] = [];
+    project.taskIds.forEach((id) => {
+      const task = getTaskById(id, taskState);
+      if (task.projectId && task.subTaskIds.length > 0) {
+        subTaskIdsForProject.push(...task.subTaskIds);
+      }
+    });
+    const allTaskIds = [
+      ...project.taskIds,
+      ...project.backlogTaskIds,
+      ...subTaskIdsForProject,
+    ];
+    const newVisibilityState = !project.isHiddenFromMenu;
+    this._store$.dispatch(
+      toggleHideFromMenu({
+        projectId: project.id,
+        allTaskIds,
+        isHiddenFromMenu: newVisibilityState,
+      }),
+    );
+  }
 }

src/app/features/project/store/project.actions.ts

@@ -85,7 +85,11 @@ export const unarchiveProject = createAction(
 
 export const toggleHideFromMenu = createAction(
   '[Project] Toggle hide from menu',
-  props<{ id: string }>(),
+  props<{
+    projectId: string;
+    allTaskIds: string[];
+    isHiddenFromMenu: boolean;
+  }>(),
 );
 
 // MOVE TASK ACTIONS

src/app/features/project/store/project.reducer.ts

@@ -157,12 +157,12 @@ export const projectReducer = createReducer<ProjectState>(
   // on(deleteProjects, (state, { ids }) => projectAdapter.removeMany(ids, state)),
   on(loadProjects, (state, { projects }) => projectAdapter.setAll(projects, state)),
 
-  on(toggleHideFromMenu, (state, { id }) =>
+  on(toggleHideFromMenu, (state, { projectId, isHiddenFromMenu }) =>
     projectAdapter.updateOne(
       {
-        id,
+        id: projectId,
         changes: {
-          isHiddenFromMenu: !state.entities[id]?.isHiddenFromMenu,
+          isHiddenFromMenu: isHiddenFromMenu,
         },
       },
       state,

src/app/features/tasks/short-syntax.spec.ts

@@ -36,6 +36,7 @@ const TASK: TaskCopy = {
   issueLastUpdated: undefined,
   issueWasUpdated: undefined,
   issueTimeTracked: undefined,
+  unavailable: false,
 };
 const ALL_TAGS: Tag[] = [
   { ...DEFAULT_TAG, id: 'blu_id', title: 'blu' },

src/app/features/tasks/store/task.reducer.ts

@@ -67,7 +67,7 @@ import { MODEL_VERSION } from '../../../core/model-version';
 import { PlannerActions } from '../../planner/store/planner.actions';
 import { TODAY_TAG } from '../../tag/tag.const';
 import { getWorklogStr } from '../../../util/get-work-log-str';
-import { deleteProject } from '../../project/store/project.actions';
+import { deleteProject, toggleHideFromMenu } from '../../project/store/project.actions';
 
 export const TASK_FEATURE_NAME = 'tasks';
 
@@ -113,6 +113,24 @@ export const taskReducer = createReducer<TaskState>(
     });
   }),
 
+  on(toggleHideFromMenu, (state, { projectId, allTaskIds, isHiddenFromMenu }) => {
+    const updatedTasks = allTaskIds
+      .map((taskId) => {
+        const task = state.entities[taskId];
+        if (task && task.projectId === projectId) {
+          return {
+            id: task.id,
+            changes: {
+              unavailable: isHiddenFromMenu,
+            },
+          };
+        }
+        return null;
+      })
+      .filter((task) => task !== null);
+    return taskAdapter.updateMany(updatedTasks, state);
+  }),
+
   // TODO check if working
   on(setCurrentTask, (state, { id }) => {
     if (id) {

src/app/features/tasks/store/task.selectors.ts

@@ -334,3 +334,28 @@ export const selectAllTaskIssueIdsForIssueProvider = (issueProvider: IssueProvid
       .map((t) => t.issueId as string);
   });
 };
+
+export const selectAllAvailableTasks = createSelector(selectAllTasks, (tasks: Task[]) =>
+  tasks.filter((task) => !task.unavailable),
+);
+
+export const selectAllAvailableTasksWithSubTasks = createSelector(
+  selectAllTasks,
+  (tasks: Task[]) => {
+    const availableTasks = tasks.filter((task) => !task.unavailable);
+    return availableTasks
+      .filter((task) => !task.parentId)
+      .map((task) => {
+        if (task.subTaskIds && task.subTaskIds.length > 0) {
+          return {
+            ...task,
+            subTasks: task.subTaskIds
+              .map((subTaskId) => tasks.find((t) => t.id === subTaskId && !t.unavailable))
+              .filter((subTask) => !!subTask),
+          };
+        } else {
+          return task;
+        }
+      });
+  },
+);

src/app/features/tasks/task.model.ts

@@ -67,6 +67,7 @@ export interface TaskCopy extends IssueFieldsForTask {
   id: string;
   projectId?: string;
   title: string;
+  unavailable: boolean;
 
   subTaskIds: string[];
   timeSpentOnDay: TimeSpentOnDay;
@@ -148,6 +149,7 @@ export const DEFAULT_TASK: Task = {
   notes: '',
   tagIds: [],
   created: Date.now(),
+  unavailable: false,
 
   _showSubTasksMode: ShowSubTasksMode.Show,