@agent-native/core 0.114.0 → 0.114.1

package/corpus/templates/content/app/components/editor/database/DatabaseView.tsx

@@ -1,6 +1,10 @@
 import { useCodeMode } from "@agent-native/core/client/agent-chat";
 import { agentNativePath } from "@agent-native/core/client/api-path";
-import { getBrowserTabId, useSession } from "@agent-native/core/client/hooks";
+import {
+  getBrowserTabId,
+  setClientAppState,
+  useSession,
+} from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import {
   useBuilderConnectFlow,
@@ -48,6 +52,7 @@ import {
   TooltipTrigger,
 } from "@agent-native/toolkit/ui/tooltip";
 import {
+  CONTENT_DATABASE_PERSONAL_VIEW_OVERRIDES_VERSION,
   type BuilderCmsModelSummary,
   type ContentDatabaseItem,
   type ContentDatabaseResponse,
@@ -111,11 +116,11 @@ import {
   IconEyeOff,
   IconFilter,
   IconFileText,
+  IconFolder,
   IconForms,
   IconGripVertical,
   IconLayoutKanban,
   IconLayoutGrid,
-  IconLayoutSidebar,
   IconList,
   IconLock,
   IconMinus,
@@ -125,6 +130,7 @@ import {
   IconPencil,
   IconRefresh,
   IconSearch,
+  IconStarOff,
   IconTable,
   IconTimeline,
   IconTrash,
@@ -145,6 +151,12 @@ import {
 import { Link, useLocation, useNavigate } from "react-router";
 import { toast } from "sonner";
 
+import {
+  contentSpaceForCatalogItem,
+  createContentSpaceSelectionQueue,
+  SELECTED_CONTENT_SPACE_STORAGE_KEY,
+  selectContentSpace,
+} from "@/components/sidebar/select-content-space";
 import {
   isContentDatabaseUnavailable,
   useAddDatabaseItem,
@@ -174,6 +186,11 @@ import {
   useUpdateContentDatabasePersonalView,
   useUpdateContentDatabaseView,
 } from "@/hooks/use-content-database";
+import {
+  useContentSpaces,
+  useCreateContentSpace,
+  useDeleteContentSpace,
+} from "@/hooks/use-content-spaces";
 import {
   useConfigureDocumentProperty,
   useSetDocumentProperty,
@@ -187,6 +204,7 @@ import {
   useUpdatePreviewDocumentDraft,
   useUpdateDocument,
 } from "@/hooks/use-documents";
+import { useLocalStorage } from "@/hooks/use-local-storage";
 import { messagesByLocale } from "@/i18n-data";
 import { cn } from "@/lib/utils";
 
@@ -210,7 +228,6 @@ import {
   BuilderSourceReviewDialog,
   type BuilderReviewPublicationTransitions,
 } from "../database-sources/BuilderSourceReviewDialog";
-import { DescriptionField } from "../DescriptionField";
 import { DocumentBlockFields } from "../DocumentBlockFields";
 import {
   AddProperty,
@@ -248,7 +265,6 @@ import { VisualEditor } from "../VisualEditor";
 import { DatabaseFormView } from "./FormView";
 import { DatabaseGalleryView } from "./GalleryView";
 import { DatabaseListView } from "./ListView";
-import { DatabaseSidebarView } from "./sidebar";
 import { DatabaseTimelineView } from "./TimelineView";
 
 export interface DatabaseViewProps {
@@ -283,6 +299,26 @@ export function databaseSearchExpansionIsPending(
   return !!searchQuery.trim() && responseLimit < requestedLimit;
 }
 
+export function databaseClientQueryExpandedItemLimit(
+  requiresCompleteDataset: boolean,
+  currentLimit: number,
+  totalItemCount: number,
+) {
+  if (!requiresCompleteDataset) return currentLimit;
+  return Math.max(
+    currentLimit,
+    Math.min(totalItemCount, CONTENT_DATABASE_MAX_ITEM_LIMIT),
+  );
+}
+
+export function databaseClientQueryExpansionIsPending(
+  requiresCompleteDataset: boolean,
+  requestedLimit: number,
+  responseLimit: number,
+) {
+  return requiresCompleteDataset && responseLimit < requestedLimit;
+}
+
 export type SortDirection = ContentDatabaseSortDirection;
 export type DatabaseSort = ContentDatabaseSort;
 export type FilterOperator = ContentDatabaseFilterOperator;
@@ -308,7 +344,6 @@ const DATABASE_VIEW_TYPES: ContentDatabaseViewType[] = [
   "timeline",
   "calendar",
   "form",
-  "sidebar",
 ];
 const DATABASE_OPEN_PAGES_IN: ContentDatabaseOpenPagesIn[] = [
   "preview",
@@ -316,7 +351,8 @@ const DATABASE_OPEN_PAGES_IN: ContentDatabaseOpenPagesIn[] = [
 ];
 const DATABASE_FILTER_MODES: DatabaseFilterMode[] = ["and", "or"];
 const DATABASE_ADVANCED_FILTER_GROUP_ID = "advanced";
-export const PERSONAL_DATABASE_VIEW_OVERRIDES_VERSION = 1;
+export const PERSONAL_DATABASE_VIEW_OVERRIDES_VERSION =
+  CONTENT_DATABASE_PERSONAL_VIEW_OVERRIDES_VERSION;
 export const BUILDER_SOURCE_CONTINUATION_STALL_MS = 5_000;
 export const BUILDER_SOURCE_CONTINUATION_MAX_BACKOFF_MS = 30_000;
 
@@ -350,6 +386,7 @@ export function previewDraftMissingCasRecovery(args: {
 }
 
 type DatabaseMessageKey = keyof (typeof messagesByLocale)["en-US"]["database"];
+type SidebarMessageKey = keyof (typeof messagesByLocale)["en-US"]["sidebar"];
 
 export function dbText(
   key: DatabaseMessageKey,
@@ -370,6 +407,15 @@ export function dbText(
   );
 }
 
+function sidebarText(key: SidebarMessageKey): string {
+  const locale =
+    typeof document === "undefined" ? "en-US" : document.documentElement.lang;
+  const messages =
+    messagesByLocale[locale as keyof typeof messagesByLocale] ??
+    messagesByLocale["en-US"];
+  return messages.sidebar[key] ?? messagesByLocale["en-US"].sidebar[key];
+}
+
 export type CreateDatabaseRowHandler = (
   title?: string,
 ) => Promise<ContentDatabaseItem | null>;
@@ -595,10 +641,12 @@ export function DatabaseItemPageIcon({
   document,
   className,
   fallbackClassName,
+  fallback = "page",
 }: {
   document: Pick<Document, "icon">;
   className?: string;
   fallbackClassName?: string;
+  fallback?: "page" | "folder";
 }) {
   const icon = databaseItemPageIconText(document);
   if (icon) {
@@ -615,8 +663,9 @@ export function DatabaseItemPageIcon({
     );
   }
 
+  const FallbackIcon = fallback === "folder" ? IconFolder : IconFileText;
   return (
-    <IconFileText
+    <FallbackIcon
       className={cn("shrink-0 text-muted-foreground", fallbackClassName)}
     />
   );
@@ -667,11 +716,21 @@ function DatabaseTable({
   const t = useT();
   const navigate = useNavigate();
   const queryClient = useQueryClient();
-  const [databaseItemLimit, setDatabaseItemLimit] = useState(
+  const contentSpacesQuery = useContentSpaces();
+  const [, setStoredSpaceId] = useLocalStorage<string | null>(
+    SELECTED_CONTENT_SPACE_STORAGE_KEY,
+    null,
+  );
+  const [manualDatabaseItemLimit, setManualDatabaseItemLimit] = useState(
+    CONTENT_DATABASE_PAGE_SIZE,
+  );
+  const [databaseRequestItemLimit, setDatabaseRequestItemLimit] = useState(
     CONTENT_DATABASE_PAGE_SIZE,
   );
-  const database = useContentDatabase(document.id, databaseItemLimit);
+  const database = useContentDatabase(document.id, databaseRequestItemLimit);
   const addItem = useAddDatabaseItem(document.id);
+  const createContentSpace = useCreateContentSpace();
+  const workspaceCreateRequestIdRef = useRef<string | null>(null);
   const attachSource = useAttachContentDatabaseSource(document.id);
   const changeSourceRole = useChangeContentDatabaseSourceRole(document.id);
   const refreshSource = useRefreshContentDatabaseSource(document.id);
@@ -684,7 +743,6 @@ function DatabaseTable({
   );
   const setSourceWriteMode = useSetContentDatabaseSourceWriteMode(document.id);
   const setProperty = useSetDocumentProperty(document.id, document.id);
-  const updateDatabaseDocument = useUpdateDocument();
   const updateView = useUpdateContentDatabaseView(document.id);
   // A deleted/missing database resolves to the unavailable union (no
   // `database` field) — treat it as no data; the inline-block wrapper owns
@@ -692,16 +750,24 @@ function DatabaseTable({
   const data = isContentDatabaseUnavailable(database.data)
     ? undefined
     : database.data;
+  const isCreatingDatabaseItem =
+    data?.database.systemRole === "workspaces"
+      ? createContentSpace.isPending
+      : addItem.isPending;
   const isDatabaseInitialLoading = database.isLoading && !data;
   const properties = data?.properties ?? [];
   const items = data?.items ?? [];
   const totalItemCount = data?.pagination?.totalItems ?? items.length;
   const hasMoreItems =
     data?.pagination?.hasMore === true &&
-    databaseItemLimit < CONTENT_DATABASE_MAX_ITEM_LIMIT;
+    databaseRequestItemLimit < CONTENT_DATABASE_MAX_ITEM_LIMIT;
   const isLoadingMoreItems =
-    database.isFetching && data?.pagination?.limit !== databaseItemLimit;
+    database.isFetching && data?.pagination?.limit !== databaseRequestItemLimit;
   const databaseId = data?.database.id ?? expectedDatabaseId;
+  const newDatabaseRowLabel =
+    data?.database.systemRole === "workspaces"
+      ? t("sidebar.newWorkspace")
+      : dbText("newPage");
   const personalView = useContentDatabasePersonalView(databaseId);
   const updatePersonalView = useUpdateContentDatabasePersonalView(databaseId);
   const source = data?.source ?? null;
@@ -726,18 +792,6 @@ function DatabaseTable({
   >(null);
   const [searchOpen, setSearchOpen] = useState(false);
   const [searchQuery, setSearchQuery] = useState("");
-  const searchExpandedItemLimit = databaseSearchExpandedItemLimit(
-    searchQuery,
-    databaseItemLimit,
-    totalItemCount,
-  );
-  const isSearchExpansionPending = databaseSearchExpansionIsPending(
-    searchQuery,
-    searchExpandedItemLimit,
-    data?.pagination?.limit ?? items.length,
-  );
-  const isDatabaseViewLoading =
-    isDatabaseInitialLoading || isSearchExpansionPending;
   const [settingsOpen, setSettingsOpen] = useState(false);
   const [inlineFilterControlsOpen, setInlineFilterControlsOpen] =
     useState(false);
@@ -753,10 +807,6 @@ function DatabaseTable({
   );
   const [builderReviewOpen, setBuilderReviewOpen] = useState(false);
 
-  useEffect(() => {
-    if (searchExpandedItemLimit === databaseItemLimit) return;
-    setDatabaseItemLimit(searchExpandedItemLimit);
-  }, [databaseItemLimit, searchExpandedItemLimit]);
   const [builderReviewSourceId, setBuilderReviewSourceId] = useState<
     string | null
   >(null);
@@ -795,6 +845,7 @@ function DatabaseTable({
   );
   const sorts = activeView.sorts;
   const filters = activeView.filters;
+  const visibleFilters = filters;
   const filterMode = activeView.filterMode ?? "and";
   const columnWidths = activeView.columnWidths;
   const databaseGroupProperty = useMemo(
@@ -822,6 +873,7 @@ function DatabaseTable({
   const builderContinuationWatchdogRef = useRef<Map<string, number>>(new Map());
   const refreshSourceInFlightRef = useRef<string | null>(null);
   const hydrationSourceInFlightRef = useRef<string | null>(null);
+  const workspaceSelectionQueueRef = useRef(createContentSpaceSelectionQueue());
   const builderReviewGenerationRef = useRef(0);
   const builderReviewSessionRef = useRef<BuilderReviewSession | null>(null);
   const [
@@ -884,6 +936,32 @@ function DatabaseTable({
     sorts,
     filters,
   );
+  const visibleConstraintCount = activeDatabaseConstraintCount(
+    searchQuery,
+    sorts,
+    visibleFilters,
+  );
+  const requiresCompleteClientDataset =
+    activeConstraintCount > 0 ||
+    !!databaseGroupProperty ||
+    activeView.type === "calendar" ||
+    activeView.type === "timeline";
+  const clientQueryExpandedItemLimit = databaseClientQueryExpandedItemLimit(
+    requiresCompleteClientDataset,
+    manualDatabaseItemLimit,
+    totalItemCount,
+  );
+  const isClientQueryExpansionPending = databaseClientQueryExpansionIsPending(
+    requiresCompleteClientDataset,
+    clientQueryExpandedItemLimit,
+    data?.pagination?.limit ?? items.length,
+  );
+  const isDatabaseViewLoading =
+    isDatabaseInitialLoading || isClientQueryExpansionPending;
+  useEffect(() => {
+    if (clientQueryExpandedItemLimit === databaseRequestItemLimit) return;
+    setDatabaseRequestItemLimit(clientQueryExpandedItemLimit);
+  }, [clientQueryExpandedItemLimit, databaseRequestItemLimit]);
   const rowsAreManuallyOrdered =
     !searchQuery.trim() &&
     sorts.length === 0 &&
@@ -1239,6 +1317,7 @@ function DatabaseTable({
   ]);
 
   function previewItemPage(item: ContentDatabaseItem) {
+    if (openWorkspaceFiles(item)) return;
     seedDatabaseItemDocumentCaches(queryClient, item);
     prioritizeBuilderBodyHydrationForItem(item);
     if (activeView.openPagesIn === "full_page") {
@@ -1278,11 +1357,50 @@ function DatabaseTable({
   }
 
   function openItemPage(item: ContentDatabaseItem) {
+    if (openWorkspaceFiles(item)) return;
     seedDatabaseItemDocumentCaches(queryClient, item);
     prioritizeBuilderBodyHydrationForItem(item);
     navigate(`/page/${item.document.id}`);
   }
 
+  function openWorkspaceFiles(item: ContentDatabaseItem) {
+    if (data?.database.systemRole !== "workspaces") {
+      return false;
+    }
+    const spacesResponse = contentSpacesQuery.data;
+    if (!spacesResponse) return false;
+    const space = contentSpaceForCatalogItem({
+      databaseId,
+      catalogDatabaseId: spacesResponse.catalogDatabaseId,
+      documentId: item.document.id,
+      spaces: spacesResponse.spaces,
+    });
+    if (!space) return false;
+    void workspaceSelectionQueueRef
+      .current(async () => {
+        await selectContentSpace({
+          space,
+          syncApplicationState: (selected) =>
+            setClientAppState(
+              "content-space",
+              {
+                spaceId: selected.id,
+                name: selected.name,
+                kind: selected.kind,
+                filesDatabaseId: selected.filesDatabaseId,
+              },
+              { requestSource: "content-workspaces-database" },
+            ),
+          persistSelection: setStoredSpaceId,
+          openFiles: (documentId) => navigate(`/page/${documentId}`),
+        });
+      })
+      .catch((error) => {
+        toast.error(error instanceof Error ? error.message : String(error));
+      });
+    return true;
+  }
+
   function prioritizeBuilderBodyHydrationForItem(item: ContentDatabaseItem) {
     const builderSource = databaseBuilderHydrationSourceForItem(item, sources);
     if (!builderSource) return;
@@ -1309,6 +1427,29 @@ function DatabaseTable({
     } = {},
   ) {
     if (!databaseId) return null;
+    if (data?.database.systemRole === "workspaces") {
+      const name = title.trim() || t("sidebar.newWorkspace");
+      const requestId =
+        workspaceCreateRequestIdRef.current ?? crypto.randomUUID();
+      workspaceCreateRequestIdRef.current = requestId;
+      try {
+        await createContentSpace.mutateAsync({
+          name,
+          requestId,
+          propertyValues:
+            Object.keys(propertyValueOverrides).length > 0
+              ? propertyValueOverrides
+              : undefined,
+        });
+        workspaceCreateRequestIdRef.current = null;
+      } catch (err) {
+        toast.error(dbText("failedToCreateRow"), {
+          description:
+            err instanceof Error ? err.message : dbText("somethingWentWrong"),
+        });
+      }
+      return null;
+    }
     const propertyValues = {
       ...databasePropertyValuesForNewItem(filters, properties, filterMode),
       ...propertyValueOverrides,
@@ -2012,28 +2153,6 @@ function DatabaseTable({
     orderedProperties,
     visibleItems,
   ]);
-  const sidebarGroups = useMemo(
-    () =>
-      databaseVisibleGroups(
-        databaseViewItemGroups(
-          visibleItems,
-          orderedProperties,
-          activeView.groupByPropertyId,
-        ),
-        activeView.hideEmptyGroups === true,
-      ),
-    [
-      activeView.groupByPropertyId,
-      activeView.hideEmptyGroups,
-      orderedProperties,
-      visibleItems,
-    ],
-  );
-  const sidebarIsGrouped = useMemo(
-    () => !!databaseViewGroupingProperty(activeView, orderedProperties),
-    [activeView, orderedProperties],
-  );
-
   useEffect(() => {
     if (!data?.database.id) return;
     if (personalView.isLoading) return;
@@ -2155,19 +2274,6 @@ function DatabaseTable({
 
   return (
     <div className="mt-4 min-w-0 w-full max-w-[calc(100vw-var(--content-sidebar-width,0px)-1.5rem)]">
-      <DescriptionField
-        description={document.description}
-        canEdit={canEdit}
-        label={t("editor.properties.description")}
-        placeholder={t("editor.properties.addDatabaseDescription")}
-        className="mb-3"
-        onSave={(description) =>
-          updateDatabaseDocument.mutateAsync({
-            id: document.id,
-            description,
-          })
-        }
-      />
       <div className="mb-1 flex min-h-8 flex-wrap items-center justify-between gap-x-3 gap-y-1 pb-1">
         <DatabaseViewTabs
           viewConfig={viewConfig}
@@ -2225,7 +2331,7 @@ function DatabaseTable({
             onSortsChange={setActiveSorts}
           />
           <FilterMenu
-            filters={filters}
+            filters={visibleFilters}
             properties={orderedProperties}
             inlineOpen={inlineFilterControlsOpen}
             open={toolbarFilterOpen}
@@ -2316,10 +2422,10 @@ function DatabaseTable({
               type="button"
               size="sm"
               className="h-7 rounded-md bg-foreground px-2.5 text-xs font-medium text-background hover:bg-foreground/90"
-              disabled={addItem.isPending || !databaseId}
+              disabled={isCreatingDatabaseItem || !databaseId}
               onClick={() => void createRow()}
             >
-              {addItem.isPending ? (
+              {isCreatingDatabaseItem ? (
                 <Spinner className="mr-1.5 size-3.5" />
               ) : null}
               New
@@ -2336,7 +2442,7 @@ function DatabaseTable({
         filters={filters}
         filterMode={filterMode}
         properties={properties}
-        constraintCount={activeConstraintCount}
+        constraintCount={visibleConstraintCount}
         forceShow={inlineFilterControlsOpen}
         addFilterOpen={inlineAddFilterOpen}
         openSortIndex={inlineSortOpenIndex}
@@ -2436,7 +2542,7 @@ function DatabaseTable({
           databaseDocumentId={document.id}
           canEdit={canEdit}
           isLoading={isDatabaseViewLoading}
-          isCreating={addItem.isPending || setProperty.isPending}
+          isCreating={isCreatingDatabaseItem || setProperty.isPending}
           hasActiveConstraints={!!searchQuery || activeFilters.length > 0}
           isMoving={setProperty.isPending}
           collapsedGroupIds={activeView.collapsedGroupIds ?? []}
@@ -2456,22 +2562,6 @@ function DatabaseTable({
           onDeletedPreviewItem={handleDeletedPreviewItem}
           onOpenPage={openItemPage}
         />
-      ) : activeView.type === "sidebar" ? (
-        <DatabaseSidebarView
-          key={activeView.id}
-          groups={sidebarGroups}
-          grouped={sidebarIsGrouped}
-          isLoading={isDatabaseViewLoading}
-          hasActiveConstraints={hasResultConstraints}
-          openPagesIn={activeView.openPagesIn ?? "preview"}
-          loadingLabel={dbText("loadingList")}
-          noMatchesLabel={dbText("noRowsMatchThisView")}
-          clearLabel={dbText("clearSearchAndFilters")}
-          navigationLabel={dbText("databasePagePreview")}
-          untitledLabel={dbText("untitled")}
-          onClearResultConstraints={clearSearchAndFilters}
-          onPreview={previewItemPage}
-        />
       ) : activeView.type === "list" ? (
         <DatabaseListView
           properties={tableProperties}
@@ -2480,7 +2570,7 @@ function DatabaseTable({
           databaseDocumentId={document.id}
           canEdit={canEdit}
           isLoading={isDatabaseViewLoading}
-          isCreating={addItem.isPending}
+          isCreating={isCreatingDatabaseItem}
           activeFilters={activeFilters}
           hasSearch={!!searchQuery}
           rowsAreManuallyOrdered={rowsAreManuallyOrdered}
@@ -2503,7 +2593,7 @@ function DatabaseTable({
           databaseDocumentId={document.id}
           canEdit={canEdit}
           isLoading={isDatabaseViewLoading}
-          isCreating={addItem.isPending}
+          isCreating={isCreatingDatabaseItem}
           activeFilters={activeFilters}
           hasSearch={!!searchQuery}
           rowsAreManuallyOrdered={rowsAreManuallyOrdered}
@@ -2526,7 +2616,7 @@ function DatabaseTable({
           databaseDocumentId={document.id}
           canEdit={canEdit}
           isLoading={isDatabaseViewLoading}
-          isCreating={addItem.isPending || setProperty.isPending}
+          isCreating={isCreatingDatabaseItem || setProperty.isPending}
           activeFilters={activeFilters}
           hasSearch={!!searchQuery}
           dateProperty={dateViewProperty}
@@ -2552,7 +2642,7 @@ function DatabaseTable({
           databaseDocumentId={document.id}
           canEdit={canEdit}
           isLoading={isDatabaseViewLoading}
-          isCreating={addItem.isPending || setProperty.isPending}
+          isCreating={isCreatingDatabaseItem || setProperty.isPending}
           activeFilters={activeFilters}
           hasSearch={!!searchQuery}
           dateProperty={dateViewProperty}
@@ -2578,6 +2668,7 @@ function DatabaseTable({
         />
       ) : (
         <DatabaseTableView
+          newRowLabel={newDatabaseRowLabel}
           properties={tableProperties}
           groupableProperties={orderedProperties}
           items={visibleItems}
@@ -2586,7 +2677,7 @@ function DatabaseTable({
           databaseDocumentId={document.id}
           canEdit={canEdit}
           isLoading={isDatabaseViewLoading}
-          isCreating={addItem.isPending}
+          isCreating={isCreatingDatabaseItem}
           columnWidths={columnWidths}
           sorts={sorts}
           filters={filters}
@@ -2632,7 +2723,7 @@ function DatabaseTable({
         />
       )}
 
-      {hasMoreItems && !isSearchExpansionPending ? (
+      {hasMoreItems && !isClientQueryExpansionPending ? (
         <div className="flex items-center justify-center border-t border-border/45 py-3">
           <Button
             type="button"
@@ -2640,7 +2731,7 @@ function DatabaseTable({
             size="sm"
             disabled={isLoadingMoreItems}
             onClick={() =>
-              setDatabaseItemLimit((current) =>
+              setManualDatabaseItemLimit((current) =>
                 Math.min(
                   current + CONTENT_DATABASE_PAGE_SIZE,
                   totalItemCount,
@@ -2684,7 +2775,9 @@ function DatabaseTable({
       <DatabaseSettingsPanelSheet
         open={settingsOpen}
         panel={settingsPanel}
+        databaseId={databaseId}
         documentId={document.id}
+        isFilesDatabase={document.database?.systemRole === "files"}
         canEdit={canEdit}
         canManage={document.canManage === true}
         activeView={activeView}
@@ -3916,8 +4009,10 @@ function DatabaseItemPreview({
   onOpenPage: () => void;
 }) {
   const queryClient = useQueryClient();
+  const contentSpaces = useContentSpaces();
   const updateDocument = useUpdateDocument();
   const deleteDocument = useDeleteDocument();
+  const deleteContentSpace = useDeleteContentSpace();
   const duplicateItem = useDuplicateDatabaseItem(databaseDocumentId);
   const { data: document, isLoading } = useDocument(item.document.id);
   const { data: persistedPreviewDraft } = usePreviewDocumentDraft(
@@ -3984,6 +4079,15 @@ function DatabaseItemPreview({
   const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
   const [openingFullPage, setOpeningFullPage] = useState(false);
   const titleInputRef = useRef<HTMLTextAreaElement>(null);
+  const removesFavoriteMembership =
+    contentSpaces.data?.favoritesDocumentId === databaseDocumentId;
+  const workspaceSpace = contentSpaces.data?.spaces.find(
+    (space) => space.catalogDocumentId === item.document.id,
+  );
+  const isWorkspaceCatalog =
+    contentSpaces.data?.catalogDocumentId === databaseDocumentId;
+  const canDeleteWorkspace =
+    isWorkspaceCatalog && workspaceSpace?.kind === "user";
 
   // The peek's primary title+body save runs through a flush-on-release controller
   // so a pending debounced edit is PERSISTED — not dropped — when the row
@@ -4588,7 +4692,14 @@ function DatabaseItemPreview({
     }
 
     try {
-      await deleteDocument.mutateAsync({ id: item.document.id });
+      if (canDeleteWorkspace && workspaceSpace) {
+        await deleteContentSpace.mutateAsync({ spaceId: workspaceSpace.id });
+      } else {
+        await deleteDocument.mutateAsync({
+          id: item.document.id,
+          databaseDocumentId,
+        });
+      }
       await queryClient.invalidateQueries({
         queryKey: [
           "action",
@@ -4673,7 +4784,7 @@ function DatabaseItemPreview({
               )}
               {openingFullPage ? dbText("opening") : dbText("openPage")}
             </Button>
-            {canEdit || canManage ? (
+            {canEdit || canManage || removesFavoriteMembership ? (
               <DropdownMenu
                 open={actionsMenuOpen}
                 onOpenChange={setActionsMenuOpen}
@@ -4694,7 +4805,7 @@ function DatabaseItemPreview({
                   className="w-44"
                   data-database-preview-portal=""
                 >
-                  {canEdit ? (
+                  {canEdit && !isWorkspaceCatalog ? (
                     <DropdownMenuItem
                       disabled={duplicateItem.isPending}
                       onSelect={(event) => {
@@ -4706,8 +4817,24 @@ function DatabaseItemPreview({
                       {dbText("duplicateRow")}
                     </DropdownMenuItem>
                   ) : null}
-                  {canEdit && canManage ? <DropdownMenuSeparator /> : null}
-                  {canManage ? (
+                  {canEdit &&
+                  !isWorkspaceCatalog &&
+                  (canManage || removesFavoriteMembership) ? (
+                    <DropdownMenuSeparator />
+                  ) : null}
+                  {removesFavoriteMembership ? (
+                    <DropdownMenuItem
+                      onSelect={(event) => {
+                        event.preventDefault();
+                        setActionsMenuOpen(false);
+                        void deletePreviewRow();
+                      }}
+                    >
+                      <IconStarOff className="mr-2 size-4 text-muted-foreground" />
+                      {sidebarText("removeFromFavorites")}
+                    </DropdownMenuItem>
+                  ) : canManage &&
+                    (!isWorkspaceCatalog || canDeleteWorkspace) ? (
                     <DropdownMenuItem
                       className="text-destructive focus:bg-destructive/10 focus:text-destructive"
                       onSelect={(event) => {
@@ -4717,7 +4844,9 @@ function DatabaseItemPreview({
                       }}
                     >
                       <IconTrash className="mr-2 size-4" />
-                      {dbText("deleteRow")}
+                      {canDeleteWorkspace
+                        ? "Delete workspace"
+                        : dbText("deleteRow")}
                     </DropdownMenuItem>
                   ) : null}
                 </DropdownMenuContent>
@@ -4860,23 +4989,45 @@ function DatabaseItemPreview({
           </div>
         </div>
       )}
-      <AlertDialog open={confirmDeleteOpen} onOpenChange={setConfirmDeleteOpen}>
+      <AlertDialog
+        open={
+          !removesFavoriteMembership &&
+          (!isWorkspaceCatalog || canDeleteWorkspace) &&
+          confirmDeleteOpen
+        }
+        onOpenChange={setConfirmDeleteOpen}
+      >
         <AlertDialogContent data-database-preview-portal="">
           <AlertDialogHeader>
-            <AlertDialogTitle>{dbText("deleteRow2")}</AlertDialogTitle>
+            <AlertDialogTitle>
+              {canDeleteWorkspace ? "Delete workspace?" : dbText("deleteRow2")}
+            </AlertDialogTitle>
             <AlertDialogDescription>
-              &ldquo;{previewTitle}&rdquo; and any sub-pages will be permanently
-              deleted. This cannot be undone.
+              {canDeleteWorkspace ? (
+                <>
+                  &ldquo;{previewTitle}&rdquo; and every page and database
+                  inside it will be permanently deleted. This cannot be undone.
+                </>
+              ) : (
+                <>
+                  &ldquo;{previewTitle}&rdquo; and any sub-pages will be
+                  permanently deleted. This cannot be undone.
+                </>
+              )}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
             <AlertDialogCancel>Cancel</AlertDialogCancel>
             <AlertDialogAction
               className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
-              disabled={deleteDocument.isPending}
+              disabled={
+                deleteDocument.isPending || deleteContentSpace.isPending
+              }
               onClick={() => void deletePreviewRow()}
             >
-              {deleteDocument.isPending ? "Deleting..." : "Delete"}
+              {deleteDocument.isPending || deleteContentSpace.isPending
+                ? "Deleting..."
+                : "Delete"}
             </AlertDialogAction>
           </AlertDialogFooter>
         </AlertDialogContent>
@@ -4886,6 +5037,7 @@ function DatabaseItemPreview({
 }
 
 function DatabaseTableView({
+  newRowLabel,
   properties,
   groupableProperties,
   items,
@@ -4930,6 +5082,7 @@ function DatabaseTableView({
   onDeletedPreviewItems,
   onOpenPage,
 }: {
+  newRowLabel: string;
   properties: DocumentProperty[];
   groupableProperties: DocumentProperty[];
   items: ContentDatabaseItem[];
@@ -4989,6 +5142,7 @@ function DatabaseTableView({
   onOpenPage: (item: ContentDatabaseItem) => void;
 }) {
   const queryClient = useQueryClient();
+  const contentSpaces = useContentSpaces();
   const moveItem = useMoveDatabaseItem(databaseDocumentId);
   const duplicateItems = useDuplicateDatabaseItems(databaseDocumentId);
   const setProperty = useSetDocumentProperty(databaseDocumentId);
@@ -5009,6 +5163,10 @@ function DatabaseTableView({
   const selectableCount = items.length;
   const selectedIdSet = new Set(selectedItemIds);
   const selectedItems = databaseSelectedItems(items, selectedItemIds);
+  const removesFavoriteMembership =
+    contentSpaces.data?.favoritesDocumentId === databaseDocumentId;
+  const isWorkspaceCatalog =
+    contentSpaces.data?.catalogDocumentId === databaseDocumentId;
   const bulkEditableProperties = databaseBulkEditableProperties(properties);
   const groups = databaseVisibleGroups(
     databaseViewItemGroups(items, groupableProperties, groupByPropertyId),
@@ -5358,11 +5516,18 @@ function DatabaseTableView({
               deleteItems.isPending
             }
             deleteDisabled={deleteItems.isPending}
+            removesFavoriteMembership={removesFavoriteMembership}
             updateDisabled={setProperty.isPending}
             onClearSelection={onClearSelection}
             onSetPropertyValue={setSelectedPropertyValue}
             onDuplicateSelected={() => void duplicateSelectedRows()}
-            onDeleteSelected={() => setConfirmDeleteSelectedOpen(true)}
+            onDeleteSelected={() => {
+              if (removesFavoriteMembership) {
+                void deleteSelectedRows();
+                return;
+              }
+              setConfirmDeleteSelectedOpen(true);
+            }}
           />
         ) : null}
         <div
@@ -5466,11 +5631,13 @@ function DatabaseTableView({
                     properties={properties}
                     columnWidths={columnWidths}
                     databaseDocumentId={databaseDocumentId}
+                    workspaceCatalog={isWorkspaceCatalog}
                     canEdit={canEdit}
                     selectedIdSet={selectedIdSet}
                     wrapCells={wrapCells}
                     rowDensity={rowDensity}
                     isCreating={isCreating}
+                    newRowLabel={newRowLabel}
                     focusedTitleDocumentId={focusedTitleDocumentId}
                     collapsed={databaseGroupIsCollapsed(
                       collapsedGroupIds,
@@ -5493,6 +5660,7 @@ function DatabaseTableView({
                     key={item.id}
                     item={item}
                     databaseDocumentId={databaseDocumentId}
+                    workspaceCatalog={isWorkspaceCatalog}
                     properties={properties}
                     columnWidths={columnWidths}
                     canEdit={canEdit}
@@ -5531,6 +5699,7 @@ function DatabaseTableView({
                 ))}
             {canEdit && !grouped ? (
               <NewDatabaseRow
+                label={newRowLabel}
                 properties={properties}
                 columnWidths={columnWidths}
                 rowDensity={rowDensity}
@@ -5561,7 +5730,7 @@ function DatabaseTableView({
         )}
       </div>
       <AlertDialog
-        open={confirmDeleteSelectedOpen}
+        open={!removesFavoriteMembership && confirmDeleteSelectedOpen}
         onOpenChange={setConfirmDeleteSelectedOpen}
       >
         <AlertDialogContent>
@@ -5647,17 +5816,17 @@ function DatabaseActiveConstraintsBar({
   onResetPersonalChanges: () => void;
   onSaveForEveryone: () => void;
 }) {
+  const filterEntries = filters.map((filter, index) => ({ filter, index }));
   if (
     !forceShow &&
     constraintCount === 0 &&
-    filters.length === 0 &&
+    filterEntries.length === 0 &&
     !hasPersonalQueryChanges
   )
     return null;
   const hasSearchOrSortConstraints =
     searchQuery.trim().length > 0 || sorts.length > 0;
   const showViewActionControls = hasPersonalQueryChanges;
-  const filterEntries = filters.map((filter, index) => ({ filter, index }));
   const advancedFilterEntries = filterEntries.filter(({ filter }) =>
     isAdvancedDatabaseFilter(filter),
   );
@@ -5724,7 +5893,7 @@ function DatabaseActiveConstraintsBar({
       ))}
       <DatabaseAddFilterButton
         open={addFilterOpen}
-        filters={filters}
+        filters={filterEntries.map(({ filter }) => filter)}
         properties={properties}
         onOpenChange={onAddFilterOpenChange}
         onAddFilter={(key, label) => {
@@ -6976,7 +7145,9 @@ function NotionLogoMark({ className }: { className?: string }) {
 function DatabaseSettingsPanelSheet({
   open,
   panel,
+  databaseId,
   documentId,
+  isFilesDatabase,
   canEdit,
   canManage,
   activeView,
@@ -7011,7 +7182,9 @@ function DatabaseSettingsPanelSheet({
 }: {
   open: boolean;
   panel: DatabaseSettingsPanel;
+  databaseId: string;
   documentId: string;
+  isFilesDatabase: boolean;
   canEdit: boolean;
   canManage: boolean;
   activeView: ContentDatabaseView;
@@ -7124,7 +7297,9 @@ function DatabaseSettingsPanelSheet({
           <DatabaseSettingsSourcePanel
             source={source}
             sources={sources}
+            databaseId={databaseId}
             documentId={documentId}
+            isFilesDatabase={isFilesDatabase}
             itemCount={items.length}
             canEdit={canEdit}
             canManage={canManage}
@@ -7506,7 +7681,9 @@ export function buildClientBuilderReviewPayload(
 function DatabaseSettingsSourcePanel({
   source,
   sources,
+  databaseId,
   documentId,
+  isFilesDatabase,
   itemCount,
   canEdit,
   canManage,
@@ -7527,7 +7704,9 @@ function DatabaseSettingsSourcePanel({
 }: {
   source: ContentDatabaseSource | null;
   sources: ContentDatabaseSource[];
+  databaseId: string;
   documentId: string;
+  isFilesDatabase: boolean;
   itemCount: number;
   canEdit: boolean;
   canManage: boolean;
@@ -7557,6 +7736,7 @@ function DatabaseSettingsSourcePanel({
   sourcePendingOperations: DatabaseSourcePendingOperations;
 }) {
   const { isCodeMode } = useCodeMode();
+  const navigate = useNavigate();
   const builderSources = databaseAttachedBuilderSources(sources, source);
   const builderStatus = useBuilderStatus();
   const builderConfigured = builderStatus.status?.configured === true;
@@ -7603,6 +7783,10 @@ function DatabaseSettingsSourcePanel({
           )
         }
         onOpenNotion={() => onNavPush({ kind: "addSource" })}
+        onOpenLocalFolder={() =>
+          navigate(`/local-files?databaseId=${databaseId}`)
+        }
+        showLocalFolder={isFilesDatabase}
         onOpenSecondary={(secondary) =>
           onNavPush({
             kind: "secondarySource",
@@ -8262,6 +8446,8 @@ function SourcesListView({
   reviewableCount,
   onOpenBuilder,
   onOpenNotion,
+  onOpenLocalFolder,
+  showLocalFolder,
   onOpenSecondary,
   onAddSource,
 }: {
@@ -8272,9 +8458,12 @@ function SourcesListView({
   reviewableCount: number;
   onOpenBuilder: (source?: ContentDatabaseSource) => void;
   onOpenNotion: () => void;
+  onOpenLocalFolder: () => void;
+  showLocalFolder: boolean;
   onOpenSecondary: (source: ContentDatabaseSource) => void;
   onAddSource: () => void;
 }) {
+  const t = useT();
   const isBuilderSource = source?.sourceType === "builder-cms";
   const connectedSources =
     sources.length > 0 ? sources : source ? [source] : [];
@@ -8350,6 +8539,13 @@ function SourcesListView({
           }
           onClick={onOpenNotion}
         />
+        {showLocalFolder ? (
+          <DatabaseSettingsRow
+            icon={<IconFolder className="size-4" />}
+            label={t("sidebar.localFolder")}
+            onClick={onOpenLocalFolder}
+          />
+        ) : null}
       </div>
       <div className="grid min-w-0 gap-1.5">
         <div className="px-2 text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
@@ -12617,6 +12813,7 @@ function NewBoardCard({
 }
 
 function NewDatabaseRow({
+  label,
   properties,
   columnWidths,
   rowDensity,
@@ -12625,6 +12822,7 @@ function NewDatabaseRow({
   onCreate,
   actionColumnWidth = ACTION_COLUMN_WIDTH,
 }: {
+  label: string;
   properties: DocumentProperty[];
   columnWidths: Record<string, number>;
   rowDensity: DatabaseRowDensity;
@@ -12641,7 +12839,7 @@ function NewDatabaseRow({
   return (
     <button
       type="button"
-      aria-label={dbText("newDatabaseRow")}
+      aria-label={label}
       disabled={disabled}
       className={cn(
         "grid w-full border-t border-border/35 text-left text-sm text-muted-foreground transition-colors hover:bg-muted/35 hover:text-foreground focus-visible:bg-muted/35 focus-visible:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-60",
@@ -12668,9 +12866,7 @@ function NewDatabaseRow({
         ) : (
           <IconPlus className="size-4 shrink-0" />
         )}
-        <span className="h-7 min-w-0 flex-1 truncate leading-7">
-          {dbText("newPage")}
-        </span>
+        <span className="h-7 min-w-0 flex-1 truncate leading-7">{label}</span>
       </span>
       {properties.map((property) => (
         <span
@@ -13025,18 +13221,22 @@ function normalizeClientDatabaseView(
   value: Partial<ContentDatabaseView> | null | undefined,
 ) {
   if (!value || typeof value.id !== "string" || !value.id.trim()) return null;
+  const retiredSidebar = value.type === "sidebar";
   const type =
     value.type === "board" ||
     value.type === "list" ||
     value.type === "gallery" ||
     value.type === "calendar" ||
     value.type === "timeline" ||
-    value.type === "form" ||
-    value.type === "sidebar"
+    value.type === "form"
       ? value.type
       : "table";
   return createDatabaseView(
-    typeof value.name === "string" ? value.name : databaseViewDefaultName(type),
+    typeof value.name === "string"
+      ? retiredSidebar && value.name.trim() === "Sidebar"
+        ? "Table"
+        : value.name
+      : databaseViewDefaultName(type),
     value.id,
     {
       sorts: Array.isArray(value.sorts)
@@ -13568,7 +13768,6 @@ function databaseViewIcon(type: ContentDatabaseViewType) {
   if (type === "calendar") return IconCalendar;
   if (type === "timeline") return IconTimeline;
   if (type === "form") return IconForms;
-  if (type === "sidebar") return IconLayoutSidebar;
   return IconTable;
 }
 
@@ -13579,7 +13778,6 @@ function databaseViewDefaultName(type: ContentDatabaseViewType) {
   if (type === "calendar") return "Calendar";
   if (type === "timeline") return "Timeline";
   if (type === "form") return "Form";
-  if (type === "sidebar") return "Sidebar";
   return "Table";
 }
 
@@ -14786,6 +14984,7 @@ function DatabaseSelectionBar({
   selectedItems,
   duplicateDisabled,
   deleteDisabled,
+  removesFavoriteMembership,
   updateDisabled,
   onClearSelection,
   onSetPropertyValue,
@@ -14798,6 +14997,7 @@ function DatabaseSelectionBar({
   selectedItems: ContentDatabaseItem[];
   duplicateDisabled: boolean;
   deleteDisabled: boolean;
+  removesFavoriteMembership: boolean;
   updateDisabled: boolean;
   onClearSelection: () => void;
   onSetPropertyValue: (
@@ -14837,12 +15037,20 @@ function DatabaseSelectionBar({
               type="button"
               variant="ghost"
               size="sm"
-              className="h-7 gap-1.5 px-2 text-xs text-destructive hover:bg-destructive/10 hover:text-destructive"
+              className={cn(
+                "h-7 gap-1.5 px-2 text-xs",
+                !removesFavoriteMembership &&
+                  "text-destructive hover:bg-destructive/10 hover:text-destructive",
+              )}
               disabled={deleteDisabled}
               onClick={onDeleteSelected}
             >
-              <IconTrash className="size-3.5" />
-              Delete
+              {removesFavoriteMembership ? (
+                <IconStarOff className="size-3.5" />
+              ) : (
+                <IconTrash className="size-3.5" />
+              )}
+              {removesFavoriteMembership ? "Remove" : "Delete"}
             </Button>
           </>
         ) : null}
@@ -15534,6 +15742,7 @@ function DatabasePropertyHeader({
   onResize: (event: ReactPointerEvent) => void;
 }) {
   const Icon = TYPE_ICONS[property.definition.type];
+  const canReorder = canEdit && !property.definition.systemRole;
   const columnState = databaseColumnHeaderState(
     sorts,
     filters,
@@ -15545,14 +15754,14 @@ function DatabasePropertyHeader({
       data-database-property-id={property.definition.id}
       className={cn(
         "group relative flex h-8 min-w-0 items-center border-r border-border/35 px-1 transition-colors",
-        canEdit && "cursor-grab active:cursor-grabbing",
+        canReorder && "cursor-grab active:cursor-grabbing",
         isDragging && "opacity-45",
         dropSide && "bg-accent/40",
       )}
-      onPointerDown={onPointerDown}
+      onPointerDown={canReorder ? onPointerDown : undefined}
     >
       <DatabaseDropIndicator side={dropSide} />
-      {canEdit ? (
+      {canEdit && !property.definition.systemRole ? (
         <PropertyManagementPopover
           property={property}
           documentId={documentId}
@@ -17621,11 +17830,13 @@ function DatabaseGroupedTableSection({
   properties,
   columnWidths,
   databaseDocumentId,
+  workspaceCatalog,
   canEdit,
   selectedIdSet,
   wrapCells,
   rowDensity,
   isCreating,
+  newRowLabel,
   focusedTitleDocumentId,
   collapsed,
   onCreateRow,
@@ -17641,11 +17852,13 @@ function DatabaseGroupedTableSection({
   properties: DocumentProperty[];
   columnWidths: Record<string, number>;
   databaseDocumentId: string;
+  workspaceCatalog: boolean;
   canEdit: boolean;
   selectedIdSet: Set<string>;
   wrapCells: boolean;
   rowDensity: DatabaseRowDensity;
   isCreating: boolean;
+  newRowLabel: string;
   focusedTitleDocumentId: string | null;
   collapsed: boolean;
   onCreateRow: (
@@ -17677,6 +17890,7 @@ function DatabaseGroupedTableSection({
               key={`${group.id}-${item.id}`}
               item={item}
               databaseDocumentId={databaseDocumentId}
+              workspaceCatalog={workspaceCatalog}
               properties={properties}
               columnWidths={columnWidths}
               canEdit={canEdit}
@@ -17705,6 +17919,7 @@ function DatabaseGroupedTableSection({
           ))}
           {canEdit ? (
             <NewDatabaseRow
+              label={newRowLabel}
               properties={properties}
               columnWidths={columnWidths}
               rowDensity={rowDensity}
@@ -17742,6 +17957,7 @@ function DatabaseTableRow({
   properties,
   columnWidths,
   databaseDocumentId,
+  workspaceCatalog,
   canEdit,
   rowIndex,
   canReorder,
@@ -17767,6 +17983,7 @@ function DatabaseTableRow({
   properties: ContentDatabaseItem["properties"];
   columnWidths: Record<string, number>;
   databaseDocumentId: string;
+  workspaceCatalog: boolean;
   canEdit: boolean;
   rowIndex: number;
   canReorder: boolean;
@@ -17809,6 +18026,7 @@ function DatabaseTableRow({
       <RowNameCell
         item={item}
         databaseDocumentId={databaseDocumentId}
+        workspaceCatalog={workspaceCatalog}
         canEdit={canEdit}
         canDragRow={canDragRow}
         selected={selected}
@@ -17920,11 +18138,22 @@ export function RowActionsCell({
   onOpenPage: () => void;
 }) {
   const queryClient = useQueryClient();
+  const contentSpaces = useContentSpaces();
   const deleteDocument = useDeleteDocument();
+  const deleteContentSpace = useDeleteContentSpace();
   const duplicateItem = useDuplicateDatabaseItem(databaseDocumentId);
   const [menuOpen, setMenuOpen] = useState(false);
   const [confirmDeleteOpen, setConfirmDeleteOpen] = useState(false);
   const title = item.document.title || "Untitled";
+  const removesFavoriteMembership =
+    contentSpaces.data?.favoritesDocumentId === databaseDocumentId;
+  const workspaceSpace = contentSpaces.data?.spaces.find(
+    (space) => space.catalogDocumentId === item.document.id,
+  );
+  const isWorkspaceCatalog =
+    contentSpaces.data?.catalogDocumentId === databaseDocumentId;
+  const canDeleteWorkspace =
+    isWorkspaceCatalog && workspaceSpace?.kind === "user";
 
   async function duplicateRow() {
     setMenuOpen(false);
@@ -17943,7 +18172,14 @@ export function RowActionsCell({
   async function deleteRow() {
     const previewMoved = onDeletedPreviewItem?.(item) ?? false;
     try {
-      await deleteDocument.mutateAsync({ id: item.document.id });
+      if (canDeleteWorkspace && workspaceSpace) {
+        await deleteContentSpace.mutateAsync({ spaceId: workspaceSpace.id });
+      } else {
+        await deleteDocument.mutateAsync({
+          id: item.document.id,
+          databaseDocumentId,
+        });
+      }
       await queryClient.invalidateQueries({
         queryKey: [
           "action",
@@ -17986,48 +18222,87 @@ export function RowActionsCell({
             <IconExternalLink className="mr-2 size-4 text-muted-foreground" />
             {dbText("openPage")}
           </DropdownMenuItem>
-          <DropdownMenuItem
-            disabled={duplicateItem.isPending}
-            onSelect={(event) => {
-              event.preventDefault();
-              void duplicateRow();
-            }}
-          >
-            <IconCopy className="mr-2 size-4 text-muted-foreground" />
-            {dbText("duplicateRow")}
-          </DropdownMenuItem>
-          <DropdownMenuSeparator />
-          <DropdownMenuItem
-            className="text-destructive focus:bg-destructive/10 focus:text-destructive"
-            onSelect={(event) => {
-              event.preventDefault();
-              setMenuOpen(false);
-              setConfirmDeleteOpen(true);
-            }}
-          >
-            <IconTrash className="mr-2 size-4" />
-            {dbText("deleteRow")}
-          </DropdownMenuItem>
+          {!isWorkspaceCatalog ? (
+            <DropdownMenuItem
+              disabled={duplicateItem.isPending}
+              onSelect={(event) => {
+                event.preventDefault();
+                void duplicateRow();
+              }}
+            >
+              <IconCopy className="mr-2 size-4 text-muted-foreground" />
+              {dbText("duplicateRow")}
+            </DropdownMenuItem>
+          ) : null}
+          {!isWorkspaceCatalog || canDeleteWorkspace ? (
+            <DropdownMenuSeparator />
+          ) : null}
+          {removesFavoriteMembership ? (
+            <DropdownMenuItem
+              onSelect={(event) => {
+                event.preventDefault();
+                setMenuOpen(false);
+                void deleteRow();
+              }}
+            >
+              <IconStarOff className="mr-2 size-4 text-muted-foreground" />
+              {sidebarText("removeFromFavorites")}
+            </DropdownMenuItem>
+          ) : !isWorkspaceCatalog || canDeleteWorkspace ? (
+            <DropdownMenuItem
+              className="text-destructive focus:bg-destructive/10 focus:text-destructive"
+              onSelect={(event) => {
+                event.preventDefault();
+                setMenuOpen(false);
+                setConfirmDeleteOpen(true);
+              }}
+            >
+              <IconTrash className="mr-2 size-4" />
+              {canDeleteWorkspace ? "Delete workspace" : dbText("deleteRow")}
+            </DropdownMenuItem>
+          ) : null}
         </DropdownMenuContent>
       </DropdownMenu>
 
-      <AlertDialog open={confirmDeleteOpen} onOpenChange={setConfirmDeleteOpen}>
+      <AlertDialog
+        open={
+          !removesFavoriteMembership &&
+          (!isWorkspaceCatalog || canDeleteWorkspace) &&
+          confirmDeleteOpen
+        }
+        onOpenChange={setConfirmDeleteOpen}
+      >
         <AlertDialogContent>
           <AlertDialogHeader>
-            <AlertDialogTitle>{dbText("deleteRow2")}</AlertDialogTitle>
+            <AlertDialogTitle>
+              {canDeleteWorkspace ? "Delete workspace?" : dbText("deleteRow2")}
+            </AlertDialogTitle>
             <AlertDialogDescription>
-              &ldquo;{title}&rdquo; and any sub-pages will be permanently
-              deleted. This cannot be undone.
+              {canDeleteWorkspace ? (
+                <>
+                  &ldquo;{title}&rdquo; and every page and database inside it
+                  will be permanently deleted. This cannot be undone.
+                </>
+              ) : (
+                <>
+                  &ldquo;{title}&rdquo; and any sub-pages will be permanently
+                  deleted. This cannot be undone.
+                </>
+              )}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
             <AlertDialogCancel>Cancel</AlertDialogCancel>
             <AlertDialogAction
               className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
-              disabled={deleteDocument.isPending}
+              disabled={
+                deleteDocument.isPending || deleteContentSpace.isPending
+              }
               onClick={() => void deleteRow()}
             >
-              {deleteDocument.isPending ? "Deleting..." : "Delete"}
+              {deleteDocument.isPending || deleteContentSpace.isPending
+                ? "Deleting..."
+                : "Delete"}
             </AlertDialogAction>
           </AlertDialogFooter>
         </AlertDialogContent>
@@ -18039,6 +18314,7 @@ export function RowActionsCell({
 function RowNameCell({
   item,
   databaseDocumentId,
+  workspaceCatalog,
   canEdit,
   canDragRow,
   selected,
@@ -18052,6 +18328,7 @@ function RowNameCell({
 }: {
   item: ContentDatabaseItem;
   databaseDocumentId: string;
+  workspaceCatalog: boolean;
   canEdit: boolean;
   canDragRow: boolean;
   selected: boolean;
@@ -18144,6 +18421,7 @@ function RowNameCell({
         document={item.document}
         className="size-4 text-sm"
         fallbackClassName="size-4"
+        fallback={workspaceCatalog ? "folder" : "page"}
       />
       {canEdit && editingTitle ? (
         <input