[C] Update useFromStore signature

1aurend · 1aurend · commit 7a7d8449f5bf · 2025-10-14T11:08:35.000-07:00
diff --git a/client/src/backend/components/authoring/EditSectionForm/index.js b/client/src/backend/components/authoring/EditSectionForm/index.js
@@ -107,7 +107,9 @@ export default function EditSectionForm({
     }
   }, [initialSlateValue, t]);
 
-  const stylesheetData = useFromStore(`entityStore.entities.stylesheets`);
+  const stylesheetData = useFromStore({
+    path: `entityStore.entities.stylesheets`
+  });
   const stylesheetDataKeys = stylesheetData ? Object.keys(stylesheetData) : [];
 
   const appliedStylesheets = stylesheetDataKeys
diff --git a/client/src/backend/components/list/EntitiesList/Entity/ContributorRow.js b/client/src/backend/components/list/EntitiesList/Entity/ContributorRow.js
@@ -18,7 +18,7 @@ function ContributorRow({ entity, onDelete, onEdit, ...props }) {
 
   const { roles } = attributes ?? {};
 
-  const authentication = useFromStore("authentication");
+  const authentication = useFromStore({ path: "authentication" });
   const auth = new Authorization();
   const canAccessMakers = auth.authorizeAbility({
     entity: "maker",
diff --git a/client/src/backend/components/list/EntitiesList/Entity/PendingEntitlementRow.js b/client/src/backend/components/list/EntitiesList/Entity/PendingEntitlementRow.js
@@ -17,8 +17,12 @@ export default function PendingEntitlementRow({
 
   const { email, subjectId, expiresOn } = entitlement?.attributes ?? {};
 
-  const project = useFromStore(`entityStore.entities.projects["${subjectId}"]`);
-  const journal = useFromStore(`entityStore.entities.journals["${subjectId}"]`);
+  const project = useFromStore({
+    path: `entityStore.entities.projects["${subjectId}"]`
+  });
+  const journal = useFromStore({
+    path: `entityStore.entities.journals["${subjectId}"]`
+  });
   const target = project ?? journal;
 
   const subtitle = target ? target.attributes?.titlePlaintext : "";
diff --git a/client/src/backend/containers/journal/AccessWrapper.js b/client/src/backend/containers/journal/AccessWrapper.js
@@ -13,7 +13,7 @@ export default function JournalAccessWrapper({ journal, route }) {
   const closeUrl = lh.link("backendJournalAccess", journal.id);
 
   const authorization = new Authorization();
-  const authentication = useFromStore("authentication");
+  const authentication = useFromStore({ path: "authentication" });
 
   const canGrantPermissions = authorization.authorizeAbility({
     authentication,
diff --git a/client/src/backend/containers/text/section/Ingest.js b/client/src/backend/containers/text/section/Ingest.js
@@ -22,9 +22,9 @@ export default function IngestSectionContainer({ textId }) {
     condition: !!ingestionId
   });
 
-  const sectionName = useFromStore(
-    `entityStore.entities.textSections[${ingestion?.attributes.textSectionId}]`
-  )?.attributes.name;
+  const sectionName = useFromStore({
+    path: `entityStore.entities.textSections[${ingestion?.attributes.textSectionId}]`
+  })?.attributes.name;
 
   const shouldRender =
     (!!sectionId && !!section) ||
diff --git a/client/src/frontend/components/entity/useEntityHeadContent/index.js b/client/src/frontend/components/entity/useEntityHeadContent/index.js
@@ -36,7 +36,7 @@ const maybePrepend = (entityTitle, prepend) => {
 
 export const useMetaTitle = (entity, parent, prepend) => {
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
 
   if (!entity?.attributes) return undefined;
 
diff --git a/client/src/frontend/components/issue/Detail.js b/client/src/frontend/components/issue/Detail.js
@@ -11,7 +11,7 @@ import Authorize from "hoc/Authorize";
 
 function Detail({ issue }) {
   const { isStandalone } = useFrontendModeContext();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings?.attributes?.general?.libraryDisabled;
 
   return (
diff --git a/client/src/frontend/components/preferences/NotificationsForm/index.js b/client/src/frontend/components/preferences/NotificationsForm/index.js
@@ -15,7 +15,7 @@ export default function NotificationsForm({
   preferences,
   setPreferences
 }) {
-  const authentication = useFromStore("authentication");
+  const authentication = useFromStore({ path: "authentication" });
   const { t } = useTranslation();
 
   const digestOpen = preferences?.digest !== "never";
diff --git a/client/src/frontend/components/privacy/AccountData/DeleteConfirm/index.js b/client/src/frontend/components/privacy/AccountData/DeleteConfirm/index.js
@@ -8,7 +8,7 @@ import Form from "global/components/form";
 import * as Styled from "./styles";
 
 export default function DeleteConfirm() {
-  const { currentUser } = useFromStore("authentication");
+  const { currentUser } = useFromStore({ path: "authentication" });
   const { t } = useTranslation();
   const dispatch = useDispatch();
 
diff --git a/client/src/frontend/components/privacy/CookiesForm/CookiesFormFields/index.js b/client/src/frontend/components/privacy/CookiesForm/CookiesFormFields/index.js
@@ -13,7 +13,7 @@ export default function CookiesFormFields({
   googleAnalyticsEnabled
 }) {
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
 
   const installationName = settings?.attributes?.general?.installationName;
 
diff --git a/client/src/frontend/components/privacy/CookiesForm/index.js b/client/src/frontend/components/privacy/CookiesForm/index.js
@@ -8,14 +8,14 @@ import * as Styled from "./styles";
 
 export default function CookiesForm() {
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
 
   const manifoldAnalyticsEnabled = !settings?.attributes?.general
     ?.disableInternalAnalytics;
   const googleAnalyticsEnabled = !!settings?.attributes?.integrations
     ?.gaFourTrackingId;
 
-  const { currentUser } = useFromStore("authentication") ?? {};
+  const { currentUser } = useFromStore({ path: "authentication" }) ?? {};
   const { consentManifoldAnalytics, consentGoogleAnalytics } =
     currentUser.attributes ?? {};
 
diff --git a/client/src/frontend/components/project/Detail.js b/client/src/frontend/components/project/Detail.js
@@ -10,7 +10,7 @@ import { useFromStore, useFrontendModeContext } from "hooks";
 
 function Detail({ project }) {
   const { isStandalone } = useFrontendModeContext();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings.attributes.general.libraryDisabled;
 
   return (
diff --git a/client/src/frontend/components/reading-group/headings/Groups/index.js b/client/src/frontend/components/reading-group/headings/Groups/index.js
@@ -26,7 +26,7 @@ function GroupsHeading({ currentUser }) {
     attributes: {
       general: { disablePublicReadingGroups }
     }
-  } = useFromStore("settings", "select");
+  } = useFromStore({ requestKey: "settings", action: "select" });
 
   return (
     <header>
diff --git a/client/src/frontend/containers/DataUse/index.js b/client/src/frontend/containers/DataUse/index.js
@@ -3,7 +3,7 @@ import { useFromStore } from "hooks";
 import * as Styled from "./styles";
 
 export default function DataUseContainer() {
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const header = settings?.attributes?.theme?.stringDataUseHeader;
   const body = settings?.attributes?.stringDataUseCopyFormatted;
 
diff --git a/client/src/frontend/containers/Home/Content.js b/client/src/frontend/containers/Home/Content.js
@@ -7,7 +7,7 @@ import EntityCollection from "frontend/components/entity/Collection";
 import EntityCollectionPlaceholder from "global/components/entity/CollectionPlaceholder";
 
 export default function Content() {
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
 
   const { hasVisibleHomeProjectCollections, hasVisibleProjects } =
     settings?.attributes?.calculated ?? {};
diff --git a/client/src/frontend/containers/Home/Feature.js b/client/src/frontend/containers/Home/Feature.js
@@ -9,7 +9,7 @@ export default function HomeFeatureContainer({ features }) {
   const dispatch = useDispatch();
   const actions = commonActions(dispatch);
 
-  const authentication = useFromStore("authentication");
+  const authentication = useFromStore({ path: "authentication" });
 
   return features?.length ? (
     <Layout.Splash
diff --git a/client/src/frontend/containers/JournalDetail/index.js b/client/src/frontend/containers/JournalDetail/index.js
@@ -33,7 +33,7 @@ function JournalDetailContainer({ journal }) {
   });
 
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings?.attributes?.general?.libraryDisabled;
 
   const { titlePlaintext, slug } = journal?.attributes || {};
diff --git a/client/src/frontend/containers/JournalIssuesList/index.js b/client/src/frontend/containers/JournalIssuesList/index.js
@@ -19,7 +19,7 @@ export default function JournalIssuesList({ journal }) {
   });
 
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings?.attributes?.general?.libraryDisabled;
 
   const { titlePlaintext, slug } = journal?.attributes || {};
diff --git a/client/src/frontend/containers/JournalVolumesList/index.js b/client/src/frontend/containers/JournalVolumesList/index.js
@@ -20,7 +20,7 @@ export default function JournalVolumesList({ journal }) {
   });
 
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings?.attributes?.general?.libraryDisabled;
 
   const { titlePlaintext, slug } = journal?.attributes ?? {};
diff --git a/client/src/frontend/containers/ProjectWrapper/index.js b/client/src/frontend/containers/ProjectWrapper/index.js
@@ -17,7 +17,7 @@ export default function ProjectWrapper({ route }) {
   const { path } = useRouteMatch();
   const location = useLocation();
   const isHomePage = location.pathname === path;
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings?.attributes?.general?.libraryDisabled;
 
   useRedirectToFirstMatch({
diff --git a/client/src/frontend/containers/Projects/index.js b/client/src/frontend/containers/Projects/index.js
@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import CollectionNavigation from "frontend/components/CollectionNavigation";
-import { projectsAPI } from "api";
+import { projectsAPI, requests } from "api";
 import EntityCollectionPlaceholder from "global/components/entity/CollectionPlaceholder";
 import EntityCollection from "frontend/components/entity/Collection";
 import HeadContent from "global/components/HeadContent";
@@ -13,7 +13,10 @@ import {
 } from "hooks";
 
 export default function ProjectsContainer() {
-  const subjects = useFromStore("feSubjects", "select");
+  const subjects = useFromStore({
+    requestKey: requests.feSubjects,
+    action: "select"
+  });
 
   const filterReset = useMemo(() => ({ standaloneModeEnforced: "false" }), []);
 
diff --git a/client/src/frontend/containers/PublicReadingGroups/Wrapper.js b/client/src/frontend/containers/PublicReadingGroups/Wrapper.js
@@ -9,7 +9,7 @@ function PublicReadingGroupsContainer({ route }) {
     attributes: {
       general: { disablePublicReadingGroups }
     }
-  } = useFromStore("settings", "select");
+  } = useFromStore({ requestKey: "settings", action: "select" });
 
   const navigate = useNavigate();
   const { pathname } = useLocation();
diff --git a/client/src/frontend/containers/ReadingGroup/index.js b/client/src/frontend/containers/ReadingGroup/index.js
@@ -22,7 +22,7 @@ export default function ReadingGroup({ route }) {
   const { t } = useTranslation();
   const dispatch = useDispatch();
 
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
 
   const [fetchVersion, setFetchVersion] = useState(1);
 
diff --git a/client/src/frontend/containers/Subscriptions/index.js b/client/src/frontend/containers/Subscriptions/index.js
@@ -12,7 +12,7 @@ import * as Styled from "./styles";
 
 export default function SubscriptionsContainer() {
   const { t } = useTranslation();
-  const { currentUser } = useFromStore("authentication") ?? {};
+  const { currentUser } = useFromStore({ path: "authentication" }) ?? {};
   const [preferences, setPreferences] = useState(
     currentUser?.attributes?.notificationPreferences
   );
diff --git a/client/src/frontend/containers/VolumeDetail/index.js b/client/src/frontend/containers/VolumeDetail/index.js
@@ -19,7 +19,7 @@ function VolumeDetailContainer({ journal }) {
   });
 
   const { t } = useTranslation();
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const libraryDisabled = settings?.attributes?.general?.libraryDisabled;
 
   const { titlePlaintext, slug: journalSlug } = journal?.attributes ?? {};
diff --git a/client/src/global/components/Annotation/Annotation/UserContent/Flag/Modal.js b/client/src/global/components/Annotation/Annotation/UserContent/Flag/Modal.js
@@ -51,7 +51,9 @@ export default function FlagAnnotationModal({
     "button-icon-secondary"
   );
 
-  const colorScheme = useFromStore("ui.persistent.reader.colors.colorScheme");
+  const colorScheme = useFromStore({
+    path: "ui.persistent.reader.colors.colorScheme"
+  });
   const styleType = colorScheme === "dark" ? "secondary" : "primary";
 
   return (
diff --git a/client/src/global/components/CookiesBanner/AnonymousUser.js b/client/src/global/components/CookiesBanner/AnonymousUser.js
@@ -16,7 +16,7 @@ export default function AnonymousUserBanner() {
     setConsentNeeded(!hasConsentCookie);
   }, []);
 
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const { manifoldAnalyticsEnabled, googleAnalyticsEnabled } =
     settings?.attributes?.calculated ?? {};
 
diff --git a/client/src/global/components/CookiesBanner/CurrentUser.js b/client/src/global/components/CookiesBanner/CurrentUser.js
@@ -5,11 +5,11 @@ import { meAPI } from "api";
 import NarrowBanner from "./NarrowBanner";
 
 export default function CurrentUserBanner() {
-  const { currentUser } = useFromStore("authentication");
+  const { currentUser } = useFromStore({ path: "authentication" });
   const { consentNeededManifoldAnalytics, consentNeededGoogleAnalytics } =
     currentUser?.attributes ?? {};
 
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const { manifoldAnalyticsEnabled, googleAnalyticsEnabled } =
     settings?.attributes?.calculated ?? {};
 
diff --git a/client/src/global/components/CookiesBanner/FormEmbedBanner.js b/client/src/global/components/CookiesBanner/FormEmbedBanner.js
@@ -11,7 +11,7 @@ export default function FormEmbedBanner({ declineAll, save, message }) {
   const [prefs, setPrefs] = useState({ manifold: false, google: false });
   const onChange = pref => setPrefs({ ...prefs, [pref]: !prefs[pref] });
 
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const { manifoldAnalyticsEnabled, googleAnalyticsEnabled } =
     settings?.attributes?.calculated ?? {};
 
diff --git a/client/src/global/components/CookiesBanner/index.js b/client/src/global/components/CookiesBanner/index.js
@@ -4,9 +4,9 @@ import CurrentUserBanner from "./CurrentUser";
 import AnonymousUserBanner from "./AnonymousUser";
 
 export default function CookiesBanner() {
-  const { currentUser } = useFromStore("authentication");
+  const { currentUser } = useFromStore({ path: "authentication" });
 
-  const settings = useFromStore("settings", "select");
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
   const { manifoldAnalyticsEnabled, googleAnalyticsEnabled } =
     settings?.attributes?.calculated ?? {};
 
diff --git a/client/src/global/components/drawer/Content/index.js b/client/src/global/components/drawer/Content/index.js
@@ -28,7 +28,7 @@ function DrawerContent(props, ref) {
     open
   } = props;
 
-  const connected = useFromStore("websocket.connected");
+  const connected = useFromStore({ path: "websocket.connected" });
   usePreventBodyScroll(lockScroll && open);
 
   // Waits for animation to finish before focusing in trap.
diff --git a/client/src/global/components/navigation/Primary.js b/client/src/global/components/navigation/Primary.js
@@ -16,12 +16,12 @@ export default function NavigationPrimary(props) {
 
   const label = getAdminModeLabel({ currentUser, mode: props.mode, t });
 
-  const resources = useFromStore(`entityStore.entities.resources`);
-  const resourceCollections = useFromStore(
-    `entityStore.entities.resourceCollections`
-  );
-  const pages = useFromStore(`entityStore.entities.pages`);
-  const texts = useFromStore(`entityStore.entities.texts`);
+  const resources = useFromStore({ path: `entityStore.entities.resources` });
+  const resourceCollections = useFromStore({
+    path: `entityStore.entities.resourceCollections`
+  });
+  const pages = useFromStore({ path: `entityStore.entities.pages` });
+  const texts = useFromStore({ path: `entityStore.entities.texts` });
 
   const to = getDestinationPath({
     mode: props.mode,
diff --git a/client/src/global/components/sign-in-up/AcceptTerms/index.js b/client/src/global/components/sign-in-up/AcceptTerms/index.js
@@ -2,14 +2,15 @@ import React, { useState } from "react";
 import { useTranslation, Trans } from "react-i18next";
 import AcceptTermsCheckbox from "./AcceptTermsCheckbox";
 import { useFromStore } from "hooks";
+import { requests } from "api";
 import PropTypes from "prop-types";
 import * as Styled from "./styles";
 
 export default function AcceptTerms({ handleViewChange }) {
   const [accepted, setAccepted] = useState(false);
   const { t } = useTranslation();
-  const pages = useFromStore("gPages", "select");
-  const settings = useFromStore("settings", "select");
+  const pages = useFromStore({ requestKey: requests.gPages, action: "select" });
+  const settings = useFromStore({ requestKey: "settings", action: "select" });
 
   const { attributes } = settings ?? {};
   const installationName = attributes?.general?.installationName;
diff --git a/client/src/global/components/sign-in-up/CreateUserForm/index.js b/client/src/global/components/sign-in-up/CreateUserForm/index.js
@@ -1,7 +1,7 @@
 import React, { useRef, useCallback, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import { usersAPI } from "api";
+import { usersAPI, requests } from "api";
 import { currentUserActions } from "actions";
 import { useFromStore } from "hooks";
 import CreateFormFields from "./CreateFormFields";
@@ -19,7 +19,7 @@ export default function CreateUserForm({
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const location = useLocation();
-  const authentication = useFromStore("authentication");
+  const authentication = useFromStore({ path: "authentication" });
   const { currentUser } = authentication ?? {};
 
   const emailRef = useRef();
@@ -32,7 +32,7 @@ export default function CreateUserForm({
     [dispatch]
   );
 
-  const pages = useFromStore("gPages", "select");
+  const pages = useFromStore({ requestKey: requests.gPages, action: "select" });
   const termsPage = pages?.find(
     p => p.attributes.purpose === "terms_and_conditions"
   );
diff --git a/client/src/global/components/sign-in-up/EditProfileForm/index.js b/client/src/global/components/sign-in-up/EditProfileForm/index.js
diff --git a/client/src/global/components/sign-in-up/Interface/index.js b/client/src/global/components/sign-in-up/Interface/index.js
diff --git a/client/src/global/components/sign-in-up/LoginForm/index.js b/client/src/global/components/sign-in-up/LoginForm/index.js
diff --git a/client/src/global/components/sign-in-up/Logout/index.js b/client/src/global/components/sign-in-up/Logout/index.js
diff --git a/client/src/global/components/sign-in-up/Overlay/Content.js b/client/src/global/components/sign-in-up/Overlay/Content.js
diff --git a/client/src/global/components/sign-in-up/oauth/OAuthLoginOptions/index.js b/client/src/global/components/sign-in-up/oauth/OAuthLoginOptions/index.js
diff --git a/client/src/global/components/sign-in-up/oauth/OAuthMonitor/index.js b/client/src/global/components/sign-in-up/oauth/OAuthMonitor/index.js
diff --git a/client/src/global/components/sign-in-up/oauth/OAuthProviderButton/index.js b/client/src/global/components/sign-in-up/oauth/OAuthProviderButton/index.js
diff --git a/client/src/hoc/analytics/hooks/useGoogleAnalytics.js b/client/src/hoc/analytics/hooks/useGoogleAnalytics.js
diff --git a/client/src/hoc/analytics/hooks/useManifoldAnalytics.js b/client/src/hoc/analytics/hooks/useManifoldAnalytics.js
diff --git a/client/src/hooks/useFromStore/index.js b/client/src/hooks/useFromStore/index.js
diff --git a/client/src/hooks/useShare.js b/client/src/hooks/useShare.js
diff --git a/client/src/hooks/useShowJournalsActive/index.js b/client/src/hooks/useShowJournalsActive/index.js
diff --git a/client/src/reader/components/Header/menus/SiteNav/index.js b/client/src/reader/components/Header/menus/SiteNav/index.js
diff --git a/client/src/reader/components/return-menu/Body/index.js b/client/src/reader/components/return-menu/Body/index.js
diff --git a/client/src/reader/containers/ReaderNotes/index.js b/client/src/reader/containers/ReaderNotes/index.js

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,9 @@ export default function EditSectionForm({`
`107`	`107`	`}`
`108`	`108`	`}, [initialSlateValue, t]);`
`109`	`109`
`110`		- const stylesheetData = useFromStore(`entityStore.entities.stylesheets`);
	`110`	`+ const stylesheetData = useFromStore({`
	`111`	+ path: `entityStore.entities.stylesheets`
	`112`	`+ });`
`111`	`113`	`const stylesheetDataKeys = stylesheetData ? Object.keys(stylesheetData) : [];`
`112`	`114`
`113`	`115`	`const appliedStylesheets = stylesheetDataKeys`