@balena/ui-shared-components 12.0.2-build-renovate-virtua-418c2c10d0fa82b41ef702198fabd623c02dd5fd-1 → 12.1.0-build-add-server-side-tag-order-by-990ba2861d7d8b91af9ea2121ebdbe45157950f4-1

package/dist/components/RJST/Lenses/types/index.d.ts

@@ -1,5 +1,4 @@
-import type { RJSTEntityPropertyDefinition } from '../../';
-import type { RJSTContext, RJSTModel } from '../../schemaOps';
+import type { RJSTContext, RJSTEntityPropertyDefinition, RJSTModel } from '../../schemaOps';
 import type { CheckedState, Pagination, TableSortOptions } from '../../components/Table/utils';
 import type { BoxProps } from '@mui/material';
 export { table } from './table';
@@ -18,11 +17,11 @@ export interface CollectionLensRendererProps<T extends {
     filtered: T[];
     selected?: Array<Subset<T>>;
     checkedState?: CheckedState;
-    sort: TableSortOptions | null;
+    sort: TableSortOptions<T> | null;
     changeSelected: (selected: T[] | undefined, allChecked?: CheckedState) => void;
     data: T[] | undefined;
     onPageChange?: (page: number, itemsPerPage: number) => void;
-    onSort?: (sort: TableSortOptions) => void;
+    onSort?: (sort: TableSortOptions<T>) => void;
     pagination: Pagination;
     rowKey?: keyof T;
 }

package/dist/components/RJST/Lenses/types/table.js

