Squashed commit of the following:

commit 9e1418c
Author: wzrdx <128477299+wzrdx@users.noreply.github.com>
Date:   Thu Oct 23 13:52:48 2025 +0300

    feat: Format ports from array in deeploy utils

commit e9da986
Author: wzrdx <128477299+wzrdx@users.noreply.github.com>
Date:   Thu Oct 23 12:55:33 2025 +0300

    chore: Update schema to use array, refactor PortMappingSection to use fields

commit 71c02de
Author: wzrdx <128477299+wzrdx@users.noreply.github.com>
Date:   Thu Oct 23 12:36:08 2025 +0300

    refactor: Move ports schema to genericAppDeploymentSchema and separate PortMappingSection from AppParametersSection

Author: wzrdx

src/components/create-job/secondary-plugins/GenericSecondaryPluginSections.tsx

@@ -2,6 +2,7 @@ import ConfigSectionTitle from '@components/job/config/ConfigSectionTitle';
 import DynamicEnvSection from '@shared/jobs/DynamicEnvSection';
 import FileVolumesSection from '@shared/jobs/FileVolumesSection';
 import KeyValueEntriesSection from '@shared/jobs/KeyValueEntriesSection';
+import PortMappingSection from '@shared/PortMappingSection';
 import AppParametersSection from '../sections/AppParametersSection';
 import PluginEnvVariablesSection from '../sections/PluginEnvVariablesSection';
 import PoliciesSection from '../sections/PoliciesSection';
