@addev-be/ui 2.1.3 → 2.1.5

package/dist/components/data/SqlRequestGrid/index.js

@@ -67,27 +67,17 @@ var helpers_1 = require("./helpers");
 var helpers_2 = require("../DataGrid/helpers");
 var hooks_1 = require("../DataGrid/hooks");
 var SqlRequestGrid = function (_a) {
-    var _b;
     var ref = _a.ref, allProps = __rest(_a, ["ref"]);
-    var _c = allProps.rowHeight, rowHeight = _c === void 0 ? styles.DEFAULT_ROW_HEIGHT : _c, itemsPerRow = allProps.itemsPerRow, itemTemplate = allProps.itemTemplate, itemProps = allProps.itemProps, gap = allProps.gap, props = __rest(allProps, ["rowHeight", "itemsPerRow", "itemTemplate", "itemProps", "gap"]);
+    var _b = allProps.rowHeight, rowHeight = _b === void 0 ? styles.DEFAULT_ROW_HEIGHT : _b, itemsPerRow = allProps.itemsPerRow, itemTemplate = allProps.itemTemplate, itemProps = allProps.itemProps, gap = allProps.gap, props = __rest(allProps, ["rowHeight", "itemsPerRow", "itemTemplate", "itemProps", "gap"]);
     var currentRows = (0, react_1.useRef)([]);
-    var _d = (0, react_1.useState)([]), rows = _d[0], setRows = _d[1];
-    var _e = (0, react_1.useState)(0), start = _e[0], setStart = _e[1];
-    var _f = (0, react_1.useState)(-1), length = _f[0], setLength = _f[1];
-    var _g = (0, react_1.useState)(-1), count = _g[0], setCount = _g[1];
+    var _c = (0, react_1.useState)([]), rows = _c[0], setRows = _c[1];
+    var _d = (0, react_1.useState)(0), start = _d[0], setStart = _d[1];
+    var _e = (0, react_1.useState)(-1), length = _e[0], setLength = _e[1];
+    var _f = (0, react_1.useState)(-1), count = _f[0], setCount = _f[1];
     var sqlRequest = (0, sqlRequests_1.useSqlRequestHandler)(props.type)[0];
-    var _h = (0, react_1.useState)({}), conditions = _h[0], setConditions = _h[1];
-    var _j = (0, react_1.useState)(Object.entries((_b = props.initialSorts) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
-        var _b, _c, _d;
-        var columnKey = _a[0], direction = _a[1];
-        var field = props.fields.find(function (field) { return field.key === columnKey; });
-        return {
-            field: (_c = (_b = field === null || field === void 0 ? void 0 : field.field) === null || _b === void 0 ? void 0 : _b.fieldAlias) !== null && _c !== void 0 ? _c : columnKey,
-            type: (_d = field === null || field === void 0 ? void 0 : field.type) !== null && _d !== void 0 ? _d : 'text',
-            direction: direction.toUpperCase(),
-        };
-    })), orderBy = _j[0], setOrderBy = _j[1];
-    var _k = (0, react_1.useMemo)(function () {
+    var _g = (0, react_1.useState)({}), conditions = _g[0], setConditions = _g[1];
+    var _h = (0, react_1.useState)([]), orderBy = _h[0], setOrderBy = _h[1];
+    var _j = (0, react_1.useMemo)(function () {
         var _a, _b;
         return [
             __spreadArray(__spreadArray([], props.fields
@@ -98,7 +88,7 @@ var SqlRequestGrid = function (_a) {
                 .filter(helpers_2.isColumnVisible)
                 .map(function (field) { return field.key; }), true), ((_b = props.additionalFields) !== null && _b !== void 0 ? _b : []), true),
         ];
-    }, [props.fields, props.additionalFields]), columnsKeys = _k[0], visibleColumnsKeys = _k[1];
+    }, [props.fields, props.additionalFields]), columnsKeys = _j[0], visibleColumnsKeys = _j[1];
     var columnTypes = (0, react_1.useMemo)(function () {
         return visibleColumnsKeys.map(function (key) { var _a, _b; return String((_b = (_a = props.fields.find(function (field) { return field.key === key; })) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : 'text'); });
     }, [visibleColumnsKeys, props.fields]);
@@ -213,7 +203,7 @@ var SqlRequestGrid = function (_a) {
     (0, react_1.useImperativeHandle)(ref, function () { return ({
         refresh: refresh,
     }); }, [refresh]);
-    var _l = (0, hooks_1.useDataGrid)({
+    var _k = (0, hooks_1.useDataGrid)({
         columns: props.fields,
         rows: rows,
         onFiltersChanged: onFiltersChanged,
@@ -225,8 +215,9 @@ var SqlRequestGrid = function (_a) {
         rowKey: '',
         filter: false,
         sort: false,
-    }), contextProps = _l[0], DataGridContext = _l[1];
-    var _m = (0, react_1.useState)(false), sidebarVisible = _m[0], setSidebarVisible = _m[1];
+        initialSorts: props.initialSorts,
+    }), contextProps = _k[0], DataGridContext = _k[1];
+    var _l = (0, react_1.useState)(false), sidebarVisible = _l[0], setSidebarVisible = _l[1];
     var onSidebarClose = (0, react_1.useCallback)(function () {
         setSidebarVisible(false);
     }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addev-be/ui",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "type": "module",
   "scripts": {
     "watch": "tsc -b --watch",
@@ -20,7 +20,7 @@
     "update-version": "../../node/update-version.mjs"
   },
   "devDependencies": {
-    "@addev-be/framework-utils": "^2.1.3",
+    "@addev-be/framework-utils": "^2.1.5",
     "@types/lodash": "^4.17.20",
     "@types/react": "^19.1.13",
     "@types/react-dom": "^19.1.9",

package/src/components/data/SqlRequestGrid/index.tsx

@@ -53,18 +53,7 @@ export const SqlRequestGrid = <R, P extends object = {}>({
   const [conditions, setConditions] = useState<Record<string, ConditionDTO>>(
     {}
   );
-  const [orderBy, setOrderBy] = useState<OrderByDTO[]>(
-    Object.entries(props.initialSorts ?? {}).map(
-      ([columnKey, direction]): OrderByDTO => {
-        const field = props.fields.find((field) => field.key === columnKey);
-        return {
-          field: field?.field?.fieldAlias ?? columnKey,
-          type: field?.type ?? 'text',
-          direction: direction.toUpperCase() as 'ASC' | 'DESC',
-        };
-      }
-    )
-  );
+  const [orderBy, setOrderBy] = useState<OrderByDTO[]>([]);
 
   const [columnsKeys, visibleColumnsKeys] = useMemo(
     () => [
@@ -259,6 +248,7 @@ export const SqlRequestGrid = <R, P extends object = {}>({
     rowKey: '',
     filter: false,
     sort: false,
+    initialSorts: props.initialSorts,
   });
 
   const [sidebarVisible, setSidebarVisible] = useState(false);