@drodil/backstage-plugin-qeta-react 3.53.2 → 3.53.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -15,6 +15,7 @@ const useUserSettings = () => {
|
|
|
15
15
|
const [settings, setSettings] = useState(DEFAULT_SETTINGS);
|
|
16
16
|
const [isLoaded, setIsLoaded] = useState(false);
|
|
17
17
|
const settingsRef = useRef(DEFAULT_SETTINGS);
|
|
18
|
+
const isUpdatingRef = useRef(false);
|
|
18
19
|
useEffect(() => {
|
|
19
20
|
settingsRef.current = settings;
|
|
20
21
|
}, [settings]);
|
|
@@ -24,15 +25,21 @@ const useUserSettings = () => {
|
|
|
24
25
|
const stored = snapshot.value;
|
|
25
26
|
if (stored) {
|
|
26
27
|
setSettings(stored);
|
|
28
|
+
settingsRef.current = stored;
|
|
27
29
|
}
|
|
28
30
|
setIsLoaded(true);
|
|
29
31
|
const subscription = bucket.observe$(STORAGE_KEY).subscribe({
|
|
30
32
|
next: (newSnapshot) => {
|
|
33
|
+
if (isUpdatingRef.current) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
31
36
|
const value = newSnapshot.value;
|
|
32
37
|
if (value) {
|
|
33
38
|
setSettings(value);
|
|
39
|
+
settingsRef.current = value;
|
|
34
40
|
} else {
|
|
35
41
|
setSettings(DEFAULT_SETTINGS);
|
|
42
|
+
settingsRef.current = DEFAULT_SETTINGS;
|
|
36
43
|
}
|
|
37
44
|
}
|
|
38
45
|
});
|
|
@@ -43,13 +50,21 @@ const useUserSettings = () => {
|
|
|
43
50
|
const updateSettings = useCallback(
|
|
44
51
|
async (updates) => {
|
|
45
52
|
const bucket = storageApi.forBucket(BUCKET_KEY);
|
|
46
|
-
const
|
|
47
|
-
const currentSettings = snapshot.value || DEFAULT_SETTINGS;
|
|
53
|
+
const currentSettings = settingsRef.current;
|
|
48
54
|
const newSettings = {
|
|
49
55
|
...currentSettings,
|
|
50
56
|
...updates
|
|
51
57
|
};
|
|
52
|
-
|
|
58
|
+
settingsRef.current = newSettings;
|
|
59
|
+
setSettings(newSettings);
|
|
60
|
+
isUpdatingRef.current = true;
|
|
61
|
+
try {
|
|
62
|
+
await bucket.set(STORAGE_KEY, newSettings);
|
|
63
|
+
} finally {
|
|
64
|
+
setTimeout(() => {
|
|
65
|
+
isUpdatingRef.current = false;
|
|
66
|
+
}, 100);
|
|
67
|
+
}
|
|
53
68
|
},
|
|
54
69
|
[storageApi]
|
|
55
70
|
);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUserSettings.esm.js","sources":["../../src/hooks/useUserSettings.ts"],"sourcesContent":["import { useApi } from '@backstage/core-plugin-api';\nimport {
|
|
1
|
+
{"version":3,"file":"useUserSettings.esm.js","sources":["../../src/hooks/useUserSettings.ts"],"sourcesContent":["import { storageApiRef, useApi } from '@backstage/core-plugin-api';\nimport { useCallback, useEffect, useRef, useState } from 'react';\nimport { ViewType } from '../components/ViewToggle/ViewToggle';\n\nexport type UserSettings = {\n autoSaveEnabled: boolean;\n filterPanelExpanded: Record<string, boolean>;\n viewType: Record<string, ViewType>;\n aiAnswerExpanded: boolean;\n usePagination: boolean;\n};\n\nconst DEFAULT_SETTINGS: UserSettings = {\n autoSaveEnabled: false,\n filterPanelExpanded: {},\n viewType: {},\n aiAnswerExpanded: false,\n usePagination: false,\n};\n\nconst BUCKET_KEY = 'qeta';\nconst STORAGE_KEY = 'qeta-user-settings';\n\nexport const useUserSettings = () => {\n const storageApi = useApi(storageApiRef);\n const [settings, setSettings] = useState<UserSettings>(DEFAULT_SETTINGS);\n const [isLoaded, setIsLoaded] = useState(false);\n const settingsRef = useRef<UserSettings>(DEFAULT_SETTINGS);\n const isUpdatingRef = useRef(false);\n\n useEffect(() => {\n settingsRef.current = settings;\n }, [settings]);\n\n useEffect(() => {\n const bucket = storageApi.forBucket(BUCKET_KEY);\n const snapshot = bucket.snapshot(STORAGE_KEY);\n const stored = snapshot.value as UserSettings | undefined;\n\n if (stored) {\n setSettings(stored);\n settingsRef.current = stored;\n }\n\n setIsLoaded(true);\n\n const subscription = bucket.observe$<UserSettings>(STORAGE_KEY).subscribe({\n next: newSnapshot => {\n if (isUpdatingRef.current) {\n return;\n }\n\n const value = newSnapshot.value as UserSettings | undefined;\n if (value) {\n setSettings(value);\n settingsRef.current = value;\n } else {\n setSettings(DEFAULT_SETTINGS);\n settingsRef.current = DEFAULT_SETTINGS;\n }\n },\n });\n\n return () => {\n subscription.unsubscribe();\n };\n }, [storageApi]);\n\n const updateSettings = useCallback(\n async (updates: Partial<UserSettings>) => {\n const bucket = storageApi.forBucket(BUCKET_KEY);\n const currentSettings = settingsRef.current;\n const newSettings = {\n ...currentSettings,\n ...(updates as Partial<UserSettings>),\n };\n settingsRef.current = newSettings;\n setSettings(newSettings);\n\n isUpdatingRef.current = true;\n try {\n await bucket.set(STORAGE_KEY, newSettings);\n } finally {\n setTimeout(() => {\n isUpdatingRef.current = false;\n }, 100);\n }\n },\n [storageApi],\n );\n\n const getSetting = useCallback(\n <K extends keyof UserSettings>(key: K): UserSettings[K] => {\n return settingsRef.current[key];\n },\n [],\n );\n\n const setSetting = useCallback(\n async <K extends keyof UserSettings>(\n key: K,\n value: UserSettings[K],\n ): Promise<void> => {\n await updateSettings({ [key]: value } as Partial<UserSettings>);\n },\n [updateSettings],\n );\n\n const resetSettings = useCallback(async () => {\n const bucket = storageApi.forBucket('qeta');\n await bucket.set(STORAGE_KEY, DEFAULT_SETTINGS);\n }, [storageApi]);\n\n return {\n settings,\n updateSettings,\n getSetting,\n setSetting,\n resetSettings,\n isLoaded,\n };\n};\n"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"frontend",
|
|
8
8
|
"backstage.io"
|
|
9
9
|
],
|
|
10
|
-
"version": "3.53.
|
|
10
|
+
"version": "3.53.3",
|
|
11
11
|
"main": "dist/index.esm.js",
|
|
12
12
|
"types": "dist/index.d.ts",
|
|
13
13
|
"prepublishOnly": "yarn tsc && yarn build",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@backstage/plugin-permission-common": "^0.9.3",
|
|
58
58
|
"@backstage/plugin-permission-react": "^0.4.39",
|
|
59
59
|
"@backstage/plugin-signals-react": "^0.0.18",
|
|
60
|
-
"@drodil/backstage-plugin-qeta-common": "^3.53.
|
|
60
|
+
"@drodil/backstage-plugin-qeta-common": "^3.53.3",
|
|
61
61
|
"@jsdevtools/rehype-toc": "^3.0.2",
|
|
62
62
|
"@material-ui/core": "^4.12.2",
|
|
63
63
|
"@material-ui/icons": "^4.11.3",
|