@cccsaurora/howler-ui 2.16.2 → 2.16.4

package/components/app/providers/HitSearchProvider.d.ts

@@ -22,5 +22,4 @@ export interface HitSearchContextType {
 }
 export declare const HitSearchContext: import("use-context-selector").Context<HitSearchContextType>;
 declare const HitSearchProvider: FC<PropsWithChildren>;
-export declare const useHitSearchContextSelector: <Selected>(selector: (value: HitSearchContextType) => Selected) => Selected;
 export default HitSearchProvider;

package/components/app/providers/HitSearchProvider.js

@@ -77,7 +77,7 @@ const HitSearchProvider = ({ children }) => {
         }
         // Fetch all view queries
         if (views.length > 0) {
-            const viewObjects = await getCurrentViews();
+            const viewObjects = await getCurrentViews({ views });
             // Filter out null/undefined views and extract queries
             viewObjects
                 .filter(view => view?.query)
@@ -157,7 +157,8 @@ const HitSearchProvider = ({ children }) => {
         trackTotalHits,
         loadHits,
         getCurrentViews,
-        setOffset
+        setOffset,
+        getFilters
     ]);
     // We only run this when ancillary properties (i.e. filters, sorting) change
     useEffect(() => {
@@ -171,7 +172,7 @@ const HitSearchProvider = ({ children }) => {
             setResponse(null);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [offset, pageCount, sort, span, bundleId, location.pathname, startDate, endDate, filters, query]);
+    }, [offset, pageCount, sort, span, bundleId, location.pathname, startDate, endDate, filters, query, views]);
     return (_jsx(HitSearchContext.Provider, { value: {
             displayType,
             setDisplayType,
@@ -187,7 +188,4 @@ const HitSearchProvider = ({ children }) => {
             setFzfSearch
         }, children: children }));
 };
-export const useHitSearchContextSelector = (selector) => {
-    return useContextSelector(HitSearchContext, selector);
-};
 export default HitSearchProvider;

package/components/app/providers/HitSearchProvider.test.js

