@flightctl/ui-components 1.1.0-rc1 → 1.1.0-rc2

package/dist/ui-components/src/components/Device/EditDeviceWizard/deviceSpecUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasMicroshiftRegistrationConfig = exports.MicroshiftRegistrationHook = exports.ACMImportConfig = exports.ACMCrdConfig = exports.formatFileMode = exports.getConfigTemplatesValues = exports.getSystemdUnitsValues = exports.getApplicationValues = exports.createInitialAppForm = exports.getApiConfig = exports.getApplicationPatches = exports.toAPIApplication = exports.getDeviceSpecConfigPatches = exports.getConfigType = exports.ACM_REPO_NAME = void 0;
+exports.hasMicroshiftRegistrationConfig = exports.MicroshiftRegistrationHook = exports.ACMImportConfig = exports.ACMCrdConfig = exports.formatFileMode = exports.getConfigTemplatesValues = exports.getSystemdUnitsValues = exports.getApplicationValues = exports.createInitialAppForm = exports.getApiConfig = exports.getApplicationPatches = exports.toApiApplication = exports.getDeviceSpecConfigPatches = exports.getConfigType = exports.ACM_REPO_NAME = void 0;
 const tslib_1 = require("tslib");
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const types_1 = require("@flightctl/types");
@@ -150,308 +150,314 @@ const getDeviceSpecConfigPatches = (currentConfigs, newConfigs, configPath) => {
     return allPatches;
 };
 exports.getDeviceSpecConfigPatches = getDeviceSpecConfigPatches;
