@gen3/core 0.12.5 → 0.12.6

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/cjs/index.js

@@ -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;