@@ -17,7 +17,7 @@ const mockSetParams = vi.fn();
 const mockParams = vi.mocked(useParams);
 const mockLocation = vi.mocked(useLocation());
 const mockViewContext = {
-    getCurrentViews: ({ viewId } = {}) => Promise.resolve([{ view_id: viewId || 'test_view_id', query: 'howler.id:*' }])
+    getCurrentViews: ({ views } = {}) => Promise.resolve([{ view_id: views?.[0] || 'test_view_id', query: 'howler.id:*' }])
 };
 let mockParameterContext = {
     filters: [],

package/components/app/providers/ParameterProvider.js

@@ -81,8 +81,8 @@ const ParameterProvider = ({ children }) => {
         if (value === values[key]) {
             return;
         }
-        if (key === 'selected' && !value) {
-            pendingChanges.current.selected = getSelectedValue(params, location.pathname, routeParams.id);
+        if (key === 'selected') {
+            pendingChanges.current.selected = value;
         }
         else {
             pendingChanges.current[key] = value ?? DEFAULT_VALUES[key] ?? null;
@@ -95,7 +95,7 @@ const ParameterProvider = ({ children }) => {
             _setValues(_current => ({ ..._current, ...pendingChanges.current }));
             pendingChanges.current = {};
         });
-    }, [location.pathname, routeParams.id, values, params]);
+    }, [values]);
     const setOffset = useCallback(_offset => _setValues(_current => ({ ..._current, offset: parseOffset(_offset) })), []);
     const setCustomSpan = useCallback((startDate, endDate) => {
         _setValues(_values => ({

package/components/app/providers/ViewProvider.d.ts

@@ -13,7 +13,7 @@ export interface ViewContextType {
     editView: (id: string, newView: Partial<Omit<View, 'view_id' | 'owner'>>) => Promise<View>;
     removeView: (id: string) => Promise<void>;
     getCurrentViews: (config?: {
-        viewId?: string;
+        views?: string[];
         lazy?: boolean;
         ignoreParams?: boolean;
     }) => Promise<View[]>;

package/components/app/providers/ViewProvider.js

@@ -3,7 +3,7 @@ import api from '@cccsaurora/howler-ui/api';
 import { useAppUser } from '@cccsaurora/howler-ui/commons/components/app/hooks';
 import useMyApi from '@cccsaurora/howler-ui/components/hooks/useMyApi';
 import { useMyLocalStorageItem } from '@cccsaurora/howler-ui/components/hooks/useMyLocalStorage';
-import { has, omit } from 'lodash-es';
+import { has, omit, uniq } from 'lodash-es';
 import { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { createContext, useContextSelector } from 'use-context-selector';
@@ -59,11 +59,8 @@ const ViewProvider = ({ children }) => {
             }
         })();
     }, [defaultView, fetchViews, setDefaultView, views]);
-    const getCurrentViews = useCallback(async ({ viewId, lazy = false, ignoreParams = false } = {}) => {
-        const currentViews = ignoreParams ? [] : searchParams.getAll('view');
-        if (viewId && !currentViews.includes(viewId)) {
-            currentViews.push(viewId);
-        }
+    const getCurrentViews = useCallback(async ({ views: _views, lazy = false, ignoreParams = false } = {}) => {
+        const currentViews = uniq([...(_views ?? []), ...(ignoreParams ? [] : searchParams.getAll('view'))]);
         if (currentViews.length < 1) {
             return [];
         }

package/components/app/providers/ViewProvider.test.js

@@ -135,7 +135,7 @@ describe('ViewContext', () => {
         it('should allow the user to fetch their current view based on the view ID', async () => {
             // lazy load should return nothing
             await expect(hook.result.current({ lazy: true })).resolves.toEqual([]);
-            const result = await act(async () => hook.result.current({ viewId: 'searched_view_id' }));
+            const result = await act(async () => hook.result.current({ views: ['searched_view_id'] }));
             expect(result).toEqual([MOCK_RESPONSES['/api/v1/search/view'].items[0]]);
         });
     });

package/components/routes/hits/search/ViewLink.js

@@ -25,7 +25,7 @@ const ViewLink = ({ id, viewId }) => {
     const [view, setView] = useState(null);
     useEffect(() => {
         setLoading(true);
-        getCurrentViews({ viewId, ignoreParams: true })
+        getCurrentViews({ views: [viewId], ignoreParams: true })
             .then(result => setView(result[0]))
             .finally(() => setLoading(false));
     }, [getCurrentViews, viewId]);

package/components/routes/hits/search/ViewLink.test.js

@@ -341,7 +341,7 @@ describe('ViewLink', () => {
         it('should call getCurrentViews when viewId changes', async () => {
             const { rerender } = render(_jsx(ViewLink, { id: 0, viewId: "test-view-id" }), { wrapper: Wrapper });
             await screen.findByText('Test View');
-            expect(mockViewContext.getCurrentViews).toHaveBeenCalledWith({ viewId: 'test-view-id', ignoreParams: true });
+            expect(mockViewContext.getCurrentViews).toHaveBeenCalledWith({ views: ['test-view-id'], ignoreParams: true });
             mockViewContext.getCurrentViews = vi.fn().mockResolvedValue([
                 createMockView({
                     view_id: 'another-view-id',
@@ -350,7 +350,7 @@ describe('ViewLink', () => {
             ]);
             rerender(_jsx(ViewLink, { id: 0, viewId: "another-view-id" }));
             await screen.findByText('Another View');
-            expect(mockViewContext.getCurrentViews).toHaveBeenCalledWith({ viewId: 'another-view-id', ignoreParams: true });
+            expect(mockViewContext.getCurrentViews).toHaveBeenCalledWith({ views: ['another-view-id'], ignoreParams: true });
         });
     });
     describe('Accessibility', () => {
@@ -385,7 +385,7 @@ describe('ViewLink', () => {
             mockViewContext.getCurrentViews = vi.fn().mockResolvedValue([createMockView()]);
             render(_jsx(ViewLink, { id: 0, viewId: "test-view-id" }), { wrapper: Wrapper });
             await screen.findByText('Test View');
-            expect(mockViewContext.getCurrentViews).toHaveBeenCalledWith({ viewId: 'test-view-id', ignoreParams: true });
+            expect(mockViewContext.getCurrentViews).toHaveBeenCalledWith({ views: ['test-view-id'], ignoreParams: true });
         });
         it('should use removeView from ParameterContext', async () => {
             mockViewContext.getCurrentViews = vi.fn().mockResolvedValue([createMockView()]);

package/components/routes/views/ViewComposer.js

@@ -143,7 +143,7 @@ const ViewComposer = () => {
             return;
         }
         (async () => {
-            const viewToEdit = (await getCurrentViews({ viewId: routeParams.id }))[0];
+            const viewToEdit = (await getCurrentViews({ views: [routeParams.id] }))[0];
             if (!viewToEdit) {
                 setError('route.views.missing');
                 return;

package/package.json

@@ -96,7 +96,7 @@
     "internal-slot": "1.0.7"
   },
   "type": "module",
-  "version": "2.16.2",
+  "version": "2.16.4",
   "exports": {
     "./i18n": "./i18n.js",
     "./index.css": "./index.css",