@webitel/ui-datalist 1.1.55 → 1.1.57

package/src/modules/filters/modules/filterConfig/components/rating/rating-from-to-filter-value-field.vue

@@ -29,16 +29,15 @@ import { computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 type ModelValue = {
-	from: number;
-	to: number;
+	from: number | null;
+	to: number | null;
 };
-const model = defineModel<ModelValue>();
-if (!model.value) {
-	model.value = {
+const model = defineModel<ModelValue>({
+	default: (): ModelValue => ({
 		from: null,
 		to: null,
-	};
-}
+	}),
+});
 
 const emit = defineEmits<{
 	'update:invalid': [
@@ -56,7 +55,9 @@ const v$ = useVuelidate<{
 			from: {
 				required: requiredIf(() => !model.value.to),
 				maxValue: maxValue(
-					model?.value?.to && model.value.from > model.value.to
+					model.value.to &&
+						model.value.from !== null &&
+						model.value.from > model.value.to
 						? model.value.to
 						: Infinity,
 				),

package/src/modules/filters/modules/filterConfig/components/score/score-from-to-filter-value-field.vue

@@ -35,16 +35,15 @@ import { computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 type ModelValue = {
-	from: number;
-	to: number;
+	from: number | null;
+	to: number | null;
 };
-const model = defineModel<ModelValue>();
-if (!model.value) {
-	model.value = {
+const model = defineModel<ModelValue>({
+	default: (): ModelValue => ({
 		from: null,
 		to: null,
-	};
-}
+	}),
+});
 
 const props = withDefaults(
 	defineProps<{

package/src/modules/filters/modules/filterConfig/composables/booleanFilterToolkit.ts

@@ -23,12 +23,12 @@ export const usePrettifyBooleanValuePreview = (
 export const useBooleanFilterValueValidation = <
 	T extends BooleanFilterModelValue,
 >(
-	model: ModelRef<T>,
+	model: ModelRef<T | null | undefined>,
 ) => {
 	const v$ = useVuelidate(
 		computed(() => ({
 			model: {
-				required: (v: T) => !(!v && v !== false),
+				required: (v: T | null | undefined) => !(!v && v !== false),
 			},
 		})),
 		{

package/src/modules/filters/modules/filterConfig/composables/useQueueTypeOptions.ts

@@ -13,7 +13,8 @@ export function useQueueTypeOptions() {
 			// staging only https://webitel.atlassian.net/browse/WS-2
 			.filter(
 				([, value]) =>
-					import.meta.env.VITE_STAGING_ENV || value !== QueueType.IM_CHAT_QUEUE,
+					import.meta.env.VITE_STAGING_ENV === 'true' ||
+					value !== QueueType.IM_CHAT_QUEUE,
 			)
 			.map(([, value]) => ({
 				value,

package/src/modules/filters/modules/filterConfig/enums/options/AMDResultOptions.ts

@@ -39,4 +39,12 @@ export const AmdResultOptions: Array<FilterInitParams> = [
 		name: 'TIMEOUT',
 		value: 'TIMEOUT',
 	},
+	{
+		name: 'UNDEFINED',
+		value: 'UNDEFINED',
+	},
+	{
+		name: 'NO ANSWER',
+		value: 'NO ANSWER',
+	},
 ] as const;

package/src/modules/filters/scripts/utils.ts

@@ -18,14 +18,18 @@ const isLabelSnapshotKey = (snapshotKey: string): boolean =>
 const isValueSnapshotKey = (snapshotKey: string): boolean =>
 	snapshotKey.includes('_val');
 
-export const filterNameFromSnapshotKey = (snapshotKey: string): FilterName => {
+export const filterNameFromSnapshotKey = (
+	snapshotKey: string,
+): FilterName | undefined => {
 	if (isLabelSnapshotKey(snapshotKey))
 		return filterLabelFromSnapshotKey(snapshotKey);
 	if (isValueSnapshotKey(snapshotKey))
 		return filterValueFromSnapshotKey(snapshotKey);
 };
 
-export const filterValuePropFromSnapshotKey = (snapshotKey: string): string => {
+export const filterValuePropFromSnapshotKey = (
+	snapshotKey: string,
+): string | undefined => {
 	if (isLabelSnapshotKey(snapshotKey)) return 'label';
 	if (isValueSnapshotKey(snapshotKey)) return 'value';
 };

package/src/modules/headers/createTableHeadersStore.ts

@@ -11,6 +11,8 @@ import type {
 	useTableStoreConfig,
 } from '../types/tableStore.types';
 
+type SortSymbol = (typeof SortSymbols)[keyof typeof SortSymbols];
+
 interface TableHeadersStoreBodyParams {
 	rawHeaders: DatalistTableHeader[];
 	id: string;
@@ -74,7 +76,7 @@ export const tableHeadersStoreBody = ({
 			}
 		});
 
-		const newOrder = [];
+		const newOrder: number[] = [];
 		for (const field of orderedFields) {
 			const indices = arrayFieldOrder.get(field);
 			const next = indices?.shift();
@@ -153,9 +155,9 @@ export const tableHeadersStoreBody = ({
 		column,
 		options:
 			| {
-					order?: SortSymbols;
+					order?: SortSymbol;
 			  }
-			| SortSymbols = {},
+			| SortSymbol = {},
 	) => {
 		const getNextSortOrder = (sort) => {
 			switch (sort) {
@@ -188,7 +190,7 @@ export const tableHeadersStoreBody = ({
 			});
 		};
 
-		let order: SortSymbols;
+		let order: SortSymbol;
 
 		if (typeof options === 'string') {
 			order = options;

package/src/modules/pagination/createTablePaginationStore.ts

@@ -30,7 +30,7 @@ export const tablePaginationStoreBody = () => {
 			value: page,
 			onRestore: async (restore, name) => {
 				const value = await restore(name);
-				const numValue = +value;
+				const numValue = Number(value);
 				if (numValue) page.value = numValue;
 			},
 		});
@@ -40,7 +40,7 @@ export const tablePaginationStoreBody = () => {
 			value: size,
 			onRestore: async (restore, name) => {
 				const value = await restore(name);
-				const numValue = +value;
+				const numValue = Number(value);
 				if (numValue) size.value = numValue;
 			},
 		});

package/src/modules/permissions-page/scripts/PermissionsApiModule.ts

@@ -1,5 +1,4 @@
-import type { ApiModule } from '@webitel/ui-sdk/src/api/types/ApiModule';
-
+import type { TableApiModule } from '../../types/tableStore.types';
 import type {
 	PermissionEntity,
 	RawPermissionsApiModule,
@@ -13,9 +12,9 @@ import type {
  */
 export const PermissionsApiModule = (
 	rawApiModule: RawPermissionsApiModule,
-): ApiModule<PermissionEntity> => {
+): TableApiModule<PermissionEntity> => {
 	return {
 		getList: rawApiModule.getPermissionsList,
 		patch: rawApiModule.patchPermissions,
-	} as unknown as ApiModule<PermissionEntity>;
+	} as unknown as TableApiModule<PermissionEntity>;
 };

package/src/modules/permissions-page/stores/createPermissionsStore.ts

@@ -73,7 +73,7 @@ export const permissionsStoreBody = (
 	const parentId = ref<Id>();
 
 	const initialize: typeof tableStoreInitialize = (options) => {
-		parentId.value = options.parentId;
+		parentId.value = options?.parentId;
 		return tableStoreInitialize(options);
 	};
 
@@ -81,7 +81,7 @@ export const permissionsStoreBody = (
 		try {
 			await (
 				config.apiModule.patch as unknown as (payload: {
-					id: Id;
+					id: Id | undefined;
 					changes: PermissionsChange[];
 				}) => Promise<unknown>
 			)({
@@ -119,7 +119,7 @@ export const permissionsStoreBody = (
 		error.value = null;
 		isLoading.value = false;
 		resetInfiniteScrollTableParamsToDefaults();
-		parentId.value = null;
+		parentId.value = undefined;
 	};
 
 	return {

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

@@ -24,7 +24,9 @@ export interface StorageLike {
 
 export interface PersistedPropertyConfig {
 	name: string;
-	value: Ref<PersistableValue>;
+	// note: createTableHeadersStore passes a computed here, which the default
+	// restore path cannot write to
+	value: Ref<PersistableValue | null>;
 	storages?: PersistedStorageType | PersistedStorageType[];
 	storagePath?: string;
 	startWatchManually?: boolean;
@@ -40,7 +42,8 @@ export interface PersistedPropertyConfig {
 		{ value, name },
 	) => Promise<void>;
 	onRestore?: (
-		restore: (name: string) => Promise<PersistableValue>,
+		// resolves `undefined` when no storage held a value for `name`
+		restore: (name: string) => Promise<PersistableValue | undefined>,
 		name: string,
 	) => Promise<void>;
 }

package/src/modules/persist/useLocalStoragePersistedStorage.ts

@@ -7,15 +7,12 @@ const makePath = (storagePath: string, key: string) => `${storagePath}/${key}`;
 export const useLocalStoragePersistedStorage = ({
 	storagePath = '',
 }: {
-	storagePath: string;
+	storagePath?: string;
 }): StorageLike => {
 	const getItem = async (key: string) => {
 		const value = localStorage.getItem(makePath(storagePath, key));
-		try {
-			return value.split(separator).join();
-		} catch {
-			return value;
-		}
+		if (value === null) return null;
+		return value.split(separator).join();
 	};
 
 	const setItem = async (key: string, inputValue: string | string[]) => {

package/src/modules/persist/usePersistedStorage.ts

@@ -1,10 +1,11 @@
-import { watch } from 'vue';
+import { type WatchHandle, watch } from 'vue';
 
 import {
 	type PersistableValue,
 	type PersistedPropertyConfig,
 	type PersistedStorageController,
 	PersistedStorageType,
+	type StorageLike,
 } from './PersistedStorage.types';
 import { useLocalStoragePersistedStorage } from './useLocalStoragePersistedStorage';
 import { useRoutePersistedStorage } from './useRoutePersistedStorage';
@@ -20,25 +21,30 @@ export const usePersistedStorage = ({
 	onStore,
 	onRestore,
 }: PersistedPropertyConfig): PersistedStorageController => {
-	let unwatch = null;
+	let unwatch: WatchHandle | null = null;
 
-	const setItemFns = [];
-	const getItemFns: Array<(name: string) => Promise<PersistableValue>> = [];
-	const removeItemFns = [];
+	const setItemFns: StorageLike['setItem'][] = [];
+	const getItemFns: StorageLike['getItem'][] = [];
+	const removeItemFns: StorageLike['removeItem'][] = [];
 
+	// `null` entries are kept: callers below pick the first non-null value, so the
+	// per-storage misses have to stay in the list to preserve priority order.
 	const composedValueGetter = async (
 		name: string,
-	): Promise<PersistableValue[]> => {
+	): Promise<Array<PersistableValue | null>> => {
 		const settledResults = await Promise.allSettled(
 			getItemFns.map((getter) => getter(name)),
 		);
 
-		return settledResults.reduce((acc, result) => {
-			if (result.status === 'fulfilled') {
-				acc.push(result.value);
-			}
-			return acc;
-		}, [] as PersistableValue[]);
+		return settledResults.reduce(
+			(acc, result) => {
+				if (result.status === 'fulfilled') {
+					acc.push(result.value);
+				}
+				return acc;
+			},
+			[] as Array<PersistableValue | null>,
+		);
 	};
 
 	const storages = Array.isArray(configStorages)

package/src/modules/table/createTableStore.store.ts

@@ -93,7 +93,7 @@ export const tableStoreBody = <Entity extends Identifiable>(
 
 	const dataList: Ref<Entity[]> = ref([]);
 	const selected: Ref<Entity[]> = ref([]);
-	const error = ref(null);
+	const error = ref<unknown>(null);
 	const isLoading = ref(false);
 
 	const updateSelected = (value: Entity[]) => {
@@ -125,7 +125,7 @@ export const tableStoreBody = <Entity extends Identifiable>(
 		try {
 			const { items, next } = await apiModule.getList(params);
 
-			dataList.value = items;
+			dataList.value = items ?? [];
 
 			/**
 			 * @author: @Oleksandr Palonnyi
@@ -134,7 +134,7 @@ export const tableStoreBody = <Entity extends Identifiable>(
 			 *
 			 * link to refactor task - https://webitel.atlassian.net/browse/WTEL-8599
 			 * */
-			updateSelected(filterSelected(items));
+			updateSelected(filterSelected(items ?? []));
 
 			$patchPaginationStore({
 				next,
@@ -169,7 +169,7 @@ export const tableStoreBody = <Entity extends Identifiable>(
 		try {
 			const { items, next } = await apiModule.getList(params);
 
-			dataList.value.push(...items);
+			dataList.value.push(...(items ?? []));
 			$patchPaginationStore({
 				next,
 			});
@@ -191,7 +191,7 @@ export const tableStoreBody = <Entity extends Identifiable>(
 		set(changes, path, value);
 
 		try {
-			await apiModule.patch({
+			await apiModule.patch?.({
 				changes,
 				parentId: parentId.value,
 				id: item.id,
@@ -211,7 +211,7 @@ export const tableStoreBody = <Entity extends Identifiable>(
 					_els,
 				];
 		const deleteEl = (el: Entity) => {
-			return apiModule.delete({
+			return apiModule.delete?.({
 				id: el.id,
 				etag: el.etag,
 				parentId: parentId.value,

package/src/modules/types/tableStore.types.ts

@@ -17,8 +17,16 @@ export type DatalistTableHeader = WtTableHeader & {
 
 export type TrackSelectedRowBy<T> = (row: T) => T;
 
+/**
+ * Every method on {@link ApiModule} is optional, but a table store cannot load
+ * anything without `getList`, so it is required here. `patch`/`delete` stay
+ * optional and are called defensively.
+ */
+export type TableApiModule<Entity> = ApiModule<Entity> &
+	Required<Pick<ApiModule<Entity>, 'getList'>>;
+
 export interface useTableStoreConfig<Entity> {
-	apiModule: ApiModule<Entity>;
+	apiModule: TableApiModule<Entity>;
 	headers: DatalistTableHeader[];
 	disablePersistence?: boolean | [];
 	storeType?: DatalistStoreProviderType;