@webitel/api-services 26.8.24 → 26.8.25

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/api-services",
-	"version": "26.8.24",
+	"version": "26.8.25",
 	"private": false,
 	"repository": {
 		"type": "git",
@@ -68,8 +68,7 @@
 		"typedoc-github-wiki-theme": "^2.1.0",
 		"typescript": "5.8.2",
 		"vue-i18n": "^11.2.8",
-		"vue-tsc": "^2.2.10",
-		"webitel-sdk": "^25.4.3"
+		"vue-tsc": "^2.2.10"
 	},
 	"dependencies": {
 		"date-fns": "^4.1.0",

package/src/api/clients/devices/devices.ts

@@ -54,9 +54,11 @@ const getDevicesList = async (params: ApiParams) => {
 	const requestParams = applyTransform(params, [
 		merge(getDefaultGetParams()),
 		starToSearch('search'),
+		starToSearch('q'),
 		(params) => ({
 			...params,
-			q: params.search,
+			// filtersManager may pass `q` (Path A) or legacy `search`
+			q: params.q ?? params.search,
 		}),
 		sanitize(listFieldsToSend),
 		camelToSnake(),

package/src/api/defaults/index.ts

@@ -1,4 +1,3 @@
 export * from './getDefaultGetListResponse/getDefaultGetListResponse';
 export * from './getDefaultGetParams/getDefaultGetParams';
 export * from './getDefaultInstance/getDefaultInstance';
-export * from './getDefaultOpenAPIConfig/getDefaultOpenAPIConfig';

package/src/validations/device/device.validations.ts

@@ -0,0 +1,70 @@
+import type { ApiDevice } from '@webitel/api-services/gen/models';
+import { z } from 'zod';
+
+import { i18nIssue } from '../_shared/i18nIssue';
+import { flexibleLookupSchema } from '../_shared/lookup.validations';
+import type { ZodShape } from '../types';
+
+const ipv4Regex =
+	/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/;
+
+const macRegex = /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/;
+
+const optionalIpSchema = z
+	.string()
+	.optional()
+	.default('')
+	.refine((value) => {
+		if (!value) return true;
+		if (value === '127.0.0.1' || value === '0.0.0.0') return false;
+		return ipv4Regex.test(value);
+	}, i18nIssue('ipValidator'));
+
+const optionalMacSchema = z
+	.string()
+	.optional()
+	.default('')
+	.refine((value) => !value || macRegex.test(value), i18nIssue('macValidator'));
+
+/**
+ * Device card schema.
+ *
+ * Password is required only when creating (`id` absent) — an empty password on
+ * update means "keep the current one" (see DevicesAPI.preRequestHandler).
+ */
+export const deviceSchema = z
+	.object<ZodShape<ApiDevice>>({
+		id: z.string().optional(),
+		name: z.string().min(1).default(''),
+		account: z.string().min(1).default(''),
+		password: z.string().optional().default(''),
+		user: flexibleLookupSchema.optional().default({}),
+		ip: optionalIpSchema,
+		brand: z.string().optional().default(''),
+		model: z.string().optional().default(''),
+		mac: optionalMacSchema,
+		hotdesk: z.boolean().optional().default(false),
+		hotdesks: z.array(z.string()).optional().default([]),
+	})
+	.superRefine((data, ctx) => {
+		if (!data.id && !data.password) {
+			ctx.addIssue({
+				code: 'custom',
+				path: [
+					'password',
+				],
+				...i18nIssue('required'),
+			});
+		}
+
+		const hotdesks = data.hotdesks as string[] | undefined;
+		if (data.hotdesk && hotdesks?.some((hotdesk) => !/\w+/.test(hotdesk))) {
+			ctx.addIssue({
+				code: 'custom',
+				path: [
+					'hotdesks',
+				],
+				...i18nIssue('required'),
+			});
+		}
+	});

package/src/validations/index.ts

@@ -23,6 +23,7 @@ export * from './contactEmail/contactEmail.validations';
 export * from './contactGroup/contactGroup.validations';
 export * from './contactGroupCondition/contactGroupCondition.validations';
 export * from './contactPhone/contactPhone.validations';
+export * from './device/device.validations';
 export * from './OAuth/OAuth.validations';
 export * from './onlineSkill/onlineSkill.validations';
 export * from './queue/queue.rules';