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.

feat(tags): add tag filters to the email view and other taggable views (#5105)

gbirman2d8616f41c2e
diff --git a/apps/web/src/features/entity/composed/list-entity/wide-layout.tsx b/apps/web/src/features/entity/composed/list-entity/wide-layout.tsx
index 0392a4b1f7..a8c5e267e7 100644
--- a/apps/web/src/features/entity/composed/list-entity/wide-layout.tsx
+++ b/apps/web/src/features/entity/composed/list-entity/wide-layout.tsx
@@ -189,12 +189,11 @@ export function WideLayout(props: LayoutProps) {
</Show>
<Show when={isEmailEntity(props.entity) && props.entity}>
{(entity) => (
- // No filter-by-tag affordance. The soup email path does not apply
- // tag filters, so filtering would leave email rows unfiltered.
- <EntityRowTags
+ <RowTags
entityId={entity().id}
entityType={EntityType.THREAD}
properties={entity().properties}
+ onFilterByTag={soupView?.filterByTag}
/>
)}
</Show>
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
index fef223405f..d0ca3fbe76 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
@@ -1,5 +1,5 @@
import type { ListView } from '@app/constants/list-views';
-import { isListViewID } from '@app/constants/list-views';
+import { isListViewID, TAGGABLE_LIST_VIEWS } from '@app/constants/list-views';
import {
type FilterContext,
NO_ASSIGNEE,
@@ -816,11 +816,12 @@ export const UnifiedFilterDropdown = (
const isTasksView = () => currentView() === 'tasks';
const isCompaniesView = () => currentView() === 'companies';
- const isDocumentsView = () => currentView() === 'documents';
const tagFilter = useTagFilter();
- const showTagsFilter = () =>
- tagFilter.hasTags() && (isTasksView() || isDocumentsView());
+ const showTagsFilter = () => {
+ const view = currentView();
+ return tagFilter.hasTags() && !!view && TAGGABLE_LIST_VIEWS.has(view);
+ };
registerHotkey({
hotkey: 'f',
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/use-filter-refinements.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/use-filter-refinements.tsx
index a142f0ad67..008087bf40 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/use-filter-refinements.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/use-filter-refinements.tsx
@@ -1,5 +1,5 @@
import type { ListView } from '@app/constants/list-views';
-import { isListViewID } from '@app/constants/list-views';
+import { isListViewID, TAGGABLE_LIST_VIEWS } from '@app/constants/list-views';
import {
type FilterContext,
type FilterID,
@@ -683,9 +683,9 @@ export function useFilterRefinements() {
);
};
- // Tags chip (consolidated, searchable) for the documents/tasks views.
+ // Tags chip (consolidated, searchable) for every taggable list view.
const pushTagsConsolidatedChip = () => {
- if (view !== 'tasks' && view !== 'documents') return;
+ if (!view || !TAGGABLE_LIST_VIEWS.has(view)) return;
if (!tagFilter.hasTags()) return;
const key = 'tags';
diff --git a/apps/web/src/lib/constants/list-views.ts b/apps/web/src/lib/constants/list-views.ts
index 60d879bbc2..fff4326f42 100644
--- a/apps/web/src/lib/constants/list-views.ts
+++ b/apps/web/src/lib/constants/list-views.ts
@@ -53,6 +53,20 @@ export const isListViewID = (id: string | null | undefined): id is ListView => {
return LIST_VIEWS.includes(id as 'inbox');
};
+/**
+ * List views whose entities are taggable, so their filter bar surfaces the tag
+ * filter. Mirrors TAGGABLE_ENTITY_TYPES (document/task/thread/project/chat/
+ * call). Channels, companies, and the mixed inbox are omitted.
+ */
+export const TAGGABLE_LIST_VIEWS: ReadonlySet<ListView> = new Set<ListView>([
+ 'documents',
+ 'tasks',
+ 'mail',
+ 'folders',
+ 'agents',
+ 'calls',
+]);
+
export const soupItemMatchesListView = (
item: SoupApiItem,
view: ListView | undefined
@@ -114,10 +128,10 @@ export const soupItemMatchesTagFilter = (
/**
* `soupItemMatchesTagFilter` for mapped entities. Rendered rows are checked
- * against the active tag filter because the server only tag-filters the
- * document/chat/project soup unions and the document search leg. Entity types
- * without loaded properties (channels, calls, search-service email results)
- * never match, so they are excluded rather than leaking through unfiltered.
+ * against the active tag filter as a client-side backstop, since the server
+ * does not tag-filter every soup union. Rows carrying loaded properties are
+ * matched on those (emails included); rows without loaded properties never
+ * match, so they are excluded rather than leaking through unfiltered.
*/
export const entityMatchesTagFilter = (
entity: EntityData,