@balena/ui-shared-components 12.1.0-build-secure-boot-acb8e3d7ac5b0201d6d8bbbb6031f9ade9d1e28c-1 → 12.1.0

package/dist/components/DownloadImageDialog/ApplicationInstructions.d.ts

@@ -6,5 +6,4 @@ export declare const ApplicationInstructions: import("react").NamedExoticCompone
     templateData: {
         dockerImage: string;
     };
-    secureboot: boolean;
 }>;

package/dist/components/DownloadImageDialog/ApplicationInstructions.js

@@ -1,12 +1,11 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import has from 'lodash/has';
 import { interpolateMustache } from './utils';
 import { Box, List, Tab, Tabs, Typography } from '@mui/material';
 import { memo, useEffect, useMemo, useState } from 'react';
 import { MUILinkWithTracking } from '../MUILinkWithTracking';
 import { OrderedListItem } from '../OrderedListItem';
 import { Markdown } from '../Markdown';
-import { Chip } from '../Chip';
-import { token } from '../../utils/token';
 export const getUserOs = () => {
     const platform = window.navigator.platform.toLowerCase();
     if (platform.includes('win')) {
@@ -20,13 +19,12 @@ export const getUserOs = () => {
     }
     return 'Unknown';
 };
-const SECURE_BOOT_INSTRUCTION_TO_REPLACE_START = 'Press the F10 key while BIOS';
 const dtJsonTocontractOsKeyMap = {
     windows: 'Windows',
     osx: 'MacOS',
     linux: 'Linux',
 };
-export const ApplicationInstructions = memo(function ApplicationInstructions({ deviceType, templateData, secureboot, }) {
+export const ApplicationInstructions = memo(function ApplicationInstructions({ deviceType, templateData, }) {
     var _a;
     const [currentOs, setCurrentOs] = useState(getUserOs());
     const instructions = useMemo(() => {
@@ -66,28 +64,37 @@ export const ApplicationInstructions = memo(function ApplicationInstructions({ d
                             setCurrentOs(value !== null && value !== void 0 ? value : 'Unknown');
                         }, "aria-label": "os tabs", children: Object.keys(instructions).map((os) => {
                             return _jsx(Tab, { label: os, value: os }, os);
-                        }) }) }) })), _jsx(InstructionsList, { instructions: finalInstructions, secureboot: secureboot }), _jsx(Box, { mt: 2, children: _jsxs(Typography, { children: ["For more details please refer to our", ' ', _jsx(MUILinkWithTracking, { href: `https://www.balena.io/docs/learn/getting-started/${deviceType.slug}/nodejs/`, children: "Getting Started Guide" }), "."] }) })] }));
+                        }) }) }) })), _jsx(InstructionsList, { instructions: finalInstructions }), _jsx(Box, { mt: 2, children: _jsxs(Typography, { children: ["For more details please refer to our", ' ', _jsx(MUILinkWithTracking, { href: `https://www.balena.io/docs/learn/getting-started/${deviceType.slug}/nodejs/`, children: "Getting Started Guide" }), "."] }) })] }));
 });
