@webitel/api-services 26.8.30 → 26.8.32

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/api-services",
-	"version": "26.8.30",
+	"version": "26.8.32",
 	"private": false,
 	"repository": {
 		"type": "git",

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

@@ -107,6 +107,10 @@ const getDevice = async ({ itemId: id }: GetItemParams) => {
 const preRequestHandler = (item: ApiParams) => {
 	const copy = deepCopy(item);
 	if (!copy.password) copy.password = undefined;
+	if (!copy.hotdesk) {
+		delete copy.hotdesk;
+		delete copy.hotdesks;
+	}
 	return copy;
 };
 

package/src/validations/_shared/__tests__/phoneNumber.validations.spec.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+
+import { phoneNumberSchema } from '../phoneNumber.validations';
+
+const symbolsIssue = expect.objectContaining({
+	code: 'custom',
+	params: {
+		i18nKey: 'phoneNumberSymbolsValidator',
+	},
+});
+
+describe('phoneNumberSchema', () => {
+	it.each([
+		'380000000000',
+		'+380000000000',
+		'sip',
+		'SIP',
+		'user_name',
+		'1-800-FLOWERS',
+		"a.b!c~d*e'f(g)",
+		'+(044)123-45-67',
+	])('accepts %j', (value) => {
+		expect(phoneNumberSchema.safeParse(value).success).toBe(true);
+	});
+
+	it.each([
+		'+',
+		'++380',
+		'380+',
+		'38+0',
+		'380 000',
+		' 380',
+		'380\n',
+		'user@host',
+		'#123',
+		'1/2',
+		'a,b',
+		'номер',
+	])('rejects %j with the symbols issue', (value) => {
+		const result = phoneNumberSchema.safeParse(value);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues).toEqual([
+			symbolsIssue,
+		]);
+	});
+
+	it('reports only required for an empty value', () => {
+		const result = phoneNumberSchema.safeParse('');
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues).toHaveLength(1);
+		expect(result.error?.issues[0].code).toBe('too_small');
+	});
+});

package/src/validations/_shared/phoneNumber.validations.ts

@@ -0,0 +1,27 @@
+import { z } from 'zod';
+
+import { i18nIssue } from './i18nIssue';
+
+/**
+ * Dialable number charset: latin letters, digits and `+ - _ . ! ~ * ' ( )`;
+ * `+` only as a leading sign. Shared by all phone-shaped fields (member
+ * destination, resource number, csv imports).
+ *
+ * [WTEL-9678](https://webitel.atlassian.net/browse/WTEL-9678),
+ * [WTEL-10374](https://webitel.atlassian.net/browse/WTEL-10374)
+ */
+const phoneNumberPattern = /^\+?[A-Za-z0-9\-_.!~*'()]+$/;
+
+/**
+ * Required phone-shaped value.
+ *
+ * `refine`, not `regex`: only a `custom` issue passes `params.i18nKey` to the ui.
+ * Empty string passes the refinement, so a blank field reports only `required`.
+ */
+export const phoneNumberSchema = z
+	.string()
+	.min(1)
+	.refine(
+		(value) => value === '' || phoneNumberPattern.test(value),
+		i18nIssue('phoneNumberSymbolsValidator'),
+	);

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

@@ -43,8 +43,10 @@ export const deviceSchema = z
 		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([]),
+		// No defaults — regular devices must omit these (see DevicesAPI.preRequestHandler / WTEL-10460).
+		// Hotdesk create sets them in opened-device via applyHotdeskDefaults.
+		hotdesk: z.boolean().optional(),
+		hotdesks: z.array(z.string()).optional(),
 	})
 	.superRefine((data, ctx) => {
 		if (!data.id && !data.password) {

package/src/validations/index.ts

@@ -2,6 +2,7 @@ export * from './_shared/clearableNumber.validations';
 export * from './_shared/duration.validations';
 export * from './_shared/i18nIssue';
 export * from './_shared/lookup.validations';
+export * from './_shared/phoneNumber.validations';
 export * from './_shared/variablePair.validations';
 export * from './adjunctType/adjunctType.validations';
 export * from './auditForm/auditForm.validations';

package/src/validations/queueMember/memberCommunication.validations.ts

@@ -4,16 +4,21 @@ import {
 	filledLookupSchema,
 	flexibleLookupSchema,
 } from '../_shared/lookup.validations';
+import { phoneNumberSchema } from '../_shared/phoneNumber.validations';
 
 /**
- * Carried over verbatim from the admin app's `digitsDtmfOnly` validator.
- *
- * NB the character class allows a literal `|` as well as digits and `w`/`W` —
- * `[\d|w|W]` was almost certainly meant to be `[\dwW]`. Preserved as-is:
- * tightening it would start rejecting values that save today.
+ * Copied as-is from admin's `digitsDtmfOnly`. NB `[\d|w|W]` also allows `|`
+ * (likely meant `[\dwW]`); kept so values that save today stay valid.
  */
 const dtmfPattern = /^[\d|w|W]*$/;
 
+/**
+ * One way to reach a queue member.
+ *
+ * `destination` is only checked for non-empty: its format depends on the
+ * channel, which `type` does not carry. For phone channels use
+ * `phoneMemberCommunicationSchema`.
+ */
 export const memberCommunicationSchema = z.object({
 	destination: z.string().min(1),
 	type: filledLookupSchema,
@@ -23,3 +28,13 @@ export const memberCommunicationSchema = z.object({
 	resource: flexibleLookupSchema.optional(),
 	description: z.string().optional(),
 });
+
+/**
+ * Communication for a `Phone` channel: `destination` is dialed, so it must be
+ * a valid number. A full schema because regle validates against object schemas.
+ *
+ * [WTEL-10374](https://webitel.atlassian.net/browse/WTEL-10374)
+ */
+export const phoneMemberCommunicationSchema = memberCommunicationSchema.extend({
+	destination: phoneNumberSchema,
+});