|
@@ -1,3 +1,4 @@
|
|
|
|
|
+import { LS_KEY_USER_SETTINGS } from '@/vdb/constants.js';
|
|
|
import { QueryClient, useMutation, useQuery } from '@tanstack/react-query';
|
|
import { QueryClient, useMutation, useQuery } from '@tanstack/react-query';
|
|
|
import { ColumnFiltersState } from '@tanstack/react-table';
|
|
import { ColumnFiltersState } from '@tanstack/react-table';
|
|
|
import React, { createContext, useEffect, useRef, useState } from 'react';
|
|
import React, { createContext, useEffect, useRef, useState } from 'react';
|
|
@@ -69,7 +70,6 @@ export interface UserSettingsContextType {
|
|
|
|
|
|
|
|
export const UserSettingsContext = createContext<UserSettingsContextType | undefined>(undefined);
|
|
export const UserSettingsContext = createContext<UserSettingsContextType | undefined>(undefined);
|
|
|
|
|
|
|
|
-const STORAGE_KEY = 'vendure-user-settings';
|
|
|
|
|
const SETTINGS_STORE_KEY = 'vendure.dashboard.userSettings';
|
|
const SETTINGS_STORE_KEY = 'vendure.dashboard.userSettings';
|
|
|
|
|
|
|
|
interface UserSettingsProviderProps {
|
|
interface UserSettingsProviderProps {
|
|
@@ -81,7 +81,7 @@ export const UserSettingsProvider: React.FC<UserSettingsProviderProps> = ({ quer
|
|
|
// Load settings from localStorage or use defaults
|
|
// Load settings from localStorage or use defaults
|
|
|
const loadSettings = (): UserSettings => {
|
|
const loadSettings = (): UserSettings => {
|
|
|
try {
|
|
try {
|
|
|
- const storedSettings = localStorage.getItem(STORAGE_KEY);
|
|
|
|
|
|
|
+ const storedSettings = localStorage.getItem(LS_KEY_USER_SETTINGS);
|
|
|
if (storedSettings) {
|
|
if (storedSettings) {
|
|
|
return { ...defaultSettings, ...JSON.parse(storedSettings) };
|
|
return { ...defaultSettings, ...JSON.parse(storedSettings) };
|
|
|
}
|
|
}
|
|
@@ -105,10 +105,7 @@ export const UserSettingsProvider: React.FC<UserSettingsProviderProps> = ({ quer
|
|
|
error,
|
|
error,
|
|
|
} = useQuery({
|
|
} = useQuery({
|
|
|
queryKey: ['user-settings', SETTINGS_STORE_KEY],
|
|
queryKey: ['user-settings', SETTINGS_STORE_KEY],
|
|
|
- queryFn: () => {
|
|
|
|
|
- console.log('runnign query, settingsStoreAvailable:', settingsStoreIsAvailable);
|
|
|
|
|
- return api.query(getSettingsStoreValueDocument, { key: SETTINGS_STORE_KEY });
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ queryFn: () => api.query(getSettingsStoreValueDocument, { key: SETTINGS_STORE_KEY }),
|
|
|
retry: false,
|
|
retry: false,
|
|
|
staleTime: 0,
|
|
staleTime: 0,
|
|
|
enabled: settingsStoreIsAvailable,
|
|
enabled: settingsStoreIsAvailable,
|
|
@@ -169,7 +166,7 @@ export const UserSettingsProvider: React.FC<UserSettingsProviderProps> = ({ quer
|
|
|
// Save settings to localStorage whenever they change
|
|
// Save settings to localStorage whenever they change
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
|
try {
|
|
try {
|
|
|
- localStorage.setItem(STORAGE_KEY, JSON.stringify(settings));
|
|
|
|
|
|
|
+ localStorage.setItem(LS_KEY_USER_SETTINGS, JSON.stringify(settings));
|
|
|
} catch (e) {
|
|
} catch (e) {
|
|
|
console.error('Failed to save user settings to localStorage', e);
|
|
console.error('Failed to save user settings to localStorage', e);
|
|
|
}
|
|
}
|