@balena/ui-shared-components 12.2.0-build-add-manage-columns-tracking-57187862023acb4b29b7aad932ba7521b790a439-1 → 12.2.1-build-improve-rjst-typings-556eb04390faa8be7ac5c845763edd6bf0926b8e-1

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

@@ -112,31 +112,33 @@ const TableRenderer = ({ filtered, selected, properties, hasUpdateActions, check
         onSort === null || onSort === void 0 ? void 0 : onSort(sortPref);
         return sortPref;
     }, [sort, model, columns, onSort]);
-    const handleAddTagClose = (selectedTagColumns) => {
-        if (!(selectedTagColumns === null || selectedTagColumns === void 0 ? void 0 : selectedTagColumns.length)) {
+    const { tagField } = rjstContext;
+    const handleAddTagClose = tagField != null
+        ? (selectedTagColumns) => {
+            if (!(selectedTagColumns === null || selectedTagColumns === void 0 ? void 0 : selectedTagColumns.length)) {
+                setShowAddTagDialog(false);
+                return;
+            }
+            const additionalColumns = selectedTagColumns.map((key, index) => {
+                return {
+                    title: key,
+                    label: `Tag: ${key}`,
+                    key: `${TAG_COLUMN_PREFIX}${key}`,
+                    selected: true,
+                    type: 'predefined',
+                    field: tagField,
+                    sortable: pagination.serverSide
+                        ? `${tagField}(tag_key='${key}')/value`
+                        : true,
+                    index: index + 1 + columns.length,
+                    priority: '',
+                    render: tagKeyRender(key),
+                };
+            });
+            setColumns(columns.concat(additionalColumns));
             setShowAddTagDialog(false);
-            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,
-                sortable: pagination.serverSide
-                    ? `${field}(tag_key='${key}')/value`
-                    : true,
-                index: index + 1 + columns.length,
-                priority: '',
-                render: tagKeyRender(key),
-            };
-        });
-        setColumns(columns.concat(additionalColumns));
-        setShowAddTagDialog(false);
-    };
+        : undefined;
     useEffect(() => {
         var _a;
         (_a = analytics.webTracker) === null || _a === void 0 ? void 0 : _a.track('View table - columns', {
@@ -166,7 +168,7 @@ const TableRenderer = ({ filtered, selected, properties, hasUpdateActions, check
                     (_a = analytics.webTracker) === null || _a === void 0 ? void 0 : _a.track('Open manage columns', {
                         resource: model.resource,
                     });
-                } })), showAddTagDialog && (tagKeys === null || tagKeys === void 0 ? void 0 : tagKeys.length) && (_jsx(AddTagHandler, { columns: columns, tagKeys: tagKeys, onClose: handleAddTagClose }))] }));
+                } })), showAddTagDialog && (tagKeys === null || tagKeys === void 0 ? void 0 : tagKeys.length) && handleAddTagClose != null && (_jsx(AddTagHandler, { columns: columns, tagKeys: tagKeys, onClose: handleAddTagClose }))] }));
 };
 export const table = {
     slug: 'table',

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

@@ -3,7 +3,7 @@ export type Order = 'asc' | 'desc';
 export type CheckedState = 'none' | 'some' | 'all';
 export interface TableSortOptions<T> {
     direction: Order;
-    field: string;
+    field: Extract<keyof T, string>;
     key: string;
     sortable: RJSTEntityPropertyDefinition<T>['sortable'];
     refScheme?: string;

package/dist/components/RJST/index.js

@@ -9,7 +9,7 @@ import { Tags } from './Actions/Tags';
 import { Update } from './Actions/Update';
 import { Create } from './Actions/Create';
 import { rjstDefaultPermissions, rjstGetModelForCollection, rjstRunTransformers, } from './models/helpers';
-import { rjstGetDisabledReason, getFromLocalStorage, getTagsDisabledReason, setToLocalStorage, getSelected, getSortingFunction, DEFAULT_ITEMS_PER_PAGE, } from './utils';
+import { rjstGetDisabledReason, getFromLocalStorage, getTagsDisabledReason, setToLocalStorage, getSortingFunction, DEFAULT_ITEMS_PER_PAGE, } from './utils';
 import { getLenses } from './Lenses';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import pickBy from 'lodash/pickBy';
@@ -311,12 +311,19 @@ const hasPropertyEnabled = (value, propertyKey) => {
             : false;
 };
 const getColumnsFromSchema = ({ t, schema, idField, isServerSide, customSort, priorities, formats, }) => {
-    var _a;
-    return Object.entries((_a = schema.properties) !== null && _a !== void 0 ? _a : {})
-        .filter(([_keyBy, val]) => isJSONSchema(val))
+    var _a, _b, _c;
+    const prioritySets = {
+        primary: new Set((_a = priorities === null || priorities === void 0 ? void 0 : priorities.primary) !== null && _a !== void 0 ? _a : []),
+        secondary: new Set((_b = priorities === null || priorities === void 0 ? void 0 : priorities.secondary) !== null && _b !== void 0 ? _b : []),
+    };
+    return Object.entries((_c = schema.properties) !== null && _c !== void 0 ? _c : {})
+        .filter((entry) => {
+        const [_key, val] = entry;
+        return isJSONSchema(val);
+    })
         .flatMap(([key, val]) => {
         const refScheme = getPropertyScheme(val);
-        if (!refScheme || refScheme.length <= 1 || typeof val !== 'object') {
+        if (!refScheme || refScheme.length <= 1) {
             return [[key, val]];
         }
         const entityFilterOnly = parseDescriptionProperty(val, 'x-filter-only');
@@ -338,15 +345,11 @@ const getColumnsFromSchema = ({ t, schema, idField, isServerSide, customSort, pr
     })
         .map(([key, val], index) => {
         var _a;
-        if (typeof val !== 'object') {
-            return;
-        }
         const xNoSort = parseDescriptionProperty(val, 'x-no-sort');
-        const definedPriorities = priorities !== null && priorities !== void 0 ? priorities : {};
         const refScheme = getPropertyScheme(val);
-        const priority = definedPriorities.primary.find((prioritizedKey) => prioritizedKey === key)
+        const priority = prioritySets.primary.has(key)
             ? 'primary'
-            : definedPriorities.secondary.find((prioritizedKey) => prioritizedKey === key)
+            : prioritySets.secondary.has(key)
                 ? 'secondary'
                 : 'tertiary';
         const widgetSchema = Object.assign(Object.assign({}, val), { title: undefined });
@@ -369,7 +372,7 @@ const getColumnsFromSchema = ({ t, schema, idField, isServerSide, customSort, pr
         }
         return Object.assign(Object.assign({}, getTitleAndLabel(t, val, key, refScheme === null || refScheme === void 0 ? void 0 : refScheme[0])), { field: key, 
             // This is used for storing columns and views
-            key: refScheme ? `${key}_${refScheme[0]}_${index}` : `${key}_${index}`, selected: getSelected(key, priorities), priority, type: 'predefined', refScheme: refScheme === null || refScheme === void 0 ? void 0 : refScheme[0], index, sortable: xNoSort || val.format === 'tag'
+            key: refScheme ? `${key}_${refScheme[0]}_${index}` : `${key}_${index}`, selected: !priorities || priority === 'primary' || priority === 'secondary', priority, type: 'predefined', refScheme: refScheme === null || refScheme === void 0 ? void 0 : refScheme[0], index, sortable: xNoSort || val.format === 'tag'
                 ? false
                 : typeof fieldCustomSort === 'function'
                     ? fieldCustomSort
@@ -377,6 +380,5 @@ const getColumnsFromSchema = ({ t, schema, idField, isServerSide, customSort, pr
                 const calculatedField = rjstAdaptRefScheme(fieldVal, val);
                 return (_jsx(Widget, { extraFormats: [...(formats !== null && formats !== void 0 ? formats : []), ...defaultFormats], schema: widgetSchema, value: calculatedField, extraContext: entry }));
             } });
-    })
-        .filter((columnDef) => !!columnDef);
+    });
 };

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

@@ -1,4 +1,4 @@
-import type { RJSTBaseResource, Permissions, Priorities, RJSTTagsSdk } from './schemaOps';
+import type { RJSTBaseResource, Permissions, RJSTTagsSdk } from './schemaOps';
 import type { JSONSchema7 as JSONSchema } from 'json-schema';
 import type { CheckedState } from './components/Table/utils';
 import type { TFunction } from '../../hooks/useTranslations';
@@ -12,4 +12,3 @@ export declare const getTagsDisabledReason: <T extends RJSTBaseResource<T>>(sele
 export declare const getCreateDisabledReason: <T extends RJSTBaseResource<T>>(permissions: Permissions<T>, hasOngoingAction: boolean, t: TFunction) => string | undefined;
 export declare const rjstGetDisabledReason: <T extends RJSTBaseResource<T>>(selected: T[] | undefined, checkedState: CheckedState | undefined, hasOngoingAction: boolean, actionType: "update" | "delete" | null, t: TFunction) => string | undefined;
 export declare const getSortingFunction: <T>(schemaKey: keyof T, schemaValue: JSONSchema) => (a: T, b: T) => number;
-export declare const getSelected: <T, K extends keyof T>(key: K, priorities?: Priorities<T>) => boolean;

package/dist/components/RJST/utils.js

@@ -133,9 +133,3 @@ export const getSortingFunction = (schemaKey, schemaValue) => {
     }
     return (a, b) => diff(a[schemaKey], b[schemaKey]);
 };
-export const getSelected = (key, priorities) => {
-    if (!priorities) {
-        return true;
-    }
-    return priorities.primary.includes(key) || priorities.secondary.includes(key);
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/ui-shared-components",
-  "version": "12.2.0-build-add-manage-columns-tracking-57187862023acb4b29b7aad932ba7521b790a439-1",
+  "version": "12.2.1-build-improve-rjst-typings-556eb04390faa8be7ac5c845763edd6bf0926b8e-1",
   "main": "./dist/index.js",
   "sideEffects": false,
   "files": [
@@ -54,7 +54,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@balena/lint": "^9.2.1",
+    "@balena/lint": "^9.3.0",
     "@storybook/addon-essentials": "^8.6.12",
     "@storybook/addon-interactions": "^8.6.12",
     "@storybook/addon-links": "^8.6.12",
@@ -89,7 +89,7 @@
     "test": "jest",
     "prepack": "npm run build",
     "lint": "balena-lint src",
-    "lint:fix": "balena-lint --fix src",
+    "lint-fix": "balena-lint --fix src",
     "prepare": "husky",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build --docs",
@@ -138,6 +138,6 @@
   },
   "homepage": "https://github.com/balena-io/ui-shared-components#readme",
   "versionist": {
-    "publishedAt": "2025-04-15T13:56:03.369Z"
+    "publishedAt": "2025-04-15T14:54:10.459Z"
   }
 }