-const InstructionsItem = ({ instruction, index, secureboot, }) => {
-    return (_jsx(OrderedListItem, { index: index + 1, sx: { maxWidth: '100%' }, children: _jsx(Markdown, { components: {
-                code: (codeProps) => {
-                    return (_jsx("code", Object.assign({ style: {
-                            maxWidth: '100%',
-                            display: 'inline-block',
-                            whiteSpace: 'normal',
-                            wordBreak: 'break-all',
-                            wordWrap: 'break-word',
-                        } }, codeProps)));
-                },
-                br: () => {
-                    return _jsx("p", {});
-                },
-                p: ({ children }) => (_jsx("p", { style: { marginTop: 0, marginBottom: 0 }, children: secureboot &&
-                        instruction.includes(SECURE_BOOT_INSTRUCTION_TO_REPLACE_START) ? (_jsxs(_Fragment, { children: [instruction.split(SECURE_BOOT_INSTRUCTION_TO_REPLACE_START)[0], _jsxs(Box, { mt: 2, borderLeft: 1, borderColor: token('color.border.subtle'), pl: 2, children: [_jsx(Chip, { sx: { marginRight: 1 }, label: "Secure Boot", color: "purple" }), "The device needs to be configured in secure boot setup mode. This depends on the UEFI/BIOS implementation, but in general, this involves resetting the UEFI settings to default configuration, configuring the device to boot in UEFI mode, setting the first boot option to the USB key and disabling the restoration of factory keys. Save and Exit the UEFI/BIOS menu and the device should automatically reboot and begin the provisioning process.", ' ', _jsx(MUILinkWithTracking, { href: "https://docs.balena.io/reference/OS/secure-boot-and-full-disk-encryption/generic-x86-64-gpt/#provision-the-device", children: "Read more on UEFI settings for secure boot and full disk encryption." })] })] })) : (children) })),
-            }, children: instruction }) }));
+const InstructionsItem = ({ node, index }) => {
+    const hasChildren = has(node, 'children');
+    let text = null;
+    if (typeof node === 'string') {
+        text = node;
+    }
+    if (node === null || node === void 0 ? void 0 : node.text) {
+        text = node.text;
+    }
+    return (_jsxs(OrderedListItem, { index: index + 1, sx: { maxWidth: '100%' }, children: [_jsx(Markdown, { components: {
+                    code: (codeProps) => {
+                        return (_jsx("code", Object.assign({ style: {
+                                maxWidth: '100%',
+                                display: 'inline-block',
+                                whiteSpace: 'normal',
+                                wordBreak: 'break-all',
+                                wordWrap: 'break-word',
+                            } }, codeProps)));
+                    },
+                    br: () => {
+                        return _jsx("p", {});
+                    },
+                    p: ({ children }) => (_jsx("p", { style: { marginTop: 0, marginBottom: 0 }, children: children })),
+                }, children: text }), hasChildren && (_jsx(List, { children: node.children.map((item, i) => {
+                    return _jsx(InstructionsItem, { node: item, index: i }, i);
+                }) }))] }));
 };
-const InstructionsList = ({ instructions, secureboot, }) => {
-    return (_jsx(List, { children: instructions.map((instruction, i) => {
-            return (_jsx(InstructionsItem, { instruction: instruction, index: i, secureboot: secureboot }, `${instruction}_${i}`));
+const InstructionsList = ({ instructions }) => {
+    return (_jsx(List, { children: instructions.map((item, i) => {
+            return _jsx(InstructionsItem, { node: item, index: i }, `${item}_${i}`);
         }) }));
 };

package/dist/components/DownloadImageDialog/ImageForm.d.ts

@@ -16,7 +16,5 @@ interface ImageFormProps {
     onSelectedOsTypeChange: (osType: string) => void;
     onChange: (key: keyof DownloadImageFormModel, value: DownloadImageFormModel[keyof DownloadImageFormModel]) => void;
 }
-export declare const GENERIC_X86_SLUG = "generic-amd64";
-export declare const GENERIC_X86_MINIMUM_SUPPORTED_SECUREBOOT_VERSION = "5.3.15";
 export declare const ImageForm: import("react").NamedExoticComponent<ImageFormProps>;
 export {};

package/dist/components/DownloadImageDialog/ImageForm.js

@@ -1,25 +1,22 @@
 import { __rest } from "tslib";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Avatar, Box, Checkbox, Chip, Divider, FormControl, FormControlLabel, FormLabel, InputAdornment, InputLabel, Radio, RadioGroup, TextField, Tooltip, Typography, IconButton, Autocomplete, Stack, Accordion, AccordionSummary, AccordionDetails, Switch, Dialog, DialogTitle, DialogContent, DialogActions, Button, } from '@mui/material';
+import { Avatar, Box, Button, Checkbox, Chip, Collapse, Divider, FormControl, FormControlLabel, FormLabel, InputAdornment, InputLabel, Radio, RadioGroup, TextField, Tooltip, Typography, IconButton, Autocomplete, Stack, } from '@mui/material';
 import HelpIcon from '@mui/icons-material/Help';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { getPreferredVersionOpts, transformVersions } from './version';
 import { OsTypeSelector } from './OsTypeSelector';
 import { VariantSelector } from './VariantSelector';
+import AddIcon from '@mui/icons-material/Add';
+import RemoveIcon from '@mui/icons-material/Remove';
 import ArticleIcon from '@mui/icons-material/Article';
 import { MUILinkWithTracking } from '../MUILinkWithTracking';
 import { Visibility, VisibilityOff } from '@mui/icons-material';
 import { FALLBACK_LOGO_UNKNOWN_DEVICE } from './utils';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faChevronRight, faTriangleExclamation, } from '@fortawesome/free-solid-svg-icons';
-import * as semver from 'balena-semver';
+import { faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
 import { Callout } from '../Callout';
 import { token } from '../../utils/token';
-import { getFromLocalStorage, setToLocalStorage } from '../../utils/storage';
-import { NewChip } from '../NewChip';
-import { useAnalyticsContext } from '../../contexts/AnalyticsContext';
 const POLL_INTERVAL_DOCS = 'https://www.balena.io/docs/reference/supervisor/bandwidth-reduction/#side-effects--warnings';
-const SECURE_BOOT_AND_FULL_DISK_ENCRYPTION_DOCS = 'https://docs.balena.io/reference/OS/secure-boot-and-full-disk-encryption/overview/';
 const getCategorizedVersions = (deviceTypeOsVersions, deviceType, osType) => {
     var _a;
     const osVersions = (_a = deviceTypeOsVersions[deviceType.slug]) !== null && _a !== void 0 ? _a : [];
@@ -39,14 +36,9 @@ const lineMap = {
     sunset: 'yellow',
     outdated: 'red',
 };
-export const GENERIC_X86_SLUG = 'generic-amd64';
-export const GENERIC_X86_MINIMUM_SUPPORTED_SECUREBOOT_VERSION = '5.3.15';
 export const ImageForm = memo(function ImageForm({ compatibleDeviceTypes, osVersions, isInitialDefault, osType, osTypes, hasEsrVersions, model, formElement, downloadUrl, applicationId, authToken, onSelectedOsTypeChange, onChange, }) {
     var _a, _b;
-    const { state } = useAnalyticsContext();
     const [showAdvancedSettings, setShowAdvancedSettings] = useState(false);
-    const [showSecureBootConfirmationDialog, setShowSecureBootConfirmationDialog,] = useState(false);
-    const [dontShowSecureBootWarningAgain, setDontShowSecureBootWarningAgain] = useState(false);
     const [showPassword, setShowPassword] = useState(false);
     const [version, setVersion] = useState();
     const [variant, setVariant] = useState('prod');
@@ -54,17 +46,6 @@ export const ImageForm = memo(function ImageForm({ compatibleDeviceTypes, osVers
     const { selectionOpts, preferredSelectionOpts } = useMemo(() => getCategorizedVersions(osVersions, model.deviceType, osType), [osVersions, model.deviceType, osType]);
     const versionSelectionOpts = useMemo(() => (showAllVersions ? selectionOpts : preferredSelectionOpts), [preferredSelectionOpts, selectionOpts, showAllVersions]);
     const showAllVersionsToggle = useMemo(() => preferredSelectionOpts.length < selectionOpts.length, [preferredSelectionOpts.length, selectionOpts.length]);
-    const supportsSecureBoot = useMemo(() => {
-        return (model.deviceType.slug === GENERIC_X86_SLUG &&
-            semver.gte(model.version, GENERIC_X86_MINIMUM_SUPPORTED_SECUREBOOT_VERSION));
-    }, [model.deviceType.slug, model.version]);
-    const secureBootDontShowAgainKey = `${model.deviceType.slug}_secureboot_warning_do_not_show_again`;
-    const dismissSecureBootWarning = useCallback((accepted, dontShowAgain) => {
-        var _a;
-        setShowSecureBootConfirmationDialog(false);
-        (_a = state.webTracker) === null || _a === void 0 ? void 0 : _a.track('Application Add Device Modal Hide Secure Boot Warning', { accepted, dontShowAgain });
-        setDontShowSecureBootWarningAgain(false);
-    }, [state.webTracker]);
     const handleVariantChange = useCallback((v) => {
         setVariant(v);
         onChange('developmentMode', v === 'dev');
@@ -118,132 +99,86 @@ export const ImageForm = memo(function ImageForm({ compatibleDeviceTypes, osVers
         onChange('deviceType', newDeviceType);
     }, [compatibleDeviceTypes, model.deviceType.slug, onChange]);
     const recommendedVersion = useMemo(() => { var _a; return (_a = versionSelectionOpts.find((v) => { var _a; return !((_a = v.knownIssueList) === null || _a === void 0 ? void 0 : _a.length); })) === null || _a === void 0 ? void 0 : _a.value; }, [versionSelectionOpts]);
-    return (_jsxs(_Fragment, { children: [_jsxs(Box, { action: downloadUrl, method: "post", component: "form", noValidate: true, autoComplete: "off", p: 2, ref: formElement, children: [_jsx("input", { type: "hidden", name: "deviceType", value: model.deviceType.slug }), _jsx("input", { type: "hidden", name: "_token", value: authToken }), _jsx("input", { type: "hidden", name: "appId", value: applicationId }), _jsx("input", { type: "hidden", name: "fileType", value: ".zip" }), _jsx("input", { type: "hidden", name: "version", value: model.version }), _jsxs(Box, { py: 3, display: "flex", flexWrap: "wrap", gap: 2, children: [compatibleDeviceTypes && compatibleDeviceTypes.length > 1 && (_jsxs(Stack, { flex: "1", maxWidth: "100%", children: [_jsxs(InputLabel, { htmlFor: "device-type-select", sx: { display: 'flex', alignItems: 'center', mb: 2 }, children: ["Device type", ' ', _jsx(Tooltip, { title: "Applications can support any devices that share the same architecture as their default device type.", children: _jsx(HelpIcon, { color: "info", sx: { fontSize: '1rem', marginLeft: 1 } }) })] }), _jsx(Autocomplete, { fullWidth: true, id: "device-type-select", value: model.deviceType, options: compatibleDeviceTypes, getOptionLabel: (option) => option.name, renderOption: (props, option) => {
-                                            var _a;
-                                            return (_jsxs(Box, Object.assign({ component: "li" }, props, { children: [_jsx(Avatar, { variant: "square", src: (_a = option.logo) !== null && _a !== void 0 ? _a : FALLBACK_LOGO_UNKNOWN_DEVICE, sx: { mr: 3, width: '20px', height: '20px' } }), _jsx(Typography, { noWrap: true, children: option.name })] })));
-                                        }, renderInput: (_a) => {
-                                            var _b;
-                                            var { InputProps } = _a, params = __rest(_a, ["InputProps"]);
-                                            return (_jsx(TextField, Object.assign({}, params, { slotProps: {
-                                                    input: Object.assign(Object.assign({}, InputProps), { startAdornment: (_jsx(Avatar, { variant: "square", src: (_b = model.deviceType.logo) !== null && _b !== void 0 ? _b : FALLBACK_LOGO_UNKNOWN_DEVICE, sx: { mr: 3, width: '20px', height: '20px' } })) }),
-                                                } })));
-                                        }, onChange: (_event, value) => {
-                                            if (!value) {
-                                                return;
-                                            }
-                                            handleSelectedDeviceTypeChange(value);
-                                        }, disableClearable: true, 
-                                        // TODO: consider whether there is a better solution than letting the width vary as you search
-                                        slotProps: {
-                                            popper: { sx: { width: 'fit-content' } },
-                                        } })] })), (!isInitialDefault || osType) &&
-                                hasEsrVersions &&
-                                model.deviceType && (_jsx(OsTypeSelector, { supportedOsTypes: osTypes, hasEsrVersions: hasEsrVersions !== null && hasEsrVersions !== void 0 ? hasEsrVersions : false, selectedOsTypeSlug: osType, onSelectedOsTypeChange: onSelectedOsTypeChange }))] }), !isInitialDefault && version && (_jsxs(Box, { display: "flex", flexWrap: "wrap", maxWidth: "100%", children: [_jsxs(Stack, { maxWidth: "100%", flex: 1, children: [_jsx(InputLabel, { sx: { mb: 2 }, htmlFor: "e2e-download-image-versions-list", children: "Select version" }), _jsx(Autocomplete, { fullWidth: true, id: "e2e-download-image-versions-list", value: version, getOptionLabel: (option) => option.value, isOptionEqualToValue: (option, value) => option.value === value.value, options: versionSelectionOpts, onChange: (_event, ver) => {
-                                            handleVersionChange(ver);
-                                        }, placeholder: "Choose a version...", renderOption: (props, option) => (_jsx(Box, Object.assign({ component: "li" }, props, { children: _jsx(VersionSelectItem, { option: option, isRecommended: option.value === recommendedVersion }) }))), renderInput: (_a) => {
-                                            var { InputProps } = _a, params = __rest(_a, ["InputProps"]);
-                                            return (_jsx(TextField, Object.assign({}, params, { slotProps: {
-                                                    input: Object.assign(Object.assign({}, InputProps), { endAdornment: (_jsxs(_Fragment, { children: [version.value === recommendedVersion && (_jsx(Chip, { sx: { ml: 1 }, color: "green", label: "recommended" })), !!(version === null || version === void 0 ? void 0 : version.knownIssueList) && (_jsx(Tooltip, { title: version.knownIssueList, children: _jsx(FontAwesomeIcon, { icon: faTriangleExclamation, color: token('color.icon.warning') }) })), InputProps.endAdornment] })) }),
-                                                } })));
-                                        }, disableClearable: true })] }), showAllVersionsToggle && (_jsx(Box, { mx: 2, display: "flex", alignItems: "center", alignSelf: "flex-end", 
-                                // TODO: find a better way to center the checkbox with the input only (without label)
-                                height: 54, children: _jsx(FormControlLabel, { control: _jsx(Checkbox, { id: "e2e-show-all-versions-check", checked: showAllVersions, onChange: handleShowAllVersions }), label: "Show outdated versions" }) }))] })), _jsx(Divider, { variant: "fullWidth", sx: { my: 3, borderStyle: 'dashed' } }), (!isInitialDefault || !variant) && (_jsx(Box, { sx: { mt: 3 }, children: _jsx(VariantSelector, { version: version, variant: variant, onVariantChange: (v) => {
-                                handleVariantChange(v ? 'dev' : 'prod');
-                            } }) })), _jsx(Divider, { variant: "fullWidth", sx: { my: 3, borderStyle: 'dashed' } }), _jsxs(Stack, { children: [_jsxs(FormControl, { children: [_jsx(FormLabel, { id: "network-radio-buttons-group-label", children: _jsx(Typography, { variant: "titleSm", children: "Network" }) }), _jsxs(RadioGroup, { "aria-labelledby": "network-radio-buttons-group-label", value: model.network, name: "network", onChange: (event) => {
-                                            onChange('network', event.target.value);
-                                        }, children: [_jsx(FormControlLabel, { value: "ethernet", control: _jsx(Radio, {}), label: "Ethernet only" }), _jsx(FormControlLabel, { value: "wifi", control: _jsx(Radio, {}), label: "Wifi + Ethernet" })] })] }), model.network === 'wifi' && (_jsxs(_Fragment, { children: [_jsx(InputLabel, { htmlFor: "device-wifi-ssid", sx: { mb: 2 }, children: "WiFi SSID" }), _jsx(TextField, { value: model.wifiSsid, id: "device-wifi-ssid", slotProps: {
-                                            htmlInput: {
-                                                name: 'wifiSsid',
-                                                autoComplete: 'wifiSsid-auto-complete',
-                                            },
-                                        }, onChange: (event) => {
-                                            onChange('wifiSsid', event.target.value);
-                                        } }), _jsx(InputLabel, { htmlFor: "device-wifi-password", sx: { my: 2 }, children: "Wifi Passphrase" }), _jsx(TextField, { type: showPassword ? 'text' : 'password', id: "device-wifi-password", value: model.wifiKey, slotProps: {
-                                            htmlInput: {
-                                                name: 'wifiKey',
-                                            },
-                                            // input and htmlInput are different https://mui.com/material-ui/api/text-field/#text-field-prop-slotProps
-                                            input: {
-                                                endAdornment: (_jsx(InputAdornment, { position: "end", children: _jsx(IconButton, { onClick: () => {
-                                                            setShowPassword((show) => !show);
-                                                        }, onMouseDown: (event) => {
-                                                            event.preventDefault();
-                                                        }, edge: "end", children: showPassword ? _jsx(VisibilityOff, {}) : _jsx(Visibility, {}) }) })),
-                                            },
-                                        }, onChange: (event) => {
-                                            onChange('wifiKey', event.target.value);
-                                        } })] }))] }), supportsSecureBoot && (_jsxs(_Fragment, { children: [_jsx(Divider, { variant: "fullWidth", sx: { my: 3, borderStyle: 'dashed' } }), _jsxs(FormControl, { children: [_jsx(FormLabel, { id: "secure-boot-and-full-disk-encryption-label", children: _jsxs(Stack, { direction: "row", alignItems: "center", gap: 1, children: [_jsx(Typography, { variant: "titleSm", children: "Secure Boot and Full Disk Encryption" }), _jsx(NewChip, { expiryTimestamp: "2025-06-01" })] }) }), _jsx(FormControlLabel, { control: _jsx(Switch, { onClick: (event) => {
-                                                if (!model.secureboot &&
-                                                    !getFromLocalStorage(secureBootDontShowAgainKey)) {
-                                                    event.preventDefault();
-                                                    setShowSecureBootConfirmationDialog(true);
-                                                    if (state.webTracker) {
-                                                        state.webTracker.track('Application Add Device Modal Show Secure Boot Warning');
-                                                    }
-                                                }
-                                            }, onChange: (event) => {
-                                                onChange('secureboot', event.target.checked);
-                                            }, checked: model.secureboot }), label: _jsxs(Stack, { direction: "row", children: [_jsx(Typography, { children: "Enable Secure Boot and Full Disk Encryption" }), _jsx(MUILinkWithTracking, { eventProperties: {
-                                                        source: 'Application Add Device Modal Secure Boot Doc Icon',
-                                                    }, href: SECURE_BOOT_AND_FULL_DISK_ENCRYPTION_DOCS, sx: {
-                                                        display: 'flex',
-                                                        alignItems: 'center',
-                                                        height: '1.5rem',
-                                                    }, children: _jsx(ArticleIcon, { sx: { ml: 1, fontSize: '1.15rem' } }) })] }) })] })] })), _jsx(Divider, { variant: "fullWidth", sx: { my: 3, borderStyle: 'dashed' } }), _jsxs(Accordion, { disableGutters: true, elevation: 0, expanded: showAdvancedSettings, onChange: () => {
-                            setShowAdvancedSettings(!showAdvancedSettings);
-                        }, sx: {
-                            border: 'none',
-                            '&::before': {
-                                display: 'none',
-                            },
-                        }, children: [_jsx(AccordionSummary, { expandIcon: _jsx(FontAwesomeIcon, { icon: faChevronRight }), sx: { flexDirection: 'row-reverse', gap: 1 }, children: _jsx(Typography, { variant: "titleSm", children: "Advanced settings" }) }), _jsx(AccordionDetails, { children: _jsxs(Stack, { children: [_jsxs(FormControl, { children: [_jsxs(FormLabel, { htmlFor: "poll-interval-label", sx: { display: 'flex', alignItems: 'center' }, children: ["Check for updates every X minutes", ' ', _jsx(MUILinkWithTracking, { eventProperties: {
-                                                                source: 'Application Add Device Modal Poll Interval Doc Icon',
-                                                            }, href: POLL_INTERVAL_DOCS, sx: {
-                                                                display: 'flex',
-                                                                alignItems: 'center',
-                                                                height: '1.5rem',
-                                                            }, children: _jsx(ArticleIcon, { sx: { ml: 1, fontSize: '1.15rem' } }) })] }), _jsx(TextField, { id: "poll-interval-label", "aria-labelledby": "poll-interval-label", value: model.appUpdatePollInterval, slotProps: {
-                                                        htmlInput: {
-                                                            name: 'appUpdatePollInterval',
-                                                            autoComplete: 'appUpdatePollInterval-auto-complete',
-                                                        },
-                                                    }, onChange: (event) => {
-                                                        onChange('appUpdatePollInterval', event.target.value);
-                                                    } })] }), _jsx(InputLabel, { htmlFor: "provision-key-name", sx: { my: 2 }, children: "Provisioning Key name" }), _jsx(TextField, { name: "provisioningKeyName", id: "provision-key-name", value: (_a = model.provisioningKeyName) !== null && _a !== void 0 ? _a : '', slotProps: {
-                                                htmlInput: {
-                                                    name: 'provisioningKeyName',
-                                                    autoComplete: 'provisioningKeyName-auto-complete',
-                                                },
-                                            }, onChange: (event) => {
-                                                onChange('provisioningKeyName', event.target.value);
-                                            } }), _jsx(InputLabel, { htmlFor: "provision-key-expiring", sx: { my: 2 }, children: "Provisioning Key expiring on" }), _jsx(TextField, { type: "date", id: "provision-key-expiring", value: (_b = model.provisioningKeyExpiryDate) !== null && _b !== void 0 ? _b : '', slotProps: {
-                                                htmlInput: {
-                                                    name: 'provisioningKeyExpiryDate',
-                                                    autoComplete: 'provisioningKeyExpiryDate-auto-complete',
-                                                },
-                                            }, onChange: (event) => {
-                                                onChange('provisioningKeyExpiryDate', event.target.value);
-                                            } })] }) })] })] }), _jsxs(Dialog, { open: showSecureBootConfirmationDialog, onClose: () => {
-                    dismissSecureBootWarning(false, dontShowSecureBootWarningAgain);
-                }, children: [_jsx(DialogTitle, { children: "Enabling Secure Boot and Full Disk Encryption" }), _jsx(DialogContent, { children: _jsxs(Stack, { children: ["Enabling Secure Boot and Full Disk Encryption has important implications:", _jsxs("ul", { children: [_jsxs("li", { children: ["The image you are about to download is", ' ', _jsx(MUILinkWithTracking, { eventProperties: {
-                                                        source: "Application Add Device Modal Secure Boot Warning signed with balena's main platform key Link",
-                                                    }, href: "https://docs.balena.io/reference/OS/secure-boot-and-full-disk-encryption/overview/#keys-and-certificates-in-secure-boot", children: "signed with balena's main platform key" })] }), _jsx("li", { children: "Full Disk Encryption (FDE): All data on the disk will be encrypted with a unique key per device, ensuring that data extraction or retrieval from a powered-off device is impossible." }), _jsxs("li", { children: ["Secure Boot: Ensures only OS images signed by balena can unlock the disks and access data stored on the device. Hardened Mode Limitations:", _jsxs("ul", { children: [_jsx("li", { children: "Unsigned kernel modules cannot be loaded." }), _jsx("li", { children: "Boot parameters cannot be modified." }), _jsx("li", { children: "Debugging early boot processes is practically impossible." })] })] })] }), _jsxs(Typography, { children: ["If you need to load out-of-tree kernel drivers or require a unique signing key,", ' ', _jsx(MUILinkWithTracking, { eventProperties: {
-                                                source: 'Application Add Device Modal Secure Boot Warning Contact Us Link',
-                                            }, href: "mailto:sales@balena.io", target: "_self", children: "contact us" }), ' ', "to discuss your specific requirements."] }), _jsx(MUILinkWithTracking, { eventProperties: {
-                                        source: 'Application Add Device Modal Secure Boot Warning Learn More Link',
-                                    }, href: "https://docs.balena.io/reference/OS/secure-boot-and-full-disk-encryption/overview/", children: "Learn more about Secure Boot and Full Disk Encryption." }), _jsx(FormControlLabel, { control: _jsx(Checkbox, { onChange: (event) => {
-                                            setDontShowSecureBootWarningAgain(event.target.checked);
-                                        } }), label: "Don't show me this warning again for this device type", sx: { mt: 2 } })] }) }), _jsxs(DialogActions, { children: [_jsx(Button, { "aria-label": "Go back and do not acknowledge Secure Boot and Full Disk Encryption warning", onClick: () => {
-                                    dismissSecureBootWarning(false, dontShowSecureBootWarningAgain);
-                                }, variant: "outlined", color: "secondary", children: "Cancel" }), _jsx(Button, { "aria-label": "Acknowledge Secure Boot and Full Disk Encryption warning", onClick: () => {
-                                    onChange('secureboot', true);
-                                    if (dontShowSecureBootWarningAgain) {
-                                        setToLocalStorage(secureBootDontShowAgainKey, 'true');
+    return (_jsxs(Box, { action: downloadUrl, method: "post", component: "form", noValidate: true, autoComplete: "off", p: 2, ref: formElement, children: [_jsx("input", { type: "hidden", name: "deviceType", value: model.deviceType.slug }), _jsx("input", { type: "hidden", name: "_token", value: authToken }), _jsx("input", { type: "hidden", name: "appId", value: applicationId }), _jsx("input", { type: "hidden", name: "fileType", value: ".zip" }), _jsx("input", { type: "hidden", name: "version", value: model.version }), _jsxs(Box, { py: 3, display: "flex", flexWrap: "wrap", gap: 2, children: [compatibleDeviceTypes && compatibleDeviceTypes.length > 1 && (_jsxs(Box, { display: "flex", flexDirection: "column", flex: "1", maxWidth: "100%", children: [_jsxs(InputLabel, { htmlFor: "device-type-select", sx: { display: 'flex', alignItems: 'center', mb: 2 }, children: ["Select device type", ' ', _jsx(Tooltip, { title: "Applications can support any devices that share the same architecture as their default device type.", children: _jsx(HelpIcon, { color: "info", sx: { fontSize: '1rem', marginLeft: 1 } }) })] }), _jsx(Autocomplete, { fullWidth: true, id: "device-type-select", value: model.deviceType, options: compatibleDeviceTypes, getOptionLabel: (option) => option.name, renderOption: (props, option) => {
+                                    var _a;
+                                    return (_jsxs(Box, Object.assign({ component: "li" }, props, { children: [_jsx(Avatar, { variant: "square", src: (_a = option.logo) !== null && _a !== void 0 ? _a : FALLBACK_LOGO_UNKNOWN_DEVICE, sx: { mr: 3, width: '20px', height: '20px' } }), _jsx(Typography, { noWrap: true, children: option.name })] })));
+                                }, renderInput: (_a) => {
+                                    var _b;
+                                    var { InputProps } = _a, params = __rest(_a, ["InputProps"]);
+                                    return (_jsx(TextField, Object.assign({}, params, { InputProps: Object.assign(Object.assign({}, InputProps), { startAdornment: (_jsx(Avatar, { variant: "square", src: (_b = model.deviceType.logo) !== null && _b !== void 0 ? _b : FALLBACK_LOGO_UNKNOWN_DEVICE, sx: { mr: 3, width: '20px', height: '20px' } })) }) })));
+                                }, onChange: (_event, value) => {
+                                    if (!value) {
+                                        return;
                                     }
-                                    dismissSecureBootWarning(true, dontShowSecureBootWarningAgain);
-                                }, children: "I understand and acknowledge" })] })] })] }));
+                                    handleSelectedDeviceTypeChange(value);
+                                }, disableClearable: true, 
+                                // TODO: consider whether there is a better solution than letting the width vary as you search
+                                componentsProps: {
+                                    popper: { sx: { width: 'fit-content' } },
+                                } })] })), (!isInitialDefault || osType) &&
+                        hasEsrVersions &&
+                        model.deviceType && (_jsx(OsTypeSelector, { supportedOsTypes: osTypes, hasEsrVersions: hasEsrVersions !== null && hasEsrVersions !== void 0 ? hasEsrVersions : false, selectedOsTypeSlug: osType, onSelectedOsTypeChange: onSelectedOsTypeChange }))] }), !isInitialDefault && version && (_jsxs(Box, { display: "flex", flexWrap: "wrap", maxWidth: "100%", children: [_jsxs(Box, { display: "flex", flexDirection: "column", maxWidth: "100%", flex: 1, children: [_jsx(InputLabel, { sx: { mb: 2 }, htmlFor: "e2e-download-image-versions-list", children: "Select version" }), _jsx(Autocomplete, { fullWidth: true, id: "e2e-download-image-versions-list", value: version, getOptionLabel: (option) => option.value, isOptionEqualToValue: (option, value) => option.value === value.value, options: versionSelectionOpts, onChange: (_event, ver) => {
+                                    handleVersionChange(ver);
+                                }, placeholder: "Choose a version...", renderOption: (props, option) => (_jsx(Box, Object.assign({ component: "li" }, props, { children: _jsx(VersionSelectItem, { option: option, isRecommended: option.value === recommendedVersion }) }))), renderInput: (_a) => {
+                                    var { InputProps } = _a, params = __rest(_a, ["InputProps"]);
+                                    return (_jsx(TextField, Object.assign({}, params, { InputProps: Object.assign(Object.assign({}, InputProps), { endAdornment: (_jsxs(_Fragment, { children: [version.value === recommendedVersion && (_jsx(Chip, { sx: { ml: 1 }, color: "green", label: "recommended" })), !!(version === null || version === void 0 ? void 0 : version.knownIssueList) && (_jsx(Tooltip, { title: version.knownIssueList, children: _jsx(FontAwesomeIcon, { icon: faTriangleExclamation, color: token('color.icon.warning') }) })), InputProps.endAdornment] })) }) })));
+                                }, disableClearable: true })] }), showAllVersionsToggle && (_jsx(Box, { mx: 2, display: "flex", alignItems: "center", alignSelf: "flex-end", 
+                        // TODO: find a better way to center the checkbox with the input only (without label)
+                        height: 54, children: _jsx(FormControlLabel, { control: _jsx(Checkbox, { id: "e2e-show-all-versions-check", checked: showAllVersions, onChange: handleShowAllVersions }), label: "Show outdated versions" }) }))] })), (!isInitialDefault || !variant) && (_jsx(Box, { sx: { mt: 3 }, children: _jsx(VariantSelector, { version: version, variant: variant, onVariantChange: (v) => {
+                        handleVariantChange(v ? 'dev' : 'prod');
+                    } }) })), _jsx(Divider, { variant: "fullWidth", sx: { my: 3, borderStyle: 'dashed' } }), _jsxs(Box, { display: "flex", flexDirection: "column", children: [_jsxs(FormControl, { children: [_jsx(FormLabel, { id: "network-radio-buttons-group-label", children: "Network" }), _jsxs(RadioGroup, { "aria-labelledby": "network-radio-buttons-group-label", value: model.network, name: "network", onChange: (event) => {
+                                    onChange('network', event.target.value);
+                                }, children: [_jsx(FormControlLabel, { value: "ethernet", control: _jsx(Radio, {}), label: "Ethernet only" }), _jsx(FormControlLabel, { value: "wifi", control: _jsx(Radio, {}), label: "Wifi + Ethernet" })] })] }), model.network === 'wifi' && (_jsxs(_Fragment, { children: [_jsx(InputLabel, { htmlFor: "device-wifi-ssid", sx: { mb: 2 }, children: "WiFi SSID" }), _jsx(TextField, { value: model.wifiSsid, id: "device-wifi-ssid", slotProps: {
+                                    htmlInput: {
+                                        name: 'wifiSsid',
+                                        autoComplete: 'wifiSsid-auto-complete',
+                                    },
+                                }, onChange: (event) => {
+                                    onChange('wifiSsid', event.target.value);
+                                } }), _jsx(InputLabel, { htmlFor: "device-wifi-password", sx: { my: 2 }, children: "Wifi Passphrase" }), _jsx(TextField, { type: showPassword ? 'text' : 'password', id: "device-wifi-password", value: model.wifiKey, slotProps: {
+                                    htmlInput: {
+                                        name: 'wifiKey',
+                                    },
+                                    // input and htmlInput are different https://mui.com/material-ui/api/text-field/#text-field-prop-slotProps
+                                    input: {
+                                        endAdornment: (_jsx(InputAdornment, { position: "end", children: _jsx(IconButton, { onClick: () => {
+                                                    setShowPassword((show) => !show);
+                                                }, onMouseDown: (event) => {
+                                                    event.preventDefault();
+                                                }, edge: "end", children: showPassword ? _jsx(VisibilityOff, {}) : _jsx(Visibility, {}) }) })),
+                                    },
+                                }, onChange: (event) => {
+                                    onChange('wifiKey', event.target.value);
+                                } })] }))] }), _jsx(Divider, { variant: "fullWidth", sx: { my: 3, borderStyle: 'dashed' } }), _jsxs(Button, { onClick: () => {
+                    setShowAdvancedSettings(!showAdvancedSettings);
+                }, variant: "outlined", sx: { mb: 2 }, children: [showAdvancedSettings ? _jsx(RemoveIcon, {}) : _jsx(AddIcon, {}), " Advanced settings"] }), _jsx(Collapse, { in: showAdvancedSettings, collapsedSize: 0, children: _jsxs(Box, { display: "flex", flexDirection: "column", children: [_jsxs(FormControl, { children: [_jsxs(FormLabel, { htmlFor: "poll-interval-label", sx: { display: 'flex' }, children: ["Check for updates every X minutes", ' ', _jsx(MUILinkWithTracking, { href: POLL_INTERVAL_DOCS, sx: {
+                                                display: 'flex',
+                                                alignItems: 'center',
+                                                height: '1.5rem',
+                                            }, children: _jsx(ArticleIcon, { sx: { ml: 1, fontSize: '1.15rem' } }) })] }), _jsx(TextField, { id: "poll-interval-label", "aria-labelledby": "poll-interval-label", value: model.appUpdatePollInterval, slotProps: {
+                                        htmlInput: {
+                                            name: 'appUpdatePollInterval',
+                                            autoComplete: 'appUpdatePollInterval-auto-complete',
+                                        },
+                                    }, onChange: (event) => {
+                                        onChange('appUpdatePollInterval', event.target.value);
+                                    } })] }), _jsx(InputLabel, { htmlFor: "provision-key-name", sx: { my: 2 }, children: "Provisioning Key name" }), _jsx(TextField, { name: "provisioningKeyName", id: "provision-key-name", value: (_a = model.provisioningKeyName) !== null && _a !== void 0 ? _a : '', slotProps: {
+                                htmlInput: {
+                                    name: 'provisioningKeyName',
+                                    autoComplete: 'provisioningKeyName-auto-complete',
+                                },
+                            }, onChange: (event) => {
+                                onChange('provisioningKeyName', event.target.value);
+                            } }), _jsx(InputLabel, { htmlFor: "provision-key-expiring", sx: { my: 2 }, children: "Provisioning Key expiring on" }), _jsx(TextField, { type: "date", id: "provision-key-expiring", value: (_b = model.provisioningKeyExpiryDate) !== null && _b !== void 0 ? _b : '', slotProps: {
+                                htmlInput: {
+                                    name: 'provisioningKeyExpiryDate',
+                                    autoComplete: 'provisioningKeyExpiryDate-auto-complete',
+                                },
+                            }, onChange: (event) => {
+                                onChange('provisioningKeyExpiryDate', event.target.value);
+                            } })] }) })] }));
 });
 // TODO: We need a better way than just copying the styling. Consider creating a component to export
 const VersionSelectItem = ({ option, isRecommended, }) => {
-    return (_jsxs(Stack, { flexWrap: "wrap", maxWidth: "100%", rowGap: 1, children: [_jsxs(Typography, { noWrap: true, maxWidth: "100%", variant: "titleSm", children: [option.title, !!option.line && (_jsx(Chip, { sx: { ml: 1 }, label: option.line, color: lineMap[option.line] })), isRecommended && (_jsx(Chip, { sx: { ml: 1 }, color: "green", label: "recommended" }))] }), !!option.knownIssueList && (_jsx(Callout, { severity: "warning", size: "sm", children: option.knownIssueList }))] }));
+    return (_jsxs(Stack, { direction: "column", flexWrap: "wrap", maxWidth: "100%", rowGap: 1, children: [_jsxs(Typography, { noWrap: true, maxWidth: "100%", variant: "titleSm", children: [option.title, !!option.line && (_jsx(Chip, { sx: { ml: 1 }, label: option.line, color: lineMap[option.line] })), isRecommended && (_jsx(Chip, { sx: { ml: 1 }, color: "green", label: "recommended" }))] }), !!option.knownIssueList && (_jsx(Callout, { severity: "warning", size: "sm", children: option.knownIssueList }))] }));
 };

package/dist/components/DownloadImageDialog/VariantSelector.js

@@ -16,7 +16,7 @@ const variantInfo = {
 };
 const BuildVariants = ['dev', 'prod'];
 export const VariantSelector = ({ version, variant, onVariantChange, }) => {
-    return (_jsxs(FormControl, { children: [_jsx(FormLabel, { children: _jsx(Typography, { variant: "titleSm", children: "Select edition" }) }), _jsx(RadioGroup, { "aria-labelledby": "variant-radio-buttons-group", name: "developmentMode", value: variant === 'dev', onChange: (event) => {
+    return (_jsxs(FormControl, { children: [_jsx(FormLabel, { children: "Select edition" }), _jsx(RadioGroup, { "aria-labelledby": "variant-radio-buttons-group", name: "developmentMode", value: variant === 'dev', onChange: (event) => {
                     onVariantChange(event.target.value === 'true');
                 }, children: BuildVariants.map((buildVariant, index) => {
                     const isDev = buildVariant === 'dev';

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

@@ -11,7 +11,6 @@ export interface DownloadImageFormModel {
     deviceType: DeviceType;
     version: string;
     network: 'ethernet' | 'wifi';
-    secureboot: boolean;
     developmentMode?: boolean;
     appUpdatePollInterval?: number;
     wifiSsid?: string;

package/dist/components/DownloadImageDialog/index.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { Avatar, Box, DialogActions, DialogContent, Divider, Grid2 as Grid, Typography, } from '@mui/material';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FALLBACK_LOGO_UNKNOWN_DEVICE, isUrlAccessible, stripVersionBuild, } from './utils';
-import { GENERIC_X86_MINIMUM_SUPPORTED_SECUREBOOT_VERSION, GENERIC_X86_SLUG, ImageForm, } from './ImageForm';
+import { ImageForm } from './ImageForm';
 import { ApplicationInstructions } from './ApplicationInstructions';
 import { DropDownButton } from '../DropDownButton';
 import DownloadIcon from '@mui/icons-material/Download';
@@ -15,7 +15,6 @@ import { enqueueSnackbar } from 'notistack';
 import { DialogWithCloseButton } from '../DialogWithCloseButton';
 import { Callout } from '../Callout';
 import { Spinner } from '../Spinner';
-import * as semver from 'balena-semver';
 const etcherLogoBase64 = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KIDxnPgogIDx0aXRsZT5FdGNoZXI8L3RpdGxlPgogIDxnIGlkPSJzdmdfMSIgc3Ryb2tlPSJudWxsIj4KICAgPHBhdGggaWQ9InN2Z18yIiBjbGFzcz0ic3QxIiBkPSJtNDEyLjkwMzgzLDM1OC4wNjcxM2wwLDE3MS40OTU4M2M3LjQ5MjU0LC0xLjY2NTAxIDE0LjE1MjU3LC0zLjMzMDAyIDIwLjgxMjYsLTcuNDkyNTRsMTQyLjM1ODE5LC04MS41ODUzOWMyMC44MTI2LC0xMS42NTUwNiAzMy4zMDAxNiwtMzQuMTMyNjYgMzMuMzAwMTYsLTU4LjI3NTI4bDAsLTE2Mi4zMzgyOGMwLC02LjY2MDAzIC0wLjgzMjUsLTEzLjMyMDA2IC0zLjMzMDAyLC0xOS4xNDc1OWwtMTU0LjAxMzI0LDg5LjA3NzkzYy0zMi40Njc2NiwyMi40Nzc2MSAtMzkuMTI3NjksNDMuMjkwMjEgLTM5LjEyNzY5LDY4LjI2NTMzbDAsLTAuMDAwMDF6IiBmaWxsPSIjQTVERTM3IiBzdHJva2U9Im51bGwiLz4KICAgPHBhdGggaWQ9InN2Z18zIiBjbGFzcz0ic3QyIiBkPSJtNjYyLjY1NTAzLDE2Ny40MjM3MWwtNTYuNjEwMjcsMzIuNDY3NjZjMS42NjUwMSw1LjgyNzUzIDMuMzMwMDIsMTIuNDg3NTYgMy4zMzAwMiwxOS4xNDc1OWwwLDE2My4xNzA3OWMwLDI0LjE0MjYyIC0xMy4zMjAwNiw0Ni42MjAyMiAtMzMuMzAwMTYsNTguMjc1MjhsLTE0Mi4zNTgxOSw4MS41ODUzOWMtNi42NjAwMywzLjMzMDAyIC0xMy4zMjAwNiw1LjgyNzUzIC0yMC44MTI2LDcuNDkyNTRsMCw2NC45MzUzMWM5Ljk5MDA1LC0xLjY2NTAxIDE5Ljk4MDEsLTQuOTk1MDIgMjguMzA1MTQsLTkuOTkwMDVsMTg0LjgxNTg5LC0xMDUuNzI4MDFjMjUuODA3NjIsLTE0Ljk4NTA3IDQxLjYyNTIsLTQyLjQ1NzcgNDEuNjI1MiwtNzIuNDI3ODVsMCwtMjExLjQ1NjAyYzAsLTkuMTU3NTQgLTEuNjY1MDEsLTE4LjMxNTA5IC00Ljk5NTAyLC0yNy40NzI2M2wtMC4wMDAwMSwweiIgZmlsbD0iI0M4RjE3OCIgc3Ryb2tlPSJudWxsIi8+CiAgIDxwYXRoIGlkPSJzdmdfNCIgY2xhc3M9InN0MSIgZD0ibTM5OS41ODM3NiwzMDMuOTU0MzZjOC4zMjUwNCwtMTMuMzIwMDYgMjAuODEyNiwtMjUuODA3NjIgMzkuMTI3NjksLTM2LjYzMDE4bDE1NS42NzgyNSwtODkuOTEwNDNjLTQuOTk1MDIsLTYuNjYwMDMgLTExLjY1NTA2LC0xMi40ODc1NiAtMTguMzE1MDksLTE2LjY1MDA4bC0xNDIuMzU4MTksLTgxLjU4NTM5Yy0yMC44MTI2LC0xMS42NTUwNiAtNDYuNjIwMjIsLTExLjY1NTA2IC02Ny40MzI4MiwwbC0xNDEuNTI1NjgsODEuNTg1MzljLTcuNDkyNTQsNC4xNjI1MiAtMTMuMzIwMDYsOS45OTAwNSAtMTkuMTQ3NTksMTYuNjUwMDhsMTU0Ljg0NTc1LDg5LjkxMDQzYzE4LjMxNTA5LDExLjY1NTA2IDMwLjgwMjY1LDIzLjMxMDExIDM5LjEyNzY5LDM2LjYzMDE4bC0wLjAwMDAxLDB6IiBmaWxsPSIjQTVERTM3IiBzdHJva2U9Im51bGwiLz4KICAgPHBhdGggaWQ9InN2Z181IiBjbGFzcz0ic3QyIiBkPSJtMjI0Ljc1NzkyLDE2MS41OTYxOGwxNDEuNTI1NjgsLTgxLjU4NTM5YzIwLjgxMjYsLTExLjY1NTA2IDQ2LjYyMDIyLC0xMS42NTUwNiA2Ny40MzI4MiwwbDE0Mi4zNTgxOSw4MS41ODUzOWM3LjQ5MjU0LDQuMTYyNTIgMTMuMzIwMDYsOS45OTAwNSAxOC4zMTUwOSwxNi42NTAwOGw1Ni42MTAyNywtMzIuNDY3NjZjLTYuNjYwMDMsLTkuMTU3NTQgLTE0Ljk4NTA3LC0xNi42NTAwOCAtMjQuOTc1MTIsLTIxLjY0NTFsLTE4NC44MTU4OSwtMTA3LjM5MzAyYy0yNS44MDc2MiwtMTQuOTg1MDcgLTU3LjQ0Mjc4LC0xNC45ODUwNyAtODMuMjUwNCwwbC0xODMuMTUwODgsMTA2LjU2MDUxYy05Ljk5MDA1LDUuODI3NTMgLTE4LjMxNTA5LDEzLjMyMDA2IC0yNC45NzUxMiwyMi40Nzc2MWw1Ni42MTAyNywzMi40Njc2NmM0LjE2MjUyLC02LjY2MDAzIDEwLjgyMjU1LC0xMi40ODc1NiAxOC4zMTUwOSwtMTYuNjUwMDh6IiBmaWxsPSIjQzhGMTc4IiBzdHJva2U9Im51bGwiLz4KICAgPHBhdGggaWQ9InN2Z182IiBjbGFzcz0ic3QyIiBkPSJtMzY2LjI4MzYsNTIyLjA3MDQxbC0xNDEuNTI1NjgsLTgxLjU4NTM5Yy0yMC44MTI2LC0xMS42NTUwNiAtMzMuMzAwMTYsLTM0LjEzMjY2IC0zMy4zMDAxNiwtNTguMjc1MjhsMCwtMTYzLjE3MDc5YzAsLTYuNjYwMDMgMC44MzI1LC0xMi40ODc1NiAyLjQ5NzUxLC0xOC4zMTUwOWwtNTYuNjEwMjcsLTMyLjQ2NzY2Yy0zLjMzMDAyLDkuMTU3NTQgLTQuOTk1MDIsMTcuNDgyNTggLTQuOTk1MDIsMjYuNjQwMTNsMCwyMTIuMjg4NTJjMCwyOS45NzAxNCAxNS44MTc1OCw1Ny40NDI3OCA0MS42MjUyLDcxLjU5NTM0bDE4My45ODMzOSwxMDUuNzI4MDFjOC4zMjUwNCw0Ljk5NTAyIDE4LjMxNTA5LDguMzI1MDQgMjguMzA1MTQsOS45OTAwNWwwLC02NC45MzUzMWMtNi42NjAwMywtMC44MzI1IC0xMy4zMjAwNiwtMy4zMzAwMiAtMTkuOTgwMSwtNy40OTI1NGwtMC4wMDAwMSwwLjAwMDAxeiIgZmlsbD0iI0M4RjE3OCIgc3Ryb2tlPSJudWxsIi8+CiAgIDxwYXRoIGlkPSJzdmdfNyIgY2xhc3M9InN0MSIgZD0ibTM0Ny4xMzYwMSwyODguOTY5MjlsLTE1My4xODA3NCwtODguMjQ1NDJjLTEuNjY1MDEsNS44Mjc1MyAtMi40OTc1MSwxMi40ODc1NiAtMi40OTc1MSwxOC4zMTUwOWwwLDE2My4xNzA3OWMwLDI0LjE0MjYyIDEyLjQ4NzU2LDQ2LjYyMDIyIDMzLjMwMDE2LDU4LjI3NTI4bDE0MS41MjU2OCw4MS41ODUzOWM2LjY2MDAzLDMuMzMwMDIgMTMuMzIwMDYsNS44Mjc1MyAyMC44MTI2LDcuNDkyNTRsMCwtMTcxLjQ5NTgzYy0wLjgzMjUsLTI0Ljk3NTEyIC03LjQ5MjU0LC00NS43ODc3MiAtMzkuOTYwMTksLTY5LjA5NzgzbDAsLTAuMDAwMDF6IiBmaWxsPSIjQTVERTM3IiBzdHJva2U9Im51bGwiLz4KICA8L2c+CiA8L2c+Cgo8L3N2Zz4=';
 const ETCHER_OPEN_IMAGE_URL = 'https://www.balena.io/etcher/open-image-url';
 export var ActionType;
@@ -65,7 +64,6 @@ const getInitialState = (deviceType, applicationId, releaseId) => ({
     deviceType,
     version: '',
     network: 'ethernet',
-    secureboot: false,
     developmentMode: false,
     appUpdatePollInterval: 10,
     wifiSsid: undefined,
@@ -172,7 +170,6 @@ export const DownloadImageDialog = ({ open, applicationId, releaseId, compatible
         return dropDownButtonActions;
     }, [
         authToken,
-        isValidatingUrl,
         downloadConfig,
         downloadSize,
         downloadUrl,
@@ -251,11 +248,7 @@ export const DownloadImageDialog = ({ open, applicationId, releaseId, compatible
             newFormModelState = getInitialState(value, applicationId, releaseId);
         }
         else {
-            newFormModelState = Object.assign(Object.assign({}, formModel), { secureboot: key === 'version' &&
-                    formModel.deviceType.slug === GENERIC_X86_SLUG &&
-                    semver.lt(value, GENERIC_X86_MINIMUM_SUPPORTED_SECUREBOOT_VERSION)
-                    ? false
-                    : formModel.secureboot, [key]: value });
+            newFormModelState = Object.assign(Object.assign({}, formModel), { [key]: value });
             onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newFormModelState);
         }
         setFormModel(newFormModelState);
@@ -282,7 +275,7 @@ export const DownloadImageDialog = ({ open, applicationId, releaseId, compatible
                                             dockerImage: formModel.version
                                                 ? getDockerArtifact(formModel.deviceType.slug, stripVersionBuild(formModel.version))
                                                 : '',
-                                        }, secureboot: formModel.secureboot })] }), ((_d = formModel.deviceType.imageDownloadAlerts) !== null && _d !== void 0 ? _d : []).map((alert) => {
+                                        } })] }), ((_d = formModel.deviceType.imageDownloadAlerts) !== null && _d !== void 0 ? _d : []).map((alert) => {
                                 return (_jsx(Grid, { pt: 0, size: 12, children: _jsx(Callout, { severity: alert.type, children: alert.message }, alert.message) }, alert.message));
                             })] }) }) }), _jsx(DialogActions, { sx: {
                     display: 'flex',

package/dist/components/HighlightedName/index.js

@@ -20,9 +20,7 @@ export const HighlightedName = (_a) => {
             borderRadius: token('shape.borderRadius.xs'),
             display: 'inline-block',
             p: 2,
-            color: token(color || isLight(bgColor)
-                ? 'color.text'
-                : 'color.text.inverse'),
+            color: token(color || isLight(bgColor) ? 'color.text' : 'color.text.inverse'),
             background: bgColor,
         } }, props, { children: children })));
 };

package/dist/components/RJST/DataTypes/object.js

@@ -6,12 +6,14 @@ import findKey from 'lodash/findKey';
 import pick from 'lodash/pick';
 import mapValues from 'lodash/mapValues';
 const getKeyLabel = (schema) => {
+    var _a;
     const s = find(schema.properties, { description: 'key' });
-    return (s === null || s === void 0 ? void 0 : s.title) ? s.title : 'key';
+    return (_a = s === null || s === void 0 ? void 0 : s.title) !== null && _a !== void 0 ? _a : 'key';
 };
 const getValueLabel = (schema) => {
+    var _a;
     const s = find(schema.properties, { description: 'value' });
-    return (s === null || s === void 0 ? void 0 : s.title) ? s.title : 'value';
+    return (_a = s === null || s === void 0 ? void 0 : s.title) !== null && _a !== void 0 ? _a : 'value';
 };
 export const isKeyValueObj = (schema) => !!find(schema.properties, { description: 'key' }) ||
     !!find(schema.properties, { description: 'value' });

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.1.0-build-secure-boot-acb8e3d7ac5b0201d6d8bbbb6031f9ade9d1e28c-1",
+  "version": "12.1.0",
   "main": "./dist/index.js",
   "sideEffects": false,
   "files": [
@@ -33,7 +33,6 @@
     "ajv-formats": "^3.0.1",
     "ajv-keywords": "^5.1.0",
     "analytics-client": "^2.0.1",
-    "balena-semver": "^3.0.5",
     "color": "^5.0.0",
     "color-hash": "^2.0.2",
     "date-fns": "^4.1.0",
@@ -55,7 +54,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@balena/lint": "^9.1.0",
+    "@balena/lint": "^9.2.1",
     "@storybook/addon-essentials": "^8.6.12",
     "@storybook/addon-interactions": "^8.6.12",
     "@storybook/addon-links": "^8.6.12",
@@ -139,6 +138,6 @@
   },
   "homepage": "https://github.com/balena-io/ui-shared-components#readme",
   "versionist": {
-    "publishedAt": "2025-04-09T12:40:08.708Z"
+    "publishedAt": "2025-04-09T13:16:39.918Z"
   }
 }