@oneuptime/common 14.0.0 → 14.0.1

package/build/dist/UI/Components/Feed/FeedOptionsButton.js

@@ -0,0 +1,346 @@
+import React, { useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, } from "react";
+import IconProp from "../../../Types/Icon/IconProp";
+import useTranslateValue from "../../Utils/Translation";
+import Icon from "../Icon/Icon";
+import { DEFAULT_FEED_SORT_ORDER, FEED_OPTIONS_TEXT, FEED_SORT_ORDER_OPTIONS, getFeedOptionsSummary, isDefaultFeedOptions, translateFeedOptionsText, } from "./FeedOptions";
+// A short checklist is scanned by eye; a longer one gets a search box.
+export const FEED_EVENT_TYPE_SEARCH_THRESHOLD = 8;
+export const FEED_OPTIONS_PANEL_WIDTH_PX = 288;
+// The panel never comes closer than this to either edge of the viewport.
+export const FEED_OPTIONS_VIEWPORT_GUTTER_PX = 16;
+/*
+ * Where the panel goes. It lines its right edge up with the trigger's, like
+ * every other header menu, and slides back inside the viewport when that
+ * would cross an edge. That happens on phones and tablets: the card header
+ * stacks there and puts this button, the first of the header's controls, at
+ * the left of the row, so a right-aligned panel would open off the screen.
+ */
+export const getFeedOptionsPanelPlacement = (data) => {
+    const width = Math.max(Math.min(FEED_OPTIONS_PANEL_WIDTH_PX, data.viewportWidth - 2 * FEED_OPTIONS_VIEWPORT_GUTTER_PX), 0);
+    const lowestLeft = FEED_OPTIONS_VIEWPORT_GUTTER_PX;
+    const highestLeft = Math.max(data.viewportWidth - FEED_OPTIONS_VIEWPORT_GUTTER_PX - width, lowestLeft);
+    const left = Math.min(Math.max(data.triggerRight - width, lowestLeft), highestLeft);
+    return {
+        left: left - data.triggerLeft,
+        width,
+    };
+};
+/*
+ * The one control in a feed's header for everything about what the feed
+ * shows: the time order and the event type filter. It opens a small panel
+ * rather than a menu, because the reader ticks several boxes in one visit and
+ * a menu closes on every pick. Changes apply as they are made - there is no
+ * Apply button to forget - and the trigger is tinted, with a count of the
+ * chosen event types, whenever the feed is not showing its default view.
+ */
+const FeedOptionsButton = (props) => {
+    const { translateString } = useTranslateValue();
+    const uniqueId = useId();
+    const buttonId = `feed-options-button-${uniqueId}`;
+    const summaryId = `feed-options-summary-${uniqueId}`;
+    const panelId = `feed-options-panel-${uniqueId}`;
+    const sortHeadingId = `feed-options-sort-${uniqueId}`;
+    const eventTypesHeadingId = `feed-options-event-types-${uniqueId}`;
+    const [isOpen, setIsOpen] = useState(false);
+    const [searchText, setSearchText] = useState("");
+    const [placement, setPlacement] = useState(null);
+    const containerRef = useRef(null);
+    const triggerRef = useRef(null);
+    const sortRadioRefs = useRef([]);
+    const eventTypeListRef = useRef(null);
+    const selectedEventTypes = useMemo(() => {
+        return new Set(props.value.eventTypes);
+    }, [props.value.eventTypes]);
+    const selectedCount = props.value.eventTypes.length;
+    const isCustomized = !isDefaultFeedOptions(props.value);
+    const isOldestFirst = props.value.sortOrder !== DEFAULT_FEED_SORT_ORDER;
+    const translate = (text, values) => {
+        return translateFeedOptionsText({
+            text,
+            values,
+            translate: translateString,
+        });
+    };
+    const summary = getFeedOptionsSummary({
+        options: props.value,
+        eventTypeCount: props.eventTypeOptions.length,
+        translate: translateString,
+    });
+    const showSearch = props.eventTypeOptions.length > FEED_EVENT_TYPE_SEARCH_THRESHOLD;
+    /*
+     * Labels are shown - and searched and ordered - in the reader's language.
+     * A label with no translation yet stays in English.
+     */
+    const translatedEventTypeOptions = props.eventTypeOptions
+        .map((option) => {
+        return Object.assign(Object.assign({}, option), { label: translate(option.label) });
+    })
+        .sort((a, b) => {
+        return a.label.localeCompare(b.label);
+    });
+    const searchTerm = searchText.trim().toLowerCase();
+    const visibleEventTypeOptions = searchTerm
+        ? translatedEventTypeOptions.filter((option) => {
+            return option.label.toLowerCase().includes(searchTerm);
+        })
+        : translatedEventTypeOptions;
+    const close = (shouldReturnFocus) => {
+        var _a;
+        setIsOpen(false);
+        setSearchText("");
+        if (shouldReturnFocus) {
+            (_a = triggerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        }
+    };
+    /*
+     * Dismiss on a press outside the trigger and panel. The listener sits on
+     * the container that holds both, so pressing the trigger to close the panel
+     * is a toggle, not a dismissal followed by a re-open.
+     */
+    useEffect(() => {
+        if (!isOpen) {
+            return undefined;
+        }
+        const onPointerDown = (event) => {
+            const target = event.target;
+            if (containerRef.current &&
+                target instanceof Node &&
+                !containerRef.current.contains(target)) {
+                setIsOpen(false);
+                setSearchText("");
+            }
+        };
+        document.addEventListener("mousedown", onPointerDown);
+        return () => {
+            document.removeEventListener("mousedown", onPointerDown);
+        };
+    }, [isOpen]);
+    const placePanel = useCallback(() => {
+        const container = containerRef.current;
+        if (!container) {
+            return;
+        }
+        const rect = container.getBoundingClientRect();
+        setPlacement(getFeedOptionsPanelPlacement({
+            triggerLeft: rect.left,
+            triggerRight: rect.right,
+            viewportWidth: document.documentElement.clientWidth || window.innerWidth,
+        }));
+    }, []);
+    // Placed before paint, so the panel never flashes off-screen first.
+    useLayoutEffect(() => {
+        if (!isOpen) {
+            setPlacement(null);
+            return undefined;
+        }
+        placePanel();
+        window.addEventListener("resize", placePanel);
+        return () => {
+            window.removeEventListener("resize", placePanel);
+        };
+    }, [isOpen, placePanel]);
+    // Opening moves focus onto the chosen sort order, the panel's first control.
+    useEffect(() => {
+        var _a;
+        if (!isOpen) {
+            return;
+        }
+        const selectedIndex = FEED_SORT_ORDER_OPTIONS.findIndex((option) => {
+            return option.value === props.value.sortOrder;
+        });
+        (_a = sortRadioRefs.current[Math.max(selectedIndex, 0)]) === null || _a === void 0 ? void 0 : _a.focus();
+        // Only on open: re-focusing on every sort change would fight the keyboard.
+    }, [isOpen]);
+    const setSortOrder = (sortOrder) => {
+        if (sortOrder === props.value.sortOrder) {
+            return;
+        }
+        props.onChange(Object.assign(Object.assign({}, props.value), { sortOrder }));
+    };
+    const toggleEventType = (eventType) => {
+        const nextSelected = new Set(selectedEventTypes);
+        if (nextSelected.has(eventType)) {
+            nextSelected.delete(eventType);
+        }
+        else {
+            nextSelected.add(eventType);
+        }
+        // Keep the checklist's order, not the order the boxes were ticked in.
+        props.onChange(Object.assign(Object.assign({}, props.value), { eventTypes: props.eventTypeOptions
+                .map((option) => {
+                return option.value;
+            })
+                .filter((value) => {
+                return nextSelected.has(value);
+            }) }));
+    };
+    /*
+     * "Show all" and "Reset to default" hide themselves once they have done
+     * their job. Focus on a button that unmounts falls to the page body, out of
+     * the panel, where Escape no longer closes it - so both hand focus to the
+     * control the reader is most likely to reach for next.
+     */
+    const focusSortOrder = (sortOrder) => {
+        var _a;
+        const index = FEED_SORT_ORDER_OPTIONS.findIndex((option) => {
+            return option.value === sortOrder;
+        });
+        (_a = sortRadioRefs.current[Math.max(index, 0)]) === null || _a === void 0 ? void 0 : _a.focus();
+    };
+    const clearEventTypes = () => {
+        var _a;
+        props.onChange(Object.assign(Object.assign({}, props.value), { eventTypes: [] }));
+        const firstCheckbox = ((_a = eventTypeListRef.current) === null || _a === void 0 ? void 0 : _a.querySelector('input[type="checkbox"]')) || null;
+        if (firstCheckbox) {
+            firstCheckbox.focus();
+        }
+        else {
+            focusSortOrder(props.value.sortOrder);
+        }
+    };
+    const resetOptions = () => {
+        props.onChange({
+            sortOrder: DEFAULT_FEED_SORT_ORDER,
+            eventTypes: [],
+        });
+        focusSortOrder(DEFAULT_FEED_SORT_ORDER);
+    };
+    const onContainerKeyDown = (event) => {
+        if (isOpen && event.key === "Escape") {
+            event.preventDefault();
+            event.stopPropagation();
+            close(true);
+        }
+    };
+    /*
+     * Tabbing out of the panel closes it. Only focus that lands on something
+     * outside counts: a press on the panel's own padding moves focus to the
+     * panel itself (it is focusable for exactly this reason), which keeps
+     * Escape working.
+     */
+    const onContainerBlur = (event) => {
+        const nextFocus = event.relatedTarget;
+        if (isOpen &&
+            nextFocus instanceof Node &&
+            containerRef.current &&
+            !containerRef.current.contains(nextFocus)) {
+            setIsOpen(false);
+            setSearchText("");
+        }
+    };
+    // Arrow keys move between the two sort orders, as in any radio group.
+    const onSortKeyDown = (event, index) => {
+        var _a;
+        let nextIndex = null;
+        if (event.key === "ArrowRight" || event.key === "ArrowDown") {
+            nextIndex = (index + 1) % FEED_SORT_ORDER_OPTIONS.length;
+        }
+        else if (event.key === "ArrowLeft" || event.key === "ArrowUp") {
+            nextIndex =
+                (index - 1 + FEED_SORT_ORDER_OPTIONS.length) %
+                    FEED_SORT_ORDER_OPTIONS.length;
+        }
+        if (nextIndex === null) {
+            return;
+        }
+        event.preventDefault();
+        const nextOption = FEED_SORT_ORDER_OPTIONS[nextIndex];
+        if (nextOption) {
+            setSortOrder(nextOption.value);
+            (_a = sortRadioRefs.current[nextIndex]) === null || _a === void 0 ? void 0 : _a.focus();
+        }
+    };
+    /*
+     * The visible label is the button's name, and the state behind it - order
+     * and filter - its description, so a screen reader says each once. The
+     * label is only drawn from xl up: beside the feed's other header controls
+     * it would squeeze the card title into a sliver on tablets. Oldest first
+     * swaps the funnel for the sort glyph, so a reversed feed does not rely on
+     * the tint alone to say so.
+     */
+    const getTrigger = () => {
+        return (React.createElement("button", { ref: triggerRef, id: buttonId, type: "button", "data-testid": "feed-options-button", className: `inline-flex min-h-[2.375rem] items-center gap-2 rounded-lg border px-3.5 py-2 text-sm font-medium shadow-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 transition-all duration-150 cursor-pointer select-none ${isCustomized
+                ? "border-indigo-300 bg-indigo-50 text-indigo-700 hover:bg-indigo-100 hover:border-indigo-400"
+                : "border-gray-300 bg-white text-gray-700 hover:bg-gray-50 hover:border-gray-400 hover:text-gray-900"}`, title: summary, "aria-describedby": summaryId, "aria-haspopup": "dialog", "aria-expanded": isOpen, "aria-controls": isOpen ? panelId : undefined, onClick: () => {
+                if (isOpen) {
+                    close(false);
+                }
+                else {
+                    setIsOpen(true);
+                }
+            } },
+            React.createElement(Icon, { icon: isOldestFirst ? IconProp.BarsArrowUp : IconProp.Filter, className: `h-4 w-4 ${isCustomized ? "text-indigo-500" : "text-gray-500"}` }),
+            React.createElement("span", { className: "sr-only xl:not-sr-only", "data-testid": "feed-options-label" }, translate(FEED_OPTIONS_TEXT.triggerLabel)),
+            selectedCount > 0 && (React.createElement("span", { "data-testid": "feed-options-count", className: "inline-flex min-w-[1.25rem] justify-center rounded-full bg-indigo-600 px-1.5 text-xs font-semibold leading-5 text-white", "aria-hidden": "true" }, selectedCount)),
+            React.createElement(Icon, { icon: IconProp.ChevronDown, className: `h-3.5 w-3.5 ml-0.5 ${isCustomized ? "text-indigo-400" : "text-gray-400"}` })));
+    };
+    const getSortSection = () => {
+        return (React.createElement("div", { className: "border-b border-gray-100 p-3" },
+            React.createElement("div", { id: sortHeadingId, className: "text-xs font-semibold uppercase tracking-wide text-gray-500" }, translate(FEED_OPTIONS_TEXT.sortHeading)),
+            React.createElement("div", { role: "radiogroup", "aria-labelledby": sortHeadingId, className: "mt-2 grid grid-cols-2 gap-1 rounded-lg bg-gray-100 p-1" }, FEED_SORT_ORDER_OPTIONS.map((option, index) => {
+                const isSelected = option.value === props.value.sortOrder;
+                return (React.createElement("button", { key: option.value, ref: (element) => {
+                        sortRadioRefs.current[index] = element;
+                    }, type: "button", role: "radio", "aria-checked": isSelected, tabIndex: isSelected ? 0 : -1, "data-testid": `feed-options-sort-${option.value}`, className: `inline-flex items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-sm transition-colors duration-150 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500 ${isSelected
+                        ? "bg-white font-semibold text-gray-900 shadow-sm ring-1 ring-indigo-400"
+                        : "font-normal text-gray-600 hover:text-gray-900"}`, onClick: () => {
+                        setSortOrder(option.value);
+                    }, onKeyDown: (event) => {
+                        onSortKeyDown(event, index);
+                    } },
+                    React.createElement(Icon, { icon: option.icon, className: `h-4 w-4 ${isSelected ? "text-indigo-500" : "text-gray-400"}` }),
+                    translate(option.label)));
+            }))));
+    };
+    const getEventTypeSection = () => {
+        return (React.createElement("div", { className: "p-3" },
+            React.createElement("div", { className: "flex items-center justify-between" },
+                React.createElement("div", { id: eventTypesHeadingId, className: "text-xs font-semibold uppercase tracking-wide text-gray-500" }, translate(FEED_OPTIONS_TEXT.eventTypesHeading)),
+                selectedCount > 0 && (React.createElement("button", { type: "button", "data-testid": "feed-options-clear-event-types", className: "-my-1 rounded px-1.5 py-1 text-xs font-medium text-indigo-600 hover:text-indigo-800 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500", onClick: clearEventTypes }, translate(FEED_OPTIONS_TEXT.showAll)))),
+            React.createElement("p", { className: "mt-1 text-xs text-gray-500", "data-testid": "feed-options-event-type-summary", "aria-live": "polite" }, selectedCount === 0
+                ? translate(FEED_OPTIONS_TEXT.showingEveryEventType)
+                : translate(FEED_OPTIONS_TEXT.showingSomeEventTypes, {
+                    selected: selectedCount,
+                    total: props.eventTypeOptions.length,
+                })),
+            showSearch && (React.createElement("div", { className: "relative mt-2" },
+                React.createElement(Icon, { icon: IconProp.Search, className: "pointer-events-none absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-gray-400" }),
+                React.createElement("input", { type: "text", value: searchText, "aria-label": translate(FEED_OPTIONS_TEXT.searchPlaceholder), placeholder: translate(FEED_OPTIONS_TEXT.searchPlaceholder), "data-testid": "feed-options-search", className: "block w-full rounded-md border border-gray-300 bg-white py-1.5 pl-8 pr-2 text-sm text-gray-900 placeholder-gray-500 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500", onChange: (event) => {
+                        setSearchText(event.target.value);
+                    } }),
+                React.createElement("span", { className: "sr-only", "aria-live": "polite", "data-testid": "feed-options-search-results" }, searchTerm
+                    ? translate(FEED_OPTIONS_TEXT.searchResults, {
+                        count: visibleEventTypeOptions.length,
+                    })
+                    : ""))),
+            React.createElement("div", { role: "group", "aria-labelledby": eventTypesHeadingId },
+                React.createElement("ul", { ref: eventTypeListRef, role: "list", className: "-mx-1 mt-2 max-h-64 overflow-y-auto", "data-testid": "feed-options-event-types" },
+                    visibleEventTypeOptions.map((option) => {
+                        const isChecked = selectedEventTypes.has(option.value);
+                        return (React.createElement("li", { key: option.value },
+                            React.createElement("label", { className: "flex cursor-pointer items-center gap-2.5 rounded-md px-1.5 py-1.5 text-sm text-gray-700 hover:bg-gray-50" },
+                                React.createElement("input", { type: "checkbox", checked: isChecked, "data-testid": `feed-options-event-type-${option.value}`, className: "h-4 w-4 shrink-0 cursor-pointer rounded border-gray-300 accent-indigo-600 text-indigo-600 focus:ring-indigo-500", onChange: () => {
+                                        toggleEventType(option.value);
+                                    } }),
+                                option.icon && (React.createElement(Icon, { icon: option.icon, className: "h-4 w-4 shrink-0 text-gray-400" })),
+                                React.createElement("span", { className: "truncate" }, option.label))));
+                    }),
+                    visibleEventTypeOptions.length === 0 && (React.createElement("li", { className: "px-1.5 py-2 text-sm text-gray-500" }, props.eventTypeOptions.length === 0
+                        ? translate(FEED_OPTIONS_TEXT.noEventTypes)
+                        : translate(FEED_OPTIONS_TEXT.noSearchMatches, {
+                            search: searchText.trim(),
+                        })))))));
+    };
+    return (React.createElement("div", { ref: containerRef, className: "relative inline-block text-left", onKeyDown: onContainerKeyDown, onBlur: onContainerBlur },
+        getTrigger(),
+        React.createElement("span", { id: summaryId, className: "sr-only", "data-testid": "feed-options-summary" }, summary),
+        isOpen && (React.createElement("div", { id: panelId, role: "dialog", tabIndex: -1, "aria-label": translate(FEED_OPTIONS_TEXT.panelLabel), "data-testid": "feed-options-panel", style: placement
+                ? { left: `${placement.left}px`, width: `${placement.width}px` }
+                : undefined, className: `absolute z-50 mt-2 origin-top-right rounded-lg bg-white shadow-xl ring-1 ring-gray-200 focus:outline-none ${placement ? "" : "right-0 w-72"}` },
+            getSortSection(),
+            getEventTypeSection(),
+            isCustomized && (React.createElement("div", { className: "flex justify-end border-t border-gray-100 px-3 py-2" },
+                React.createElement("button", { type: "button", "data-testid": "feed-options-reset", className: "-my-1 rounded px-1.5 py-1 text-xs font-medium text-gray-600 hover:text-gray-900 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500", onClick: resetOptions }, translate(FEED_OPTIONS_TEXT.reset))))))));
+};
+export default FeedOptionsButton;
+//# sourceMappingURL=FeedOptionsButton.js.map

package/build/dist/UI/Components/Feed/FeedOptionsButton.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FeedOptionsButton.js","sourceRoot":"","sources":["../../../../../UI/Components/Feed/FeedOptionsButton.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/Feed/useFeedItems.js

@@ -3,7 +3,8 @@ import { DEFAULT_LIMIT, LIMIT_PER_PROJECT, } from "../../../Types/Database/Limit
 import API from "../../Utils/API/API";
 /*
  * Every dashboard activity feed follows the same paging contract: read the
- * newest top N rows and replace that window when the reader asks for more.
+ * first N rows in the reader's chosen order (newest first unless they asked
+ * for oldest first) and replace that window when the reader asks for more.
  * Re-reading from zero matters for a live feed. Offset-appending can duplicate
  * or skip a row when a new event arrives between page requests.
  */
@@ -15,8 +16,17 @@ const useFeedItems = (props) => {
     const [loadMoreError, setLoadMoreError] = useState(undefined);
     const [hasMore, setHasMore] = useState(false);
     const [loadedResourceKey, setLoadedResourceKey] = useState(null);
-    const activeResourceKeyRef = useRef(props.resourceKey);
-    activeResourceKeyRef.current = props.resourceKey;
+    /*
+     * The resource and the view together name the feed being shown. Everything
+     * below that guards against a stale response or resets the window keys on
+     * this, so a response for the previous view is dropped the same way as a
+     * response for the previous resource.
+     */
+    const feedKey = props.viewKey === undefined
+        ? props.resourceKey
+        : `${props.resourceKey}\u0000${props.viewKey}`;
+    const activeResourceKeyRef = useRef(feedKey);
+    activeResourceKeyRef.current = feedKey;
     const previousResourceKeyRef = useRef(null);
     const currentLimitRef = useRef(DEFAULT_LIMIT);
     const fetchGenerationRef = useRef(0);
@@ -99,8 +109,8 @@ const useFeedItems = (props) => {
         });
     }, [fetchItems]);
     useEffect(() => {
-        const hasResourceChanged = previousResourceKeyRef.current !== props.resourceKey;
-        previousResourceKeyRef.current = props.resourceKey;
+        const hasResourceChanged = previousResourceKeyRef.current !== feedKey;
+        previousResourceKeyRef.current = feedKey;
         if (hasResourceChanged) {
             currentLimitRef.current = DEFAULT_LIMIT;
             setFeedItems([]);
@@ -113,13 +123,13 @@ const useFeedItems = (props) => {
         }).catch(() => {
             // fetchItems converts request failures into the appropriate UI state.
         });
-    }, [fetchItems, props.resourceKey, props.refreshToken]);
+    }, [fetchItems, feedKey, props.refreshToken]);
     useEffect(() => {
         return () => {
             fetchGenerationRef.current += 1;
         };
     }, []);
