Fix groups import/export in on-premise environment

add support for both `customizations.groups` (hosted) and `customizations.group` (on-premise) formats.
Updated mapper and export logic to handle format conversion between JSON and TOML blueprints.

Author: mgold1234

playwright/Customizations/Users.spec.ts

@@ -99,7 +99,7 @@ test('Create a blueprint with Users customization', async ({
     ).toBeVisible();
     await expect(
       frame.getByText(
-        'Each group will automatically be assigned an ID number.',
+        'Define groups before assigning users to them. Each group will be created on systems using this image. Each group will automatically be assigned an ID number.',
       ),
     ).toBeVisible();
 
@@ -117,9 +117,18 @@ test('Create a blueprint with Users customization', async ({
     const gidInputs = frame.getByPlaceholder('Auto-generated');
     await expect(gidInputs.nth(0)).toHaveValue(/^\d+$/);
     await expect(gidInputs.nth(1)).toHaveValue(/^\d+$/);
+    // Verify GID inputs are disabled (read-only)
+    await expect(gidInputs.nth(0)).toBeDisabled();
+    await expect(gidInputs.nth(1)).toBeDisabled();
   });
 
   await test.step('Test group validation errors', async () => {
+    // Get Groups section container for scoped assertions
+    const groupsSection = frame
+      .getByRole('heading', { name: 'Groups' })
+      .first()
+      .locator('..');
+
     const groupNameInputs = frame.getByPlaceholder('Set group name');
     const addGroupButton = frame.getByRole('button', { name: 'Add group' });
     await expect(addGroupButton).toBeVisible();
@@ -130,28 +139,28 @@ test('Create a blueprint with Users customization', async ({
     await expect(newGroupInput1).toBeVisible();
     await expect(newGroupInput1).toBeEnabled();
 
-    await expect(frame.getByText('Invalid group name')).toBeHidden();
+    await expect(groupsSection.getByText('Invalid group name')).toBeHidden();
     await newGroupInput1.fill('@invalid');
     await expect(newGroupInput1).toHaveValue('@invalid');
-    await expect(frame.getByText('Invalid group name')).toBeVisible();
+    await expect(groupsSection.getByText('Invalid group name')).toBeVisible();
 
     const addGroupButtons = frame.getByRole('button', { name: 'Add group' });
     await expect(addGroupButtons.last()).toBeDisabled();
 
     await newGroupInput1.clear();
-    await expect(frame.getByText('Invalid group name')).toBeHidden();
+    await expect(groupsSection.getByText('Invalid group name')).toBeHidden();
     await expect(newGroupInput1).toHaveValue('');
     await newGroupInput1.fill('develop');
     await expect(newGroupInput1).toHaveValue('develop');
-    await expect(frame.getByText('Invalid group name')).toBeHidden();
+    await expect(groupsSection.getByText('Invalid group name')).toBeHidden();
     await expect(addGroupButtons.last()).toBeEnabled();
 
     await newGroupInput1.clear();
     await expect(newGroupInput1).toHaveValue('');
     await newGroupInput1.fill('admins');
     await expect(newGroupInput1).toHaveValue('admins');
     await expect(
-      frame.getByText('Group name already exists').first(),
+      groupsSection.getByText('Group name already exists').first(),
     ).toBeVisible();
     await expect(addGroupButtons.last()).toBeDisabled();
 
@@ -228,11 +237,14 @@ test('Create a blueprint with Users customization', async ({
       .first();
     await expect(warningMessage).toBeVisible();
 
-    const closeButton = frame
+    // Remove customgroup
+    const customgroupCloseButton = frame
       .getByRole('button', { name: 'Close customgroup' })
       .first();
-    await expect(closeButton).toBeVisible();
-    await closeButton.click();
+    await expect(customgroupCloseButton).toBeVisible();
+    await customgroupCloseButton.click();
+
+    // Warning should be hidden now because 'wheel' is a system group and not considered undefined
     await expect(warningMessage).toBeHidden();
   });
 

src/Components/Blueprints/helpers/onPremToHostedBlueprintMapper.tsx

@@ -77,7 +77,16 @@ export type CustomizationsOnPrem = {
   hostname?: string;
   kernel?: Kernel;
   user?: UserOnPrem[];
+  /**
+   * User groups with GIDs (plural form, used in Hosted environment).
+   * Hosted blueprints use this field in JSON format.
+   */
   groups?: GroupOnPrem[];
+  /**
+   * User groups with GIDs (singular form, used in On-Prem environment).
+   * On-Prem blueprints use this field in TOML format: [[customizations.group]]
+   */
+  group?: GroupOnPrem[];
   timezone?: Timezone;
   locale?: Locale;
   firewall?: FirewallCustomization;
@@ -123,9 +132,11 @@ export const mapOnPremToHosted = async (
     blueprint.packages !== undefined
       ? blueprint.packages.map((p) => p.name)
       : undefined;
-  const groups =
-    blueprint.customizations?.groups !== undefined
-      ? blueprint.customizations.groups.map((p) => `@${p.name}`)
+  // Note: blueprint.groups refers to package groups (e.g., @development-tools),
+  // not user groups. User groups are in customizations.groups (see below).
+  const packageGroups =
+    blueprint.groups !== undefined
+      ? blueprint.groups.map((p) => `@${p.name}`)
       : undefined;
   const distro = process.env.IS_ON_PREMISE
     ? await getHostDistro()
@@ -144,14 +155,19 @@ export const mapOnPremToHosted = async (
         }),
       ),
       packages:
-        packages !== undefined || groups !== undefined
-          ? [...(packages ? packages : []), ...(groups ? groups : [])]
+        packages !== undefined || packageGroups !== undefined
+          ? [
+              ...(packages ? packages : []),
+              ...(packageGroups ? packageGroups : []),
+            ]
           : undefined,
       users:
         users !== undefined || user_keys !== undefined
           ? [...(users ? users : []), ...(user_keys ? user_keys : [])]
           : undefined,
-      groups: blueprint.customizations?.groups,
+      // Support both 'groups' (hosted/current) and 'group' (on-prem/legacy) formats
+      groups:
+        blueprint.customizations?.groups || blueprint.customizations?.group,
       filesystem: blueprint.customizations?.filesystem?.map(
         ({ minsize, size, ...fs }) => ({
           min_size: minsize || size,
@@ -207,12 +223,36 @@ export const mapHostedToOnPrem = (
   };
 
   if (blueprint.customizations.packages) {
-    result.packages = blueprint.customizations.packages.map((pkg) => {
-      return {
-        name: pkg,
-        version: '*',
-      };
+    // Separate regular packages from package groups (those starting with @)
+    const regularPackages: string[] = [];
+    const packageGroups: string[] = [];
+
+    blueprint.customizations.packages.forEach((pkg) => {
+      if (pkg.startsWith('@')) {
+        // Package group (e.g., @development-tools) - remove @ prefix and add to groups
+        packageGroups.push(pkg.substring(1));
+      } else {
+        // Regular package
+        regularPackages.push(pkg);
+      }
     });
+
+    // Map regular packages to packages array
+    if (regularPackages.length > 0) {
+      result.packages = regularPackages.map((pkg) => {
+        return {
+          name: pkg,
+          version: '*',
+        };
+      });
+    }
+
+    // Map package groups to blueprint.groups array
+    if (packageGroups.length > 0) {
+      result.groups = packageGroups.map((groupName) => ({
+        name: groupName,
+      }));
+    }
   }
 
   if (blueprint.customizations.containers) {
@@ -242,6 +282,10 @@ export const mapHostedToOnPrem = (
     result.customizations!.disk = blueprint.customizations.disk;
   }
 
+  if (blueprint.customizations.groups) {
+    result.customizations!.group = blueprint.customizations.groups;
+  }
+
   if (blueprint.customizations.users) {
     result.customizations!.user = blueprint.customizations.users.map((u) => {
       return {