@webitel/ui-datalist 1.1.69 → 1.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/ui-datalist",
-	"version": "1.1.69",
+	"version": "1.1.70",
 	"description": "Toolkit for building data lists in webitel ui system",
 	"scripts": {
 		"build:types": "vue-tsc -b tsconfig.build.json",

package/src/modules/filter-presets/stores/__tests__/createFilterPresetsStore.spec.ts

@@ -0,0 +1,58 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { createFilterPresetsStore } from '../createFilterPresetsStore';
+
+const NAMESPACE = 'test';
+const STORAGE_KEY = `${NAMESPACE}/presets/preset`;
+const CACHED_PRESET_ID = 42;
+
+const setupStore = async () => {
+	const store = createFilterPresetsStore(NAMESPACE)();
+	await store.setupPresetPersistence();
+
+	return store;
+};
+
+describe('filter presets persistence', () => {
+	beforeEach(() => {
+		setActivePinia(createPinia());
+		localStorage.clear();
+	});
+
+	it('restores the cached preset id', async () => {
+		localStorage.setItem(STORAGE_KEY, String(CACHED_PRESET_ID));
+
+		const store = await setupStore();
+
+		expect(store.presetId).toBe(CACHED_PRESET_ID);
+	});
+
+	/*
+   restore() snapshots the value through onStore before reading the storages,
+    so an onStore that clears used to delete the cached preset on every setup
+   */
+	it('keeps the cached preset id stored while restoring it', async () => {
+		localStorage.setItem(STORAGE_KEY, String(CACHED_PRESET_ID));
+
+		await setupStore();
+
+		expect(localStorage.getItem(STORAGE_KEY)).toBe(String(CACHED_PRESET_ID));
+	});
+
+	it('leaves presetId empty when nothing is cached, instead of NaN', async () => {
+		const store = await setupStore();
+
+		expect(store.presetId).toBeNull();
+	});
+
+	it('drops the cached preset on resetPreset', async () => {
+		localStorage.setItem(STORAGE_KEY, String(CACHED_PRESET_ID));
+		const store = await setupStore();
+
+		await store.resetPreset();
+
+		expect(store.presetId).toBeNull();
+		expect(localStorage.getItem(STORAGE_KEY)).toBeNull();
+	});
+});

package/src/modules/filter-presets/stores/createFilterPresetsStore.ts

@@ -28,6 +28,8 @@ export const filterPresetsStoreBody = (namespace = 'presets') => {
 
 	const presetId = ref<number | null>(null);
 
+	let resetPersistedPreset: (() => Promise<void>) | null = null;
+
 	const setupPresetPersistence = async () => {
 		const { restore: restorePreset, reset } = usePersistedStorage({
 			name: 'preset',
@@ -36,11 +38,15 @@ export const filterPresetsStoreBody = (namespace = 'presets') => {
 				PersistedStorageType.LocalStorage,
 			],
 			storagePath: presetsNamespace,
-			onStore: (save, { name }) => {
+			/*
+     side-effect free on purpose: serialize() runs this path merely to snapshot
+      the value, so clearing the storage from here wipes the cached preset
+      before restore() gets to read it
+     */
+			onStore: async (save, { name }) => {
 				const value = presetId.value;
-				if (!value) {
-					return reset();
-				}
+				if (!value) return;
+
 				return save({
 					name,
 					value,
@@ -48,9 +54,13 @@ export const filterPresetsStoreBody = (namespace = 'presets') => {
 			},
 			onRestore: async (restore, name) => {
 				const value = await restore(name);
-				presetId.value = Number(value);
+				/* absent key resolves undefined, and Number(undefined) is NaN */
+				if (value) presetId.value = Number(value);
 			},
 		});
+
+		resetPersistedPreset = reset;
+
 		await restorePreset();
 	};
 
@@ -59,8 +69,10 @@ export const filterPresetsStoreBody = (namespace = 'presets') => {
 		presetsTableConfig,
 	);
 
-	const resetPreset = () => {
+	/* onStore no longer clears, so dropping the cached preset is explicit */
+	const resetPreset = async () => {
 		presetId.value = null;
+		await resetPersistedPreset?.();
 	};
 
 	return {

package/src/modules/persist/PersistedStorage.types.ts

@@ -36,6 +36,10 @@ export interface PersistedPropertyConfig {
 	storagePath?: string;
 	startWatchManually?: boolean;
 	watchConfig?: WatchOptions;
+	// must be side-effect free apart from the `save` it is handed: serialize()
+	// runs this path with a `save` that only captures, so touching the storages
+	// from here mutates them at snapshot time – including before restore() has
+	// read them
 	onStore?: (
 		save: ({
 			name,