Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(tasks): name Gantt project groups and fall back when Projects is off (#9099)

gbirman3209b2d6ab0e
diff --git a/apps/web/src/features/tasks-view/tasks-gantt.tsx b/apps/web/src/features/tasks-view/tasks-gantt.tsx
index 3162944489..8b4baaaf27 100644
--- a/apps/web/src/features/tasks-view/tasks-gantt.tsx
+++ b/apps/web/src/features/tasks-view/tasks-gantt.tsx
@@ -12,6 +12,7 @@ import { toast } from '@core/component/Toast/Toast';
import { fireAndForget } from '@core/util/fireAndForget';
import { getTaskStatusOptionId, type TaskEntityWithProperties } from '@entity';
import { PropertyValueIcon } from '@property/component/propertyValue';
+import { usePropertyEntityDisplay } from '@property/hooks/usePropertyEntityDisplay';
import { usePropertyUserDisplay } from '@property/hooks/usePropertyUserDisplay';
import { PROPERTY_OPTION_IDS } from '@property/identifiers';
import type { Accessor, JSX } from 'solid-js';
@@ -152,6 +153,9 @@ export function TasksGantt(props: { ref?: (element: HTMLDivElement) => void }) {
},
}}
createAssigneeName={(id) => usePropertyUserDisplay(id).name}
+ createProjectName={(id) =>
+ usePropertyEntityDisplay(id, () => 'INITIATIVE').name
+ }
isGroupExpanded={(id) => !state.collapsedGroupIds.includes(id)}
onToggleGroup={(id) =>
setState('collapsedGroupIds', (ids) =>
diff --git a/apps/web/src/features/tasks-view/tasks-view-context.tsx b/apps/web/src/features/tasks-view/tasks-view-context.tsx
index 8f75dbf384..93719cb9d4 100644
--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx
@@ -249,12 +249,14 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
return persistedState.layout;
},
get groupBy() {
+ if (persistedState.groupBy === 'project' && !projectsEnabled()) {
+ return 'status';
+ }
if (state.layout !== 'board') {
return persistedState.groupBy;
}
- const grouping = toTaskBoardGrouping(persistedState.groupBy);
- return grouping === 'project' && !projectsEnabled() ? 'status' : grouping;
+ return toTaskBoardGrouping(persistedState.groupBy);
},
get tab(): TasksTab {
return persistedState.tab === 'projects' && !projectsEnabled()
diff --git a/apps/web/src/features/tasks-view/views/task-gantt-view.tsx b/apps/web/src/features/tasks-view/views/task-gantt-view.tsx
index 6819d4ba72..4d2f6c3aed 100644
--- a/apps/web/src/features/tasks-view/views/task-gantt-view.tsx
+++ b/apps/web/src/features/tasks-view/views/task-gantt-view.tsx
@@ -11,8 +11,8 @@ import {
import CalendarIcon from '@icon/system/regular/calendar-blank.svg';
import CaretRightIcon from '@icon/system/regular/caret-right.svg';
import CircleDashedIcon from '@icon/system/regular/circle-dashed.svg';
-import FolderIcon from '@icon/system/regular/folder-simple.svg';
import SpinnerIcon from '@icon/system/regular/spinner.svg';
+import ProjectIcon from '@icon/system/regular/stack.svg';
import { PropertyValueIcon } from '@property/component/propertyValue';
import { Button, cn, Layer } from '@ui';
import type { ComponentProps } from 'solid-js';
@@ -32,7 +32,7 @@ import type {
} from '../queries/use-tasks-query';
import type { TaskGroupBy } from '../types';
-function AssigneeLabel(props: {
+function EntityGroupLabel(props: {
id: string;
createName: (id: Accessor<string>) => Accessor<string>;
}) {
@@ -42,6 +42,7 @@ function AssigneeLabel(props: {
export function TaskGanttView(props: {
createAssigneeName: (id: Accessor<string>) => Accessor<string>;
+ createProjectName: (id: Accessor<string>) => Accessor<string>;
source: TasksDataSource;
groupBy: TaskGroupBy;
groupMoves: Omit<ComponentProps<typeof Gantt.GroupDrag>, 'children'>;
@@ -266,7 +267,7 @@ export function TaskGanttView(props: {
/>
</Match>
<Match when={props.groupBy === 'project'}>
- <FolderIcon class="size-3.5 shrink-0" />
+ <ProjectIcon class="size-3.5 shrink-0" />
</Match>
<Match when={props.groupBy === 'date'}>
<CalendarIcon class="size-3.5 shrink-0" />
@@ -275,7 +276,8 @@ export function TaskGanttView(props: {
<span class="truncate">
<Show
when={
- props.groupBy === 'assignee' &&
+ (props.groupBy === 'assignee' ||
+ props.groupBy === 'project') &&
group().groupId
}
fallback={
@@ -287,9 +289,13 @@ export function TaskGanttView(props: {
: group().label
}
>
- <AssigneeLabel
+ <EntityGroupLabel
id={group().groupId}
- createName={props.createAssigneeName}
+ createName={
+ props.groupBy === 'project'
+ ? props.createProjectName
+ : props.createAssigneeName
+ }
/>
</Show>
</span>