@webitel/api-services 1.0.6 → 1.0.7

package/src/api/clients/wtTypes/adjunctTypeRecords/adjunctTypeRecords.ts

@@ -20,10 +20,10 @@ import type { ApiId, ApiParams } from '../../_shared/types';
 const instance = getDefaultInstance();
 
 const getAdjunctTypeRecordsList = async ({
-	repo,
+	parentId,
 	...params
 }: {
-	repo: string;
+	parentId: string;
 } & ApiParams) => {
 	const fieldsToSend = [
 		'page',
@@ -45,7 +45,7 @@ const getAdjunctTypeRecordsList = async ({
 		camelToSnake(),
 	]);
 	try {
-		const response = await getDictionaries().searchData(repo, {
+		const response = await getDictionaries().searchData(parentId, {
 			size,
 			page,
 			sort,
@@ -69,13 +69,13 @@ const getAdjunctTypeRecordsList = async ({
 
 const getAdjunctTypeRecord = async ({
 	itemId: id,
-	repo,
+	parentId,
 }: {
 	itemId: ApiId;
-	repo: string;
+	parentId: string;
 }) => {
 	try {
-		const response = await getDictionaries().locateData(repo, String(id));
+		const response = await getDictionaries().locateData(parentId, String(id));
 		return response.data;
 	} catch (err) {
 		throw applyTransform(err, [
@@ -87,18 +87,18 @@ const getAdjunctTypeRecord = async ({
 const addAdjunctTypeRecord = async ({
 	itemInstance,
 	fieldsToSend,
-	repo,
+	parentId,
 }: {
 	itemInstance: ApiParams;
 	fieldsToSend: string[];
-	repo: string;
+	parentId: string;
 }) => {
 	const item = applyTransform(itemInstance, [
 		camelToSnake(),
 		sanitize(fieldsToSend),
 	]);
 	try {
-		const response = await getDictionaries().createData(repo, item);
+		const response = await getDictionaries().createData(parentId, item);
 		return applyTransform(response.data, [
 			snakeToCamel(),
 		]);
@@ -113,19 +113,23 @@ const updateAdjunctTypeRecord = async ({
 	itemInstance,
 	fieldsToSend,
 	itemId: id,
-	repo,
+	parentId,
 }: {
 	itemInstance: ApiParams;
 	fieldsToSend: string[];
 	itemId: ApiId;
-	repo: string;
+	parentId: string;
 }) => {
 	const item = applyTransform(itemInstance, [
 		camelToSnake(),
 		sanitize(fieldsToSend),
 	]);
 	try {
-		const response = await getDictionaries().updateData(repo, String(id), item);
+		const response = await getDictionaries().updateData(
+			parentId,
+			String(id),
+			item,
+		);
 		return applyTransform(response.data, [
 			snakeToCamel(),
 		]);
@@ -137,10 +141,10 @@ const updateAdjunctTypeRecord = async ({
 };
 
 const deleteAdjunctTypeRecord = async ({
-	repo,
+	parentId,
 	id,
 }: {
-	repo: string;
+	parentId: string;
 	id: ApiId | ApiId[];
 }) => {
 	const ids = (
@@ -151,8 +155,7 @@ const deleteAdjunctTypeRecord = async ({
 				]
 	).map(String);
 	try {
-		const response = await getDictionaries().deleteData2(repo, ids);
-		return response.data;
+		await getDictionaries().deleteData2(parentId, ids);
 	} catch (err) {
 		throw applyTransform(err, [
 			notify,

package/src/api/clients/wtTypes/adjunctTypes/adjunctTypes.ts

@@ -18,6 +18,8 @@ import type {
 	ApiParams,
 	UpdateItemParams,
 } from '../../_shared/types';
+import { assignFieldPositions } from '../_shared/utils/assignFieldPositions';
+import { sortDynamicFields } from '../_shared/utils/sortDynamicFields';
 
 const fieldsToSend = [
 	'name',
@@ -102,6 +104,7 @@ const getAdjunctType = async ({ itemId: itemRepo }: { itemId: string }) => {
 		return applyTransform(response.data, [
 			snakeToCamel(),
 			itemResponseHandler,
+			assignFieldPositions,
 		]);
 	} catch (err) {
 		throw applyTransform(err, [
@@ -134,6 +137,7 @@ const updateAdjunctType = async ({
 	itemId: id,
 }: UpdateItemParams) => {
 	const item = applyTransform(itemInstance, [
+		sortDynamicFields,
 		camelToSnake(),
 		sanitize(fieldsToSend),
 	]);

package/src/api/clients/wtTypes/typeExtensions/typeExtensions.ts

@@ -1,19 +1,17 @@
-import { ExtensionsApiFactory, type WebitelProtoDataStruct } from 'webitel-sdk';
-import { getDefaultInstance, getDefaultOpenAPIConfig } from '../../../defaults';
+import type { ProtoDataStruct } from '@webitel/api-services/gen/models';
+import { getExtensions } from '../../../../gen-wire';
 import {
 	applyTransform,
 	camelToSnake,
 	notify,
-	sanitize,
+	sanitizeToWire,
 	snakeToCamel,
 } from '../../../transformers';
 import type { ApiId, ApiParams } from '../../_shared/types';
+import { assignFieldPositions } from '../_shared/utils/assignFieldPositions';
 import { sortDynamicFields } from '../_shared/utils/sortDynamicFields';
 
-const instance = getDefaultInstance();
-const configuration = getDefaultOpenAPIConfig();
-
-const typeExtensionsService = ExtensionsApiFactory(configuration, '', instance);
+const typeExtensionsService = getExtensions();
 
 const fieldsToSend = [
 	'fields',
@@ -21,33 +19,19 @@ const fieldsToSend = [
 	'path',
 ];
 
-const generateIdsFromRepos = (item: WebitelProtoDataStruct) => ({
+const generateIdsFromRepos = (item: ProtoDataStruct) => ({
 	...item,
 	id: item.repo,
 });
 
 const getTypeExtension = async ({ itemId: typeRepo }: { itemId: string }) => {
-	const createPositionGenerator = () => {
-		let position = 1;
-		return (item: ApiParams) => (item.readonly ? null : position++);
-	};
-	const getPosition = createPositionGenerator();
-
-	const itemResponseHandler = (item: ApiParams) => ({
-		...item,
-		fields: item.fields.map((field: ApiParams) => ({
-			...field,
-			position: getPosition(field),
-		})),
-	});
-
 	try {
-		const response = await typeExtensionsService.locateType(typeRepo);
+		const response = await typeExtensionsService.locateTypeExtensions(typeRepo);
 
 		return applyTransform(response.data, [
 			snakeToCamel(),
 			generateIdsFromRepos,
-			itemResponseHandler,
+			assignFieldPositions,
 		]);
 	} catch {
 		return {
@@ -67,11 +51,11 @@ const addTypeExtension = async ({
 }) => {
 	const item = applyTransform(itemInstance, [
 		sortDynamicFields,
+		sanitizeToWire(fieldsToSend),
 		camelToSnake(),
-		sanitize(fieldsToSend),
 	]);
 	try {
-		const response = await typeExtensionsService.createType(
+		const response = await typeExtensionsService.createTypeExtensions(
 			String(typeRepo),
 			item,
 		);
@@ -88,7 +72,7 @@ const addTypeExtension = async ({
 
 const deleteTypeExtension = async ({ itemId: typeRepo }: { itemId: ApiId }) => {
 	try {
-		await typeExtensionsService.deleteType([
+		await typeExtensionsService.deleteTypeExtensions([
 			String(typeRepo),
 		]);
 	} catch (err) {
@@ -116,18 +100,24 @@ const updateTypeExtension = async ({
 	}
 
 	if (!itemInstance.fields.length && !itemInstance.isNew) {
-		return deleteTypeExtension({
+		await deleteTypeExtension({
 			itemId: typeRepo,
 		});
+
+		return {
+			id: typeRepo,
+			fields: [],
+			isNew: true,
+		};
 	}
 
 	const item = applyTransform(itemInstance, [
 		sortDynamicFields,
+		sanitizeToWire(fieldsToSend),
 		camelToSnake(),
-		sanitize(fieldsToSend),
 	]);
 	try {
-		const response = await typeExtensionsService.updateType(
+		const response = await typeExtensionsService.updateTypeExtensions(
 			String(typeRepo),
 			item,
 		);
@@ -143,7 +133,7 @@ const updateTypeExtension = async ({
 };
 
 export const WtTypeExtensionAPI = {
-	getList: getTypeExtension,
+	get: getTypeExtension,
 	add: addTypeExtension,
 	update: updateTypeExtension,
 	delete: deleteTypeExtension,