@vertesia/ui 1.5.0-dev.20260807.073259Z → 1.5.0-dev.20260901.005903Z

package/src/features/store/objects/search/DocumentSearchContext.ts

@@ -29,6 +29,17 @@ export class DocumentSearch implements SearchInterface {
     facetSpecs: FacetSpec[] = [];
     query: ComplexSearchQuery = {};
 
+    /**
+     * Ids the server confirmed deleted, hidden until the index stops returning them.
+     *
+     * Deletes reach the search index out of band, so a search issued right after one can still
+     * return the object. Without this the row reappears and stays until a manual refresh.
+     */
+    private deletedIds = new Set<string>();
+
+    /** Objects the server has returned so far, before hiding — `loadMore` pages on this, not on the visible count. */
+    private loadedCount = 0;
+
     constructor(
         public client: ZenoClient,
         public limit = 100,
@@ -98,8 +109,31 @@ export class DocumentSearch implements SearchInterface {
         this.query = {};
     }
 
+    /**
+     * Drop objects the server confirmed deleted, and keep them out of results until the index
+     * agrees. Reconciled in `_search`: once a full search stops returning an id, it is really gone
+     * and stops being hidden.
+     */
+    removeDeletedObjects(ids: string[]) {
+        if (ids.length === 0) return;
+        for (const id of ids) {
+            this.deletedIds.add(id);
+        }
+        const previous = this.result.value;
+        const objects = previous.objects.filter((obj) => !this.deletedIds.has(obj.id));
+        const removed = previous.objects.length - objects.length;
+        this.result.value = { ...previous, objects };
+
+        const facets = this.facets.value;
+        if (removed > 0 && typeof facets.total === 'number') {
+            this.facets.value = { ...facets, total: Math.max(0, facets.total - removed) };
+        }
+    }
+
     reset(isLoading = false) {
         this.initialized = false;
+        this.deletedIds.clear();
+        this.loadedCount = 0;
         this.result.value = {
             objects: [],
             isLoading,
@@ -118,12 +152,14 @@ export class DocumentSearch implements SearchInterface {
     }
 
     _searchRequest(query: ComplexSearchQuery, limit: number, offset: number, includeFacets: boolean = true) {
-        const payload: ComplexSearchPayload = {
+        // Keep this as `satisfies`: the full-object overload depends on preserving the literal
+        // `select?: undefined` shape rather than widening to a generic ComplexSearchPayload.
+        const payload = {
             limit,
             offset,
             query,
             facets: includeFacets ? this.facetSpecs : undefined,
-        };
+        } satisfies ComplexSearchPayload;
 
         const request = this.collectionId
             ? this.client.collections.searchMembers(this.collectionId, payload)
@@ -159,16 +195,30 @@ export class DocumentSearch implements SearchInterface {
             hasMore: loadMore ? this.result.value.hasMore : true,
         };
         const limit = this.limit;
-        const offset = loadMore ? this.objects.length : 0;
+        const offset = loadMore ? this.loadedCount : 0;
         try {
             const res = await this._searchRequest(this.query, limit, offset, !noFacets);
             // Handle the new format with results and facets
             const results = res.results || [];
             const facets = res.facets || {};
 
+            this.loadedCount = loadMore ? this.loadedCount + results.length : results.length;
+
+            // Only a full search proves an id is gone. A `loadMore` page is a different slice, so an
+            // absence there says nothing and must not clear the entry.
+            if (!loadMore && this.deletedIds.size > 0) {
+                for (const id of [...this.deletedIds]) {
+                    if (!results.some((obj) => obj.id === id)) {
+                        this.deletedIds.delete(id);
+                    }
+                }
+            }
+            const visible = this.deletedIds.size > 0 ? results.filter((obj) => !this.deletedIds.has(obj.id)) : results;
+
             this.result.value = {
                 isLoading: false,
-                objects: loadMore ? this.objects.concat(results) : results,
+                objects: loadMore ? this.objects.concat(visible) : visible,
+                // `results`, not `visible`: paging is the server's page size, not what we show.
                 hasMore: results.length === limit,
             };
 

package/src/features/store/objects/selection/actions/DeleteObjectsAction.tsx

@@ -64,6 +64,11 @@ export function DeleteObjectsActionComponent({ action, objectIds, children }: Ac
                     if (objectIds.length === facets._value.total) {
                         search.resetFacets();
                     }
+                    // Drop the deleted rows before refetching. The search index applies deletes out
+                    // of band, so the refetch below can still return them; without this they come
+                    // back and stay until the user refreshes by hand.
+                    const failed = new Set(result.failed);
+                    search.removeDeletedObjects(objectIds.filter((id) => !failed.has(id)));
                     search.search();
                 } else {
                     // we are in the object view

package/src/features/store/objects/upload/DocumentUploadModal.tsx

@@ -1,4 +1,4 @@
-import type { Collection, ContentObjectTypeCatalogEntry, DynamicCollection } from '@vertesia/common';
+import type { Collection, ContentObjectTypeCatalogEntry, DynamicCollection, JSONObject } from '@vertesia/common';
 import {
     Button,
     errorMessage,
@@ -59,6 +59,10 @@ interface DocumentUploadModalProps {
     /** Show only the type selection, used for type change operations */
     showTypeSelectionOnly?: boolean;
     allowFolders?: boolean;
+    /** Preselect a content type while preserving the normal type chooser. */
+    initialTypeId?: string;
+    /** Properties applied to newly created objects from this upload. */
+    defaultProperties?: JSONObject;
 }
 
 /**
@@ -81,6 +85,8 @@ export function DocumentUploadModal({
     hideFileSelection = false,
     showTypeSelectionOnly = false,
     allowFolders = true,
+    initialTypeId,
+    defaultProperties,
 }: DocumentUploadModalProps) {
     const { client } = useUserSession();
     const { registry: typeRegistry } = useTypeRegistry();
@@ -222,7 +228,7 @@ export function DocumentUploadModal({
             // Always reset state first
             setProcessedFiles([]);
             setProcessingDone(false);
-            setSelectedType(null);
+            setSelectedType(initialTypeId ? (typeRegistry?.getType(initialTypeId) ?? null) : null);
             setFileStatuses([]);
             setIsUploading(false);
             setUploadComplete(false);
@@ -243,7 +249,7 @@ export function DocumentUploadModal({
             // Create a new key to ensure the modal is fresh
             setModalKey(Date.now());
         }
-    }, [isOpen, initialFiles, processFiles, resolvedTitle]);
+    }, [initialFiles, initialTypeId, isOpen, processFiles, resolvedTitle, typeRegistry]);
 
     // Complete cleanup when modal closes
     const handleClose = () => {
@@ -415,6 +421,7 @@ export function DocumentUploadModal({
                                         content: fileInfo.file,
                                         location:
                                             fileInfo.location || fileInfo.file.webkitRelativePath || fileInfo.name,
+                                        properties: defaultProperties,
                                     },
                                     {
                                         collection_id: collectionId,

package/src/features/store/objects/upload/useSmartFileUploadProcessing.ts

@@ -1,4 +1,4 @@
-import type { ComplexSearchPayload, ContentObjectItem, FindPayload } from '@vertesia/common';
+import type { ComplexSearchPayload, FindPayload } from '@vertesia/common';
 import { errorMessage, useToast } from '@vertesia/ui/core';
 import { i18nInstance, NAMESPACE } from '@vertesia/ui/i18n';
 import { useUserSession } from '@vertesia/ui/session';
@@ -7,6 +7,11 @@ import { Md5 } from 'ts-md5';
 
 const t = i18nInstance.getFixedT(null, NAMESPACE);
 
+interface ExistingHashMatch {
+    id: string;
+    content?: { etag?: string };
+}
+
 /**
  * Types of actions that can be taken with a file
  */
@@ -140,20 +145,24 @@ export function useSmartFileUploadProcessing() {
                         'content.etag': { $in: hashes },
                     };
 
-                    let res: Array<Pick<ContentObjectItem, 'id' | 'content'>>;
+                    let res: ExistingHashMatch[];
 
                     if (limitToCollectionId) {
                         const payload: ComplexSearchPayload = {
                             query: { match: query },
                             select: 'id content.etag',
                         };
-                        res = (await client.store.collections.searchMembers(limitToCollectionId, payload)).results;
+                        res = (
+                            await client.store.collections.searchMembers(limitToCollectionId, payload)
+                        ).results.filter((doc): doc is ExistingHashMatch => typeof doc.id === 'string');
                     } else {
-                        const payload: FindPayload = {
+                        const payload = {
                             query,
                             select: 'id content.etag',
-                        };
-                        res = await client.store.objects.find(payload);
+                        } satisfies FindPayload & { select: string };
+                        res = (await client.store.objects.find(payload)).flatMap((doc) =>
+                            typeof doc.id === 'string' ? [{ id: doc.id, content: doc.content }] : [],
+                        );
                     }
 
                     for (const doc of res) {

package/src/features/store/types/ContentObjectTypesTable.tsx

@@ -3,11 +3,8 @@ import { Button, CopyButton, Table, TBody, THead, VTooltip } from '@vertesia/ui/
 import { useUITranslation } from '@vertesia/ui/i18n';
 import { useNavigate } from '@vertesia/ui/router';
 import clsx from 'clsx';
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
 import { Filter } from 'lucide-react';
-
-dayjs.extend(relativeTime);
+import dayjs from '../../../core/utils/dayjs.js';
 
 const ACTION_BTN_CLASS =
     'h-6 w-6 p-0 opacity-0 group-hover/field:opacity-100 text-muted hover:text-foreground transition-opacity shrink-0';

package/src/features/store/types/IntakePolicyEditor.tsx

@@ -345,7 +345,17 @@ export function IntakePolicyEditor({
             onSaveProp ??
             (objectType
                 ? (next: ContentTypeIntakePolicy) =>
-                      store.types.update(objectType.id, { intake: next }).then((response) => response.intake)
+                      store.types
+                          .update(objectType.id, {
+                              intake: next,
+                              ...(objectType.edit_revision === undefined
+                                  ? {}
+                                  : { expected_edit_revision: objectType.edit_revision }),
+                          })
+                          .then((response) => {
+                              objectType.edit_revision = response.edit_revision;
+                              return response.intake;
+                          })
                 : undefined);
         if (!persist) {
             return;
@@ -506,12 +516,11 @@ export function IntakePolicyEditor({
                     current={activeTab}
                     onTabChange={onTabChange}
                     updateHash={false}
-                    responsive
                     fullHeight
-                    className="px-0"
+                    className="px-0 flex-row!"
                 >
-                    <TabsBar sticky />
-                    <TabsPanel className="min-h-0 flex-1 overflow-auto pt-1" />
+                    <TabsBar className="py-2 w-48 shrink-0" direction="vertical" />
+                    <TabsPanel className="min-h-0 min-w-0 flex-1 overflow-auto pt-1 ps-4" />
                 </Tabs>
             </div>
         </Panel>