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-view): wrong tags context position (#6516)

dev-rb63dcdf81a930
diff --git a/apps/web/src/features/drive-view/drive-view.tsx b/apps/web/src/features/drive-view/drive-view.tsx
index 0975643cb2..e4f6d3ea1b 100644
--- a/apps/web/src/features/drive-view/drive-view.tsx
+++ b/apps/web/src/features/drive-view/drive-view.tsx
@@ -50,6 +50,7 @@ import FilterIcon from '@phosphor/funnel-simple.svg';
import PlusIcon from '@phosphor/plus.svg';
import SpinnerIcon from '@phosphor/spinner.svg';
import UploadIcon from '@phosphor/upload-simple.svg';
+import { TagSetsProvider } from '@property/tags/tag-sets-context';
import { useFavoritesData } from '@queries/favorites/favorites';
import { useProjectsQuery } from '@queries/storage/projects';
import type { Favorite } from '@service-storage/generated/schemas/favorite';
@@ -452,9 +453,11 @@ function DriveViewContent(props: DriveViewProps) {
favorites={Favorites}
detail={
navigationStack.active() ? (
- <DriveDetailView
- breadcrumbOrderOffset={locationBreadcrumbs().length}
- />
+ <TagSetsProvider tagSets={view.tagFilter.tagSets}>
+ <DriveDetailView
+ breadcrumbOrderOffset={locationBreadcrumbs().length}
+ />
+ </TagSetsProvider>
) : undefined
}
>
diff --git a/apps/web/src/features/tasks-view/tasks-view.tsx b/apps/web/src/features/tasks-view/tasks-view.tsx
index afeda9afdb..4a9cc048f6 100644
--- a/apps/web/src/features/tasks-view/tasks-view.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view.tsx
@@ -33,41 +33,37 @@ function TasksViewRoot() {
onMount(() => panel.handle.setDisplayName('Tasks'));
return (
- <ListEntityMetadataQueryProvider>
- <SplitPanel.Root>
- <SplitPanel.Body>
- <ViewShell.Root
- resizable
- aside={{ preserveDuringResize: false }}
- main={{ preferredWidth: 640 }}
- >
- <ViewShell.Aside>
- <TasksSidebar />
- </ViewShell.Aside>
- <ViewShell.Main>
- <Switch>
- <Match when={selectedTask()}>
- {(task) => <TasksDetailView task={task()} />}
- </Match>
- <Match when={!selectedTask()}>
- <TasksTopBar />
- <ViewShell.Header>
- <TasksHeader
- onSearchEscape={() => listElement()?.focus()}
- />
- </ViewShell.Header>
- <ViewShell.Content>
- <Suspense fallback={<TasksListFallback />}>
- <TaskList ref={setListElement} />
- </Suspense>
- </ViewShell.Content>
- </Match>
- </Switch>
- </ViewShell.Main>
- </ViewShell.Root>
- </SplitPanel.Body>
- </SplitPanel.Root>
- </ListEntityMetadataQueryProvider>
+ <SplitPanel.Root>
+ <SplitPanel.Body>
+ <ViewShell.Root
+ resizable
+ aside={{ preserveDuringResize: false }}
+ main={{ preferredWidth: 640 }}
+ >
+ <ViewShell.Aside>
+ <TasksSidebar />
+ </ViewShell.Aside>
+ <ViewShell.Main>
+ <Switch>
+ <Match when={selectedTask()}>
+ {(task) => <TasksDetailView task={task()} />}
+ </Match>
+ <Match when={!selectedTask()}>
+ <TasksTopBar />
+ <ViewShell.Header>
+ <TasksHeader onSearchEscape={() => listElement()?.focus()} />
+ </ViewShell.Header>
+ <ViewShell.Content>
+ <Suspense fallback={<TasksListFallback />}>
+ <TaskList ref={setListElement} />
+ </Suspense>
+ </ViewShell.Content>
+ </Match>
+ </Switch>
+ </ViewShell.Main>
+ </ViewShell.Root>
+ </SplitPanel.Body>
+ </SplitPanel.Root>
);
}
@@ -77,9 +73,11 @@ export function TasksView(props: TasksViewProps) {
<EntityDetailNavigationStack.Root
shouldNavigate={(_, options) => options?.event?.shiftKey !== true}
>
- <TasksViewProvider initialState={props.initialState}>
- <TasksViewRoot />
- </TasksViewProvider>
+ <ListEntityMetadataQueryProvider>
+ <TasksViewProvider initialState={props.initialState}>
+ <TasksViewRoot />
+ </TasksViewProvider>
+ </ListEntityMetadataQueryProvider>
</EntityDetailNavigationStack.Root>
);
}