-const toAPIApplication = (app) => {
-    var _a, _b, _c;
-    if ((0, deviceSpec_1.isHelmImageAppForm)(app)) {
-        const data = {
-            name: app.name,
-            image: app.image,
-            appType: app.appType,
-        };
-        if (app.namespace) {
-            data.namespace = app.namespace;
-        }
-        if (app.valuesYaml) {
-            try {
-                const values = js_yaml_1.default.load(app.valuesYaml);
-                if (values && Object.keys(values).length > 0) {
-                    data.values = values;
-                }
-            }
-            catch (error) {
-                throw new Error('Values content is not valid YAML.');
-            }
-        }
-        const fileNames = app.valuesFiles.filter((file) => file && file.trim() !== '');
-        if (fileNames.length > 0) {
-            data.valuesFiles = fileNames;
-        }
-        return data;
-    }
-    const envVars = app.variables.reduce((acc, variable) => {
-        acc[variable.name] = variable.value;
-        return acc;
-    }, {});
-    const volumes = (_a = app.volumes) === null || _a === void 0 ? void 0 : _a.map((v) => {
-        const volume = {
-            name: v.name || '',
-        };
-        if (v.imageRef) {
-            volume.image = {
-                reference: v.imageRef,
-                pullPolicy: v.imagePullPolicy || types_1.ImagePullPolicy.PullIfNotPresent,
-            };
-        }
-        if (v.mountPath) {
-            volume.mount = {
-                path: v.mountPath,
-            };
-        }
-        return volume;
+const haveInlineFilesChanged = (current, updated) => {
+    if (current.length !== updated.length)
+        return true;
+    return current.some((file, index) => {
+        const other = updated[index];
+        const aBase64 = file.contentEncoding === types_1.EncodingType.EncodingBase64;
+        const bBase64 = other.contentEncoding === types_1.EncodingType.EncodingBase64;
+        return (aBase64 !== bBase64 || (file.path || '') !== (other.path || '') || (file.content || '') !== (other.content || ''));
     });
-    if ((0, deviceSpec_1.isSingleContainerAppForm)(app)) {
-        const data = {
-            image: app.image,
-            appType: app.appType,
-            envVars,
-            volumes,
-        };
-        if (app.name) {
-            data.name = app.name;
-        }
-        if (app.ports) {
-            data.ports = app.ports.map((p) => `${p.hostPort}:${p.containerPort}`);
-        }
-        // Removed fields must not appear in the resources object
-        const appLimits = {};
-        if ((_b = app.limits) === null || _b === void 0 ? void 0 : _b.cpu) {
-            appLimits.cpu = app.limits.cpu;
-        }
-        if ((_c = app.limits) === null || _c === void 0 ? void 0 : _c.memory) {
-            appLimits.memory = app.limits.memory;
-        }
-        if (Object.keys(appLimits).length > 0) {
-            data.resources = {
-                limits: appLimits,
-            };
-        }
-        data.runAs = app.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER;
-        return data;
-    }
-    if ((0, deviceSpec_1.isQuadletImageAppForm)(app) || (0, deviceSpec_1.isComposeImageAppForm)(app)) {
-        const data = {
-            image: app.image,
-            appType: app.appType,
-            envVars,
-            volumes,
-        };
-        if (app.name) {
-            data.name = app.name;
-        }
-        if ((0, deviceSpec_1.isQuadletImageAppForm)(app) && app.runAs) {
-            data.runAs = app.runAs;
-        }
-        return data;
-    }
-    // Inline applications (Quadlet or Compose)
-    const inlineData = {
-        name: app.name,
-        appType: app.appType,
-        inline: toAPIFiles(app.files),
-        envVars,
-        volumes,
-    };
-    if ((0, deviceSpec_1.isQuadletInlineAppForm)(app) && app.runAs) {
-        inlineData.runAs = app.runAs;
-    }
-    return inlineData;
 };
-exports.toAPIApplication = toAPIApplication;
-const hasInlineApplicationChanged = (currentApp, updatedApp) => {
-    if (currentApp.inline.length !== updatedApp.files.length) {
+const haveEnvVarsChanged = (current, updated) => {
+    const aKeys = Object.keys(current);
+    const bKeys = Object.keys(updated);
+    if (aKeys.length !== bKeys.length)
         return true;
-    }
-    const filesChanged = currentApp.inline.some((file, index) => {
-        const updatedFile = updatedApp.files[index];
-        const isCurrentBase64 = file.contentEncoding === types_1.EncodingType.EncodingBase64;
-        return ((updatedFile.base64 || false) !== isCurrentBase64 ||
-            updatedFile.path !== file.path ||
-            updatedFile.content !== file.content);
-    });
-    if (filesChanged) {
+    return aKeys.some((key) => current[key] !== updated[key]);
+};
+const haveVolumesChanged = (current, updated) => {
+    if (current.length !== updated.length)
         return true;
-    }
-    // Check runAs for Quadlet inline apps
-    if ((0, deviceSpec_1.isQuadletInlineAppForm)(updatedApp)) {
-        const currentAppWithRunAs = currentApp;
-        if ((currentAppWithRunAs.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER) !== (updatedApp.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER)) {
+    return current.some((currentVol, index) => {
+        var _a, _b, _c, _d, _e, _f;
+        const updatedVol = updated[index];
+        if (currentVol.name !== updatedVol.name)
+            return true;
+        if ((currentVol.reclaimPolicy || types_1.ApplicationVolumeReclaimPolicy.RETAIN) !==
+            (updatedVol.reclaimPolicy || types_1.ApplicationVolumeReclaimPolicy.RETAIN))
+            return true;
+        const currentFull = currentVol;
+        const updatedFull = updatedVol;
+        const currentImageRef = ((_a = currentFull.image) === null || _a === void 0 ? void 0 : _a.reference) || '';
+        const updatedImageRef = ((_b = updatedFull.image) === null || _b === void 0 ? void 0 : _b.reference) || '';
+        if (currentImageRef !== updatedImageRef)
             return true;
-        }
-    }
-    return !areVolumesEqual(currentApp.volumes || [], updatedApp.volumes || []);
-};
-const areVolumesEqual = (currentVolumes, updatedFormVolumes) => {
-    if (currentVolumes.length !== updatedFormVolumes.length) {
-        return false;
-    }
-    return currentVolumes.every((currentVol, index) => {
-        var _a, _b, _c;
-        const updatedFormVol = updatedFormVolumes[index];
-        const currentFullVol = currentVol;
-        if (currentFullVol.name !== updatedFormVol.name) {
-            return false;
-        }
-        const currentImageRef = ((_a = currentFullVol.image) === null || _a === void 0 ? void 0 : _a.reference) || '';
-        const updatedImageRef = (updatedFormVol === null || updatedFormVol === void 0 ? void 0 : updatedFormVol.imageRef) || '';
-        if (currentImageRef !== updatedImageRef) {
-            return false;
-        }
         if (currentImageRef || updatedImageRef) {
-            const currentPullPolicy = ((_b = currentFullVol.image) === null || _b === void 0 ? void 0 : _b.pullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent;
-            const updatedPullPolicy = (updatedFormVol === null || updatedFormVol === void 0 ? void 0 : updatedFormVol.imagePullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent;
-            if (currentPullPolicy !== updatedPullPolicy) {
-                return false;
-            }
-        }
-        const currentMountPath = ((_c = currentFullVol.mount) === null || _c === void 0 ? void 0 : _c.path) || '';
-        const updatedMountPath = (updatedFormVol === null || updatedFormVol === void 0 ? void 0 : updatedFormVol.mountPath) || '';
-        if (currentMountPath !== updatedMountPath) {
-            return false;
+            if ((((_c = currentFull.image) === null || _c === void 0 ? void 0 : _c.pullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent) !==
+                (((_d = updatedFull.image) === null || _d === void 0 ? void 0 : _d.pullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent))
+                return true;
         }
-        return true;
+        return (((_e = currentFull.mount) === null || _e === void 0 ? void 0 : _e.path) || '') !== (((_f = updatedFull.mount) === null || _f === void 0 ? void 0 : _f.path) || '');
     });
 };
-const arePortsEqual = (currentPorts, updatedPorts) => {
-    if (currentPorts.length !== updatedPorts.length) {
-        return false;
-    }
-    // Reordered ports will be considered as changed
-    return currentPorts.every((currentPort, index) => {
-        const updatedPort = updatedPorts[index];
-        return currentPort === `${updatedPort.hostPort}:${updatedPort.containerPort}`;
-    });
+const hasStringChanged = (current, updated, defaultValue = '') => (current || defaultValue) !== (updated || defaultValue);
+const havePortsChanged = (current, updated) => {
+    if (current.length !== updated.length)
+        return true;
+    return current.some((port, index) => port !== updated[index]);
 };
-const areResourceLimitsEqual = (currentLimits, updatedLimits) => {
-    const currentCpu = (currentLimits === null || currentLimits === void 0 ? void 0 : currentLimits.cpu) || '';
-    const updatedCpu = (updatedLimits === null || updatedLimits === void 0 ? void 0 : updatedLimits.cpu) || '';
-    const currentMemory = (currentLimits === null || currentLimits === void 0 ? void 0 : currentLimits.memory) || '';
-    const updatedMemory = (updatedLimits === null || updatedLimits === void 0 ? void 0 : updatedLimits.memory) || '';
-    return currentCpu === updatedCpu && currentMemory === updatedMemory;
+const haveResourceLimitsChanged = (current, updated) => {
+    return ((current === null || current === void 0 ? void 0 : current.cpu) || '') !== ((updated === null || updated === void 0 ? void 0 : updated.cpu) || '') || ((current === null || current === void 0 ? void 0 : current.memory) || '') !== ((updated === null || updated === void 0 ? void 0 : updated.memory) || '');
 };
-const areEnvVariablesEqual = (currentVars, updatedFormVars) => {
-    const envVars = currentVars || {};
-    if (Object.keys(envVars).length !== updatedFormVars.length) {
-        return false;
-    }
-    return updatedFormVars.every((variable) => {
-        // Envvars may have "falsy" values (eg. number 0) when they are defined
-        return variable.name in envVars && envVars[variable.name] === variable.value;
-    });
+const haveValuesFilesChanged = (current, updated) => {
+    const a = current.filter((f) => f.trim() !== '');
+    const b = updated.filter((f) => f.trim() !== '');
+    if (a.length !== b.length)
+        return true;
+    return a.some((file, i) => file !== b[i]);
 };
-const hasSingleContainerAppChanged = (currentApp, updatedApp) => {
-    var _a;
-    if (!(0, deviceSpec_1.isSingleContainerAppForm)(updatedApp)) {
+const haveHelmValuesChanged = (current, updated) => JSON.stringify(current) !== JSON.stringify(updated);
+const hasRunAsChanged = (current, updated) => {
+    if (!current) {
+        // For empty "runAs", we mark the app as changed.
+        // This means that we'll set the field explicitly to the default user (currently "root").
         return true;
     }
-    const imageApp = currentApp;
-    if (imageApp.name !== updatedApp.name || imageApp.image !== updatedApp.image) {
+    return current !== updated;
+};
+// Single container apps always have an image, and it doesn't have an inline variant
+const hasContainerAppChanged = (current, updated) => {
+    var _a, _b;
+    return hasStringChanged(current.name, updated.name) ||
+        hasStringChanged(current.image, updated.image) ||
+        havePortsChanged(current.ports || [], updated.ports || []) ||
+        haveResourceLimitsChanged((_a = current.resources) === null || _a === void 0 ? void 0 : _a.limits, (_b = updated.resources) === null || _b === void 0 ? void 0 : _b.limits) ||
+        haveEnvVarsChanged(current.envVars || {}, updated.envVars || {}) ||
+        hasRunAsChanged(current.runAs, updated.runAs) ||
+        haveVolumesChanged(current.volumes || [], updated.volumes || []);
+};
+// Helm apps always have an image (chart), and it doesn't have an inline variant
+const hasHelmAppChanged = (current, updated) => hasStringChanged(current.name, updated.name) ||
+    hasStringChanged(current.image, updated.image) ||
+    hasStringChanged(current.namespace, updated.namespace) ||
+    haveValuesFilesChanged(current.valuesFiles || [], updated.valuesFiles || []) ||
+    haveHelmValuesChanged(current.values || {}, updated.values || {});
+const hasComposeAppChanged = (current, updated, specType) => {
+    const baseChanged = hasStringChanged(current.name, updated.name) ||
+        haveEnvVarsChanged(current.envVars || {}, updated.envVars || {}) ||
+        haveVolumesChanged(current.volumes || [], updated.volumes || []);
+    if (baseChanged) {
         return true;
     }
-    if (!arePortsEqual(imageApp.ports || [], updatedApp.ports || [])) {
-        return true;
+    if (specType === deviceSpec_1.AppSpecType.OCI_IMAGE) {
+        return hasStringChanged(current.image, updated.image);
     }
-    if (!areResourceLimitsEqual((_a = imageApp.resources) === null || _a === void 0 ? void 0 : _a.limits, updatedApp.limits)) {
+    return haveInlineFilesChanged(current.inline, updated.inline);
+};
+// Quadlet apps are currently the same as Compose apps, plus an optional "runAs" field.
+const hasQuadletAppChanged = (current, updated, specType) => {
+    const baseChanged = hasComposeAppChanged(current, updated, specType);
+    if (baseChanged) {
         return true;
     }
-    if (!areEnvVariablesEqual(imageApp.envVars, updatedApp.variables)) {
+    return hasRunAsChanged(current.runAs, updated.runAs);
+};
+const hasApplicationChanged = (current, updated) => {
+    if (current.appType !== updated.appType) {
         return true;
     }
-    if ((imageApp.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER) !== (updatedApp.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER)) {
+    const currentSpectType = (0, deviceSpec_1.isImageVariantApp)(current) ? deviceSpec_1.AppSpecType.OCI_IMAGE : deviceSpec_1.AppSpecType.INLINE;
+    const updatedSpectType = (0, deviceSpec_1.isImageVariantApp)(updated) ? deviceSpec_1.AppSpecType.OCI_IMAGE : deviceSpec_1.AppSpecType.INLINE;
+    if (currentSpectType !== updatedSpectType) {
         return true;
     }
-    return !areVolumesEqual(imageApp.volumes || [], updatedApp.volumes || []);
-};
-const hasApplicationChanged = (currentApp, updatedApp) => {
-    const isCurrentImageApp = (0, deviceSpec_1.isImageAppProvider)(currentApp);
-    const currentAppSpecType = isCurrentImageApp ? deviceSpec_1.AppSpecType.OCI_IMAGE : deviceSpec_1.AppSpecType.INLINE;
-    // Check if application name changed, or it's a different type of application (either specType or appType)
-    if (currentAppSpecType !== updatedApp.specType ||
-        currentApp.appType !== updatedApp.appType ||
-        currentApp.name !== updatedApp.name) {
-        return true;
+    switch (current.appType) {
+        case types_1.AppType.AppTypeContainer:
+            return hasContainerAppChanged(current, updated);
+        case types_1.AppType.AppTypeHelm:
+            return hasHelmAppChanged(current, updated);
+        case types_1.AppType.AppTypeQuadlet:
+            return hasQuadletAppChanged(current, updated, currentSpectType);
+        case types_1.AppType.AppTypeCompose:
+            return hasComposeAppChanged(current, updated, currentSpectType);
     }
-    // The app is a single container application
-    if ((0, deviceSpec_1.isSingleContainerAppForm)(updatedApp)) {
-        return hasSingleContainerAppChanged(currentApp, updatedApp);
+};
+const variablesToEnvVars = (variables) => {
+    if (variables.length === 0) {
+        return undefined;
     }
-    // The app is a Helm application
-    if ((0, deviceSpec_1.isHelmImageAppForm)(updatedApp)) {
-        const imageApp = currentApp;
-        if (imageApp.image !== updatedApp.image || imageApp.namespace !== updatedApp.namespace) {
-            return true;
+    return variables.reduce((acc, v) => {
+        if (v.name) {
+            acc[v.name] = v.value || '';
         }
-        // Compare valuesFiles arrays
-        const currentValuesFiles = (imageApp.valuesFiles || []).filter((file) => file !== '');
-        const updatedValuesFiles = updatedApp.valuesFiles.filter((file) => file !== '');
-        if (currentValuesFiles.length !== updatedValuesFiles.length) {
-            return true;
+        return acc;
+    }, {});
+};
+/**
+ * Converts form volumes to API volumes, ignoring fields that are not allowed for the given app type.
+ * Quadlet/Compose apps --> can only be image volumes (mount is not allowed)
+ * Container apps --> can either be mount or image mount volumes
+ */
+const formVolumesToApi = (volumes, appType) => {
+    return volumes.map((v) => {
+        const vol = {
+            name: v.name || '',
+        };
+        if (v.imageRef) {
+            vol.image = {
+                reference: v.imageRef,
+                pullPolicy: v.imagePullPolicy || types_1.ImagePullPolicy.PullIfNotPresent,
+            };
         }
-        if (!currentValuesFiles.every((file, index) => file === updatedValuesFiles[index])) {
-            return true;
+        if (v.mountPath && appType === types_1.AppType.AppTypeContainer) {
+            vol.mount = { path: v.mountPath };
         }
-        const updatedValues = js_yaml_1.default.load(updatedApp.valuesYaml || '  ');
-        if (JSON.stringify(imageApp.values || {}) !== JSON.stringify(updatedValues)) {
-            return true;
+        return vol;
+    });
+};
+const formFilesToApi = (files) => files.map((f) => ({
+    path: f.path,
+    content: f.content || '',
+    contentEncoding: f.base64 ? types_1.EncodingType.EncodingBase64 : types_1.EncodingType.EncodingPlain,
+}));
+const toFormFiles = (files) => files.map((file) => ({
+    path: file.path || '',
+    content: file.content || '',
+    base64: file.contentEncoding === types_1.EncodingType.EncodingBase64,
+}));
+const toApiHelmApp = (app) => {
+    const helmApp = {
+        name: app.name,
+        image: app.image,
+        appType: app.appType,
+    };
+    if (app.namespace) {
+        helmApp.namespace = app.namespace;
+    }
+    if (app.valuesYaml) {
+        try {
+            const values = js_yaml_1.default.load(app.valuesYaml);
+            if (values && Object.keys(values).length > 0)
+                helmApp.values = values;
+        }
+        catch (_a) {
+            // leave values unset on invalid YAML
         }
-        return false;
     }
-    if (!areEnvVariablesEqual(currentApp.envVars, updatedApp.variables)) {
-        return true;
+    const fileNames = (app.valuesFiles || []).filter((f) => f.trim() !== '');
+    if (fileNames.length > 0) {
+        helmApp.valuesFiles = fileNames;
     }
-    // The app is an image application (Quadlet/Compose image apps)
-    if (isCurrentImageApp) {
-        const imageApp = currentApp;
-        const updatedImageApp = updatedApp;
-        if (imageApp.image !== updatedImageApp.image) {
-            return true;
+    return helmApp;
+};
+const toApiContainerApp = (app) => {
+    const containerApp = {
+        image: app.image,
+        appType: app.appType,
+        runAs: app.runAs || deviceSpec_1.RUN_AS_ROOT_USER,
+        envVars: variablesToEnvVars(app.variables || []),
+        volumes: formVolumesToApi(app.volumes || [], types_1.AppType.AppTypeContainer),
+    };
+    if (app.name) {
+        containerApp.name = app.name;
+    }
+    if (app.ports.length > 0) {
+        containerApp.ports = app.ports.map((p) => `${p.hostPort}:${p.containerPort}`);
+    }
+    const cpu = app.cpuLimit;
+    const memory = app.memoryLimit;
+    if (cpu || memory) {
+        const limits = {};
+        if (cpu) {
+            limits.cpu = cpu;
         }
-        // Check runAs for Quadlet image apps
-        if ((0, deviceSpec_1.isQuadletImageAppForm)(updatedApp)) {
-            if ((currentApp.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER) !== (updatedApp.runAs || deviceSpec_1.RUN_AS_DEFAULT_USER)) {
-                return true;
-            }
+        if (memory) {
+            limits.memory = memory;
         }
-        return !areVolumesEqual(imageApp.volumes || [], updatedApp.volumes || []);
+        containerApp.resources = { limits };
+    }
+    return containerApp;
+};
+const toApiComposeApp = (app) => {
+    const formApp = {
+        appType: app.appType,
+        envVars: variablesToEnvVars(app.variables || []),
+        volumes: formVolumesToApi(app.volumes || [], app.appType),
+    };
+    if (app.name) {
+        formApp.name = app.name;
+    }
+    if (app.specType === deviceSpec_1.AppSpecType.OCI_IMAGE) {
+        formApp.image = app.image;
+    }
+    else {
+        formApp.inline = formFilesToApi(app.files);
+    }
+    return formApp;
+};
+// Quadlet apps are currently the same as Compose apps, plus an optional "runAs" field.
+const toApiQuadletApp = (app) => {
+    const baseApp = toApiComposeApp(app);
+    return Object.assign(Object.assign({}, baseApp), { appType: types_1.AppType.AppTypeQuadlet, runAs: app.runAs || deviceSpec_1.RUN_AS_ROOT_USER });
+};
+const toApiApplication = (app) => {
+    switch (app.appType) {
+        case types_1.AppType.AppTypeHelm:
+            return toApiHelmApp(app);
+        case types_1.AppType.AppTypeContainer:
+            return toApiContainerApp(app);
+        case types_1.AppType.AppTypeQuadlet:
+            return toApiQuadletApp(app);
+        case types_1.AppType.AppTypeCompose:
+            return toApiComposeApp(app);
+        default:
+            throw new Error('Unknown application type');
+    }
+};
+exports.toApiApplication = toApiApplication;
+const toFormVariables = (envVars) => Object.entries(envVars).map(([name, value]) => ({ name, value: value || '' }));
+const toFormVolumes = (volumes) => {
+    if (!volumes)
+        return [];
+    return volumes.map((vol) => {
+        var _a, _b, _c;
+        const fullVolume = vol;
+        return {
+            name: fullVolume.name,
+            imageRef: ((_a = fullVolume.image) === null || _a === void 0 ? void 0 : _a.reference) || '',
+            mountPath: ((_b = fullVolume.mount) === null || _b === void 0 ? void 0 : _b.path) || '',
+            imagePullPolicy: ((_c = fullVolume.image) === null || _c === void 0 ? void 0 : _c.pullPolicy) || types_1.ImagePullPolicy.PullIfNotPresent,
+        };
+    });
+};
+const toFormApps = (app) => {
+    switch (app.appType) {
+        case types_1.AppType.AppTypeContainer:
+            return toContainerAppForm(app);
+        case types_1.AppType.AppTypeHelm:
+            return toHelmAppForm(app);
+        case types_1.AppType.AppTypeQuadlet:
+            return toQuadletAppForm(app);
+        case types_1.AppType.AppTypeCompose:
+            return toComposeAppForm(app);
+        default:
+            throw new Error('Unknown application type');
     }
-    // The app must be an inline application
-    return hasInlineApplicationChanged(currentApp, updatedApp);
 };
 const getApplicationPatches = (basePath, currentApps, updatedApps) => {
     const patches = [];
     const currentLen = currentApps.length;
     const newLen = updatedApps.length;
     if (currentLen === 0 && newLen > 0) {
-        // First apps(s) have been added
-        patches.push({
-            path: `${basePath}/applications`,
-            op: 'add',
-            value: updatedApps.map(exports.toAPIApplication),
-        });
+        patches.push({ path: `${basePath}/applications`, op: 'add', value: updatedApps.map(exports.toApiApplication) });
     }
     else if (currentLen > 0 && newLen === 0) {
-        // Last app(s) have been removed
-        patches.push({
-            path: `${basePath}/applications`,
-            op: 'remove',
-        });
+        patches.push({ path: `${basePath}/applications`, op: 'remove' });
     }
     else if (currentLen !== newLen) {
-        // Array length changed, need to replace entire array
-        patches.push({
-            path: `${basePath}/applications`,
-            op: 'replace',
-            value: updatedApps.map(exports.toAPIApplication),
-        });
+        patches.push({ path: `${basePath}/applications`, op: 'replace', value: updatedApps.map(exports.toApiApplication) });
     }
     else {
-        // Apps length has not changed. We only PATCH the applications that have actually changed
         currentApps.forEach((currentApp, index) => {
             const updatedApp = updatedApps[index];
-            if (hasApplicationChanged(currentApp, updatedApp)) {
+            const updatedApi = (0, exports.toApiApplication)(updatedApp);
+            if (hasApplicationChanged(currentApp, updatedApi)) {
                 patches.push({
                     path: `${basePath}/applications/${index}`,
                     op: 'replace',
-                    value: (0, exports.toAPIApplication)(updatedApp),
+                    value: updatedApi,
                 });
             }
         });
@@ -511,40 +517,15 @@ const getApiConfig = (ct) => {
     };
 };
 exports.getApiConfig = getApiConfig;
-const getAppFormVariables = (envVars) => Object.entries(envVars || {}).map(([varName, varValue]) => ({ name: varName, value: varValue }));
-const toFormFiles = (files) => {
-    return files.map((file) => ({
-        path: file.path || '',
-        content: file.content || '',
-        base64: file.contentEncoding === types_1.EncodingType.EncodingBase64,
-    }));
-};
-const toAPIFiles = (files) => {
-    return files.map((file) => ({
-        path: file.path,
-        content: file.content || '',
-        contentEncoding: file.base64 ? types_1.EncodingType.EncodingBase64 : types_1.EncodingType.EncodingPlain,
-    }));
-};
-const convertVolumesToForm = (volumes) => {
-    if (!volumes)
-        return [];
-    return volumes.map((vol) => {
-        var _a, _b;
-        const fullVolume = vol;
-        const volForm = {
-            name: fullVolume.name,
-            imageRef: ((_a = fullVolume.image) === null || _a === void 0 ? void 0 : _a.reference) || '',
-            mountPath: ((_b = fullVolume.mount) === null || _b === void 0 ? void 0 : _b.path) || '',
-        };
-        // Only set imagePullPolicy if there's an image
-        if (fullVolume.image) {
-            volForm.imagePullPolicy = fullVolume.image.pullPolicy || types_1.ImagePullPolicy.PullIfNotPresent;
-        }
-        return volForm;
-    });
+const getRunAsUser = (app) => {
+    if (app) {
+        // Existing apps that don't have a "runAs" user are actually running as the "root" user.
+        return app.runAs || deviceSpec_1.RUN_AS_ROOT_USER;
+    }
+    // For new applications, we want to promote "flightctl" as the default user.
+    return deviceSpec_1.RUN_AS_FLIGHTCTL_USER;
 };
-const createContainerApp = (containerApp) => {
+const toContainerAppForm = (containerApp) => {
     var _a, _b;
     const ports = ((_a = containerApp === null || containerApp === void 0 ? void 0 : containerApp.ports) === null || _a === void 0 ? void 0 : _a.map((portString) => {
         const [hostPort, containerPort] = portString.split(':');
@@ -556,114 +537,78 @@ const createContainerApp = (containerApp) => {
         specType: deviceSpec_1.AppSpecType.OCI_IMAGE,
         name: (containerApp === null || containerApp === void 0 ? void 0 : containerApp.name) || '',
         image: (containerApp === null || containerApp === void 0 ? void 0 : containerApp.image) || '',
-        variables: getAppFormVariables(containerApp === null || containerApp === void 0 ? void 0 : containerApp.envVars),
-        volumes: convertVolumesToForm(containerApp === null || containerApp === void 0 ? void 0 : containerApp.volumes),
+        variables: toFormVariables((containerApp === null || containerApp === void 0 ? void 0 : containerApp.envVars) || {}),
+        volumes: toFormVolumes(containerApp === null || containerApp === void 0 ? void 0 : containerApp.volumes),
         ports,
-        limits: limits
-            ? {
-                cpu: limits.cpu || '',
-                memory: limits.memory || '',
-            }
-            : undefined,
-        runAs: (containerApp === null || containerApp === void 0 ? void 0 : containerApp.runAs) || deviceSpec_1.RUN_AS_DEFAULT_USER,
+        cpuLimit: (limits === null || limits === void 0 ? void 0 : limits.cpu) || '',
+        memoryLimit: (limits === null || limits === void 0 ? void 0 : limits.memory) || '',
+        runAs: getRunAsUser(containerApp),
     };
 };
-const createHelmApp = (helmApp) => {
+const toHelmAppForm = (helmApp) => {
+    var _a;
+    // We want to always show at least one values file field, even when no files have been added yet.
     const values = (helmApp === null || helmApp === void 0 ? void 0 : helmApp.values) || {};
+    const valuesFiles = ((_a = helmApp === null || helmApp === void 0 ? void 0 : helmApp.valuesFiles) === null || _a === void 0 ? void 0 : _a.length) ? helmApp.valuesFiles : [''];
+    const valuesYaml = Object.keys(values || {}).length > 0 ? js_yaml_1.default.dump(values) : '';
     return {
         appType: types_1.AppType.AppTypeHelm,
         specType: deviceSpec_1.AppSpecType.OCI_IMAGE,
         name: (helmApp === null || helmApp === void 0 ? void 0 : helmApp.name) || '',
         image: (helmApp === null || helmApp === void 0 ? void 0 : helmApp.image) || '',
-        namespace: helmApp === null || helmApp === void 0 ? void 0 : helmApp.namespace,
-        valuesYaml: Object.keys(values).length > 0 ? js_yaml_1.default.dump(values) : '',
-        valuesFiles: (helmApp === null || helmApp === void 0 ? void 0 : helmApp.valuesFiles) || [''],
-    };
-};
-const createQuadletImageApp = (quadletApp) => {
-    return {
-        appType: types_1.AppType.AppTypeQuadlet,
-        specType: deviceSpec_1.AppSpecType.OCI_IMAGE,
-        name: (quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.name) || '',
-        image: (quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.image) || '',
-        variables: getAppFormVariables(quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.envVars),
-        volumes: convertVolumesToForm(quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.volumes),
-        runAs: (quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.runAs) || deviceSpec_1.RUN_AS_DEFAULT_USER,
+        namespace: (helmApp === null || helmApp === void 0 ? void 0 : helmApp.namespace) || '',
+        valuesYaml,
+        valuesFiles,
     };
 };
-const createQuadletInlineApp = (quadletApp) => {
-    return {
-        appType: types_1.AppType.AppTypeQuadlet,
-        specType: deviceSpec_1.AppSpecType.INLINE,
-        name: (quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.name) || '',
-        files: toFormFiles((quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.inline) || []),
-        variables: getAppFormVariables(quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.envVars),
-        volumes: convertVolumesToForm(quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.volumes),
-        runAs: (quadletApp === null || quadletApp === void 0 ? void 0 : quadletApp.runAs) || deviceSpec_1.RUN_AS_DEFAULT_USER,
-    };
-};
-const createComposeImageApp = (composeApp) => {
-    return {
+const toComposeAppForm = (app) => {
+    const isInlineVariant = app && (0, deviceSpec_1.isInlineVariantApp)(app);
+    const specType = isInlineVariant ? deviceSpec_1.AppSpecType.INLINE : deviceSpec_1.AppSpecType.OCI_IMAGE;
+    const formApp = {
         appType: types_1.AppType.AppTypeCompose,
-        specType: deviceSpec_1.AppSpecType.OCI_IMAGE,
-        name: (composeApp === null || composeApp === void 0 ? void 0 : composeApp.name) || '',
-        image: (composeApp === null || composeApp === void 0 ? void 0 : composeApp.image) || '',
-        variables: getAppFormVariables(composeApp === null || composeApp === void 0 ? void 0 : composeApp.envVars),
-        volumes: convertVolumesToForm(composeApp === null || composeApp === void 0 ? void 0 : composeApp.volumes),
+        specType,
+        name: (app === null || app === void 0 ? void 0 : app.name) || '',
+        variables: toFormVariables((app === null || app === void 0 ? void 0 : app.envVars) || {}),
+        volumes: toFormVolumes(app === null || app === void 0 ? void 0 : app.volumes),
     };
+    // We want to have both fields initialized for the formik form
+    if (isInlineVariant) {
+        formApp.files = toFormFiles((app === null || app === void 0 ? void 0 : app.inline) || []);
+        formApp.image = '';
+    }
+    else {
+        formApp.image = (app === null || app === void 0 ? void 0 : app.image) || '';
+        formApp.files = [];
+    }
+    return formApp;
 };
-const createComposeInlineApp = (composeApp) => {
-    return {
-        appType: types_1.AppType.AppTypeCompose,
-        specType: deviceSpec_1.AppSpecType.INLINE,
-        name: (composeApp === null || composeApp === void 0 ? void 0 : composeApp.name) || '',
-        files: toFormFiles((composeApp === null || composeApp === void 0 ? void 0 : composeApp.inline) || []),
-        variables: getAppFormVariables(composeApp === null || composeApp === void 0 ? void 0 : composeApp.envVars),
-        volumes: convertVolumesToForm(composeApp === null || composeApp === void 0 ? void 0 : composeApp.volumes),
-    };
+const toQuadletAppForm = (app) => {
+    const baseApp = toComposeAppForm(app);
+    return Object.assign(Object.assign({}, baseApp), { appType: types_1.AppType.AppTypeQuadlet, runAs: getRunAsUser(app) });
 };
-const createInitialAppForm = (appType, specType, name = '') => {
+const createInitialAppForm = (appType, name = '') => {
     let app;
     switch (appType) {
         case types_1.AppType.AppTypeContainer:
-            app = createContainerApp(undefined);
+            app = toContainerAppForm(undefined);
             break;
         case types_1.AppType.AppTypeHelm:
-            app = createHelmApp(undefined);
+            app = toHelmAppForm(undefined);
             break;
         case types_1.AppType.AppTypeQuadlet:
-            app = specType === deviceSpec_1.AppSpecType.OCI_IMAGE ? createQuadletImageApp(undefined) : createQuadletInlineApp(undefined);
+            app = toQuadletAppForm(undefined);
             break;
         case types_1.AppType.AppTypeCompose:
-            app = specType === deviceSpec_1.AppSpecType.OCI_IMAGE ? createComposeImageApp(undefined) : createComposeInlineApp(undefined);
+            app = toComposeAppForm(undefined);
             break;
+        default:
+            throw new Error('Unknown application type');
     }
     app.name = name;
     return app;
 };
 exports.createInitialAppForm = createInitialAppForm;
-const getApplicationValues = (deviceSpec) => {
-    const apps = (deviceSpec === null || deviceSpec === void 0 ? void 0 : deviceSpec.applications) || [];
-    return apps.map((app) => {
-        if (!app.appType) {
-            throw new Error('Application appType is required');
-        }
-        switch (app.appType) {
-            case types_1.AppType.AppTypeContainer:
-                return createContainerApp(app);
-            case types_1.AppType.AppTypeHelm:
-                return createHelmApp(app);
-            case types_1.AppType.AppTypeQuadlet:
-                return (0, deviceSpec_1.isImageAppProvider)(app)
-                    ? createQuadletImageApp(app)
-                    : createQuadletInlineApp(app);
-            case types_1.AppType.AppTypeCompose:
-                return (0, deviceSpec_1.isImageAppProvider)(app)
-                    ? createComposeImageApp(app)
-                    : createComposeInlineApp(app);
-        }
-    });
-};
+const getApplicationValues = (deviceSpec) => ((deviceSpec === null || deviceSpec === void 0 ? void 0 : deviceSpec.applications) || []).map(toFormApps);
 exports.getApplicationValues = getApplicationValues;
 const getSystemdUnitsValues = (deviceSpec) => {
     var _a, _b;