Resolves: MTV-3642 | address feedback

Signed-off-by: Jeff Puzzo <jpuzzo@redhat.com>

Author: jpuzz0

src/plans/create/steps/customization-scripts/NewScriptsFields.tsx

@@ -18,11 +18,11 @@ import {
   ScriptTypeLabels,
 } from './constants';
 import ScriptContentField from './ScriptContentField';
-import { getNextOrder, validateScriptName } from './utils';
+import { validateScriptName } from './utils';
 
 const NewScriptsFields: FC = () => {
   const { t } = useForkliftTranslation();
-  const { control, getValues, setValue } = useCreatePlanFormContext();
+  const { control, setValue } = useCreatePlanFormContext();
 
   const {
     append,
@@ -39,11 +39,7 @@ const NewScriptsFields: FC = () => {
     `${CustomScriptsFieldId.Scripts}.${index}.${field}`;
 
   const handleAddScript = (): void => {
-    const currentScripts = getValues(CustomScriptsFieldId.Scripts);
-    append({
-      ...DefaultScript,
-      order: getNextOrder(currentScripts),
-    });
+    append({ ...DefaultScript });
   };
 
   const handleRemoveScript = (index: number): void => {

src/plans/create/steps/customization-scripts/__tests__/utils.test.ts

@@ -4,7 +4,6 @@ import { GuestType, ScriptType } from '../constants';
 import type { CustomScript } from '../types';
 import {
   buildConfigMapKey,
-  getNextOrder,
   isScriptConfigMap,
   scriptsToConfigMapData,
   validateScriptName,
@@ -14,45 +13,39 @@ const createScript = (overrides: Partial<CustomScript> = {}): CustomScript => ({
   content: '#!/bin/bash\necho hello',
   guestType: GuestType.Linux,
   name: 'setup-network',
-  order: 10,
   scriptType: ScriptType.Firstboot,
   ...overrides,
 });
 
 describe('buildConfigMapKey', () => {
-  it('builds a Linux firstboot key', () => {
+  it('builds a Linux firstboot key with customer prefix', () => {
     const script = createScript();
-    expect(buildConfigMapKey(script)).toBe('10_linux_firstboot_setup-network.sh');
+    expect(buildConfigMapKey(script)).toBe('99999_linux_firstboot_setup-network.sh');
   });
 
   it('builds a Windows firstboot key', () => {
     const script = createScript({ guestType: GuestType.Windows, scriptType: ScriptType.Firstboot });
-    expect(buildConfigMapKey(script)).toBe('10_win_firstboot_setup-network.ps1');
+    expect(buildConfigMapKey(script)).toBe('99999_win_firstboot_setup-network.ps1');
   });
 
   it('builds a Linux run key', () => {
     const script = createScript({ scriptType: ScriptType.Run });
-    expect(buildConfigMapKey(script)).toBe('10_linux_run_setup-network.sh');
-  });
-
-  it('zero-pads single-digit order numbers', () => {
-    const script = createScript({ order: 5 });
-    expect(buildConfigMapKey(script)).toBe('05_linux_firstboot_setup-network.sh');
+    expect(buildConfigMapKey(script)).toBe('99999_linux_run_setup-network.sh');
   });
 });
 
 describe('scriptsToConfigMapData', () => {
   it('converts multiple scripts to ConfigMap data entries', () => {
     const scripts = [
-      createScript({ name: 'first', order: 10 }),
-      createScript({ name: 'second', order: 20, scriptType: ScriptType.Run }),
+      createScript({ name: 'first' }),
+      createScript({ name: 'second', scriptType: ScriptType.Run }),
     ];
 
     const result = scriptsToConfigMapData(scripts);
 
     expect(result).toEqual({
-      '10_linux_firstboot_first.sh': '#!/bin/bash\necho hello',
-      '20_linux_run_second.sh': '#!/bin/bash\necho hello',
+      '99999_linux_firstboot_first.sh': '#!/bin/bash\necho hello',
+      '99999_linux_run_second.sh': '#!/bin/bash\necho hello',
     });
   });
 
@@ -61,17 +54,6 @@ describe('scriptsToConfigMapData', () => {
   });
 });
 
-describe('getNextOrder', () => {
-  it('returns 10 for an empty array', () => {
-    expect(getNextOrder([])).toBe(10);
-  });
-
-  it('increments by 10 from the highest order', () => {
-    const scripts = [createScript({ order: 10 }), createScript({ order: 30 })];
-    expect(getNextOrder(scripts)).toBe(40);
-  });
-});
-
 describe('validateScriptName', () => {
   it('returns undefined for a valid name with hyphens', () => {
     expect(validateScriptName('setup-network')).toBeUndefined();
@@ -96,12 +78,12 @@ describe('validateScriptName', () => {
 
 describe('isScriptConfigMap', () => {
   it('returns true for a Linux script key', () => {
-    const data = { '10_linux_firstboot_setup.sh': '#!/bin/bash' };
+    const data = { '99999_linux_firstboot_setup.sh': '#!/bin/bash' };
     expect(isScriptConfigMap(data)).toBe(true);
   });
 
   it('returns true for a Windows script key', () => {
-    const data = { '05_win_run_cleanup.ps1': 'Remove-Item' };
+    const data = { '99999_win_run_cleanup.ps1': 'Remove-Item' };
     expect(isScriptConfigMap(data)).toBe(true);
   });
 

src/plans/create/steps/customization-scripts/constants.ts

@@ -38,13 +38,16 @@ export const ScriptTypeLabels: Record<ScriptType, ReturnType<typeof t>> = {
   [ScriptType.Run]: t('Run'),
 };
 
-export const ORDER_INCREMENT = 10;
+// The backend reads scripts alphabetically via Go's os.ReadDir.
+// MTV's own scripts use prefix 9999 (see customize.go). Customer scripts
+// use 99999 so they always sort after MTV scripts.
+// https://github.com/kubev2v/forklift/blob/main/pkg/virt-v2v/customize/customize.go
+export const CUSTOMER_SCRIPT_PREFIX = 99999;
 
 export const DefaultScript: CustomScript = {
   content: '',
   guestType: GuestType.Linux,
   name: '',
-  order: ORDER_INCREMENT,
   scriptType: ScriptType.Firstboot,
 };
 

src/plans/create/steps/customization-scripts/types.ts

@@ -4,6 +4,5 @@ export type CustomScript = {
   content: string;
   guestType: GuestType;
   name: string;
-  order: number;
   scriptType: ScriptType;
 };

src/plans/create/steps/customization-scripts/utils.ts

@@ -1,9 +1,8 @@
-import { isEmpty } from '@utils/helpers';
 import { t } from '@utils/i18n';
 
 import {
+  CUSTOMER_SCRIPT_PREFIX,
   FILE_EXTENSIONS,
-  ORDER_INCREMENT,
   OS_PREFIXES,
   SCRIPT_KEY_PATTERN,
   SCRIPT_NAME_REGEX,
@@ -12,15 +11,14 @@ import type { CustomScript } from './types';
 
 /**
  * Builds a ConfigMap data key matching the backend regex patterns in customize.go.
- * Order is zero-padded so lexicographic sorting matches numeric order (e.g. `02_` before `10_`).
+ * Uses a large prefix (99999) so customer scripts sort after virt-v2v (4000–5005) and MTV (9999) scripts.
  * @see https://github.com/kubev2v/forklift/blob/main/pkg/virt-v2v/customize/customize.go
  */
 export const buildConfigMapKey = (script: CustomScript): string => {
-  const paddedOrder = String(script.order).padStart(2, '0');
   const osPrefix = OS_PREFIXES[script.guestType];
   const ext = FILE_EXTENSIONS[script.guestType];
 
-  return `${paddedOrder}_${osPrefix}_${script.scriptType}_${script.name}.${ext}`;
+  return `${CUSTOMER_SCRIPT_PREFIX}_${osPrefix}_${script.scriptType}_${script.name}.${ext}`;
 };
 
 export const scriptsToConfigMapData = (scripts: CustomScript[]): Record<string, string> => {
@@ -30,15 +28,6 @@ export const scriptsToConfigMapData = (scripts: CustomScript[]): Record<string,
   }, {});
 };
 
-export const getNextOrder = (scripts: CustomScript[]): number => {
-  if (isEmpty(scripts)) {
-    return ORDER_INCREMENT;
-  }
-
-  const maxOrder = Math.max(...scripts.map((script) => script.order));
-  return maxOrder + ORDER_INCREMENT;
-};
-
 export const validateScriptName = (value: string): string | undefined => {
   if (!value?.trim()) {
     return t('Script name is required.');