@balena/ui-shared-components 14.0.1-build-bump-typescript-to-5-9-2-31dbec9f4f68887ab6fc1fbeae9778554f2c46e2-1 → 14.0.1-build-sdk23-orderby-e357d5b8ffc1975aa61a5978370ee31a3b72fcc7-1

package/dist/components/RJST/oData/jsonToOData.d.ts

@@ -7,5 +7,5 @@ interface FilterMutation extends JSONSchema {
     $or?: any[];
 }
 export declare const convertToPineClientFilter: (parentKeys: string[], filter: FilterMutation | FilterMutation[]) => PineFilterObject | undefined;
-export declare const orderbyBuilder: <T>(sortInfo: TableSortOptions<T> | null, customSort: RJSTContext<T>["customSort"]) => string[] | null;
+export declare const orderbyBuilder: <T>(sortInfo: TableSortOptions<T> | null, customSort: RJSTContext<T>["customSort"]) => {}[] | null;
 export {};

package/dist/components/RJST/oData/jsonToOData.js

@@ -176,6 +176,43 @@ export const convertToPineClientFilter = (parentKeys, filter) => {
     }
     return handlePrimitiveFilter(parentKeys, filter);
 };
+const keyToOrderByStructure = (path, direction) => {
+    console.log('*** path', path);
+    // Step 1: Normalize the path.
+    // Replace bracket notation like [0] with dot notation like .0
+    // This makes splitting the path into consistent parts easier.
+    const parts = path.replace(/\[(\d+)\]/g, '/$1').split('/');
+    const result = {};
+    // Step 2: Define the recursive helper function.
+    // This function will traverse the parts and build the object.
+    const build = (currentObject, currentParts) => {
+        var _a;
+        const key = currentParts.shift();
+        // If key is undefined (e.g. empty string), we stop.
+        if (!key) {
+            return;
+        }
+        // Base Case: If there are no more parts left, we've reached
+        // the end of the path. Assign the value to the current key.
+        if (currentParts.length === 0) {
+            currentObject[key] = direction;
+            return;
+        }
+        // Recursive Step: If there are more parts, we need to go deeper.
+        // We peek at the *next* part to decide if we need to create
+        // an Array or an Object for the current key.
+        const nextKey = currentParts[0];
+        const needsArray = /^\d+$/.test(nextKey);
+        // If the path doesn't exist yet, create it.
+        // Create an array if the next part is a number, otherwise an object.
+        (_a = currentObject[key]) !== null && _a !== void 0 ? _a : (currentObject[key] = needsArray ? [] : {});
+        // Make the recursive call on the next level down.
+        build(currentObject[key], currentParts);
+    };
+    // Step 3: Kick off the recursion.
+    build(result, parts);
+    return result;
+};
 export const orderbyBuilder = (sortInfo, customSort) => {
     var _a, _b;
     if (!sortInfo) {
@@ -190,7 +227,10 @@ export const orderbyBuilder = (sortInfo, customSort) => {
     // The refScheme will reference the property path, e.g., owns_items[0].uuid.
     const customOrderByKey = (_b = (_a = customSort === null || customSort === void 0 ? void 0 : customSort[`${field}_${refScheme}`]) !== null && _a !== void 0 ? _a : customSort === null || customSort === void 0 ? void 0 : customSort[field]) !== null && _b !== void 0 ? _b : (typeof sortInfo.sortable === 'string' ? sortInfo.sortable : undefined);
     if (typeof customOrderByKey === 'string') {
-        return [`${customOrderByKey} ${direction}`, `id ${direction}`];
+        return [
+            keyToOrderByStructure(customOrderByKey, direction),
+            { id: direction },
+        ];
     }
     if (Array.isArray(customOrderByKey)) {
         if (customOrderByKey.length === 0 ||
@@ -198,8 +238,8 @@ export const orderbyBuilder = (sortInfo, customSort) => {
             throw new Error(`Field ${field} error: custom sort for this field must be of type string or a non empty string array, ${customOrderByKey.join(',')} is not accepted.`);
         }
         return [
-            ...customOrderByKey.map((k) => `${k} ${direction}`),
-            `id ${direction}`,
+            ...customOrderByKey.map((k) => keyToOrderByStructure(k, direction)),
+            { id: direction },
         ];
     }
     if (customOrderByKey != null && typeof customOrderByKey !== 'string') {
@@ -209,5 +249,5 @@ export const orderbyBuilder = (sortInfo, customSort) => {
     if (refScheme) {
         fieldPath += `/${refScheme.replace(/\[(.*?)\]/g, '').replace(/\./g, '/')}`;
     }
-    return [`${fieldPath} ${direction}`, `id ${direction}`];
+    return [keyToOrderByStructure(fieldPath, direction), { id: direction }];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/ui-shared-components",
-  "version": "14.0.1-build-bump-typescript-to-5-9-2-31dbec9f4f68887ab6fc1fbeae9778554f2c46e2-1",
+  "version": "14.0.1-build-sdk23-orderby-e357d5b8ffc1975aa61a5978370ee31a3b72fcc7-1",
   "main": "./dist/index.js",
   "sideEffects": false,
   "files": [
@@ -49,7 +49,7 @@
     "remark-gfm": "^4.0.0",
     "rimraf": "^6.0.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.9.2",
+    "typescript": "^5.8.2",
     "virtua": "^0.37.3",
     "zxcvbn": "^4.4.2"
   },
@@ -132,7 +132,7 @@
   },
   "homepage": "https://github.com/balena-io/ui-shared-components#readme",
   "versionist": {
-    "publishedAt": "2025-08-01T09:00:14.477Z"
+    "publishedAt": "2025-09-03T12:11:52.365Z"
   },
   "overrides": {
     "storybook": "$storybook"