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

package/dist/ui-components/src/components/form/UploadField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadField.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/UploadField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IACjE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAuHF,QAAA,MAAM,kBAAkB,2DAA4D,gBAAgB,sBASnG,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"UploadField.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/UploadField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IACjE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAsHF,QAAA,MAAM,kBAAkB,2DAA4D,gBAAgB,sBASnG,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/ui-components/src/components/form/UploadField.js

@@ -6,23 +6,25 @@ const formik_1 = require("formik");
 const react_core_1 = require("@patternfly/react-core");
 const useTranslation_1 = require("../../hooks/useTranslation");
 const FieldHelperText_1 = tslib_1.__importStar(require("./FieldHelperText"));
-const UploadHelperText = ({ meta, isUploading, isRejected, maxFileBytes, }) => {
+const ONE_MB = 1024 * 1024;
+const UploadMaxFileSizeHelperText = ({ maxFileBytes }) => {
+    const { t } = (0, useTranslation_1.useTranslation)();
+    const showKB = maxFileBytes < ONE_MB;
+    const maxFileSize = maxFileBytes / (showKB ? 1024 : ONE_MB);
+    const helperText = showKB
+        ? t('Max file size {{ maxFileSize }} KB', { maxFileSize })
+        : t('Max file size {{ maxFileSize }} MB', { maxFileSize });
+    return React.createElement(FieldHelperText_1.DefaultHelperText, { helperText: helperText });
+};
+const UploadErrorHelperText = ({ meta, isUploading, isRejected, }) => {
     const { t } = (0, useTranslation_1.useTranslation)();
-    const maxFileMB = (maxFileBytes || 0) / (1024 * 1024);
-    const defaultContent = maxFileBytes ? (React.createElement(FieldHelperText_1.DefaultHelperText, { helperText: t('Max file size {{ maxFileSize }} MB', { maxFileSize: maxFileMB }) })) : null;
     if (isRejected) {
-        return (React.createElement(React.Fragment, null,
-            defaultContent,
-            React.createElement(FieldHelperText_1.default, { error: t('Content exceeds max file size of {{ maxFileSize }} MB', {
-                    maxFileSize: maxFileMB,
-                }) })));
+        return React.createElement(FieldHelperText_1.default, { error: t('File exceeds maximum allowed size.') });
     }
     else if (!isUploading && !!(meta === null || meta === void 0 ? void 0 : meta.error)) {
-        return (React.createElement(React.Fragment, null,
-            defaultContent,
-            React.createElement(FieldHelperText_1.default, { meta: meta })));
+        return React.createElement(FieldHelperText_1.default, { meta: meta });
     }
-    return defaultContent;
+    return null;
 };
 const UploadField = ({ ariaLabel, maxFileBytes, isRequired, name }) => {
     const { t } = (0, useTranslation_1.useTranslation)();
@@ -47,13 +49,17 @@ const UploadField = ({ ariaLabel, maxFileBytes, isRequired, name }) => {
                 return;
             }
         }
-        void setValue(file);
+        // To prevent timing issues with validations, we must touch the field before we set the new value
         void setTouched(true);
+        void setValue(file, true);
         setIsRejected(false);
     };
     return (React.createElement(react_core_1.FormGroup, { fieldId: fieldId, "aria-label": ariaLabel, isRequired: isRequired },
         React.createElement(react_core_1.FileUpload, { type: "text", id: field.name, isRequired: isRequired, filenamePlaceholder: t('Drag a file or browse to upload'), browseButtonText: t('Browse...'), clearButtonText: t('Clear'), allowEditingUploadedText: true, style: { resize: 'vertical' }, validated: isValid || isFileUploading ? 'default' : 'error', value: field.value, filename: filename ? t('Content loaded from: {{ filename }}', { filename }) : '', onDataChange: handleFileChange, onTextChange: handleFileChange, onFileInputChange: (_event, file) => {
-                if (!maxFileBytes || file.size <= maxFileBytes) {
+                if (maxFileBytes && file.size > maxFileBytes) {
+                    handleFileRejected(true);
+                }
+                else {
                     setFilename(file.name);
                     setIsRejected(false);
                 }
@@ -65,10 +71,13 @@ const UploadField = ({ ariaLabel, maxFileBytes, isRequired, name }) => {
                 onDropRejected: () => handleFileRejected(true),
             }, onClearClick: () => {
                 setFilename('');
+                if (!isRequired) {
+                    void setTouched(false);
+                }
                 void setValue('');
-                void setTouched(false);
             } }),
-        React.createElement(UploadHelperText, { maxFileBytes: maxFileBytes, meta: meta, isUploading: isFileUploading, isRejected: isRejected })));
+        maxFileBytes && React.createElement(UploadMaxFileSizeHelperText, { maxFileBytes: maxFileBytes }),
+        React.createElement(UploadErrorHelperText, { meta: meta, isUploading: isFileUploading, isRejected: isRejected })));
 };
 const UploadFieldWrapper = (_a) => {
     var { name, ariaLabel, maxFileBytes, isRequired } = _a, rest = tslib_1.__rest(_a, ["name", "ariaLabel", "maxFileBytes", "isRequired"]);

package/dist/ui-components/src/components/form/UploadField.js.map

@@ -1 +1 @@
-{"version":3,"file":"UploadField.js","sourceRoot":"","sources":["../../../../../src/components/form/UploadField.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UploadField.js","sourceRoot":"","sources":["../../../../../src/components/form/UploadField.tsx"],"names":[],"mappings":"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"}

package/dist/ui-components/src/components/form/validations.d.ts

@@ -25,6 +25,11 @@ export declare const validKubernetesLabelValue: (t: TFunction, { isRequired, fie
     fieldName?: string | undefined;
 }) => Yup.StringSchema<string | undefined, Yup.AnyObject, undefined, "">;
 export declare const validApplicationAndVolumeName: (t: TFunction) => Yup.StringSchema<string | undefined, Yup.AnyObject, undefined, "">;
+export declare const getBuildNameValidations: (t: TFunction) => {
+    key: string;
+    message: string;
+}[];
+export declare const validImageBuildName: (t: TFunction) => Yup.StringSchema<string, Yup.AnyObject, undefined, "">;
 export declare const maxLengthString: (t: TFunction, props: {
     maxLength: number;
     fieldName: string;
@@ -32,6 +37,8 @@ export declare const maxLengthString: (t: TFunction, props: {
 export declare const validOsImage: (t: TFunction, { isFleet }: {
     isFleet: boolean;
 }) => Yup.StringSchema<string | undefined, Yup.AnyObject, undefined, "">;
+export declare const validHelmNamespace: (t: TFunction) => Yup.StringSchema<string | undefined, Yup.AnyObject, undefined, "">;
+export declare const validHelmValuesFile: (t: TFunction) => Yup.StringSchema<string | undefined, Yup.AnyObject, undefined, "">;
 export declare const validLabelsSchema: (t: TFunction, forbiddenLabels?: string[]) => Yup.ArraySchema<{
     value?: string | undefined;
     key: string;
@@ -44,34 +51,34 @@ export declare const isValidPortMapping: (hostPort: string, containerPort: strin
 export declare const validateCPULimit: (cpu: string | undefined) => boolean;
 export declare const validateMemoryLimit: (memory: string | undefined) => boolean;
 export declare const validApplicationsSchema: (t: TFunction) => Yup.ArraySchema<({
+    ports?: {
+        hostPort: string;
+        containerPort: string;
+    }[] | undefined;
     volumes?: {
         imageRef?: string | undefined;
         imagePullPolicy?: string | undefined;
         mountPath?: string | undefined;
         name: string;
     }[] | undefined;
-    ports?: {
-        hostPort: string;
-        containerPort: string;
-    }[] | undefined;
+    name?: string | undefined;
     runAs?: string | undefined;
     image: string;
-    variables: {
-        value: string;
-        name: string;
-    }[];
     appType: AppType.AppTypeContainer;
     specType: AppSpecType.OCI_IMAGE;
-    name: string;
     limits: {
         cpu?: string | undefined;
         memory?: string | undefined;
     };
+    variables: {
+        value: string;
+        name: string;
+    }[];
 } | {
     name?: string | undefined;
     namespace?: string | undefined;
-    valuesYaml?: string | undefined;
     valuesFiles?: (string | undefined)[] | undefined;
+    valuesYaml?: string | undefined;
     image: string;
     appType: AppType.AppTypeHelm;
     specType: AppSpecType.OCI_IMAGE;
@@ -83,25 +90,25 @@ export declare const validApplicationsSchema: (t: TFunction) => Yup.ArraySchema<
     }[] | undefined;
     name?: string | undefined;
     image: string;
+    appType: NonNullable<AppType.AppTypeCompose | AppType.AppTypeQuadlet | undefined>;
+    specType: AppSpecType.OCI_IMAGE;
     variables: {
         value: string;
         name: string;
     }[];
-    appType: NonNullable<AppType.AppTypeCompose | AppType.AppTypeQuadlet | undefined>;
-    specType: AppSpecType.OCI_IMAGE;
 } | {
     volumes?: {
         name: string;
         imageRef: string;
         imagePullPolicy: NonNullable<ImagePullPolicy | undefined>;
     }[] | undefined;
+    name: string;
+    appType: AppType.AppTypeQuadlet;
+    specType: NonNullable<AppSpecType | undefined>;
     variables: {
         value: string;
         name: string;
     }[];
-    appType: AppType.AppTypeQuadlet;
-    specType: NonNullable<AppSpecType | undefined>;
-    name: string;
     files: {
         content?: string | undefined;
         path: string;
@@ -112,13 +119,13 @@ export declare const validApplicationsSchema: (t: TFunction) => Yup.ArraySchema<
         imageRef: string;
         imagePullPolicy: NonNullable<ImagePullPolicy | undefined>;
     }[] | undefined;
+    name: string;
+    appType: AppType.AppTypeCompose;
+    specType: NonNullable<AppSpecType | undefined>;
     variables: {
         value: string;
         name: string;
     }[];
-    appType: AppType.AppTypeCompose;
-    specType: NonNullable<AppSpecType | undefined>;
-    name: string;
     files: {
         content?: string | undefined;
         path: string;

package/dist/ui-components/src/components/form/validations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/validations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIpC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAEL,WAAW,EAEX,cAAc,EASd,WAAW,EAiBZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAkCtD,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAuB9C,eAAO,MAAM,wBAAwB,MAAO,SAAS;;;GAUpD,CAAC;AAEF,eAAO,MAAM,0BAA0B,MAAO,SAAS;;;GAUtD,CAAC;AAEF,eAAO,MAAM,+BAA+B,UAAW,MAAM,2BAY5D,CAAC;AAEF,eAAO,MAAM,kBAAkB,WAAY,cAAc,EAAE,YAG1D,CAAC;AAEF,eAAO,MAAM,0BAA0B,WAAY,cAAc,EAAE,qBAuClE,CAAC;AAEF,eAAO,MAAM,2BAA2B,MACnC,SAAS;gBAC6B,OAAO;;wEAahC,CAAC;AAwBnB,eAAO,MAAM,yBAAyB,MACjC,SAAS;gBAC6B,OAAO;;wEAMmB,CAAC;AAEtE,eAAO,MAAM,6BAA6B,MAAO,SAAS,uEAIvD,CAAC;AAEJ,eAAO,MAAM,eAAe,MAAO,SAAS,SAAS;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,uEACc,CAAC;AAE5G,eAAO,MAAM,YAAY,MAAO,SAAS;aAA0B,OAAO;wEA2BvE,CAAC;AAEJ,eAAO,MAAM,iBAAiB,MAAO,SAAS,oBAAoB,MAAM,EAAE;;;2BAwCpE,CAAC;AAEP,eAAO,MAAM,yBAAyB,MAAO,SAAS,iEAYhD,CAAC;AAsOP,eAAO,MAAM,kBAAkB,SAAU,MAAM,KAAK,SAAS,KAAG,MAAM,GAAG,SAgBxE,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,KAAG,OAIhD,CAAC;AAEF,eAAO,MAAM,sBAAsB,aACvB,MAAM,iBACD,MAAM,kBACN,WAAW,EAAE,KAC3B,OAKF,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,iBACD,MAAM,kBACN,WAAW,EAAE,KAC3B,OAKF,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,MAAM,GAAG,SAAS,KAAG,OAa1D,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,SAAS,KAAG,OAShE,CAAC;AA8CF,eAAO,MAAM,uBAAuB,MAAO,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wCA0JnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,MAAO,SAAS;;;;;;;;;;;;;;;;MA6DzD,CAAC;AA8DF,eAAO,MAAM,uBAAuB,MAAO,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAkBnD,CAAC;AAEF,eAAO,MAAM,gCAAgC,MAAO,SAAS;;;;;;;;;;MAc5D,CAAC;AAEF,eAAO,MAAM,0BAA0B,MAAO,SAAS;;;;;;;;;;;;;;;;;;;;;wCA8ElD,CAAC;AAEN,eAAO,MAAM,+BAA+B,MAAO,SAAS;;;uCAoCvD,CAAC;AAEN,eAAO,MAAM,kCAAkC,MAAO,SAAS;;;;;;;MAG3D,CAAC;AAGL,eAAO,MAAM,8BAA8B,MAAO,SAAS,QAAQ;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE;;;;;;;;;MAS1F,CAAC;AAEL,eAAO,MAAM,gCAAgC,MAAO,SAAS;;;;;;;;MAYzD,CAAC"}
+{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../../../../src/components/form/validations.ts"],"names":[],"mappings":"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"}

package/dist/ui-components/src/components/form/validations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMassResumeValidationSchema = exports.deviceApprovalValidationSchema = exports.deviceSystemdUnitsValidationSchema = exports.systemdUnitListValidationSchema = exports.validConfigTemplatesSchema = exports.validFleetDisruptionBudgetSchema = exports.validUpdatePolicySchema = exports.validFleetRolloutPolicySchema = exports.validApplicationsSchema = exports.validateMemoryLimit = exports.validateCPULimit = exports.isValidPortMapping = exports.isDuplicatePortMapping = exports.isValidPortNumber = exports.validatePortNumber = exports.validGroupLabelKeysSchema = exports.validLabelsSchema = exports.validOsImage = exports.maxLengthString = exports.validApplicationAndVolumeName = exports.validKubernetesLabelValue = exports.validKubernetesDnsSubdomain = exports.getInvalidKubernetesLabels = exports.hasUniqueLabelKeys = exports.getKubernetesDnsSubdomainErrors = exports.getDnsSubdomainValidations = exports.getLabelValueValidations = exports.MAX_TARGET_REVISION_LENGTH = void 0;
+exports.createMassResumeValidationSchema = exports.deviceApprovalValidationSchema = exports.deviceSystemdUnitsValidationSchema = exports.systemdUnitListValidationSchema = exports.validConfigTemplatesSchema = exports.validFleetDisruptionBudgetSchema = exports.validUpdatePolicySchema = exports.validFleetRolloutPolicySchema = exports.validApplicationsSchema = exports.validateMemoryLimit = exports.validateCPULimit = exports.isValidPortMapping = exports.isDuplicatePortMapping = exports.isValidPortNumber = exports.validatePortNumber = exports.validGroupLabelKeysSchema = exports.validLabelsSchema = exports.validHelmValuesFile = exports.validHelmNamespace = exports.validOsImage = exports.maxLengthString = exports.validImageBuildName = exports.getBuildNameValidations = exports.validApplicationAndVolumeName = exports.validKubernetesLabelValue = exports.validKubernetesDnsSubdomain = exports.getInvalidKubernetesLabels = exports.hasUniqueLabelKeys = exports.getKubernetesDnsSubdomainErrors = exports.getDnsSubdomainValidations = exports.getLabelValueValidations = exports.MAX_TARGET_REVISION_LENGTH = void 0;
 const tslib_1 = require("tslib");
 const Yup = tslib_1.__importStar(require("yup"));
 const countBy_1 = tslib_1.__importDefault(require("lodash/countBy"));
@@ -19,9 +19,9 @@ const K8S_LABEL_VALUE_MAX_LENGTH = 63;
 const K8S_DNS_SUBDOMAIN_START_END = /^[a-z0-9](.*[a-z0-9])?$/;
 const K8S_DNS_SUBDOMAIN_ALLOWED_CHARACTERS = /^[a-z0-9.-]*$/;
 const K8S_DNS_SUBDOMAIN_VALUE_MAX_LENGTH = 253;
-// https://issues.redhat.com/browse/MGMT-18349 to make the validation more robust
-const BASIC_DEVICE_OS_IMAGE_REGEXP = /^[a-zA-Z0-9.\-\/:@_+]*$/;
-const APPLICATION_IMAGE_REGEXP = BASIC_DEVICE_OS_IMAGE_REGEXP;
+const OCI_IMAGE_FULL_REGEXP = /^(?![./_])[a-zA-Z0-9.\-\/:@_+]*$/;
+// Accepts all characters from the above regex, but it rejects leading dot, slash, or underscore
+const OCI_IMAGE_ALLOWED_CHARS_REGEXP = /^[a-zA-Z0-9.\-\/:@_+]*$/;
 const APPLICATION_NAME_REGEXP = /^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/;
 const APPLICATION_VAR_NAME_REGEXP = /^[a-zA-Z_]+[a-zA-Z0-9_]*$/;
 const TEMPLATE_VARIABLES_REGEXP = /{{.+?}}/g;
@@ -35,6 +35,8 @@ const absolutePathRegex = /^\/.*$/;
 const relativePathRegex = /^(?!\.\.\/|\.\.\$|\.\/)(\.\/)*[\w.-]+(?:\/[\w.-]+)*\/?$/;
 exports.MAX_TARGET_REVISION_LENGTH = 244;
 const MAX_FILE_PATH_LENGTH = 253;
+const HELM_NAMESPACE_MAX_LENGTH = 63;
+const HELM_VALUES_FILE_EXT_REGEXP = /\.(yaml|yml)$/i;
 const isInteger = (val) => val === undefined || Number.isInteger(val);
 const validComposeFileNames = [
     'podman-compose.yaml',
@@ -170,6 +172,21 @@ const validKubernetesLabelValue = (t, { isRequired, fieldName }) => isRequired
 exports.validKubernetesLabelValue = validKubernetesLabelValue;
 const validApplicationAndVolumeName = (t) => Yup.string().matches(APPLICATION_NAME_REGEXP, t('Use lowercase alphanumeric characters, or dash (-). Must start and end with an alphanumeric character.'));
 exports.validApplicationAndVolumeName = validApplicationAndVolumeName;
+const getBuildNameValidations = (t) => [
+    {
+        key: 'imageBuildName',
+        message: t('Use lowercase alphanumeric characters, or dash (-). Must start and end with an alphanumeric character.'),
+    },
+];
+exports.getBuildNameValidations = getBuildNameValidations;
+const validImageBuildName = (t) => Yup.string()
+    .required(t('Build name is required'))
+    .test('imageBuildName', function (value) {
+    if (!value)
+        return true;
+    return APPLICATION_NAME_REGEXP.test(value) || this.createError({ message: { imageBuildName: 'failed' } });
+});
+exports.validImageBuildName = validImageBuildName;
 const maxLengthString = (t, props) => Yup.string().max(props.maxLength, t('{{ fieldName }} must not exceed {{ maxLength }} characters', props));
 exports.maxLengthString = maxLengthString;
 const validOsImage = (t, { isFleet }) => (0, exports.maxLengthString)(t, { fieldName: t('System image'), maxLength: 2048 }).test('osImageValidations', t('System image is invalid'), (osImage) => {
@@ -191,9 +208,39 @@ const validOsImage = (t, { isFleet }) => (0, exports.maxLengthString)(t, { field
             validateOsImage = osImage.replace(TEMPLATE_VARIABLES_REGEXP, 'tv');
         }
     }
-    return BASIC_DEVICE_OS_IMAGE_REGEXP.test(validateOsImage);
+    return OCI_IMAGE_FULL_REGEXP.test(validateOsImage);
 });
 exports.validOsImage = validOsImage;
+const validHelmNamespace = (t) => Yup.string()
+    .max(HELM_NAMESPACE_MAX_LENGTH, t('Namespace must not exceed {{ max }} characters.', { max: HELM_NAMESPACE_MAX_LENGTH }))
+    .test('helm-namespace-format', t('Namespace must only include lowercase letters, numbers, and hyphens. It must start and end with a letter or number.'), (value) => {
+    return !value || APPLICATION_NAME_REGEXP.test(value);
+});
+exports.validHelmNamespace = validHelmNamespace;
+const validHelmValuesFile = (t) => Yup.string().test('helm-values-file', function (filename) {
+    if (!filename) {
+        return true;
+    }
+    if (filename.length > MAX_FILE_PATH_LENGTH) {
+        return this.createError({
+            message: t('Values file path must not exceed {{ max }} characters.', {
+                max: MAX_FILE_PATH_LENGTH,
+            }),
+        });
+    }
+    if (filename.startsWith('/') || filename.includes('..')) {
+        return this.createError({
+            message: t('Values file path must be relative and cannot contain parent directory references (..).'),
+        });
+    }
+    if (!HELM_VALUES_FILE_EXT_REGEXP.test(filename)) {
+        return this.createError({
+            message: t('Values file must have .yaml or .yml extension.'),
+        });
+    }
+    return true;
+});
+exports.validHelmValuesFile = validHelmValuesFile;
 const validLabelsSchema = (t, forbiddenLabels) => Yup.array()
     .of(Yup.object().shape({
     key: Yup.string()
@@ -477,14 +524,23 @@ const validateMemoryLimit = (memory) => {
     return true;
 };
 exports.validateMemoryLimit = validateMemoryLimit;
-// Common volume validation helpers
-const volumeNameSchema = (t) => (0, exports.validApplicationAndVolumeName)(t).required(t('Volume name is required'));
-const optionalImageRefSchema = (t) => Yup.string().test('image-ref-format', t('Image reference includes invalid characters.'), (value) => {
-    if (!value || value.length === 0) {
-        return true; // Empty is allowed
+const ociImageSchema = (t) => Yup.string().test('oci-image-format', (value, testContext) => {
+    if (!value)
+        return true;
+    if (!OCI_IMAGE_ALLOWED_CHARS_REGEXP.test(value)) {
+        return testContext.createError({
+            message: t('Image includes invalid characters.'),
+        });
     }
-    return APPLICATION_IMAGE_REGEXP.test(value);
+    if (!OCI_IMAGE_FULL_REGEXP.test(value)) {
+        return testContext.createError({
+            message: t('Image must not start with a dot (.), slash (/), or underscore (_).'),
+        });
+    }
+    return true;
 });
+const requiredOciImageSchema = (t, requiredMessage) => ociImageSchema(t).required(requiredMessage || t('Image is required.'));
+const volumeNameSchema = (t) => (0, exports.validApplicationAndVolumeName)(t).required(t('Volume name is required'));
 const imagePullPolicySchema = (t) => Yup.string()
     .oneOf([types_1.ImagePullPolicy.PullAlways, types_1.ImagePullPolicy.PullIfNotPresent, types_1.ImagePullPolicy.PullNever], t('Pull policy must be one of: Always, IfNotPresent, or Never'))
     .required(t('Pull policy is required'));
@@ -492,32 +548,29 @@ const mountPathSchema = (t, isRequired = true) => {
     const schema = Yup.string().matches(absolutePathRegex, t('Mount path must be absolute.'));
     return isRequired ? schema.required(t('Mount path is required for this volume type')) : schema;
 };
-// Volume validation schemas
 const singleContainerVolumesSchema = (t) => Yup.array().of(Yup.object().shape({
     name: volumeNameSchema(t),
-    imageRef: optionalImageRefSchema(t),
+    imageRef: ociImageSchema(t),
     imagePullPolicy: Yup.string(),
     mountPath: mountPathSchema(t, true),
 }));
 const composeQuadletVolumesSchema = (t) => Yup.array().of(Yup.object().shape({
     name: volumeNameSchema(t),
-    imageRef: optionalImageRefSchema(t).required(t('Image reference is required for this volume type')),
+    imageRef: requiredOciImageSchema(t, t('Image reference is required for this volume type')),
     imagePullPolicy: imagePullPolicySchema(t),
 }));
 const validApplicationsSchema = (t) => {
     return Yup.array()
         .of(Yup.lazy((value) => {
         // Container applications (image-based with ports and resources)
-        if ((0, deviceSpec_1.isSingleContainerAppForm)(value)) {
+        if (value.appType === types_1.AppType.AppTypeContainer) {
             return Yup.object().shape({
                 specType: Yup.string()
                     .oneOf([deviceSpec_1.AppSpecType.OCI_IMAGE])
                     .required(t('Definition source must be image for this type of applications')),
                 appType: Yup.string().oneOf([types_1.AppType.AppTypeContainer]).required(t('Application type is required')),
-                name: (0, exports.validApplicationAndVolumeName)(t).required(t('Name is required for single container applications.')),
-                image: Yup.string()
-                    .required(t('Image is required.'))
-                    .matches(APPLICATION_IMAGE_REGEXP, t('Application image includes invalid characters.')),
+                name: (0, exports.validApplicationAndVolumeName)(t),
+                image: requiredOciImageSchema(t),
                 ports: Yup.array().of(Yup.object()
                     .shape({
                     hostPort: Yup.string()
@@ -544,17 +597,15 @@ const validApplicationsSchema = (t) => {
             });
         }
         // Helm applications
-        if ((0, deviceSpec_1.isHelmImageAppForm)(value)) {
+        if (value.appType === types_1.AppType.AppTypeHelm) {
             return Yup.object().shape({
                 specType: Yup.string()
                     .oneOf([deviceSpec_1.AppSpecType.OCI_IMAGE])
                     .required(t('Definition source must be image for this type of applications')),
                 appType: Yup.string().oneOf([types_1.AppType.AppTypeHelm]).required(t('Application type is required')),
                 name: (0, exports.validApplicationAndVolumeName)(t),
-                image: Yup.string()
-                    .required(t('Image is required.'))
-                    .matches(APPLICATION_IMAGE_REGEXP, t('Application image includes invalid characters.')),
-                namespace: Yup.string(),
+                image: requiredOciImageSchema(t),
+                namespace: (0, exports.validHelmNamespace)(t),
                 valuesYaml: Yup.string().test('valid-yaml', t('YAML content is invalid.'), (value) => {
                     if (!value || value.trim() === '') {
                         return true;
@@ -567,14 +618,11 @@ const validApplicationsSchema = (t) => {
                     }
                     return true;
                 }),
-                // Values files don't need to be validated.
-                // Since the UX design has the first field added by default, we will ignore all empty values files.
-                // The user can't add more values files if any is empty (though they can clear existing ones).
-                valuesFiles: Yup.array().of(Yup.string()),
+                valuesFiles: Yup.array().of((0, exports.validHelmValuesFile)(t)),
             });
         }
         // Image applications (Quadlet or Compose)
-        if ((0, deviceSpec_1.isQuadletImageAppForm)(value) || (0, deviceSpec_1.isComposeImageAppForm)(value)) {
+        if (value.specType === deviceSpec_1.AppSpecType.OCI_IMAGE) {
             return Yup.object().shape({
                 specType: Yup.string()
                     .oneOf([deviceSpec_1.AppSpecType.OCI_IMAGE])
@@ -583,15 +631,13 @@ const validApplicationsSchema = (t) => {
                     .oneOf([types_1.AppType.AppTypeCompose, types_1.AppType.AppTypeQuadlet])
                     .required(t('Application type is required')),
                 name: (0, exports.validApplicationAndVolumeName)(t),
-                image: Yup.string()
-                    .required(t('Image is required.'))
-                    .matches(APPLICATION_IMAGE_REGEXP, t('Application image includes invalid characters.')),
+                image: requiredOciImageSchema(t),
                 volumes: composeQuadletVolumesSchema(t),
                 variables: appVariablesSchema(t),
             });
         }
         // Inline quadlet applications
-        if ((0, deviceSpec_1.isQuadletInlineAppForm)(value)) {
+        if (value.appType === types_1.AppType.AppTypeQuadlet && value.specType === deviceSpec_1.AppSpecType.INLINE) {
             return Yup.object().shape({
                 specType: appSpecTypeSchema(t),
                 appType: Yup.string().oneOf([types_1.AppType.AppTypeQuadlet]).required(t('Application type is required')),