@webitel/ui-sdk 26.8.110 → 26.8.112

package/src/locale/uz/uz.js

@@ -21,7 +21,7 @@ import {
 } from '../../enums';
 import { AccessMode } from '../../modules/ObjectPermissions/enums/AccessMode.enum';
 import { snakeToCamel } from '../../scripts/caseConverters';
-import { SortSymbols } from '../../scripts/sortQueryAdapters.js';
+import { SortSymbols } from '../../scripts/sortQueryAdapters';
 
 export default {
 	// describes reusable buttons, actions, default titles, and other ui elements

package/src/locale/vi/vi.js

@@ -21,7 +21,7 @@ import {
 } from '../../enums';
 import { AccessMode } from '../../modules/ObjectPermissions/enums/AccessMode.enum';
 import { snakeToCamel } from '../../scripts/caseConverters';
-import { SortSymbols } from '../../scripts/sortQueryAdapters.js';
+import { SortSymbols } from '../../scripts/sortQueryAdapters';
 
 export default {
 	// describes reusable buttons, actions, default titles, and other ui elements

package/src/modules/QueryFilters/mixins/sortFilterMixin.js

@@ -2,7 +2,7 @@ import {
 	queryToSortAdapter,
 	SortSymbols,
 	sortToQueryAdapter,
-} from '../../../scripts/sortQueryAdapters.js';
+} from '../../../scripts/sortQueryAdapters';
 import baseFilterMixin from './baseFilterMixin/baseFilterMixin.js';
 
 const getNextSortOrder = (sort) => {

package/src/modules/TableStoreModule/store/TableStoreModule.js

@@ -1,7 +1,7 @@
 import {
 	queryToSortAdapter,
 	sortToQueryAdapter,
-} from '../../../scripts/sortQueryAdapters.js';
+} from '../../../scripts/sortQueryAdapters';
 import BaseStoreModule from '../../../store/BaseStoreModules/BaseStoreModule.js';
 import FilterEvent from '../../Filters/enums/FilterEvent.enum.js';
 

package/src/modules/TableStoreModule/store/__tests__/TableStoreModule.spec.js

@@ -1,7 +1,7 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import { createStore } from 'vuex';
 
-import { SortSymbols } from '../../../../scripts/sortQueryAdapters.js';
+import { SortSymbols } from '../../../../scripts/sortQueryAdapters';
 import FilterEvent from '../../../Filters/enums/FilterEvent.enum.js';
 import FiltersStoreModule from '../../../Filters/store/FiltersStoreModule.js';
 import TableStoreModule from '../TableStoreModule.js';

package/src/scripts/__tests__/{sortQueryAdapters.spec.js → sortQueryAdapters.spec.ts}

@@ -1,4 +1,4 @@
-import * as sortQueryAdapters from '../sortQueryAdapters.js';
+import * as sortQueryAdapters from '../sortQueryAdapters';
 
 test('sortToQueryAdapter', () => {
 	expect(sortQueryAdapters.sortToQueryAdapter('asc')).toBe('+');
@@ -10,3 +10,8 @@ test('queryToSortAdapter', () => {
 	expect(sortQueryAdapters.queryToSortAdapter('-')).toBe('desc');
 	expect(sortQueryAdapters.queryToSortAdapter('')).toBe(null);
 });
+test('getNextSortOrder', () => {
+	expect(sortQueryAdapters.getNextSortOrder('asc')).toBe('desc');
+	expect(sortQueryAdapters.getNextSortOrder('desc')).toBe(null);
+	expect(sortQueryAdapters.getNextSortOrder(null)).toBe('asc');
+});

package/src/scripts/index.js

@@ -36,8 +36,8 @@ import saveAsJSON from './saveAsJSON';
 import {
 	getNextSortOrder,
 	queryToSortAdapter,
+	SortSymbols,
 	sortToQueryAdapter,
-	SortSymbols
 } from './sortQueryAdapters';
 import updateObject from './updateObject';
 
@@ -65,6 +65,7 @@ export {
 	prettifyTime,
 	preventHiddenPageCallsDecorator,
 	queryToSortAdapter,
+	SortSymbols,
 	saveAsJSON,
 	sizeGreaterOrEqual,
 	sizeGreaterThen,
@@ -74,7 +75,6 @@ export {
 	snakeToKebab,
 	// sortQueryAdapters
 	sortToQueryAdapter,
-	SortSymbols,
 	updateObject,
 	wtlog,
 };

package/src/scripts/sortQueryAdapters.ts

@@ -0,0 +1,45 @@
+export const SortSymbols = Object.freeze({
+	ASC: 'asc',
+	DESC: 'desc',
+	NONE: null,
+} as const);
+
+export type SortOrder = (typeof SortSymbols)[keyof typeof SortSymbols];
+
+// query-string prefix the API sorts by: `+field` ascending, `-field` descending
+export type SortQueryPrefix = '+' | '-' | '';
+
+export const sortToQueryAdapter = (order?: SortOrder): SortQueryPrefix => {
+	switch (order) {
+		case SortSymbols.ASC:
+			return '+';
+		case SortSymbols.DESC:
+			return '-';
+		default:
+			return '';
+	}
+};
+
+export const queryToSortAdapter = (order?: string): SortOrder => {
+	switch (order) {
+		case '+':
+			return SortSymbols.ASC;
+		case '-':
+			return SortSymbols.DESC;
+		default:
+			return SortSymbols.NONE;
+	}
+};
+
+// cycles a column through asc -> desc -> none -> asc; a boolean `sort` is the
+// back-compat "sortable, not sorted yet" header flag and starts at asc
+export const getNextSortOrder = (sort?: SortOrder | boolean): SortOrder => {
+	switch (sort) {
+		case SortSymbols.ASC:
+			return SortSymbols.DESC;
+		case SortSymbols.DESC:
+			return SortSymbols.NONE;
+		default:
+			return SortSymbols.ASC;
+	}
+};

package/src/store/new/modules/tableStoreModule/__tests__/tableStoreModule.spec.js

@@ -3,7 +3,7 @@ import { createStore } from 'vuex';
 
 import FilterEvent from '../../../../../modules/Filters/enums/FilterEvent.enum.js';
 import FiltersStoreModule from '../../../../../modules/Filters/store/FiltersStoreModule.js';
-import { SortSymbols } from '../../../../../scripts/sortQueryAdapters.js';
+import { SortSymbols } from '../../../../../scripts/sortQueryAdapters';
 import { createTableStoreModule } from '../../../helpers/createTableStoreModule.js';
 
 describe('TableStoreModule', () => {

package/src/store/new/modules/tableStoreModule/tableStoreModule.js

@@ -2,7 +2,7 @@ import FilterEvent from '../../../../modules/Filters/enums/FilterEvent.enum.js';
 import {
 	queryToSortAdapter,
 	sortToQueryAdapter,
-} from '../../../../scripts/sortQueryAdapters.js';
+} from '../../../../scripts/sortQueryAdapters';
 
 const state = () => ({
 	headers: [],