@gen3/core 0.12.5 → 0.12.8

package/dist/cjs/index.js

@@ -914,7 +914,7 @@ const fetchFencePresignedURL = async ({ guid, method = 'GET', onAbort = ()=>null
         } : {}
     });
     if (!response.ok) {
-        throw new HTTPError(response.status, response.statusText, response.text());
+        throw new HTTPError(response.status, response.statusText);
     }
     if (response.status === 204) {
         // no content so returns null
@@ -1227,7 +1227,8 @@ const getFederatedLoginStatus = async (selectedFiles)=>{
                 return {
                     error: {
                         message: e.message,
-                        locations: e.locations
+                        locations: e.locations,
+                        path: e.path
                     }
                 };
             }
@@ -3298,17 +3299,21 @@ const explorerTags = guppyApi.enhanceEndpoints({
                             ...gqlFilters && {
                                 [filterName]: gqlFilters
                             }
+                        },
+                        validateStatus: (response)=>{
+                            if (response?.errors && response.errors?.length > 0) return false;
+                            if (!response.data || !response.data[`${indexPrefix ?? ''}_aggregation`]) {
+                                return false;
+                            }
+                            if (!(type in response.data[`${indexPrefix ?? ''}_aggregation`])) {
+                                return false;
+                            }
+                            return true;
                         }
                     };
                 },
                 transformResponse: (response, _meta, args)=>{
-                    if (!response.data || !response.data[`${args?.indexPrefix ?? ''}_aggregation`]) {
-                        throw new Error('Invalid response: Missing data or _aggregation field');
-                    }
-                    if (!(args.type in response.data[`${args?.indexPrefix ?? ''}_aggregation`])) {
-                        throw new Error(`Invalid response: Missing expected key '${args.type}' in _aggregation`);
-                    }
-                    return response.data[`${args?.indexPrefix ?? ''}_aggregation`][args.type]._totalCount ?? 0;
+                    return response?.data[`${args?.indexPrefix ?? ''}_aggregation`][args.type]?._totalCount ?? 0;
                 },
                 providesTags: [
                     'COUNTS'
@@ -3490,8 +3495,32 @@ const createNoopStorage = ()=>{
 const storage = typeof window !== 'undefined' ? createWebStorage('local') : createNoopStorage();
 typeof window !== 'undefined' ? createWebStorage('session') : createNoopStorage();
 
+/**
+ * Low-level helper to fetch Arborist resources for the current user.
+ * Adds an Authorization header when a token is provided and normalizes the response
+ * to a simple string[] of resource paths.
+ *
+ * token { string | null } - access token to use for authorization
+ * useService { boolean } - use the arborist service endpoint instead of the public arborist API
+ */ async function fetchArboristResources(token, useService = false) {
+    const headers = {};
+    if (token) {
+        headers.Authorization = `Bearer ${token}`;
+    }
+    const url = useService ? `${GEN3_AUTHZ_SERVICE}/resource` : `${GEN3_AUTHZ_API}/resources`;
+    const res = await fetch(url, {
+        headers
+    });
+    if (!res.ok) {
+        console.error('@gen3/core:fetchArboristResources /resource failed:', res.status, await res.text());
+        return [];
+    }
+    const data = await res.json();
+    return data.resources ?? [];
+}
+
 const persistConfig = {
-    key: 'root',
+    key: `${GEN3_COMMONS_NAME}-root`,
     version: 1,
     storage,
     whitelist: [
@@ -3659,30 +3688,6 @@ const selectAuthzMappingData = toolkit.createSelector(selectAuthzMapping, (authz
         mappings: []
     });
 
-/**
- * Low-level helper to fetch Arborist resources for the current user.
- * Adds an Authorization header when a token is provided and normalizes the response
- * to a simple string[] of resource paths.
- *
- * token { string | null } - access token to use for authorization
- * useService { boolean } - use the arborist service endpoint instead of the public arborist API
- */ async function fetchArboristResources(token, useService = false) {
-    const headers = {};
-    if (token) {
-        headers.Authorization = `Bearer ${token}`;
-    }
-    const url = useService ? `${GEN3_AUTHZ_SERVICE}/resource` : `${GEN3_AUTHZ_API}/resources`;
-    const res = await fetch(url, {
-        headers
-    });
-    if (!res.ok) {
-        console.error('@gen3/core:fetchArboristResources /resource failed:', res.status, await res.text());
-        return [];
-    }
-    const data = await res.json();
-    return data.resources ?? [];
-}
-
 class CohortStorage {
     constructor(config){
         this.databaseName = config.databaseName;
@@ -4265,7 +4270,7 @@ const extractIndexFromDataLibraryCohort = (query)=>{
         if (!dataObjects || !Array.isArray(dataObjects)) {
             return acc;
         }
-        const datasetId = resource[dataFieldMapping.datasetIdField]; // Note: typo still preserved
+        const datasetId = resource[dataFieldMapping.datasetIdField];
         if (datasetId === undefined) {
             return acc; // Skip if dataset ID is missing
         }
@@ -4924,137 +4929,124 @@ const useDataLibrary = (options = {
     storageMode: DataLibraryStoreMode.ApiOnly
 })=>{
     // State management
-    const [isLoggedIn, setIsLoggedIn] = React.useState(false);
     const [isLoading, setIsLoading] = React.useState(false);
     const [isUpdating, setIsUpdating] = React.useState(null);
     const [error, setError] = React.useState(null);
     const [lists, setLists] = React.useState({});
     // Refs
-    const initialLoadRef = React.useRef(false);
+    const hasInitializedRef = React.useRef(false);
     // Services
-    const dataLibraryStoreAPI = React.useRef(new DataLibraryStorageService(options.storageMode)).current;
-    const handleErrorOrSetLists = React.useCallback(async (error)=>{
-        if (error.isError) {
-            setError(error);
-        } else {
-            const getListResults = await dataLibraryStoreAPI.getLists();
-            if (getListResults.isError) {
-                setError(getListResults);
-            } else {
-                setLists(getListResults.lists ?? {});
-                setError(null);
-            }
+    const storage = React.useRef(new DataLibraryStorageService(options.storageMode)).current;
+    const refreshLists = React.useCallback(async ()=>{
+        const results = await storage.getLists();
+        if (results.isError) {
+            setError(results);
+            return results;
         }
+        setLists(results.lists ?? {});
+        setError(null);
+        return results;
     }, [
-        dataLibraryStoreAPI
+        storage
     ]);
-    const generateUniqueName = React.useCallback((baseName = DEFAULT_LIST_NAME)=>{
-        let uniqueName = baseName;
-        let counter = 1;
-        const existingNames = Object.values(lists).map((x)=>x.name);
-        while(existingNames.includes(uniqueName)){
-            uniqueName = `${baseName} ${counter}`;
-            counter++;
+    const applyOperationResult = React.useCallback(async (result)=>{
+        if (result.isError) {
+            setError(result);
+            return;
         }
-        return uniqueName;
+        await refreshLists();
     }, [
-        lists
+        refreshLists
     ]);
-    const performLibraryOperation = React.useCallback(async (operation, updateId)=>{
+    const runOperation = React.useCallback(async (operation, updatingId)=>{
         setError(null);
-        if (updateId) {
-            setIsUpdating(updateId);
-        } else setIsLoading(true);
-        const operationResults = await operation();
-        await handleErrorOrSetLists(operationResults);
-        if (updateId) setIsUpdating(null);
+        if (updatingId) setIsUpdating(updatingId);
+        else setIsLoading(true);
+        const result = await operation();
+        await applyOperationResult(result);
+        if (updatingId) setIsUpdating(null);
         else setIsLoading(false);
-        return operationResults;
+        return result;
     }, [
-        handleErrorOrSetLists
+        applyOperationResult
     ]);
-    // Lifecycle effects
-    React.useEffect(()=>{
-        const initializeData = async ()=>{
-            if (!initialLoadRef.current) {
-                setError(null);
-                setIsLoading(true);
-                const results = await dataLibraryStoreAPI.getLists(); // get the initial lists
-                if (results.isError) setError(results);
-                else setLists(results.lists ?? {});
-                setIsLoading(false);
-                initialLoadRef.current = true;
-            }
-        };
-        initializeData();
+    const createUniqueListName = React.useCallback((preferredName = DEFAULT_LIST_NAME)=>{
+        const existingNames = new Set(Object.values(lists).map((x)=>x.name));
+        if (!existingNames.has(preferredName)) return preferredName;
+        let counter = 1;
+        let candidate = `${preferredName} ${counter}`;
+        while(existingNames.has(candidate)){
+            counter += 1;
+            candidate = `${preferredName} ${counter}`;
+        }
+        return candidate;
     }, [
-        dataLibraryStoreAPI
+        lists
     ]);
+    // Lifecycle effects
     React.useEffect(()=>{
-        const handleLogin = async ()=>{
-        // setIsLoading(true);
-        // await dataLibraryStoreAPI.setUseAPI(options.requiresAPI && isLoggedIn);
-        // setIsLoading(false);
+        const initialize = async ()=>{
+            if (hasInitializedRef.current) return;
+            setError(null);
+            setIsLoading(true);
+            await refreshLists();
+            setIsLoading(false);
+            hasInitializedRef.current = true;
         };
-        handleLogin();
+        void initialize();
     }, [
-        dataLibraryStoreAPI,
-        isLoggedIn
+        refreshLists
     ]);
     // CRUD operations
     const addListToDataLibrary = React.useCallback(async (items, name)=>{
         const apiItems = convertDatasetOrCohortToLibraryListItemsAPI(items);
-        const namedItems = {
+        const payload = {
             items: apiItems,
-            name: generateUniqueName(name ?? DEFAULT_LIST_NAME)
+            name: createUniqueListName(name ?? DEFAULT_LIST_NAME)
         };
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.addList(namedItems));
+        return runOperation(()=>storage.addList(payload));
     }, [
-        dataLibraryStoreAPI,
-        generateUniqueName,
-        performLibraryOperation
+        createUniqueListName,
+        runOperation,
+        storage
     ]);
     const updateListInDataLibrary = React.useCallback(async (payload)=>{
         const flattened = flattenDataList(payload);
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.updateList(payload.id, {
+        return runOperation(()=>storage.updateList(payload.id, {
                 name: payload.name,
                 items: flattened.items
             }), payload.id);
     }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
+        runOperation,
+        storage
     ]);
-    const deleteListFromDataLibrary = React.useCallback(async (id)=>{
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.deleteList(id));
-    }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
+    const deleteListFromDataLibrary = React.useCallback(async (id)=>runOperation(()=>storage.deleteList(id)), [
+        runOperation,
+        storage
     ]);
-    const clearLibrary = React.useCallback(async ()=>{
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.clearLists());
-    }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
+    const clearLibrary = React.useCallback(async ()=>runOperation(()=>storage.clearLists()), [
+        runOperation,
+        storage
     ]);
     const setAllListsInDataLibrary = React.useCallback(async (data)=>{
-        const flattenedLists = data.map((x)=>flattenDataList(x));
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.setAllLists(flattenedLists));
+        const flattenedLists = data.map(flattenDataList);
+        return runOperation(()=>storage.setAllLists(flattenedLists));
     }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
+        runOperation,
+        storage
     ]);
     const getDatalist = React.useCallback((id)=>{
-        if (id in lists) return lists[id];
+        const list = lists[id];
+        if (list) return list;
         setError({
             isError: true,
             status: 404,
-            message: `List not found. Returning empty list.`
+            message: 'List not found. Returning empty list.'
         });
         return EMPTY_LIST;
     }, [
         lists
     ]);
-    const setLoginState = React.useCallback((loggedIn)=>setIsLoggedIn(loggedIn), []);
     const results = useDeepCompare.useDeepCompareMemo(()=>({
             dataLibrary: lists,
             isLoading,
@@ -5065,7 +5057,6 @@ const useDataLibrary = (options = {
             deleteListFromDataLibrary,
             clearLibrary,
             setAllListsInDataLibrary,
-            setLoginState,
             getDatalist
         }), [
         addListToDataLibrary,
@@ -5077,7 +5068,6 @@ const useDataLibrary = (options = {
         isUpdating,
         lists,
         setAllListsInDataLibrary,
-        setLoginState,
         updateListInDataLibrary
     ]);
     return results;