@@ -12,6 +13,9 @@ export default function GenericSecondaryPluginSections({ name }: { name: string
             <ConfigSectionTitle title="App Parameters" />
             <AppParametersSection baseName={name} />
 
+            <ConfigSectionTitle title="Port Mapping" />
+            <PortMappingSection baseName={name} />
+
             <PluginEnvVariablesSection baseName={name} />
 
             <ConfigSectionTitle title="Dynamic ENV Variables" />

src/components/create-job/secondary-plugins/NativeInputsSection.tsx

@@ -2,6 +2,7 @@ import ConfigSectionTitle from '@components/job/config/ConfigSectionTitle';
 import { PLUGIN_SIGNATURE_TYPES } from '@data/pluginSignatureTypes';
 import CustomParametersSection from '@shared/jobs/native/CustomParametersSection';
 import NativeAppIdentitySection from '@shared/jobs/native/NativeAppIdentitySection';
+import PortMappingSection from '@shared/PortMappingSection';
 import { useFormContext } from 'react-hook-form';
 import AppParametersSection from '../sections/AppParametersSection';
 
@@ -19,6 +20,9 @@ export default function NativeInputsSection({ index }: { index: number }) {
             <ConfigSectionTitle title="App Parameters" />
             <AppParametersSection baseName={name} />
 
+            <ConfigSectionTitle title="Port Mapping" />
+            <PortMappingSection baseName={name} />
+
             <ConfigSectionTitle title="Custom Parameters" />
             <CustomParametersSection baseName={name} />
         </div>

src/components/create-job/secondary-plugins/SecondaryPluginsCard.tsx

@@ -94,7 +94,6 @@ export default function SecondaryPluginsCard() {
                         crVisibility: CR_VISIBILITY_OPTIONS[0],
                         crUsername: '',
                         crPassword: '',
-                        ports: {},
                     },
                     ...TUNNELING_DEFAULTS,
                     ...GENERIC_PLUGIN_DEFAULTS,
@@ -115,7 +114,6 @@ export default function SecondaryPluginsCard() {
                             { command: 'npm run build' },
                             { command: 'npm run start' },
                         ],
-                        ports: {},
                     },
                     ...TUNNELING_DEFAULTS,
                     ...GENERIC_PLUGIN_DEFAULTS,

src/components/create-job/sections/AppParametersSection.tsx

@@ -1,15 +1,13 @@
 import { BOOLEAN_TYPES } from '@data/booleanTypes';
 import InputWithLabel from '@shared/InputWithLabel';
 import NumberInputWithLabel from '@shared/NumberInputWithLabel';
-import PortMappingSection from '@shared/PortMappingSection';
 import SelectWithLabel from '@shared/SelectWithLabel';
 import { useFormContext } from 'react-hook-form';
 
 export default function AppParametersSection({ baseName = 'deployment' }: { baseName?: string }) {
     const { watch, trigger } = useFormContext();
 
     const enableTunneling: (typeof BOOLEAN_TYPES)[number] = watch(`${baseName}.enableTunneling`);
-    const deploymentType = watch(`${baseName}.deploymentType.type`);
 
     return (
         <div className="col gap-4">
@@ -35,11 +33,6 @@ export default function AppParametersSection({ baseName = 'deployment' }: { base
                     <InputWithLabel name={`${baseName}.tunnelingToken`} label="Tunnel Token" placeholder="Starts with 'ey'" />
                 </div>
             )}
-
-            {/* TODO: Check if deploying generic plugin/job */}
-            {(deploymentType === 'container' || deploymentType === 'worker') && (
-                <PortMappingSection name={`${baseName}.deploymentType.ports`} label="Port Mapping" />
-            )}
         </div>
     );
 }

src/components/create-job/steps/deployment/GenericDeployment.tsx

@@ -8,6 +8,7 @@ import EnvVariablesCard from '@shared/jobs/EnvVariablesCard';
 import FileVolumesSection from '@shared/jobs/FileVolumesSection';
 import KeyValueEntriesSection from '@shared/jobs/KeyValueEntriesSection';
 import TargetNodesCard from '@shared/jobs/target-nodes/TargetNodesCard';
+import PortMappingSection from '@shared/PortMappingSection';
 
 function GenericDeployment({ isEditingJob }: { isEditingJob?: boolean }) {
     return (
@@ -26,6 +27,10 @@ function GenericDeployment({ isEditingJob }: { isEditingJob?: boolean }) {
                 <AppParametersSection />
             </SlateCard>
 
+            <SlateCard title="Port Mapping">
+                <PortMappingSection />
+            </SlateCard>
+
             <EnvVariablesCard />
 
             <SlateCard title="Dynamic ENV Variables">

src/lib/deeploy-utils.ts

@@ -23,7 +23,12 @@ import {
     ServiceJobDeployment,
     ServiceJobSpecifications,
 } from '@typedefs/deeploys';
-import { GenericSecondaryPlugin, NativeSecondaryPlugin, SecondaryPluginType } from '@typedefs/steps/deploymentStepTypes';
+import {
+    GenericSecondaryPlugin,
+    NativeSecondaryPlugin,
+    PortMappingEntry,
+    SecondaryPluginType,
+} from '@typedefs/steps/deploymentStepTypes';
 import { addDays, addHours, differenceInDays, differenceInHours } from 'date-fns';
 import _ from 'lodash';
 import { FieldValues, UseFieldArrayAppend, UseFieldArrayRemove } from 'react-hook-form';
@@ -170,12 +175,23 @@ export const formatFileVolumes = (fileVolumes: { name: string; mountingPoint: st
     return formatted;
 };
 
-export const formatContainerResources = (containerOrWorkerType: ContainerOrWorkerType, ports?: Record<string, string>) => {
-    return {
+export const formatContainerResources = (containerOrWorkerType: ContainerOrWorkerType, portsArray: Array<PortMappingEntry>) => {
+    const baseResources: { cpu: number; memory: string; ports?: Record<string, number> } = {
         cpu: containerOrWorkerType.cores,
         memory: `${containerOrWorkerType.ram}g`,
-        ...(ports && Object.keys(ports).length > 0 && { ports }),
     };
+
+    if (portsArray.length > 0) {
+        const ports = {};
+
+        portsArray.forEach((port) => {
+            ports[port.hostPort.toString()] = port.containerPort;
+        });
+
+        baseResources.ports = ports;
+    }
+
+    return baseResources;
 };
 
 export const formatNodes = (targetNodes: { address: string }[]): string[] => {
@@ -246,7 +262,7 @@ export const formatGenericPluginConfigAndSignature = (
     resources: {
         cpu: number;
         memory: string;
-        ports?: Record<string, string>;
+        ports?: Record<string, number>;
     },
     plugin: GenericSecondaryPlugin,
 ) => {
@@ -311,7 +327,7 @@ export const formatGenericJobPayload = (
     const spareNodes = formatNodes(deployment.spareNodes);
 
     const { pluginConfig, pluginSignature } = formatGenericPluginConfigAndSignature(
-        formatContainerResources(containerType, deployment.deploymentType.ports),
+        formatContainerResources(containerType, deployment.ports),
         deployment,
     );
 
@@ -351,7 +367,7 @@ export const formatNativeJobPayload = (
         }
     });
 
-    const nodeResources = formatContainerResources(workerType, undefined);
+    const nodeResources = formatContainerResources(workerType, []);
     const targetNodes = formatNodes(deployment.targetNodes);
     const targetNodesCount = formatTargetNodesCount(targetNodes, specifications.targetNodesCount);
 
@@ -438,7 +454,7 @@ export const formatServiceJobPayload = (
     deployment: ServiceJobDeployment,
 ) => {
     const jobTags = formatJobTags(specifications);
-    const containerResources = formatContainerResources(containerType, undefined);
+    const containerResources = formatContainerResources(containerType, []);
     const targetNodes = formatNodes(deployment.targetNodes);
     const spareNodes = formatNodes(deployment.spareNodes);
 

src/schemas/steps/deployment.ts

@@ -40,12 +40,6 @@ const validations = {
         .max(256, 'Value cannot exceed 256 characters')
         .regex(/^https?:\/\/.+/, 'Must be a valid URI'),
 
-    // optionalUri: z
-    //     .string()
-    //     .refine((val) => val === '' || val.length >= 2, 'Value must be at least 2 characters')
-    //     .refine((val) => val === '' || val.length <= 256, 'Value cannot exceed 256 characters')
-    //     .refine((val) => val === '' || /^https?:\/\/.+/.test(val), 'Must be a valid URI'),
-
     optionalUri: z
         .union([
             z.literal(''),
@@ -66,6 +60,32 @@ const validations = {
             .max(65535, 'Value cannot exceed 65535'),
     ]),
 
+    ports: z
+        .array(
+            z.object({
+                hostPort: z
+                    .number()
+                    .int('Value must be a whole number')
+                    .min(1, 'Value must be at least 1')
+                    .max(65535, 'Value cannot exceed 65535'),
+                containerPort: z
+                    .number()
+                    .int('Value must be a whole number')
+                    .min(1, 'Value must be at least 1')
+                    .max(65535, 'Value cannot exceed 65535'),
+            }),
+        )
+        .refine(
+            (entries) => {
+                const hostPorts = entries.map((entry) => entry.hostPort);
+                return hostPorts.length === new Set(hostPorts).size;
+            },
+            {
+                message: 'Duplicate host ports are not allowed',
+            },
+        )
+        .default([]),
+
     envVars: getKeyValueEntriesArraySchema(),
     dynamicEnvVars: z
         .array(dynamicEnvEntrySchema)
@@ -197,6 +217,7 @@ export const applyCustomPluginSignatureRefinements = (schema) => {
 };
 
 const baseDeploymentSchema = z.object({
+    // Target Nodes
     autoAssign: z.boolean(),
     targetNodes: z.array(nodeSchema).refine(
         (nodes) => {
@@ -221,9 +242,12 @@ const baseDeploymentSchema = z.object({
         },
     ),
     allowReplicationInTheWild: z.boolean(),
+
+    // Tunneling
     enableTunneling: z.enum(BOOLEAN_TYPES, { required_error: 'Value is required' }),
-    tunnelingLabel: getOptionalStringSchema(64),
+    port: validations.port,
     tunnelingToken: getOptionalStringSchema(512),
+    tunnelingLabel: getOptionalStringSchema(64),
 });
 
 const containerDeploymentTypeSchema = z.object({
@@ -233,7 +257,6 @@ const containerDeploymentTypeSchema = z.object({
     crVisibility: z.enum(CR_VISIBILITY_OPTIONS, { required_error: 'Value is required' }),
     crUsername: z.union([getStringSchema(3, 128), z.literal('')]).optional(),
     crPassword: z.union([getStringSchema(3, 256), z.literal('')]).optional(),
-    ports: z.record(z.string(), z.string()).optional(),
 });
 
 const workerDeploymentTypeSchema = z.object({
@@ -266,15 +289,14 @@ const workerDeploymentTypeSchema = z.object({
             message: 'Duplicate commands are not allowed',
         },
     ),
-    ports: z.record(z.string(), z.string()).optional(),
 });
 
 export const deploymentTypeSchema = z.discriminatedUnion('type', [containerDeploymentTypeSchema, workerDeploymentTypeSchema]);
 
 const genericAppDeploymentSchemaWihtoutRefinements = baseDeploymentSchema.extend({
     jobAlias: validations.jobAlias,
     deploymentType: deploymentTypeSchema,
-    port: validations.port,
+    ports: validations.ports,
     envVars: validations.envVars,
     dynamicEnvVars: validations.dynamicEnvVars,
     volumes: validations.volumes,
@@ -296,6 +318,9 @@ const baseGenericSecondaryPluginSchema = z.object({
     enableTunneling: z.enum(BOOLEAN_TYPES, { required_error: 'Value is required' }),
     tunnelingToken: getOptionalStringSchema(512),
 
+    // Ports
+    ports: validations.ports,
+
     // Deployment type
     deploymentType: deploymentTypeSchema,
 
@@ -324,6 +349,9 @@ const baseNativeSecondaryPluginSchema = z.object({
     enableTunneling: z.enum(BOOLEAN_TYPES, { required_error: 'Value is required' }),
     tunnelingToken: getOptionalStringSchema(512),
 
+    // Ports
+    ports: validations.ports,
+
     // Custom Parameters
     customParams: validations.customParams,
 });
@@ -341,7 +369,6 @@ const nativeAppDeploymentSchemaWihtoutRefinements = baseDeploymentSchema.extend(
     jobAlias: validations.jobAlias,
     pluginSignature: validations.pluginSignature,
     customPluginSignature: getOptionalStringSchema(128),
-    port: validations.port,
     customParams: validations.customParams,
     pipelineParams: validations.pipelineParams,
     pipelineInputType: z.enum(PIPELINE_INPUT_TYPES, { required_error: 'Value is required' }),
@@ -356,7 +383,6 @@ export const nativeAppDeploymentSchema = applyCustomPluginSignatureRefinements(
 
 const serviceAppDeploymentSchemaWihtoutRefinements = baseDeploymentSchema.extend({
     jobAlias: validations.jobAlias,
-    port: validations.port,
     enableTunneling: z.enum(BOOLEAN_TYPES, { required_error: 'Value is required' }),
     tunnelingToken: getOptionalStringSchema(512),
     inputs: validations.envVars,