@@ -118,14 +118,17 @@ const TableRenderer = ({ filtered, selected, properties, hasUpdateActions, check
             return;
         }
         const additionalColumns = selectedTagColumns.map((key, index) => {
+            const field = rjstContext.tagField;
             return {
                 title: key,
                 label: `Tag: ${key}`,
                 key: `${TAG_COLUMN_PREFIX}${key}`,
                 selected: true,
                 type: 'predefined',
-                field: rjstContext.tagField,
-                sortable: pagination.serverSide ? false : true,
+                field,
+                sortable: pagination.serverSide
+                    ? `${field}(tag_key='${key}')/value`
+                    : true,
                 index: index + 1 + columns.length,
                 priority: '',
                 render: tagKeyRender(key),

package/dist/components/RJST/components/Table/AddTagHandler.d.ts

@@ -1,4 +1,4 @@
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 interface AddTagHandlerProps<T> {
     columns: Array<RJSTEntityPropertyDefinition<T>>;
     tagKeys: string[];

package/dist/components/RJST/components/Table/TableActions.d.ts

@@ -1,4 +1,4 @@
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 import type { MenuItemProps } from '@mui/material';
 import type { ColumnPreferencesChangeProp } from './index';
 interface TableActionsProps<T> {

package/dist/components/RJST/components/Table/TableCell.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 export interface TableCellProps<T> {
     href: string | undefined;
     onRowClick: ((entity: T, event: React.MouseEvent<HTMLAnchorElement>) => void) | undefined;

package/dist/components/RJST/components/Table/TableHeader.d.ts

@@ -1,6 +1,6 @@
 import type * as React from 'react';
 import type { CheckedState, Order } from './utils';
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 interface TableHeaderProps<T> {
     columns: Array<RJSTEntityPropertyDefinition<T>>;
     data: T[];

package/dist/components/RJST/components/Table/TableRow.d.ts

@@ -1,7 +1,7 @@
 import type * as React from 'react';
 import type { CheckedState } from './utils';
 import { type TableCellProps } from './TableCell';
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 export interface TableRowProps<T> {
     row: T;
     rowKey: keyof T;

package/dist/components/RJST/components/Table/TableToolbar.d.ts

@@ -1,5 +1,5 @@
 import type { MenuItemProps } from '@mui/material';
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 import type { ColumnPreferencesChangeProp } from './index';
 interface TableToolbarProps<T> {
     numSelected?: number;

package/dist/components/RJST/components/Table/index.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import type { CheckedState, Pagination, TableSortOptions } from './utils';
 import type { MenuItemProps } from '@mui/material';
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 export type ColumnPreferencesChangeProp<T> = (columns: Array<RJSTEntityPropertyDefinition<T>>, changeType: 'display' | 'reorder') => void;
 interface TableProps<T> {
     rowKey: keyof T;
@@ -10,10 +10,10 @@ interface TableProps<T> {
     checkedState?: CheckedState;
     columns: Array<RJSTEntityPropertyDefinition<T>>;
     pagination: Pagination;
-    sort: TableSortOptions;
+    sort: TableSortOptions<T>;
     actions?: MenuItemProps[];
     onCheck?: (selected: T[] | undefined, allChecked?: CheckedState) => void;
-    onSort?: (sort: TableSortOptions) => void;
+    onSort?: (sort: TableSortOptions<T>) => void;
     getRowHref: ((entry: any) => string) | undefined;
     onRowClick?: (entity: T, event: React.MouseEvent<HTMLAnchorElement>) => void;
     onPageChange?: (page: number, itemsPerPage: number) => void;

package/dist/components/RJST/components/Table/index.js

@@ -55,7 +55,7 @@ export const Table = ({ rowKey, data, checkedItems = [], checkedState, columns,
             ? new Map(visibleRows.map((row) => [row[rowKey], row]))
             : null;
     }, [visibleRows, rowKey]);
-    const handleOnSort = React.useCallback((_event, { key, field, refScheme }) => {
+    const handleOnSort = React.useCallback((_event, { key, field, refScheme, sortable }) => {
         if (!sort) {
             return;
         }
@@ -66,6 +66,7 @@ export const Table = ({ rowKey, data, checkedItems = [], checkedState, columns,
         const sortObj = {
             direction: newOrder,
             field: field,
+            sortable,
             key: key,
             refScheme: refScheme,
         };

package/dist/components/RJST/components/Table/useColumns.d.ts

@@ -1,6 +1,6 @@
 import type React from 'react';
 import type { TagField } from './utils';
-import type { RJSTEntityPropertyDefinition } from '../..';
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 export declare const TAG_COLUMN_PREFIX = "tag_column_";
 export declare function useColumns<T>(resourceName: string, defaultColumns: Array<RJSTEntityPropertyDefinition<T>>, tagKeyRender: (key: string) => (tags: TagField[] | undefined) => React.ReactElement | null): readonly [{
     render: ((tags: TagField[] | undefined) => React.ReactElement | null) | ((value: any, row: T) => string | number | JSX.Element | null | undefined);
@@ -10,7 +10,7 @@ export declare function useColumns<T>(resourceName: string, defaultColumns: Arra
     label: string | JSX.Element;
     field: Extract<keyof T, string>;
     key: string;
-    sortable: boolean | ((a: T, b: T) => number);
+    sortable: string | boolean | ((a: T, b: T) => number);
     type: string;
     priority: string;
     refScheme?: string;
@@ -22,7 +22,7 @@ export declare function useColumns<T>(resourceName: string, defaultColumns: Arra
     label: string | JSX.Element;
     field: Extract<keyof T, string>;
     key: string;
-    sortable: boolean | ((a: T, b: T) => number);
+    sortable: string | boolean | ((a: T, b: T) => number);
     type: string;
     priority: string;
     refScheme?: string;

package/dist/components/RJST/components/Table/utils.d.ts

@@ -1,9 +1,11 @@
+import type { RJSTEntityPropertyDefinition } from '../../schemaOps';
 export type Order = 'asc' | 'desc';
 export type CheckedState = 'none' | 'some' | 'all';
-export interface TableSortOptions {
+export interface TableSortOptions<T> {
     direction: Order;
     field: string;
     key: string;
+    sortable: RJSTEntityPropertyDefinition<T>['sortable'];
     refScheme?: string;
 }
 export type Pagination = {

package/dist/components/RJST/index.d.ts

@@ -59,16 +59,3 @@ export interface RJSTProps<T> extends Omit<BoxProps, 'onChange'> {
 }
 export declare const RJST: <T extends RJSTBaseResource<T>>({ model: modelRaw, data, formats, actions, sdk, customSort, refresh, getBaseUrl, onEntityClick, onChange, pagination, customLenses, loading, rowKey, noDataInfo, persistFilters, ...boxProps }: RJSTProps<T>) => import("react/jsx-runtime").JSX.Element;
 export { rjstRunTransformers, rjstDefaultPermissions, rjstGetModelForCollection, rjstAddToSchema, type RJSTAction, type RJSTBaseResource, type RJSTRawModel, type RJSTModel, rjstJsonSchemaPick, rjstGetDisabledReason, getPropertyScheme, getSubSchemaFromRefScheme, parseDescription, parseDescriptionProperty, generateSchemaFromRefScheme, };
-export type RJSTEntityPropertyDefinition<T> = {
-    title: string;
-    label: string | JSX.Element;
-    field: Extract<keyof T, string>;
-    key: string;
-    selected: boolean;
-    index: number;
-    sortable: boolean | ((a: T, b: T) => number);
-    render: (value: any, row: T) => string | number | JSX.Element | null | undefined;
-    type: string;
-    priority: string;
-    refScheme?: string;
-};

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 | null, customSort: RJSTContext<T>["customSort"]) => string[] | null;
+export declare const orderbyBuilder: <T>(sortInfo: TableSortOptions<T> | null, customSort: RJSTContext<T>["customSort"]) => string[] | null;
 export {};

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

@@ -177,7 +177,7 @@ export const convertToPineClientFilter = (parentKeys, filter) => {
     return handlePrimitiveFilter(parentKeys, filter);
 };
 export const orderbyBuilder = (sortInfo, customSort) => {
-    var _a;
+    var _a, _b;
     if (!sortInfo) {
         return null;
     }
@@ -188,7 +188,7 @@ export const orderbyBuilder = (sortInfo, customSort) => {
     // TODO: Refactor this logic to create an object structure and retrieve the correct property using the refScheme.
     // The customSort should look like: { user: { owns_items: [{ uuid: 'xx09x0' }] } }
     // The refScheme will reference the property path, e.g., owns_items[0].uuid.
-    const customOrderByKey = (_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];
+    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}`];
     }

package/dist/components/RJST/schemaOps.d.ts

@@ -33,6 +33,19 @@ export interface RJSTModel<T> {
     permissions: Permissions<T>;
     priorities?: Priorities<T>;
 }
+export type RJSTEntityPropertyDefinition<T> = {
+    title: string;
+    label: string | JSX.Element;
+    field: Extract<keyof T, string>;
+    key: string;
+    selected: boolean;
+    sortable: boolean | ((a: T, b: T) => number) | string;
+    index: number;
+    render: (value: any, row: T) => string | number | JSX.Element | null | undefined;
+    type: string;
+    priority: string;
+    refScheme?: string;
+};
 export interface CustomSchemaDescription {
     'x-ref-scheme'?: string[];
     'x-foreign-key-scheme'?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/ui-shared-components",
-  "version": "12.0.2-build-renovate-virtua-418c2c10d0fa82b41ef702198fabd623c02dd5fd-1",
+  "version": "12.1.0-build-add-server-side-tag-order-by-990ba2861d7d8b91af9ea2121ebdbe45157950f4-1",
   "main": "./dist/index.js",
   "sideEffects": false,
   "files": [
@@ -50,7 +50,7 @@
     "rimraf": "^6.0.0",
     "ts-jest": "^29.2.5",
     "typescript": "^5.8.2",
-    "virtua": "^0.40.0",
+    "virtua": "^0.37.3",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
@@ -138,6 +138,6 @@
   },
   "homepage": "https://github.com/balena-io/ui-shared-components#readme",
   "versionist": {
-    "publishedAt": "2025-04-07T14:58:36.874Z"
+    "publishedAt": "2025-04-08T10:35:24.000Z"
   }
 }