asab_webui_components 27.3.7 → 27.3.9

package/dist/components/DataTable2/DataTable2.js

@@ -366,7 +366,8 @@ function DataTable2(_ref5) {
     id: "datatable-column-".concat(idx)
   }, column !== null && column !== void 0 && column.sort ? /*#__PURE__*/_react.default.createElement(DataTableSort2, {
     title: column === null || column === void 0 ? void 0 : column.title,
-    field: column.sort
+    field: column.sort,
+    sortDirection: column === null || column === void 0 ? void 0 : column.sortDirection
   }) : column === null || column === void 0 ? void 0 : column.title)))), /*#__PURE__*/_react.default.createElement("tbody", null, rows.map((row, ridx) => /*#__PURE__*/_react.default.createElement("tr", {
     key: ridx,
     style: _objectSpread(_objectSpread({}, rowStyle ? rowStyle(row) : {}), {}, {
@@ -489,7 +490,8 @@ function DataTableBadge(_ref7) {
 function DataTableSort2(_ref8) {
   var {
     title,
-    field
+    field,
+    sortDirection
   } = _ref8;
   var {
     onTriggerSort,
@@ -498,21 +500,35 @@ function DataTableSort2(_ref8) {
   var {
     t
   } = (0, _reactI18next.useTranslation)();
-  return getParam("s".concat(field)) ? getParam("s".concat(field)) == "d" ? /*#__PURE__*/_react.default.createElement("span", {
+
+  // Get the current sorting direction for this field from URL/search params (e.g. 'a' or 'd')
+  var currentSort = getParam("s".concat(field));
+
+  // Determine what the start sorting direction should be after click
+  var getInitialSortDirection = () => {
+    if (sortDirection && !currentSort) {
+      // If there is a SortDirection and the field is not sorted yet, we use SortDirection
+      return sortDirection;
+    }
+
+    // Otherwise standard behavior (sorted in ascending order)
+    return 'a';
+  };
+  return currentSort ? currentSort === 'd' ? /*#__PURE__*/_react.default.createElement("span", {
     className: "sort-span-wrapper",
-    onClick: e => onTriggerSort(e, field, "a")
+    onClick: e => onTriggerSort(e, field, 'a')
   }, title, /*#__PURE__*/_react.default.createElement("i", {
     title: "".concat(t('General|Sort ascend'), ". ").concat(t('General|Shift + left mouse click to remove from sorting')),
     className: "bi bi-sort-up sort-icon-active ms-2"
   })) : /*#__PURE__*/_react.default.createElement("span", {
     className: "sort-span-wrapper",
-    onClick: e => onTriggerSort(e, field, "d")
+    onClick: e => onTriggerSort(e, field, 'd')
   }, title, /*#__PURE__*/_react.default.createElement("i", {
     title: "".concat(t('General|Sort descend'), ". ").concat(t('General|Shift + left mouse click to remove from sorting')),
     className: "bi bi-sort-down-alt sort-icon-active ms-2"
   })) : /*#__PURE__*/_react.default.createElement("span", {
     className: "sort-span-wrapper",
-    onClick: e => onTriggerSort(e, field, "a")
+    onClick: e => onTriggerSort(e, field, getInitialSortDirection())
   }, title, /*#__PURE__*/_react.default.createElement("i", {
     title: t('General|Shift + left mouse click for advanced sorting'),
     className: "bi bi-arrow-down-up ms-2"

package/dist/components/DataTable2/DataTable2.jsx

@@ -307,6 +307,7 @@ export function DataTable2({columns, rows, limit, loading, rowHeight, rowStyle})
 								<DataTableSort2
 									title={column?.title}
 									field={column.sort}
+									sortDirection={column?.sortDirection}
 								/>
 							: column?.title}
 						</th>
@@ -431,35 +432,49 @@ function DataTableBadge({ item, value, isLoading, onRemove }) {
 }
 
 // Inner sorting function
-function DataTableSort2({title, field}) {
+function DataTableSort2({title, field, sortDirection}) {
 	const { onTriggerSort, getParam } = useDataTableContext();
 	const { t } = useTranslation();
 
+	// Get the current sorting direction for this field from URL/search params (e.g. 'a' or 'd')
+	const currentSort = getParam(`s${field}`);
+
+	// Determine what the start sorting direction should be after click
+	const getInitialSortDirection = () => {
+		if (sortDirection && !currentSort) {
+			// If there is a SortDirection and the field is not sorted yet, we use SortDirection
+			return sortDirection;
+		}
+
+		// Otherwise standard behavior (sorted in ascending order)
+		return 'a';
+	};
+
 	return (
-		getParam(`s${field}`) ?
-			(getParam(`s${field}`) == "d") ?
-				<span className="sort-span-wrapper" onClick={(e) => onTriggerSort(e, field, "a")}>
+		currentSort ?
+			(currentSort === 'd') ?
+				<span className='sort-span-wrapper' onClick={(e) => onTriggerSort(e, field, 'a')}>
 					{title}
 					<i
 						title={`${t('General|Sort ascend')}. ${t('General|Shift + left mouse click to remove from sorting')}`}
-						className="bi bi-sort-up sort-icon-active ms-2"
-					></i>
-				</span>
-				:
-				<span className="sort-span-wrapper" onClick={(e) => onTriggerSort(e, field, "d")}>
-					{title}
-					<i
-						title={`${t('General|Sort descend')}. ${t('General|Shift + left mouse click to remove from sorting')}`}
-						className="bi bi-sort-down-alt sort-icon-active ms-2"
-					></i>
+						className='bi bi-sort-up sort-icon-active ms-2'
+					/>
 				</span>
 			:
-				<span className="sort-span-wrapper" onClick={(e) => onTriggerSort(e, field, "a")}>
+				<span className='sort-span-wrapper' onClick={(e) => onTriggerSort(e, field, 'd')}>
 					{title}
 					<i
-						title={t('General|Shift + left mouse click for advanced sorting')}
-						className="bi bi-arrow-down-up ms-2"
-					></i>
+						title={`${t('General|Sort descend')}. ${t('General|Shift + left mouse click to remove from sorting')}`}
+						className='bi bi-sort-down-alt sort-icon-active ms-2'
+					/>
 				</span>
-	)
+		:
+			<span className='sort-span-wrapper' onClick={(e) => onTriggerSort(e, field, getInitialSortDirection())}>
+				{title}
+				<i
+					title={t('General|Shift + left mouse click for advanced sorting')}
+					className='bi bi-arrow-down-up ms-2'
+				/>
+			</span>
+	);
 }

package/dist/components/DataTable2/DataTableContext.js

@@ -116,7 +116,17 @@ var DataTableContextProvider = _ref => {
           updatedSearchParams.append(key, value);
         }
       });
-      (0, _updateTableLimit.updateLimit)("decrease", updatedSearchParams);
+      /*	Only decrease limit when adding the very first filtering.
+      	Check original params (including the field being replaced) so that
+      	replacing an existing filter does not decrease the limit a second time
+      */
+      var isFirstFilter = ![...searchParams.entries()].some(_ref2 => {
+        var [key] = _ref2;
+        return key.startsWith('a');
+      });
+      if (isFirstFilter) {
+        (0, _updateTableLimit.updateLimit)("decrease", updatedSearchParams);
+      }
       updatedSearchParams.set("p", 1);
       updatedSearchParams.append("a".concat(field), value);
       setSearchParams(updatedSearchParams);
@@ -129,7 +139,11 @@ var DataTableContextProvider = _ref => {
             updatedState[key] = prevState[key];
           }
         });
-        (0, _updateTableLimit.updateStateLimit)("decrease", updatedState);
+        // Same check against the original prevState (before stripping the field)
+        var isFirstFilter = !Object.keys(prevState).some(key => key.startsWith('a'));
+        if (isFirstFilter) {
+          (0, _updateTableLimit.updateStateLimit)("decrease", updatedState);
+        }
         updatedState['p'] = 1;
         updatedState["a".concat(field)] = [value];
         return updatedState;
@@ -359,8 +373,8 @@ var DataTableContextProvider = _ref => {
 
   // Inner method to update search params
   var _updateSearchParams = (searchParams, params) => {
-    Object.entries(params).forEach(_ref2 => {
-      var [key, value] = _ref2;
+    Object.entries(params).forEach(_ref3 => {
+      var [key, value] = _ref3;
       searchParams.set(key, value);
     });
     return searchParams;

package/dist/components/DataTable2/DataTableContext.jsx

@@ -89,7 +89,14 @@ const DataTableContextProvider = ({ children, disableParams, initialLimit }) =>
 					updatedSearchParams.append(key, value);
 				}
 			})
-			updateLimit("decrease", updatedSearchParams);
+			/*	Only decrease limit when adding the very first filtering.
+				Check original params (including the field being replaced) so that
+				replacing an existing filter does not decrease the limit a second time
+			*/
+			const isFirstFilter = ![...searchParams.entries()].some(([key]) => key.startsWith('a'));
+			if (isFirstFilter) {
+				updateLimit("decrease", updatedSearchParams);
+			}
 			updatedSearchParams.set("p", 1);
 			updatedSearchParams.append(`a${field}`, value);
 			setSearchParams(updatedSearchParams);
@@ -102,7 +109,11 @@ const DataTableContextProvider = ({ children, disableParams, initialLimit }) =>
 						updatedState[key] = prevState[key];
 					}
 				});
-				updateStateLimit("decrease", updatedState);
+				// Same check against the original prevState (before stripping the field)
+				const isFirstFilter = !Object.keys(prevState).some(key => key.startsWith('a'));
+				if (isFirstFilter) {
+					updateStateLimit("decrease", updatedState);
+				}
 				updatedState['p'] = 1;
 				updatedState[`a${field}`] = [value];
 				return updatedState;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asab_webui_components",
-	"version": "27.3.7",
+	"version": "27.3.9",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Components Library",
 	"contributors": [