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(drive): list databases in the sidebar (#8899)

Jacob Beckermande75b219927b
diff --git a/apps/web/src/features/drive-view/context/drive-source.ts b/apps/web/src/features/drive-view/context/drive-source.ts
index 460a0e465c..a107120777 100644
--- a/apps/web/src/features/drive-view/context/drive-source.ts
+++ b/apps/web/src/features/drive-view/context/drive-source.ts
@@ -1,6 +1,6 @@
import type { ListDataSource } from '@app/components/list';
import type { SoupEntityRow } from '@app/features/soup/collection/types';
-import type { EntityData } from '@entity';
+import type { DatabaseEntity, EntityData } from '@entity';
import type { Favorite } from '@service-storage/generated/schemas/favorite';
import type { Accessor } from 'solid-js';
import type { DriveFolder, DriveState } from '../core/types';
@@ -26,6 +26,7 @@ export type DriveFolderMetadata = DriveFolder & { userId: string };
export type DriveSidebarSource = {
folders: Accessor<DriveFolderMetadata[]>;
favorites: Accessor<Favorite[]>;
+ databases: Accessor<DatabaseEntity[]>;
foldersLoading: Accessor<boolean>;
foldersError: Accessor<boolean>;
retryFolders: () => Promise<void>;
diff --git a/apps/web/src/features/drive-view/core/types.ts b/apps/web/src/features/drive-view/core/types.ts
index 2c8a05bc23..9a4d5d607f 100644
--- a/apps/web/src/features/drive-view/core/types.ts
+++ b/apps/web/src/features/drive-view/core/types.ts
@@ -24,6 +24,7 @@ export type DriveState = {
facets: FacetSelection;
expandedFolderIds: string[];
favoritesOpen: boolean;
+ databasesOpen: boolean;
rootOpen: boolean;
};
diff --git a/apps/web/src/features/drive-view/drive-view.tsx b/apps/web/src/features/drive-view/drive-view.tsx
index 9c411f9274..ed883c4351 100644
--- a/apps/web/src/features/drive-view/drive-view.tsx
+++ b/apps/web/src/features/drive-view/drive-view.tsx
@@ -73,7 +73,10 @@ function DriveComposition(props: { route: DriveRouteState }) {
);
const searchText = () => view.value().search;
const selection = () => ({ ...viewState(), search: searchText() });
- const sidebar = createDriveSidebarSource();
+ const sidebar = createDriveSidebarSource({
+ databasesEnabled: () => databasesFlag().enabled,
+ formsEnabled: () => formsFlag().enabled,
+ });
const source = withSplitPanelOwner(listOwnedSlotName('data-source'), () =>
createDriveDataSource({
selection,
diff --git a/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx b/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx
index 7d67286ae2..8e8004e857 100644
--- a/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx
+++ b/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx
@@ -70,6 +70,7 @@ it.each(['pointer', 'keyboard'])(
facets: {},
expandedFolderIds: [],
favoritesOpen: true,
+ databasesOpen: true,
rootOpen: true,
});
render(() => {
diff --git a/apps/web/src/features/drive-view/primitives/drive-route-state.ts b/apps/web/src/features/drive-view/primitives/drive-route-state.ts
index 79f4c5d999..26eb9eaa4e 100644
--- a/apps/web/src/features/drive-view/primitives/drive-route-state.ts
+++ b/apps/web/src/features/drive-view/primitives/drive-route-state.ts
@@ -101,6 +101,7 @@ export function createDriveViewState(
search: '',
expandedFolderIds: [],
favoritesOpen: true,
+ databasesOpen: true,
rootOpen: true,
},
});
diff --git a/apps/web/src/features/drive-view/primitives/drive-state.ts b/apps/web/src/features/drive-view/primitives/drive-state.ts
index a0161d63db..fff17ab267 100644
--- a/apps/web/src/features/drive-view/primitives/drive-state.ts
+++ b/apps/web/src/features/drive-view/primitives/drive-state.ts
@@ -144,6 +144,9 @@ export function createDriveState(options: {
setFavoritesOpen: (favoritesOpen: boolean) =>
setState((current) => ({ ...current, favoritesOpen })),
+ setDatabasesOpen: (databasesOpen: boolean) =>
+ setState((current) => ({ ...current, databasesOpen })),
+
setRootOpen: (rootOpen: boolean) =>
setState((current) => ({ ...current, rootOpen })),
};
diff --git a/apps/web/src/features/drive-view/queries/drive-databases.test.ts b/apps/web/src/features/drive-view/queries/drive-databases.test.ts
index c2ab09a4a2..e975a9ecd4 100644
--- a/apps/web/src/features/drive-view/queries/drive-databases.test.ts
+++ b/apps/web/src/features/drive-view/queries/drive-databases.test.ts
@@ -2,7 +2,10 @@ import type { ListedDatabase } from '@service-storage/generated/schemas/listedDa
import { describe, expect, it } from 'vitest';
import type { DriveSelection } from '../context/drive-source';
import { availableDriveState } from '../primitives/drive-state';
-import { selectDriveDatabases } from './drive-databases';
+import {
+ selectDriveDatabases,
+ selectSidebarDatabases,
+} from './drive-databases';
import {
driveEntityMatchesLocation,
orderDriveEntities,
@@ -144,6 +147,7 @@ describe('disabled database filters', () => {
facets: { type: ['database', 'doc-markdown'], tags: ['urgent'] },
expandedFolderIds: [],
favoritesOpen: false,
+ databasesOpen: true,
rootOpen: true,
};
expect(availableDriveState(state, false, true).facets).toEqual({
@@ -161,3 +165,28 @@ describe('disabled database filters', () => {
expect(state.facets.type).toEqual(['database', 'doc-markdown']);
});
});
+
+describe('Drive sidebar databases', () => {
+ it('lists owned and shared live databases by name, without hidden ones', () => {
+ const another: ListedDatabase = {
+ database: {
+ id: 'another',
+ name: 'Hiring pipeline',
+ owner_id: 'me',
+ created_at: '2026-09-05T00:00:00Z',
+ trashed_at: null,
+ },
+ grant: 'owner',
+ tables: [],
+ };
+ const poll: ListedDatabase = {
+ ...another,
+ database: { ...another.database, id: 'poll', name: 'Lunch poll' },
+ };
+ expect(
+ selectSidebarDatabases([...listed, another, poll], new Set(['poll'])).map(
+ (entity) => entity.id
+ )
+ ).toEqual(['shared', 'another', 'mine']);
+ });
+});
diff --git a/apps/web/src/features/drive-view/queries/drive-databases.ts b/apps/web/src/features/drive-view/queries/drive-databases.ts
index 9aeb0392ec..129f6e1ada 100644
--- a/apps/web/src/features/drive-view/queries/drive-databases.ts
+++ b/apps/web/src/features/drive-view/queries/drive-databases.ts
@@ -41,3 +41,26 @@ export function selectDriveDatabases(
];
});
}
+
+/** Every database the viewer can open, owned or shared, for the sidebar, alphabetical. */
+export function selectSidebarDatabases(
+ listed: readonly ListedDatabase[],
+ hidden: ReadonlySet<string>
+): DatabaseEntity[] {
+ return listed
+ .flatMap(({ database, grant }): DatabaseEntity[] =>
+ database.trashed_at || hidden.has(database.id)
+ ? []
+ : [
+ {
+ type: 'database',
+ id: database.id,
+ name: database.name,
+ ownerId: database.owner_id,
+ createdAt: database.created_at,
+ grant,
+ },
+ ]
+ )
+ .sort((a, b) => a.name.localeCompare(b.name));
+}
diff --git a/apps/web/src/features/drive-view/queries/drive-sidebar-source.ts b/apps/web/src/features/drive-view/queries/drive-sidebar-source.ts
index d1dab3029b..354ee5574a 100644
--- a/apps/web/src/features/drive-view/queries/drive-sidebar-source.ts
+++ b/apps/web/src/features/drive-view/queries/drive-sidebar-source.ts
@@ -3,17 +3,28 @@ import {
isFeatureEnabled,
} from '@core/constant/featureFlags';
import { useFavoritesData } from '@queries/favorites/favorites';
+import { useDatabasesQuery } from '@queries/storage/databases';
+import { useFormsQuery } from '@queries/storage/forms';
import { createGraphqlFoldersQuery } from '@queries/storage/graphql-folders';
import { useProjectsQuery } from '@queries/storage/projects';
-import { createMemo } from 'solid-js';
+import { type Accessor, createMemo } from 'solid-js';
import type { DriveSidebarSource } from '../context/drive-source';
+import { selectSidebarDatabases } from './drive-databases';
+import { hiddenFormDatabases } from './drive-forms';
-export function createDriveSidebarSource(): DriveSidebarSource {
+type DriveSidebarOptions = {
+ databasesEnabled: Accessor<boolean>;
+ formsEnabled: Accessor<boolean>;
+};
+
+export function createDriveSidebarSource(
+ options: DriveSidebarOptions
+): DriveSidebarSource {
if (isFeatureEnabled(enableGraphqlSoup)) {
- return createGraphqlDriveSidebarSource();
+ return createGraphqlDriveSidebarSource(options);
}
- return createRestDriveSidebarSource();
+ return createRestDriveSidebarSource(options);
}
function createSidebarFavorites() {
@@ -30,7 +41,26 @@ function createSidebarFavorites() {
);
}
-function createGraphqlDriveSidebarSource(): DriveSidebarSource {
+function createSidebarDatabases(options: DriveSidebarOptions) {
+ const databases = useDatabasesQuery();
+ const forms = useFormsQuery();
+ return createMemo(() => {
+ if (!options.databasesEnabled() || databases.isPending) return [];
+ // The forms list names the databases made for polls; without it, show none.
+ const formsEnabled = options.formsEnabled();
+ if (formsEnabled && forms.isPending) return [];
+ const listedForms = formsEnabled ? forms.data : [];
+ if (!listedForms) return [];
+ return selectSidebarDatabases(
+ databases.data ?? [],
+ hiddenFormDatabases(listedForms)
+ );
+ });
+}
+
+function createGraphqlDriveSidebarSource(
+ options: DriveSidebarOptions
+): DriveSidebarSource {
const folders = createGraphqlFoldersQuery();
return {
@@ -41,10 +71,13 @@ function createGraphqlDriveSidebarSource(): DriveSidebarSource {
await folders.refetch({ requestPolicy: 'network-only' });
},
favorites: createSidebarFavorites(),
+ databases: createSidebarDatabases(options),
};
}
-function createRestDriveSidebarSource(): DriveSidebarSource {
+function createRestDriveSidebarSource(
+ options: DriveSidebarOptions
+): DriveSidebarSource {
const projects = useProjectsQuery();
return {
@@ -62,5 +95,6 @@ function createRestDriveSidebarSource(): DriveSidebarSource {
},
favorites: createSidebarFavorites(),
+ databases: createSidebarDatabases(options),
};
}
diff --git a/apps/web/src/features/drive-view/views/drive-sidebar.tsx b/apps/web/src/features/drive-view/views/drive-sidebar.tsx
index 0706218897..d1612461e0 100644
--- a/apps/web/src/features/drive-view/views/drive-sidebar.tsx
+++ b/apps/web/src/features/drive-view/views/drive-sidebar.tsx
@@ -7,12 +7,14 @@ import { ConnectorImportSidebar } from '@app/features/connector-import/connector
import { FavoriteContextMenu } from '@app/features/favorites/FavoriteContextMenu';
import { FavoriteIcon } from '@app/features/favorites/FavoriteIcon';
import { useFavoriteDisplayName } from '@app/util/favorites';
+import { createScrollTopFade } from '@core/util/createScrollTopFade';
import { fireAndForget } from '@core/util/fireAndForget';
+import DatabaseIcon from '@icon/system/regular/database.svg';
import FolderIcon from '@icon/system/regular/folder.svg';
import SearchIcon from '@icon/system/regular/magnifying-glass.svg';
import UploadIcon from '@icon/system/regular/upload-simple.svg';
import type { Favorite } from '@service-storage/generated/schemas/favorite';
-import { Button } from '@ui';
+import { Button, cn, Scroll } from '@ui';
import { createMemo, createSignal, For, Show } from 'solid-js';
import { DriveNavigation } from '../components/drive-navigation';
import { FolderTree } from '../components/folder-tree';
@@ -21,6 +23,45 @@ import { buildFolderTree, filterFolderTree } from '../core/folder-tree';
import { DriveCreateMenu } from '../drive-create-menu';
import { DriveLocationMenu } from '../drive-location-menu';
+/** Past this many databases, the section scrolls within its own height. */
+const DATABASE_SCROLL_THRESHOLD = 10;
+
+function DriveDatabases(props: { onNavigate?: () => void }) {
+ const { sidebar, actions } = useDriveView();
+ const [scrollRoot, setScrollRoot] = createSignal<HTMLDivElement>();
+ createScrollTopFade(scrollRoot);
+
+ return (
+ <Scroll
+ fill={false}
+ scrollRef={setScrollRoot}
+ class={cn(
+ sidebar.databases().length > DATABASE_SCROLL_THRESHOLD &&
+ 'max-h-[calc(10*var(--sidebar-row-height)+9*var(--sidebar-row-gap))] touch:max-h-[calc(10*2.75rem+9*var(--sidebar-row-gap))]'
+ )}
+ >
+ <ViewSidebar.Nav aria-label="Databases">
+ <For each={sidebar.databases()}>
+ {(database) => (
+ <ViewSidebar.Item
+ title={database.name}
+ onClick={(event) => {
+ actions.openEntity(database, event);
+ props.onNavigate?.();
+ }}
+ >
+ <ViewSidebar.Icon>
+ <DatabaseIcon class="size-4" />
+ </ViewSidebar.Icon>
+ <span class="truncate">{database.name}</span>
+ </ViewSidebar.Item>
+ )}
+ </For>
+ </ViewSidebar.Nav>
+ </Scroll>
+ );
+}
+
function DriveFavorite(props: { favorite: Favorite; onNavigate?: () => void }) {
const { actions } = useDriveView();
@@ -102,6 +143,20 @@ export function DriveSidebarContent(props: { onNavigate?: () => void }) {
</CollapsibleSection.Content>
</CollapsibleSection.Root>
</Show>
+ <Show when={sidebar.databases().length > 0}>
+ <CollapsibleSection.Root
+ open={state.value().databasesOpen}
+ onOpenChange={state.setDatabasesOpen}
+ >
+ <CollapsibleSection.Trigger>
+ <span class="min-w-0 truncate">Databases</span>
+ <CollapsibleSection.Indicator />
+ </CollapsibleSection.Trigger>
+ <CollapsibleSection.Content>
+ <DriveDatabases onNavigate={props.onNavigate} />
+ </CollapsibleSection.Content>
+ </CollapsibleSection.Root>
+ </Show>
<CollapsibleSection.Root
open={state.value().rootOpen}
onOpenChange={state.setRootOpen}
diff --git a/docs/agent-guide/files.md b/docs/agent-guide/files.md
index ee2ca6465b..ce4268a60c 100644
--- a/docs/agent-guide/files.md
+++ b/docs/agent-guide/files.md
@@ -57,7 +57,10 @@ touch uses the global search overlay and creation uses the dock's New button.
The **Folders** pill opens the folder overview and stays highlighted inside
any folder; tapping it from inside a folder returns to the overview, and
selecting another pill leaves the folder tree. The sidebar contains `New file or folder`, `My Files`, `Recent`,
-`Shared with me`, collapsible Favorites, and a searchable folder hierarchy.
+`Shared with me`, collapsible Favorites, a collapsible Databases section
+listing every database the viewer owns or has been shared, by name (past ten,
+it scrolls within its own height; hidden when there are none or databases are
+disabled), and a searchable folder hierarchy.
The Drive sidebar's import card (**Import files**, see
[setup cards](setup-cards.md#import-from-connected-apps)) lists Notion; its
**Import** (or a successful **Connect**) opens a new agent chat beside Drive