@webitel/api-services 26.8.55 → 26.8.56

package/package.json

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

package/src/api/clients/index.ts

@@ -96,6 +96,7 @@ export * from './triggers/triggerJobs';
 export * from './triggers/triggers';
 export * from './userSettings/userSettings';
 export * from './users/users';
+export * from './userTokens/userTokens';
 export * from './variables/variables';
 export * from './workingConditions/workingConditions';
 export * from './workspaceWidgets/workspaceWidgets';

package/src/api/clients/logs/logs.ts

@@ -1,4 +1,5 @@
 import { getLoggerService } from '../../../gen-wire';
+import { normalizeDatetimeRange } from '../../../scripts';
 import { getDefaultGetListResponse, getDefaultGetParams } from '../../defaults';
 import {
 	applyTransform,
@@ -26,8 +27,7 @@ const getLogsByUserList = async (params: ApiParams) => {
 		'fields',
 		'action',
 		'object',
-		'from',
-		'to',
+		'date',
 		'userIp',
 	];
 
@@ -40,12 +40,15 @@ const getLogsByUserList = async (params: ApiParams) => {
 		fields,
 		action,
 		object,
-		from,
-		to,
+		date,
 		userIp,
 	} = applyTransform(params, [
 		sanitize(fieldsToSend),
 		merge(getDefaultGetParams()),
+		({ date, ...rest }) => ({
+			...rest,
+			date: normalizeDatetimeRange(date),
+		}),
 		starToSearch('search'),
 	]);
 
@@ -58,12 +61,15 @@ const getLogsByUserList = async (params: ApiParams) => {
 				// the generated param is `q`; `search` is what the datalist store sends
 				q: search,
 				sort: sort || DEFAULT_SORT,
-				fields,
+				fields: fields && [
+					...fields,
+					'config_id',
+				],
 				object_id: object,
 				action,
 				user_ip: userIp,
-				date_from: from,
-				date_to: to,
+				date_from: date?.from,
+				date_to: date?.to,
 			},
 		);
 		const { items, next } = applyTransform(response.data, [

package/src/api/clients/userTokens/userTokens.ts

@@ -0,0 +1,147 @@
+import { getShallowFieldsToSendFromZodSchema } from '@webitel/api-services/gen/utils';
+import { userTokenSchema } from '@webitel/api-services/validations';
+import { getUserAccessTokens } from '../../../gen-wire';
+import { getDefaultGetListResponse, getDefaultGetParams } from '../../defaults';
+import {
+	applyTransform,
+	camelToSnake,
+	merge,
+	notify,
+	sanitizeToWire,
+	snakeToCamel,
+	starToSearch,
+} from '../../transformers';
+import type {
+	ApiParams,
+	NestedAddItemParams,
+	NestedDeleteItemParams,
+	NestedGetItemParams,
+	NestedUpdateItemParams,
+} from '../_shared/types';
+
+const fieldsToSend = getShallowFieldsToSendFromZodSchema(userTokenSchema);
+
+const getUserTokensList = async (params: ApiParams) => {
+	const { page, size, search, sort, fields, parentId } = applyTransform(
+		params,
+		[
+			merge(getDefaultGetParams()),
+			starToSearch('search'),
+		],
+	);
+
+	try {
+		const response = await getUserAccessTokens().listUserAccessToken(
+			String(parentId),
+			{
+				page,
+				size,
+				q: search,
+				sort: sort
+					? [
+							sort,
+						]
+					: undefined,
+				fields,
+			},
+		);
+		const { items, next } = applyTransform(response.data, [
+			snakeToCamel(),
+			merge(getDefaultGetListResponse()),
+		]);
+		return {
+			items,
+			next,
+		};
+	} catch (err) {
+		throw applyTransform(err, [
+			notify,
+		]);
+	}
+};
+
+const getUserToken = async ({ parentId, itemId: id }: NestedGetItemParams) => {
+	try {
+		const response = await getUserAccessTokens().getUserAccessToken(
+			String(parentId),
+			String(id),
+		);
+		return applyTransform(response.data, [
+			snakeToCamel(),
+		]);
+	} catch (err) {
+		throw applyTransform(err, [
+			notify,
+		]);
+	}
+};
+
+const addUserToken = async ({
+	parentId,
+	itemInstance,
+}: NestedAddItemParams) => {
+	const item = applyTransform(itemInstance, [
+		sanitizeToWire(fieldsToSend),
+		camelToSnake(),
+	]);
+	try {
+		const response = await getUserAccessTokens().addUserAccessToken(
+			String(parentId),
+			item,
+		);
+		return applyTransform(response.data, [
+			snakeToCamel(),
+		]);
+	} catch (err) {
+		throw applyTransform(err, [
+			notify,
+		]);
+	}
+};
+
+const updateUserToken = async ({
+	parentId,
+	itemId: id,
+	itemInstance,
+}: NestedUpdateItemParams) => {
+	const item = applyTransform(itemInstance, [
+		sanitizeToWire(fieldsToSend),
+		camelToSnake(),
+	]);
+	try {
+		const response = await getUserAccessTokens().updateUserAccessToken(
+			String(parentId),
+			String(id),
+			item,
+		);
+		return applyTransform(response.data, [
+			snakeToCamel(),
+		]);
+	} catch (err) {
+		throw applyTransform(err, [
+			notify,
+		]);
+	}
+};
+
+const deleteUserToken = async ({ parentId, id }: NestedDeleteItemParams) => {
+	try {
+		const response = await getUserAccessTokens().deleteUserAccessToken(
+			String(parentId),
+			String(id),
+		);
+		return applyTransform(response.data, []);
+	} catch (err) {
+		throw applyTransform(err, [
+			notify,
+		]);
+	}
+};
+
+export const UserTokensAPI = {
+	getList: getUserTokensList,
+	get: getUserToken,
+	add: addUserToken,
+	update: updateUserToken,
+	delete: deleteUserToken,
+};

package/src/utils/formatDate.ts

@@ -1,5 +1,5 @@
 import { uk } from 'date-fns/locale';
-import { formatInTimeZone } from 'date-fns-tz';
+import { formatInTimeZone, toDate } from 'date-fns-tz';
 
 import type { FormatDateMode } from '../enums/FormatDateMode/FormatDateMode';
 
@@ -27,8 +27,19 @@ const formatStringMap = {
 	datetimeShort: 'Pp', // dd.MM.yyyy, HH:mm (13.11.2025, 15:53)
 };
 
+function normalizeDate(date: string | number | Date): string | number | Date {
+	if (
+		typeof date === 'string' &&
+		/^\d+$/.test(date) &&
+		Number.isNaN(toDate(date).getTime())
+	) {
+		return +date;
+	}
+	return date;
+}
+
 export function formatDate(
-	date: string | number | Date,
+	date: string | number | Date | null | undefined,
 	to: (typeof FormatDateMode)[keyof typeof FormatDateMode],
 	{
 		timezone = undefined,
@@ -36,9 +47,11 @@ export function formatDate(
 		timezone?: string;
 	} = {},
 ): string {
+	if (date === null || date === undefined || date === '') return '';
+
 	const timeZone = timezone ?? getUserTimeZone();
 
-	return formatInTimeZone(date, timeZone, formatStringMap[to], {
+	return formatInTimeZone(normalizeDate(date), timeZone, formatStringMap[to], {
 		locale: uk,
 	});
 }

package/src/validations/index.ts

@@ -45,4 +45,5 @@ export * from './slaCondition/slaCondition.validations';
 export * from './typeExtension/typeExtension.validations';
 export * from './types';
 export * from './user/user.validations';
+export * from './userToken/userToken.validations';
 export * from './variable/variable.validations';

package/src/validations/userToken/userToken.validations.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const userTokenSchema = z.object({
+	usage: z.string().default(''),
+});