refactor: Move useSettings to settings provider

CrawlerCode · CrawlerCode · commit 98d547d721f9 · 2025-02-07T21:09:27.000+01:00
diff --git a/src/components/issues/AddIssueNotesModal.tsx b/src/components/issues/AddIssueNotesModal.tsx
@@ -4,8 +4,8 @@ import { FastField, Form, Formik, FormikProps } from "formik";
 import { useRef } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import * as Yup from "yup";
-import useSettings from "../../hooks/useSettings";
 import { useRedmineApi } from "../../provider/RedmineApiProvider";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TIssue, TRedmineError, TUpdateIssue } from "../../types/redmine";
 import Button from "../general/Button";
 import LoadingSpinner from "../general/LoadingSpinner";
diff --git a/src/components/issues/CreateIssueModal.tsx b/src/components/issues/CreateIssueModal.tsx
@@ -8,8 +8,8 @@ import useIssuePriorities from "../../hooks/useIssuePriorities";
 import useIssueTrackers from "../../hooks/useIssueTrackers";
 import useMyUser from "../../hooks/useMyUser";
 import useProject from "../../hooks/useProject";
-import useSettings from "../../hooks/useSettings";
 import { useRedmineApi } from "../../provider/RedmineApiProvider";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TCreateIssue, TRedmineError } from "../../types/redmine";
 import Button from "../general/Button";
 import DateField, { shouldUpdate as shouldUpdateDateField } from "../general/DateField";
diff --git a/src/components/issues/CreateTimeEntryModal.tsx b/src/components/issues/CreateTimeEntryModal.tsx
@@ -8,10 +8,10 @@ import * as Yup from "yup";
 import useMyProjectRoles from "../../hooks/useMyProjectRoles";
 import useMyUser from "../../hooks/useMyUser";
 import useProject from "../../hooks/useProject";
-import useSettings from "../../hooks/useSettings";
 import useStorage from "../../hooks/useStorage";
 import useTimeEntryActivities from "../../hooks/useTimeEntryActivities";
 import { useRedmineApi } from "../../provider/RedmineApiProvider";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TCreateTimeEntry, TIssue, TRedmineError, TUpdateIssue } from "../../types/redmine";
 import { clsxm } from "../../utils/clsxm";
 import { formatHoursUsually } from "../../utils/date";
diff --git a/src/components/issues/EditIssueModal.tsx b/src/components/issues/EditIssueModal.tsx
@@ -8,8 +8,8 @@ import * as Yup from "yup";
 import useIssue from "../../hooks/useIssue";
 import useIssueStatuses from "../../hooks/useIssueStatuses";
 import useIssueTrackers from "../../hooks/useIssueTrackers";
-import useSettings from "../../hooks/useSettings";
 import { useRedmineApi } from "../../provider/RedmineApiProvider";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TCreateIssue, TIssue, TRedmineError, TUpdateIssue } from "../../types/redmine";
 import Button from "../general/Button";
 import DateField, { shouldUpdate as shouldUpdateDateField } from "../general/DateField";
diff --git a/src/components/issues/Issue.tsx b/src/components/issues/Issue.tsx
@@ -5,8 +5,8 @@ import clsx from "clsx";
 import { useRef, useState } from "react";
 import { FormattedMessage, PrimitiveType, useIntl } from "react-intl";
 import { Tooltip } from "react-tooltip";
-import useSettings from "../../hooks/useSettings";
 import { Timer } from "../../hooks/useTimers";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TIssue } from "../../types/redmine";
 import { clsxm } from "../../utils/clsxm";
 import ContextMenu from "../general/ContextMenu";
diff --git a/src/components/issues/IssueTimer.tsx b/src/components/issues/IssueTimer.tsx
@@ -5,8 +5,8 @@ import clsx from "clsx";
 import { Ref, useEffect, useImperativeHandle, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Tooltip } from "react-tooltip";
-import useSettings from "../../hooks/useSettings";
 import { Timer } from "../../hooks/useTimers";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TIssue } from "../../types/redmine";
 import { formatTimer, roundTimeNearestInterval } from "../../utils/date";
 import Button from "../general/Button";
