@vertesia/ui 0.73.0 → 0.76.0

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

@@ -2,13 +2,14 @@ import { createContext, useContext } from 'react';
 
 import { SharedState, useWatchSharedState } from '@vertesia/ui/core';
 import { ComputeFacetsResponse, ZenoClient } from '@vertesia/client';
-import { ComplexSearchQuery, ContentObjectItem, FacetBucket, FacetSpec, ObjectSearchQuery } from '@vertesia/common';
+import { ComplexSearchPayload, ComplexSearchQuery, ComputeObjectFacetPayload, ContentObjectItem, FacetBucket, FacetSpec, ObjectSearchQuery } from '@vertesia/common';
 import { SearchInterface } from '@vertesia/ui/features'
 
 interface DocumentSearchResult {
     objects: ContentObjectItem[],
     error?: Error;
     isLoading: boolean;
+    hasMore?: boolean;
 }
 
 
@@ -36,10 +37,14 @@ export class DocumentSearch implements SearchInterface {
         return this.result.value.error;
     }
 
-    get isRunning() {
+    get isRunning(): boolean {
         return this.result.value.isLoading;
     }
 
+    get hasMore(): boolean {
+        return this.result.value.hasMore || false;
+    }
+
     getFilterValue(name: string) {
         return (this.query as any)[name];
     }
@@ -51,9 +56,16 @@ export class DocumentSearch implements SearchInterface {
     }
 
     clearFilters(autoSearch: boolean = true) {
-        const parent = this.query.parent;
+        // Preserve search-related fields when clearing filters
+        const { parent, full_text, vector, weights, score_aggregation, dynamic_scaling, limit } = this.query;
         this.query = {
-            parent
+            parent,
+            ...(full_text !== undefined && { full_text }),
+            ...(vector !== undefined && { vector }),
+            ...(weights !== undefined && { weights }),
+            ...(score_aggregation !== undefined && { score_aggregation }),
+            ...(dynamic_scaling !== undefined && { dynamic_scaling }),
+            ...(limit !== undefined && { limit })
         };
 
         if (autoSearch) {
@@ -72,7 +84,8 @@ export class DocumentSearch implements SearchInterface {
     reset(isLoading = false) {
         this.result.value = {
             objects: [],
-            isLoading
+            isLoading,
+            hasMore: true
         };
     }
 
@@ -81,34 +94,29 @@ export class DocumentSearch implements SearchInterface {
         this.result.value = {
             objects: prev.objects,
             isLoading: value,
-            error: prev.error
+            error: prev.error,
+            hasMore: prev.hasMore
         }
     }
 
-    _searchRequest(query: ComplexSearchQuery, limit: number, offset: number) {
+    _searchRequest(query: ComplexSearchQuery, limit: number, offset: number, includeFacets: boolean = true) {
+        const payload: ComplexSearchPayload = {
+            limit,
+            offset,
+            query,
+            facets: includeFacets ? this.facetSpecs : undefined
+        };
+
         return this.collectionId ?
-            this.client.collections.searchMembers(this.collectionId, {
-                limit,
-                offset,
-                query
-            })
-            : this.client.objects.search({
-                limit,
-                offset,
-                query
-            });
+            this.client.collections.searchMembers(this.collectionId, payload)
+            : this.client.objects.search(payload);
     }
 
     _facetsRequest() {
+        const payload: ComputeObjectFacetPayload = { facets: this.facetSpecs, query: this.query }
         return this.collectionId ?
-            this.client.collections.computeFacets(this.collectionId, {
-                facets: this.facetSpecs,
-                query: this.query
-            })
-            : this.client.objects.computeFacets({
-                facets: this.facetSpecs,
-                query: this.query
-            });
+            this.client.collections.computeFacets(this.collectionId, payload)
+            : this.client.objects.computeFacets(payload);
     }
 
     computeFacets(_query: ObjectSearchQuery) {
@@ -117,27 +125,40 @@ export class DocumentSearch implements SearchInterface {
         });
     }
 
-    _search(loadMore = false) {
+    _search(loadMore = false, noFacets = false) {
         if (this.isRunning) { // avoid searching when a search is pending
             return Promise.resolve(false);
         }
         this.result.value = {
             isLoading: true,
             objects: loadMore ? this.objects : [],
+            hasMore: loadMore ? this.result.value.hasMore : true
         }
         const limit = this.limit;
-        const offset = this.objects.length;
-        return this._searchRequest(this.query, limit, offset).then(async (res) => {
+        const offset = loadMore ? this.objects.length : 0;
+        return this._searchRequest(this.query, limit, offset, !noFacets).then(async (res) => {
+            // Handle the new format with results and facets
+            const results = res.results || [];
+            const facets = res.facets || {};
+
             this.result.value = {
                 isLoading: false,
-                objects: this.objects.concat(res)
+                objects: loadMore ? this.objects.concat(results) : results,
+                hasMore: results.length === limit
             }
+
+            // Update facets if they were requested and returned
+            if (!noFacets && facets && Object.keys(facets).length > 0) {
+                this.facets.value = facets;
+            }
+
             return true;
         }).catch((err) => {
             this.result.value = {
                 error: err,
                 isLoading: false,
-                objects: this.objects
+                objects: this.objects,
+                hasMore: this.result.value.hasMore
             }
             throw err;
         })
@@ -145,16 +166,16 @@ export class DocumentSearch implements SearchInterface {
 
     search(noFacets = false) {
         if (this.isRunning) return Promise.resolve(false);
-        !noFacets && this.computeFacets(this.query);
-        return this._search(false);
+        return this._search(false, noFacets);
     }
 
     loadMore(noFacets = false) {
-        if (this.isRunning) return Promise.resolve(false);
-        if (this.objects.length === 0) {
-            !noFacets && this.computeFacets(this.query);
+        if (this.isRunning || !this.hasMore) return Promise.resolve(false);
+        if (this.query.vector) return Promise.resolve(false); //Load more not supported on vector queries
+        if (this.objects.length > 0) {
+            noFacets = true; //Only reload facets on loadMore if there are no results.
         }
-        return this._search(true);
+        return this._search(true, noFacets);
     }
 }
 

package/src/features/store/objects/search/DocumentSearchProvider.tsx

@@ -1,5 +1,5 @@
 import { useUserSession } from "@vertesia/ui/session";
-import { FacetSpec, SupportedEmbeddingTypes } from "@vertesia/common";
+import { FacetSpec } from "@vertesia/common";
 import React, { useMemo } from "react";
 import { DocumentSearch, SearchContext } from "./DocumentSearchContext";
 
@@ -9,12 +9,10 @@ interface DocumentSearchProviderProps {
     typeId?: string;
     parent?: string;
     facets?: FacetSpec[];
-    similarTo?: string; //vector search similarity
-    embeddingType?: SupportedEmbeddingTypes; //vector search similarity
     collectionId?: string;
     name?: string;
 }
-export function DocumentSearchProvider({ children, limit, parent, typeId, facets, similarTo, embeddingType, name, collectionId }: DocumentSearchProviderProps) {
+export function DocumentSearchProvider({ children, limit, parent, typeId, facets, name, collectionId }: DocumentSearchProviderProps) {
     const { store } = useUserSession();
     const search = useMemo(() => {
         let facetSpecs: FacetSpec[];
@@ -42,8 +40,6 @@ export function DocumentSearchProvider({ children, limit, parent, typeId, facets
         search.collectionId = collectionId;
         search.query.type = typeId;
         search.query.parent = parent;
-        search.query.similarTo = similarTo;
-        search.query.embeddingType = embeddingType;
         search.query.name = name;
         return search;
     }, [typeId, limit]);

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

@@ -1,4 +1,4 @@
-import { ContentObjectItem } from "@vertesia/common";
+import { ComplexSearchPayload, ContentObjectItem } from "@vertesia/common";
 import { useToast } from "@vertesia/ui/core";
 import { useUserSession } from "@vertesia/ui/session";
 import { Md5 } from "ts-md5";
@@ -134,18 +134,12 @@ export function useSmartFileUploadProcessing() {
 
                 let res: ContentObjectItem[];
 
+                const payload: ComplexSearchPayload = {query: {match: query}, select: undefined}
+
                 if (limitToCollectionId) {
-                    res = await client.store.collections.searchMembers(limitToCollectionId, {
-                        query: {
-                            match: query,
-                        },
-                        select: undefined,
-                    });
+                    res = (await client.store.collections.searchMembers(limitToCollectionId, payload)).results;
                 } else {
-                    res = await client.store.objects.search({
-                        query: { match: query },
-                        select: undefined,
-                    });
+                    res = (await client.store.objects.search(payload)).results;
                 }
 
                 for (const doc of res) {
@@ -180,7 +174,7 @@ export function useSmartFileUploadProcessing() {
                                 match: query,
                             },
                             select: undefined,
-                        });
+                        }).then((response) => response.results);
                         queries.push(res);
                     } else {
                         const res = client.store.objects.find({

package/src/features/user/UserInfo.tsx

@@ -180,7 +180,7 @@ export function ApiKeyAvatar({ keyId, showTitle = false, size = "md" }: ApiKeyAv
             </tr>
             <tr>
                 <td className="font-semibold w-20">Project:</td>
-                <td className="truncate max-w-0">{data?.project}</td>
+                <td className="truncate max-w-0">{data?.project.name}</td>
             </tr>
         </Table>
     );
@@ -189,7 +189,7 @@ export function ApiKeyAvatar({ keyId, showTitle = false, size = "md" }: ApiKeyAv
         <UserPopoverPanel title={title} description={description}>
             <div className="flex flex-row items-center gap-2">
                 {avatar}
-                {showTitle && <div className="text-sm font-semibold">{data?.name || data?.account || data?.project || "unknown"}</div>}
+                {showTitle && <div className="text-sm font-semibold">{data?.name || data?.account || data?.project.name || "unknown"}</div>}
             </div>
         </UserPopoverPanel >
     )

package/src/session/UserSessionProvider.tsx

@@ -26,7 +26,7 @@ export function UserSessionProvider({ children }: UserSessionProviderProps) {
     const token = hashParams.get("token");
     const state = hashParams.get("state");
     const [session, setSession] = useState<UserSession>(new UserSession());
-    const { generateState, verifyState } = useAuthState();
+    const { generateState, verifyState, clearState } = useAuthState();
 
     const redirectToCentralAuth = (projectId?: string, accountId?: string) => {
         const url = new URL(CENTRAL_AUTH_REDIRECT);
@@ -68,8 +68,10 @@ export function UserSessionProvider({ children }: UserSessionProviderProps) {
                     },
                 });
                 redirectToCentralAuth();
+            } else {
+                clearState()
             }
-            getComposableToken(selectedAccount, selectedProject, token)
+            getComposableToken(selectedAccount, selectedProject, token, false, shouldRedirectToCentralAuth())
                 .then((res) => {
                     session.login(res.rawToken).then(() => {
                         setSession(session.clone());
@@ -132,7 +134,7 @@ export function UserSessionProvider({ children }: UserSessionProviderProps) {
                     },
                 });
                 session.setSession = setSession;
-                await getComposableToken(selectedAccount, selectedProject)
+                await getComposableToken(selectedAccount, selectedProject, undefined, false, shouldRedirectToCentralAuth())
                     .then((res) => {
                         session.login(res.rawToken).then(() => setSession(session.clone()));
                     })

package/src/session/auth/composable.ts

@@ -134,7 +134,7 @@ export async function fetchComposableTokenFromFirebaseToken(accountId?: string,
     return fetchComposableToken(getFirebaseAuthToken, accountId, projectId, ttl);
 }
 
-export async function getComposableToken(accountId?: string, projectId?: string, initToken?: string, forceRefresh = false): Promise<ComposableTokenResponse> {
+export async function getComposableToken(accountId?: string, projectId?: string, initToken?: string, forceRefresh = false, useInternalAuth = false): Promise<ComposableTokenResponse> {
 
     const selectedAccount = accountId ?? localStorage.getItem(LastSelectedAccountId_KEY) ?? undefined
     const selectedProject = projectId ?? localStorage.getItem(LastSelectedProjectId_KEY + '-' + selectedAccount) ?? undefined
@@ -145,11 +145,11 @@ export async function getComposableToken(accountId?: string, projectId?: string,
     }
 
     //token is close to expire, refresh it
-    if (getFirebaseAuth().currentUser) {
+    if (!useInternalAuth && getFirebaseAuth().currentUser) {
         //we have a firebase user, get the token from there
         AUTH_TOKEN_RAW = await fetchComposableTokenFromFirebaseToken(selectedAccount, selectedProject);
     } else if (initToken || AUTH_TOKEN_RAW) {
-        //we have a token already and no firebase user, refresh it
+        // we have a token already and no firebase user, refresh it
         AUTH_TOKEN_RAW = await fetchComposableToken(() => Promise.resolve(initToken ?? AUTH_TOKEN_RAW), selectedAccount, selectedProject);
     }
 

package/src/session/auth/firebase.ts

@@ -13,6 +13,9 @@ let _firebaseAuth: Auth | null = null;
 export function getFirebaseApp(): FirebaseApp {
     if (!_firebaseApp) {
         try {
+            if (!Env.firebase) {
+                throw new Error("Firebase configuration is not available in the environment");
+            }
             _firebaseApp = initializeApp(Env.firebase);
         } catch (error) {
             console.error("Failed to initialize Firebase app:", error);
@@ -43,6 +46,11 @@ export async function setFirebaseTenant(tenantEmail?: string) {
         return;
     }
 
+    if (!Env.firebase) {
+        console.log("Firebase configuration is not available in the environment");
+        return;
+    }
+
     try {
         if (tenantEmail) console.log(`Resolving tenant ID from email: ${tenantEmail}`);
 

package/src/session/auth/useAuthState.ts

@@ -44,10 +44,6 @@ export function useAuthState() {
             reason = undefined; // No errors
         }
 
-        // Clear stored state regardless of outcome
-        sessionStorage.removeItem(AUTH_STATE_KEY);
-        sessionStorage.removeItem(STATE_EXPIRY_KEY);
-
         return reason;
     }, []);
 

package/src/shell/apps/StandaloneApp.tsx

@@ -101,7 +101,7 @@ function UnknownAppName() {
                 Before starting to code a Vertesia application you must register an application manifest
                 in Vertesia Studio then install it in one or more projects.
                 <p />
-                Then use the created app name as a parameter to <code>&lt;StandaloneApp name=&quot;your-app-name&quot;&gt;</code> in the <code>src/main.ts</code> file.
+                Then use the created app name as a parameter to <code>&lt;StandaloneApp name=&quot;your-app-name&quot;&gt;</code> in the <code>src/main.tsx</code> file.
             </div>
         </Center>
     )

package/src/shell/login/EnterpriseSigninButton.tsx

@@ -6,6 +6,9 @@ import { useState } from "react";
 
 
 function getProvider(redirectTo?: string) {
+    if (!Env.firebase) {
+        throw new Error("Firebase configuration is not available in the environment");
+    }
     const providerType = Env.firebase.providerType;
     switch (providerType) {
         case "oidc":

package/src/shell/login/InviteAcceptModal.tsx

@@ -68,7 +68,7 @@ export function InviteAcceptModal() {
                 <div className="w-full font-semibold">{invite.data.account.name ?? invite.data.account}</div>
                 {invite.data.project && <div className="w-full text-base">- {invite.data.project.name}</div>}
                 <div className="text-xs">Role: {invite.data.role}</div>
-                <div className="text-xs">by {invite.data.invited_by.name}</div>
+                {invite.data.invited_by &&<div className="text-xs">by {invite.data.invited_by.name ?? invite.data.invited_by}</div>}
             </div>
             <div className="flex flex-col gap-4">
                 <Button size={'xs'} onClick={() => accept(invite)}>Accept</Button> <Button size={'xs'} variant="secondary" onClick={() => reject(invite)}>Reject</Button>

package/src/widgets/form/ManagedObject.ts

@@ -237,7 +237,7 @@ export class ManagedListProperty extends Node<ArrayPropertySchema, JSONSchemaArr
         }
         if (Array.isArray(value) && index >= 0 && index < value.length) {
             value.splice(index, 1);
-            // TODO trigger onCHnage only if this item isn't transient
+            // TODO trigger onChange only if this item isn't transient
             this.onChange(this);
         }
     }

package/src/widgets/index.ts

@@ -1,6 +1,7 @@
 export * from "./codemirror/index.js";
 export * from "./form/index.js";
 export * from "./json-view/index.js";
+export * from "./markdown/index.js";
 export * from "./popover/index.js";
 export * from "./Progress.js";
 export * from "./properties/index.js";

package/src/widgets/markdown/MarkdownRenderer.tsx

@@ -0,0 +1,45 @@
+import Markdown from "react-markdown";
+import remarkGfm from "remark-gfm";
+import { visit, SKIP } from 'unist-util-visit';
+
+function remarkRemoveComments() {
+    return (tree: any) => {
+        visit(tree, 'html', (node: any, index: number | undefined, parent: any) => {
+            if (node.value && /<!--[\s\S]*?-->/.test(node.value)) {
+                if (parent && typeof index === 'number' && parent.children) {
+                    parent.children.splice(index, 1);
+                    return [SKIP, index];
+                }
+            }
+        });
+    };
+}
+
+interface MarkdownRendererProps {
+    children: string;
+    components?: any;
+    remarkPlugins?: any[];
+    removeComments?: boolean;
+}
+
+export function MarkdownRenderer({ 
+    children, 
+    components, 
+    remarkPlugins = [], 
+    removeComments = true
+}: MarkdownRendererProps) {
+    const plugins = [remarkGfm, ...remarkPlugins];
+    
+    if (removeComments) {
+        plugins.push(remarkRemoveComments);
+    }
+
+    return (
+        <Markdown 
+            remarkPlugins={plugins}
+            components={components}
+        >
+            {children}
+        </Markdown>
+    );
+}

package/src/widgets/markdown/index.ts

@@ -0,0 +1 @@
+export { MarkdownRenderer } from './MarkdownRenderer';