@balena/ui-shared-components 13.0.0-build-remove-role-inheritance-ac3d10291e39eebb252625d4d728cead979ec6ad-1 → 13.0.0-build-rename-and-require-widget-extracontext-37df890fe262ef54dc0d361d32b076c7eeccd84b-1

package/dist/components/RJST/Actions/Create.js

@@ -33,7 +33,7 @@ export const Create = ({ model, rjstContext, hasOngoingAction, onActionTriggered
     return (_jsx(Box, { display: "flex", children: _jsx(Tooltip, { title: typeof disabledReason === 'string' ? disabledReason : undefined, children: _jsx(Button, { "data-action": `create-${model.resource}`, variant: "contained", onClick: () => {
                     onActionTriggered({
                         action,
-                        schema: rjstJsonSchemaPick(model.schema, model.permissions.flatMap((p) => p.create)),
+                        schema: rjstJsonSchemaPick(model.schema, model.permissions.create),
                     });
                 }, startIcon: _jsx(FontAwesomeIcon, { icon: faMagic }), disabled: !!disabledReason, children: _jsx(ActionContent, { action: action, getDisabledReason: action.isDisabled, affectedEntries: undefined, checkedState: undefined, onDisabledReady: (result) => {
                         setDisabledReasonsByAction((disabledReasonsState) => (Object.assign(Object.assign({}, disabledReasonsState), { [action.title]: result })));

package/dist/components/RJST/Actions/Update.js

@@ -45,9 +45,7 @@ export const Update = ({ model, rjstContext, selected, hasOngoingAction, onActio
                         action,
                         schema: action.type === 'delete'
                             ? {}
-                            : rjstJsonSchemaPick(model.schema, model.permissions.flatMap(
-                            // TODO: Why is this cast necessary?
-                            (p) => p[action.type])),
+                            : rjstJsonSchemaPick(model.schema, model.permissions[action.type]),
                         affectedEntries: selected,
                     });
                 },
@@ -88,9 +86,7 @@ export const Update = ({ model, rjstContext, selected, hasOngoingAction, onActio
                             action,
                             schema: action.type === 'delete'
                                 ? {}
-                                : rjstJsonSchemaPick(model.schema, model.permissions.flatMap(
-                                // TODO: Why is this cast necessary?
-                                (p) => p[action.type])),
+                                : rjstJsonSchemaPick(model.schema, model.permissions[action.type]),
                             affectedEntries: selected,
                         });
                     }, disabled: !!disabledUpdateReason, color: action.isDangerous ? 'error' : 'secondary', children: _jsx(ActionContent, { action: action, getDisabledReason: action.isDisabled, affectedEntries: selected, checkedState: checkedState, onDisabledReady: (result) => {

package/dist/components/RJST/components/Widget/Formats/BooleanAsIconWidget.js

@@ -4,7 +4,7 @@ import { faTimesCircle } from '@fortawesome/free-solid-svg-icons/faTimesCircle';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { JsonTypes, widgetFactory } from '../utils';
 import { Box, Typography } from '@mui/material';
-export const BooleanAsIconWidget = widgetFactory('BooleanAsIcon', {}, [
+export const BooleanAsIconWidget = widgetFactory('BooleanAsIcon', [
     JsonTypes.boolean,
     JsonTypes.number,
     JsonTypes.null,

package/dist/components/RJST/components/Widget/Formats/CodeWidget.js

@@ -3,6 +3,6 @@ import { Tooltip } from '@mui/material';
 import { Copy } from '../../../../Copy';
 import { JsonTypes, widgetFactory } from '../utils';
 import { Code } from '../../../../Code';
-export const CodeWidget = widgetFactory('Code', {}, [JsonTypes.string])(({ value, }) => {
+export const CodeWidget = widgetFactory('Code', [JsonTypes.string])(({ value, }) => {
     return (_jsx(Copy, { copy: value, children: _jsx(Tooltip, { title: value, children: _jsx(Code, { noWrap: true, children: value }) }) }));
 });

package/dist/components/RJST/components/Widget/Formats/DisabledTextWidget.js

@@ -3,7 +3,7 @@ import { Tooltip, Typography } from '@mui/material';
 import { useTranslation } from '../../../../../hooks/useTranslations';
 import { JsonTypes, widgetFactory } from '../utils';
 import { token } from '../../../../../utils/token';
-export const DisabledTextWidget = widgetFactory('DisabledText', {}, [
+export const DisabledTextWidget = widgetFactory('DisabledText', [
     JsonTypes.string,
     JsonTypes.number,
     JsonTypes.null,

package/dist/components/RJST/components/Widget/Formats/DurationWidget.d.ts

@@ -1,6 +1 @@
-export declare const DurationWidget: import("../utils").Widget<object, {
-    value: {
-        start?: number | Date | null;
-        end?: number | Date | null;
-    };
-}>;
+export declare const DurationWidget: import("../utils").Widget<object, object>;

package/dist/components/RJST/components/Widget/Formats/DurationWidget.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { intervalToDuration } from 'date-fns';
 import { JsonTypes, widgetFactory } from '../utils';
 import { Typography } from '@mui/material';
-export const DurationWidget = widgetFactory('Duration', {}, [JsonTypes.object])(({ value, }) => {
+export const DurationWidget = widgetFactory('Duration', [JsonTypes.object])(({ value }) => {
     const duration = React.useMemo(() => {
         var _a, _b, _c;
         if (!value.start || !value.end) {

package/dist/components/RJST/components/Widget/Formats/ElapsedTimeWidget.js

@@ -2,9 +2,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { UiOption, JsonTypes, widgetFactory, formatTimestamp, timeSince, } from '../utils';
 import { Material, Tooltip } from '../../../../..';
 const { Typography } = Material;
-export const ElapsedTimeWidget = widgetFactory('ElapsedTime', {
+export const ElapsedTimeWidget = widgetFactory('ElapsedTime', [JsonTypes.string, JsonTypes.number], {
     dtFormat: UiOption.string,
-}, [JsonTypes.string, JsonTypes.number])(({ value }) => {
+})(({ value }) => {
     if (!value) {
         return null;
     }

package/dist/components/RJST/components/Widget/Formats/HashWidget.js

@@ -2,6 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Code } from '@mui/icons-material';
 import { Copy } from '../../../../Copy';
 import { JsonTypes, truncateHash, widgetFactory } from '../utils';
-export const HashWidget = widgetFactory('Hash', {}, [JsonTypes.string])(({ value, }) => {
+export const HashWidget = widgetFactory('Hash', [JsonTypes.string])(({ value, }) => {
     return (_jsx(Copy, { copy: value, children: _jsx(Code, { children: truncateHash(value) }) }));
 });

package/dist/components/RJST/components/Widget/Formats/PercentageWidget.js

@@ -1,6 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { JsonTypes, widgetFactory } from '../utils';
-export const PercentageWidget = widgetFactory('Percentage', {}, [
+export const PercentageWidget = widgetFactory('Percentage', [
     JsonTypes.string,
     JsonTypes.number,
 ])(({ value }) => {

package/dist/components/RJST/components/Widget/Formats/PlaceholderTextWidget.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Typography } from '@mui/material';
 import { JsonTypes, widgetFactory } from '../utils';
 import { token } from '../../../../../utils/token';
-export const PlaceholderTextWidget = widgetFactory('PlaceholderText', {}, [
+export const PlaceholderTextWidget = widgetFactory('PlaceholderText', [
     JsonTypes.string,
     JsonTypes.number,
     JsonTypes.null,

package/dist/components/RJST/components/Widget/Formats/TemperatureWidget.js

@@ -1,6 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { JsonTypes, widgetFactory } from '../utils';
-export const TemperatureWidget = widgetFactory('Temperature', {}, [
+export const TemperatureWidget = widgetFactory('Temperature', [
     JsonTypes.number,
 ])(({ value }) => {
     return _jsx(_Fragment, { children: value ? `~${value}°C` : '-' });

package/dist/components/RJST/components/Widget/Formats/TxtWidget.js

@@ -19,7 +19,14 @@ const getArrayValue = (value, uiSchema) => {
     return arrayString;
 };
 const DATE_TIME_FORMATS = ['date-time', 'date', 'time'];
-const TxtWidget = widgetFactory('Txt', {
+const TxtWidget = widgetFactory('Txt', [
+    JsonTypes.string,
+    JsonTypes.null,
+    JsonTypes.integer,
+    JsonTypes.number,
+    JsonTypes.boolean,
+    JsonTypes.array,
+], {
     dtFormat: UiOption.string,
     align: Object.assign(Object.assign({}, UiOption.string), { enum: ['inherit', 'left', 'center', 'right', 'justify'] }),
     gutterBottom: UiOption.bolean,
@@ -27,14 +34,7 @@ const TxtWidget = widgetFactory('Txt', {
     paragraph: UiOption.boolean,
     sx: UiOption.object,
     variant: UiOption.string,
-}, [
-    JsonTypes.string,
-    JsonTypes.null,
-    JsonTypes.integer,
-    JsonTypes.number,
-    JsonTypes.boolean,
-    JsonTypes.array,
-])(({ value, schema, uiSchema }) => {
+})(({ value, schema, uiSchema }) => {
     var _a;
     let displayValue = isArray(value)
         ? getArrayValue(value, uiSchema)

package/dist/components/RJST/components/Widget/Formats/WrapWidget.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Typography } from '@mui/material';
 import { JsonTypes, widgetFactory } from '../utils';
-export const WrapWidget = widgetFactory('Wrap', {}, [JsonTypes.string])(({ value, }) => {
+export const WrapWidget = widgetFactory('Wrap', [JsonTypes.string])(({ value, }) => {
     return (_jsx(Typography, { sx: { maxWidth: '475px', whitespace: 'normal' }, children: value }));
 });

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

@@ -1,2 +1,2 @@
 import type { WidgetProps } from './utils';
-export declare const Widget: ({ value, extraContext, schema, extraFormats, uiSchema, }: WidgetProps) => import("react/jsx-runtime").JSX.Element | null;
+export declare const Widget: ({ value, resource, schema, extraFormats, uiSchema, }: WidgetProps) => import("react/jsx-runtime").JSX.Element | null;

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

@@ -31,7 +31,7 @@ const getWidget = (value, format, uiSchemaWidget, extraFormats) => {
     });
     return (_b = (_a = extraFormat === null || extraFormat === void 0 ? void 0 : extraFormat.widget) !== null && _a !== void 0 ? _a : typeWidgets[valueType]) !== null && _b !== void 0 ? _b : typeWidgets.default;
 };
-export const Widget = ({ value, extraContext, schema = {}, extraFormats, uiSchema, }) => {
+export const Widget = ({ value, resource, schema = {}, extraFormats, uiSchema, }) => {
     const format = getSchemaFormat(schema);
     if (!format) {
         return _jsx(_Fragment, { children: value });
@@ -43,5 +43,5 @@ export const Widget = ({ value, extraContext, schema = {}, extraFormats, uiSchem
         return null;
     }
     const WidgetComponent = getWidget(processedValue, format, undefined, extraFormats);
-    return (_jsx(WidgetComponent, { extraContext: extraContext, value: processedValue !== null && processedValue !== void 0 ? processedValue : null, schema: schema }));
+    return (_jsx(WidgetComponent, { resource: resource, value: processedValue !== null && processedValue !== void 0 ? processedValue : null, schema: schema }));
 };

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

@@ -19,7 +19,7 @@ export interface WidgetProps<T extends object = object> {
     schema: JSONSchema | undefined;
     extraFormats?: Format[];
     uiSchema?: UiSchema;
-    extraContext?: T;
+    resource: T;
 }
 export interface Widget<T extends object = object, ExtraProps = object> {
     uiOptions?: UiOptions;
@@ -49,7 +49,7 @@ export type UiOptions = {
     [key: string]: JSONSchema;
 };
 export declare const UiOption: UiOptions;
-export declare const widgetFactory: <ST extends Array<keyof JsonTypesTypeMap>>(displayName: string, uiOptions: Widget["uiOptions"], supportedTypes: ST) => <T extends object, ExtraProps extends object = object, V extends WidgetProps["value"] | null = JsonTypesTypeMap[ST[number]]>(widgetFn: (props: Overwrite<WidgetProps<T>, {
+export declare const widgetFactory: <ST extends Array<keyof JsonTypesTypeMap>>(displayName: string, supportedTypes: ST, uiOptions?: Widget["uiOptions"]) => <T extends object, ExtraProps extends object = object, V extends WidgetProps["value"] | null = JsonTypesTypeMap[ST[number]]>(widgetFn: (props: Overwrite<WidgetProps<T>, {
     value: V;
 }> & ExtraProps) => JSX.Element | null) => Widget<T, ExtraProps>;
 export declare const formatTimestamp: (timestamp: string | number, uiSchema?: UiSchema) => string;

package/dist/components/RJST/components/Widget/utils.js

@@ -33,7 +33,9 @@ export const UiOption = {
 // TODO: Replace the HOF with a plain function once TS supports optional generic types
 // See: https://github.com/microsoft/TypeScript/issues/14400
 // TODO: convert the fn args to an object once we bump TS
-export const widgetFactory = (displayName, uiOptions, supportedTypes) => {
+export const widgetFactory = (displayName, supportedTypes, 
+// TODO: Implement a way to pass these from RJST to widgets. Likely by adding a uiSchema property or something
+uiOptions = {}) => {
     return (widgetFn) => {
         const widget = widgetFn;
         Object.assign(widget, {

package/dist/components/RJST/index.js

@@ -378,7 +378,7 @@ const getColumnsFromSchema = ({ t, schema, idField, isServerSide, customSort, pr
                     ? fieldCustomSort
                     : getSortingFunction(key, val), render: (fieldVal, entry) => {
                 const calculatedField = rjstAdaptRefScheme(fieldVal, val);
-                return (_jsx(Widget, { extraFormats: [...(formats !== null && formats !== void 0 ? formats : []), ...defaultFormats], schema: widgetSchema, value: calculatedField, extraContext: entry }));
+                return (_jsx(Widget, { extraFormats: [...(formats !== null && formats !== void 0 ? formats : []), ...defaultFormats], schema: widgetSchema, value: calculatedField, resource: entry }));
             } });
     });
 };

package/dist/components/RJST/models/example.d.ts

@@ -8,7 +8,7 @@ export interface AugmentedSshKey extends RJSTBaseResource<AugmentedSshKey> {
 }
 export declare const model: RJSTRawModel<AugmentedSshKey>;
 export declare const transformers: {
-    __permissions: () => import("../schemaOps").Permissions<AugmentedSshKey>[];
+    __permissions: () => import("../schemaOps").Permissions<AugmentedSshKey>;
 };
 export declare const dataExample: {
     id: number;

package/dist/components/RJST/models/example.js

@@ -45,7 +45,7 @@ export const model = {
     },
 };
 export const transformers = {
-    __permissions: () => [model.permissions.administrator],
+    __permissions: () => model.permissions.administrator,
 };
 export const dataExample = [
     {

package/dist/components/RJST/models/helpers.d.ts

@@ -10,6 +10,6 @@ export declare const rjstDefaultPermissions: {
 };
 export declare const rjstRunTransformers: <T extends Dictionary<any>, TResult extends T, TContext = null>(data: T | undefined, transformers: Transformers<T, Omit<TResult, keyof T>, TContext>, context?: TContext) => TResult | undefined;
 export declare const rjstGetModelForCollection: <T>(model: RJSTRawModel<T>, context?: {
-    accessRole?: string[] | null;
+    accessRole?: string | null;
 }) => RJSTModel<T>;
 export {};

package/dist/components/RJST/models/helpers.js

@@ -38,6 +38,6 @@ export const rjstGetModelForCollection = (model, context) => {
             ...model.priorities.tertiary,
         ])
         : model.schema;
-    return Object.assign(Object.assign({}, model), { permissions: (!!(accessRole === null || accessRole === void 0 ? void 0 : accessRole.length) &&
-            accessRole.map((a) => { var _a; return (_a = model.permissions[a]) !== null && _a !== void 0 ? _a : model.permissions['default']; })) || [model.permissions['default']], schema });
+    return Object.assign(Object.assign({}, model), { permissions: (accessRole != null && model.permissions[accessRole]) ||
+            model.permissions['default'], schema });
 };

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

@@ -4,7 +4,7 @@ import type { CheckedState } from './components/Table/utils';
 import type { PineFilterObject } from './oData/jsonToOData';
 export interface RJSTBaseResource<T> {
     id: number;
-    __permissions: Array<Permissions<T>>;
+    __permissions: Permissions<T>;
 }
 type XHeaderLink = {
     tooltip: string;
@@ -30,7 +30,7 @@ export interface RJSTRawModel<T> {
 export interface RJSTModel<T> {
     resource: string;
     schema: JSONSchema;
-    permissions: Array<Permissions<T>>;
+    permissions: Permissions<T>;
     priorities?: Priorities<T>;
 }
 export type RJSTEntityPropertyDefinition<T> = {

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

@@ -9,6 +9,6 @@ export declare const setToLocalStorage: (key: string, value: unknown) => void;
 export declare const findInObject: (obj: Record<string, any>, key: string) => any;
 export declare const ObjectFromEntries: (entries: Array<[string, any]>) => Record<string, any>;
 export declare const getTagsDisabledReason: <T extends RJSTBaseResource<T>>(selected: T[] | undefined, tagField: keyof T, checkedState: CheckedState | undefined, tagsSdk: RJSTTagsSdk<T>, t: TFunction) => Promise<string | null>;
-export declare const getCreateDisabledReason: <T extends RJSTBaseResource<T>>(permissions: Array<Permissions<T>>, hasOngoingAction: boolean, t: TFunction) => string | undefined;
+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;

package/dist/components/RJST/utils.js

@@ -60,9 +60,9 @@ export const getTagsDisabledReason = async (selected, tagField, checkedState, ta
     const lacksPermissionsOnSelected = tagsSdk && 'canAccess' in tagsSdk
         ? !(await tagsSdk.canAccess({ checkedState, selected }))
         : selected === null || selected === void 0 ? void 0 : selected.some((entry) => {
-            return !entry.__permissions.some((p) => p.delete ||
-                p.create.includes(tagField) ||
-                p.update.includes(tagField));
+            return (!entry.__permissions.delete &&
+                !entry.__permissions.create.includes(tagField) &&
+                !entry.__permissions.update.includes(tagField));
         });
     if (lacksPermissionsOnSelected) {
         return t('info.edit_tag_no_permissions', { resource: 'item' });
@@ -70,11 +70,11 @@ export const getTagsDisabledReason = async (selected, tagField, checkedState, ta
     return null;
 };
 export const getCreateDisabledReason = (permissions, hasOngoingAction, t) => {
+    var _a;
     if (hasOngoingAction) {
         return t('info.ongoing_action_wait');
     }
-    if (!permissions.length ||
-        !permissions.filter((p) => { var _a; return (_a = p.create) === null || _a === void 0 ? void 0 : _a.length; }).length) {
+    if (!((_a = permissions.create) === null || _a === void 0 ? void 0 : _a.length)) {
         return t('info.create_item_no_permissions', { resource: 'item' });
     }
 };
@@ -89,9 +89,9 @@ export const rjstGetDisabledReason = (selected, checkedState, hasOngoingAction,
         return;
     }
     const lacksPermissionsOnSelected = selected.some((entry) => {
-        return entry.__permissions.every((p) => !p[actionType] ||
-            (Array.isArray(p[actionType]) &&
-                p[actionType].length <= 0));
+        return (!entry.__permissions[actionType] ||
+            (Array.isArray(entry.__permissions[actionType]) &&
+                entry.__permissions[actionType].length <= 0));
     });
     if (lacksPermissionsOnSelected) {
         return t('info.update_item_no_permissions', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/ui-shared-components",
-  "version": "13.0.0-build-remove-role-inheritance-ac3d10291e39eebb252625d4d728cead979ec6ad-1",
+  "version": "13.0.0-build-rename-and-require-widget-extracontext-37df890fe262ef54dc0d361d32b076c7eeccd84b-1",
   "main": "./dist/index.js",
   "sideEffects": false,
   "files": [
@@ -32,7 +32,7 @@
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "ajv-keywords": "^5.1.0",
-    "analytics-client": "^3.0.0",
+    "analytics-client": "^3.1.0",
     "color": "^5.0.0",
     "color-hash": "^2.0.2",
     "date-fns": "^4.1.0",
@@ -138,6 +138,6 @@
   },
   "homepage": "https://github.com/balena-io/ui-shared-components#readme",
   "versionist": {
-    "publishedAt": "2025-05-13T11:25:22.649Z"
+    "publishedAt": "2025-05-15T18:17:53.484Z"
   }
 }