diff --git a/src/components/issues/IssuesList.tsx b/src/components/issues/IssuesList.tsx
@@ -9,8 +9,8 @@ import useMyProjectRoles from "../../hooks/useMyProjectRoles";
 import useMyProjects from "../../hooks/useMyProjects";
 import useMyUser from "../../hooks/useMyUser";
 import useProjectVersions from "../../hooks/useProjectVersions";
-import useSettings from "../../hooks/useSettings";
 import useTimers from "../../hooks/useTimers";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TIssue, TProject, TReference } from "../../types/redmine";
 import { getGroupedIssues, getSortedIssues } from "../../utils/issue";
 import CreateIssueModal from "./CreateIssueModal";
diff --git a/src/components/issues/Search.tsx b/src/components/issues/Search.tsx
@@ -4,7 +4,7 @@ import { ReactNode, Ref, useImperativeHandle, useRef, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import useDebounce from "../../hooks/useDebounce";
 import useHotKey from "../../hooks/useHotkey";
-import useSettings from "../../hooks/useSettings";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TReference } from "../../types/redmine";
 import InputField from "../general/InputField";
 
diff --git a/src/components/time/EditTimeEntryModal.tsx b/src/components/time/EditTimeEntryModal.tsx
@@ -6,9 +6,9 @@ import { useRef } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import * as Yup from "yup";
 import useIssue from "../../hooks/useIssue";
-import useSettings from "../../hooks/useSettings";
 import useTimeEntryActivities from "../../hooks/useTimeEntryActivities";
 import { useRedmineApi } from "../../provider/RedmineApiProvider";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TRedmineError, TTimeEntry, TUpdateTimeEntry } from "../../types/redmine";
 import { clsxm } from "../../utils/clsxm";
 import { formatHoursUsually } from "../../utils/date";
diff --git a/src/components/time/TimeEntryContextMenu.tsx b/src/components/time/TimeEntryContextMenu.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ComponentProps, useState } from "react";
 import { useIntl } from "react-intl";
 import useMyProjectRoles from "../../hooks/useMyProjectRoles";
-import useSettings from "../../hooks/useSettings";
+import { useSettings } from "../../provider/SettingsProvider";
 import { TTimeEntry } from "../../types/redmine";
 import ContextMenu from "../general/ContextMenu";
 import EditTimeEntryModal from "./EditTimeEntryModal";