-    const isCurrentFeedLoaded = loadedResourceKey === props.resourceKey;
+    const isCurrentFeedLoaded = loadedResourceKey === feedKey;
     return {
         feedItems,
         isLoading,

package/build/dist/UI/Components/Feed/useFeedItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFeedItems.js","sourceRoot":"","sources":["../../../../../UI/Components/Feed/useFeedItems.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useFeedItems.js","sourceRoot":"","sources":["../../../../../UI/Components/Feed/useFeedItems.ts"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/Feed/useFeedOptions.js

@@ -0,0 +1,130 @@
+import { useCallback, useEffect, useMemo, useRef, useState, } from "react";
+import LocalStorage from "../../Utils/LocalStorage";
+import { DEFAULT_FEED_SORT_ORDER, getFeedEventTypeOptions, getFeedOptionsKey, isFeedFiltered, isFeedSortOrder, sanitizeFeedEventTypes, } from "./FeedOptions";
+const SORT_ORDER_STORAGE_KEY_PREFIX = "feed-sort-order:";
+// One shared empty selection, so an unfiltered render keeps its identity.
+const NO_EVENT_TYPES = [];
+export const getSortOrderStorageKey = (storageKey) => {
+    return `${SORT_ORDER_STORAGE_KEY_PREFIX}${storageKey}`;
+};
+/*
+ * Storage can be missing, blocked or hold anything, so every read falls back
+ * to the default order.
+ */
+const readStoredSortOrder = (storageKey) => {
+    if (!storageKey) {
+        return DEFAULT_FEED_SORT_ORDER;
+    }
+    try {
+        const storedValue = LocalStorage.getItem(getSortOrderStorageKey(storageKey));
+        return isFeedSortOrder(storedValue) ? storedValue : DEFAULT_FEED_SORT_ORDER;
+    }
+    catch (_a) {
+        return DEFAULT_FEED_SORT_ORDER;
+    }
+};
+const writeStoredSortOrder = (storageKey, sortOrder) => {
+    if (!storageKey) {
+        return;
+    }
+    try {
+        if (sortOrder === DEFAULT_FEED_SORT_ORDER) {
+            LocalStorage.removeItem(getSortOrderStorageKey(storageKey));
+        }
+        else {
+            LocalStorage.setItem(getSortOrderStorageKey(storageKey), sortOrder);
+        }
+    }
+    catch (_a) {
+        // A preference that cannot be saved still applies to this page.
+    }
+};
+const useFeedOptions = (props) => {
+    /*
+     * Callers pass Object.values(SomeEnum), a new array on every render, so the
+     * list is keyed by its contents.
+     */
+    const eventTypesKey = props.eventTypes.join("\u0000");
+    const knownEventTypes = useMemo(() => {
+        return props.eventTypes;
+    }, [eventTypesKey]);
+    const [sortOrder, setSortOrder] = useState(() => {
+        return readStoredSortOrder(props.storageKey);
+    });
+    /*
+     * The selection remembers which resource it was made on. It is read through
+     * that, during render rather than in an effect, so the first render for a
+     * new resource is already unfiltered and never asks the API for the old
+     * resource's filter. The stale selection is also dropped (React's "adjust
+     * state when a prop changes" pattern), so going back to the first resource
+     * does not bring its old filter back either.
+     */
+    const [selection, setSelection] = useState(() => {
+        return {
+            resetKey: props.resetKey,
+            eventTypes: [],
+        };
+    });
+    const isSelectionForThisResource = selection.resetKey === props.resetKey;
+    if (!isSelectionForThisResource) {
+        setSelection({
+            resetKey: props.resetKey,
+            eventTypes: NO_EVENT_TYPES,
+        });
+    }
+    const selectedEventTypes = isSelectionForThisResource
+        ? selection.eventTypes
+        : NO_EVENT_TYPES;
+    const options = useMemo(() => {
+        return {
+            sortOrder,
+            eventTypes: sanitizeFeedEventTypes({
+                selectedEventTypes,
+                knownEventTypes,
+            }),
+        };
+    }, [sortOrder, selectedEventTypes, knownEventTypes]);
+    const eventTypeOptions = useMemo(() => {
+        return getFeedEventTypeOptions({
+            eventTypes: knownEventTypes,
+            getEventTypeLabel: props.getEventTypeLabel,
+            getEventTypeIcon: props.getEventTypeIcon,
+        });
+    }, [knownEventTypes, props.getEventTypeLabel, props.getEventTypeIcon]);
+    const setOptions = useCallback((nextOptions) => {
+        const nextSortOrder = isFeedSortOrder(nextOptions.sortOrder)
+            ? nextOptions.sortOrder
+            : DEFAULT_FEED_SORT_ORDER;
+        setSortOrder(nextSortOrder);
+        setSelection({
+            resetKey: props.resetKey,
+            eventTypes: sanitizeFeedEventTypes({
+                selectedEventTypes: nextOptions.eventTypes,
+                knownEventTypes,
+            }),
+        });
+    }, [knownEventTypes, props.resetKey]);
+    /*
+     * The stored order follows the committed state, not each setOptions call:
+     * two changes batched into one render would otherwise leave storage holding
+     * the first while the page shows the second. The first run is the value
+     * just read from storage, so there is nothing to write.
+     */
+    const hasCommittedSortOrderRef = useRef(false);
+    useEffect(() => {
+        if (!hasCommittedSortOrderRef.current) {
+            hasCommittedSortOrderRef.current = true;
+            return;
+        }
+        writeStoredSortOrder(props.storageKey, sortOrder);
+    }, [sortOrder]);
+    return {
+        options,
+        optionsKey: getFeedOptionsKey(options),
+        eventTypeOptions,
+        isFiltered: isFeedFiltered(options),
+        setOptions,
+    };
+};
+export default useFeedOptions;
+//# sourceMappingURL=useFeedOptions.js.map

package/build/dist/UI/Components/Feed/useFeedOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFeedOptions.js","sourceRoot":"","sources":["../../../../../UI/Components/Feed/useFeedOptions.ts"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/Icon/Icon.js

@@ -338,7 +338,7 @@ const Icon = ({ size = SizeProp.Regular, icon, className, color, thick, onClick,
         return getSvgWrapper(React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0M3.124 7.5A8.969 8.969 0 015.292 3m13.416 0a8.969 8.969 0 012.168 4.5" }));
     }
     else if (icon === IconProp.BarsArrowUp) {
-        return getSvgWrapper(React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M3 4.5h14.25M3 9h9.75M3 13.5h9.75m4.5-4.5v12m0 0l-3.75-3.75M17.25 21L21 17.25" }));
+        return getSvgWrapper(React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M3 4.5h14.25M3 9h9.75M3 13.5h5.25m5.25-.75L17.25 9m0 0L21 12.75M17.25 9v12" }));
     }
     else if (icon === IconProp.CheckCircle) {
         return getSvgWrapper(React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" }));