@webitel/ui-datalist 26.12.1 → 26.12.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/ui-datalist",
-	"version": "26.12.1",
+	"version": "26.12.3",
 	"description": "Toolkit for building data lists in webitel ui system",
 	"scripts": {
 		"build:types": "vue-tsc -b tsconfig.build.json",

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

@@ -1,3 +1,4 @@
+import { AccessRuleName } from '@webitel/ui-sdk/modules/ObjectPermissions/enums';
 import type { TableApiModule } from '../../types/tableStore.types';
 import type {
 	PermissionEntity,
@@ -13,6 +14,25 @@ import type {
 export const PermissionsApiModule = (
 	rawApiModule: RawPermissionsApiModule,
 ): TableApiModule<PermissionEntity> => {
+	/**
+	 * [Claude] The rule columns are keyed by their letter (`r`, `w`, `d`), so
+	 * each sorts on its own, but the endpoint has no such attributes in `fields`:
+	 * it returns the three rules merged into one `granted` string, asked for once.
+	 */
+	const toAclFields = (fields?: string[]) => {
+		if (!fields) return fields;
+		const ruleFields = Object.values(AccessRuleName).filter(
+			(rule) => rule !== AccessRuleName.X,
+		);
+		return [
+			...new Set(
+				fields
+					.filter((field) => field !== 'id')
+					.map((field) => (ruleFields.includes(field) ? 'granted' : field)),
+			),
+		];
+	};
+
 	/**
 	 * The table store always asks for `id` (every registry needs it to open or
 	 * delete a row), but an access rule has no such attribute and the endpoint
@@ -27,7 +47,7 @@ export const PermissionsApiModule = (
 	} & Record<string, unknown>) =>
 		rawApiModule.getPermissionsList?.({
 			...params,
-			fields: fields?.filter((field) => field !== 'id'),
+			fields: toAclFields(fields),
 		});
 
 	return {

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

@@ -0,0 +1,31 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { PermissionsApiModule } from '../PermissionsApiModule';
+
+describe('PermissionsApiModule', () => {
+	it('asks for one `granted` in place of the rule columns, and never for `id`', async () => {
+		const getPermissionsList = vi.fn();
+		const { getList } = PermissionsApiModule({
+			getPermissionsList,
+		} as never);
+
+		await getList({
+			fields: [
+				'id',
+				'grantee',
+				'r',
+				'w',
+				'd',
+			],
+			sort: '+w',
+		} as never);
+
+		expect(getPermissionsList).toHaveBeenCalledWith({
+			fields: [
+				'grantee',
+				'granted',
+			],
+			sort: '+w',
+		});
+	});
+});