diff --git a/src/hooks/useActiveRedmineTab.ts b/src/hooks/useActiveRedmineTab.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import useSettings from "./useSettings";
+import { useSettings } from "../provider/SettingsProvider";
 
 function useActiveRedmineTab() {
   const { settings } = useSettings();
diff --git a/src/hooks/useFormatHours.ts b/src/hooks/useFormatHours.ts
@@ -1,6 +1,6 @@
 import { useIntl } from "react-intl";
+import { useSettings } from "../provider/SettingsProvider";
 import { formatHoursUsually } from "../utils/date";
-import useSettings from "./useSettings";
 
 const useFormatHours = () => {
   const { formatMessage, formatNumber } = useIntl();
diff --git a/src/hooks/useMyUser.ts b/src/hooks/useMyUser.ts
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { useRedmineApi } from "../provider/RedmineApiProvider";
-import useSettings from "./useSettings";
+import { useSettings } from "../provider/SettingsProvider";
 
 type Options = {
   staleTime?: number;
diff --git a/src/hooks/useRedmineUrl.ts b/src/hooks/useRedmineUrl.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import useSettings from "./useSettings";
+import { useSettings } from "../provider/SettingsProvider";
 
 function useRedmineUrl() {
   const { settings } = useSettings();
diff --git a/src/hooks/useSearch.ts b/src/hooks/useSearch.ts
@@ -2,9 +2,9 @@ import { keepPreviousData } from "@tanstack/react-query";
 import { FilterQuery } from "../components/issues/Filter";
 import { SearchQuery } from "../components/issues/Search";
 import { useRedmineApi } from "../provider/RedmineApiProvider";
+import { useSettings } from "../provider/SettingsProvider";
 import { TIssue } from "../types/redmine";
 import { useRedminePaginatedInfiniteQuery } from "./useRedminePaginatedInfiniteQuery";
-import useSettings from "./useSettings";
 
 const STALE_DATA_TIME = 1000 * 60;
 
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
diff --git a/src/hooks/useTimers.ts b/src/hooks/useTimers.ts
@@ -1,4 +1,4 @@
-import useSettings from "./useSettings";
+import { useSettings } from "../provider/SettingsProvider";
 import useStorage from "./useStorage";
 
 type TimerData = {
diff --git a/src/pages/IssuesPage.tsx b/src/pages/IssuesPage.tsx
@@ -11,8 +11,8 @@ import useIssuePriorities from "../hooks/useIssuePriorities";
 import useMyIssues from "../hooks/useMyIssues";
 import useProjectVersions from "../hooks/useProjectVersions";
 import useSearch from "../hooks/useSearch";
-import useSettings from "../hooks/useSettings";
 import useTimers from "../hooks/useTimers";
+import { useSettings } from "../provider/SettingsProvider";
 
 const IssuesPage = ({ search, filter, searchRef, isLoading: isPageLoading }: { search: SearchQuery; filter: FilterQuery; searchRef: RefObject<SearchRef | null>; isLoading: boolean }) => {
   const { formatMessage } = useIntl();
diff --git a/src/pages/SettingsPage.tsx b/src/pages/SettingsPage.tsx
@@ -16,9 +16,8 @@ import ReactSelectFormik from "../components/general/ReactSelectFormik";
 import Switch from "../components/general/Switch";
 import Toast from "../components/general/Toast";
 import useMyUser from "../hooks/useMyUser";
-import useSettings from "../hooks/useSettings";
 import { LANGUAGES } from "../provider/IntlProvider";
-import { Settings } from "../provider/SettingsProvider";
+import { Settings, useSettings } from "../provider/SettingsProvider";
 import { formatHoursUsually } from "../utils/date";
 
 const LANGUAGE_FLAGS: Record<(typeof LANGUAGES)[number], FlagComponent> = {
diff --git a/src/provider/IntlProvider.tsx b/src/provider/IntlProvider.tsx
@@ -2,7 +2,7 @@ import { setDefaultOptions } from "date-fns";
 import flatpickr from "flatpickr";
 import React, { ComponentProps, useEffect, useState } from "react";
 import { IntlProvider as ReactIntlProvider } from "react-intl";
-import useSettings from "../hooks/useSettings";
+import { useSettings } from "./SettingsProvider";
 
 import messagesEN from "../lang/en.json";
 
diff --git a/src/provider/RedmineApiProvider.tsx b/src/provider/RedmineApiProvider.tsx
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { ReactNode, createContext, use } from "react";
 import { RedmineApi } from "../api/redmine";
-import useSettings from "../hooks/useSettings";
+import { useSettings } from "./SettingsProvider";
 
 const RedmineApiContext = createContext<RedmineApi | null>(null);
 
@@ -28,7 +28,6 @@ const RedmineApiProvider = ({ children }: { children: ReactNode }) => {
   );
 };
 
-const useRedmineApi = () => use(RedmineApiContext)!;
+export const useRedmineApi = () => use(RedmineApiContext)!;
 
-export { useRedmineApi };
 export default RedmineApiProvider;
diff --git a/src/provider/SettingsProvider.tsx b/src/provider/SettingsProvider.tsx
@@ -1,5 +1,5 @@
 import deepmerge from "deepmerge";
-import { ReactNode, createContext } from "react";
+import { ReactNode, createContext, use } from "react";
 import useStorage from "../hooks/useStorage";
 
 export type Settings = {
@@ -61,7 +61,7 @@ const SettingsContext = createContext({
   setSettings: (_data: Settings) => undefined,
 });
 
-const SettingsProvider = ({ children }: { children: ReactNode }) => {
+export const SettingsProvider = ({ children }: { children: ReactNode }) => {
   const { data, setData } = useStorage<Settings>("settings", defaultSettings);
 
   // Migrate old settings TODO: Remove in future
@@ -92,5 +92,6 @@ const SettingsProvider = ({ children }: { children: ReactNode }) => {
   );
 };
 
-export { SettingsContext };
+export const useSettings = () => use(SettingsContext);
+
 export default SettingsProvider;
