Address enum schema review feedback

Author: eviltester

docs-src/docs/040-test-data/015-data-grid-editable.md

@@ -60,7 +60,7 @@ The default value is:
 - the largest column unique-value count when it is `256` or less
 - `256` when the largest column has more than `256` unique values
 
-If the chosen limit is lower than the number of unique values in one or more columns then AnyWayData will ask for confirmation before truncating the schema. Truncation keeps the first values seen in current grid row order.
+If the chosen limit is lower than the number of unique values in one or more columns, then AnyWayData will ask for confirmation before truncating the schema. Truncation keeps the first values seen in current grid row order.
 
 When accepted, the generated enum schema replaces the existing schema definition in the Test Data editor. The schema grid, schema text area, validation state, and pairwise button visibility are all refreshed automatically.
 
@@ -137,4 +137,3 @@ The schema in the Column Definition Data Grid will be used to generate the data.
 
 All data generation happens in the browser so the amount of data you can generate is limited only by the performance and memory of your computer.
 
-

packages/core-ui/js/gui_components/app/test-data-grid/controller/test-data-grid-controller.js

@@ -215,15 +215,13 @@ function createTestDataGenerationPanelManager({
       return false;
     }
 
-    state.dataPopulationPanel?.setGenerateSchemaBusy?.(true);
-    statusServiceApi.setTestDataLoadingStatus('Scanning grid for enum schema...');
-
     try {
+      state.dataPopulationPanel?.setGenerateSchemaBusy?.(true);
+      statusServiceApi.setTestDataLoadingStatus('Scanning grid for enum schema...');
       const dataTable = await Promise.resolve(gridExtras.getGridAsGenericDataTable());
       const initialSummary = createEnumSchemaRowsFromGrid({
         dataTable,
         maxEnumValues: DEFAULT_ENUM_LIMIT,
-        createBlankRow,
       });
 
       if (initialSummary.usableColumns.length === 0) {

packages/core-ui/js/gui_components/app/test-data-grid/schema/grid-to-enum-schema.js

@@ -14,6 +14,14 @@ function normaliseGridCellValue(value) {
   return String(value ?? '').trim();
 }
 
+function serialiseEnumSchemaValue(value) {
+  const normalised = normaliseGridCellValue(value);
+  if (!/[,"\r\n]/.test(normalised)) {
+    return normalised;
+  }
+  return `"${normalised.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+}
+
 function buildGridEnumSchemaSummary({ dataTable, maxEnumValues = DEFAULT_ENUM_LIMIT } = {}) {
   const headers = Array.isArray(dataTable?.getHeaders?.()) ? dataTable.getHeaders() : [];
   const rowCount = Number.parseInt(dataTable?.getRowCount?.() ?? 0, 10) || 0;
@@ -64,7 +72,7 @@ function createEnumSchemaRowsFromGrid({ dataTable, maxEnumValues = DEFAULT_ENUM_
     sourceType: SOURCE_TYPE_ENUM,
     command: '',
     params: '',
-    value: column.keptValues.join(','),
+    value: column.keptValues.map(serialiseEnumSchemaValue).join(','),
     comments: '',
     leadingTextLines: [],
   }));

packages/core-ui/js/gui_components/shared/modal-text-input.js

@@ -76,11 +76,11 @@ function createTextInputDialogComponent({
       const okButton = backdrop.querySelector('[data-role="text-input-dialog-ok"]');
       const cancelButton = backdrop.querySelector('[data-role="text-input-dialog-cancel"]');
 
-      titleElem.textContent = String(title || 'Enter Value');
-      const messageText = String(message || '');
+      titleElem.textContent = String(title ?? 'Enter Value');
+      const messageText = String(message ?? '');
       messageElem.textContent = messageText;
       messageElem.hidden = messageText.length === 0;
-      const labelText = String(label || '');
+      const labelText = String(label ?? '');
       labelElem.textContent = labelText;
       labelElem.hidden = labelText.length === 0;
       inputElem.value = String(initialValue ?? '');

packages/core-ui/src/tests/grid/controller/test-data-grid-controller.test.js

@@ -648,4 +648,76 @@ describe('test data grid controller', () => {
     );
     expect(panel.replaceSchemaRows).not.toHaveBeenCalled();
   });
+
+  test('resets the schema busy flag when loading status throws during grid-to-enum startup', async () => {
+    const panel = {
+      destroy: jest.fn(),
+      getMode: jest.fn(() => 'new-table'),
+      setPairwiseVisible: jest.fn(),
+      setRowCountValue: jest.fn(),
+      setGenerateSchemaBusy: jest.fn(),
+      validateSchemaRows: jest.fn(() => ({ rows: [], errors: [] })),
+      syncSchemaTextFromRows: jest.fn(),
+      insertSampleSchema: jest.fn(),
+      getSchemaDefinition: jest.fn(() => ({ replaceRows: jest.fn() })),
+      getState: jest.fn(() => ({
+        schemaDefinitionProps: {
+          createBlankRow: () => ({
+            id: 'generated-row',
+            name: '',
+            sourceType: 'regex',
+            command: '',
+            params: '',
+            value: '',
+            comments: '',
+            leadingTextLines: [],
+          }),
+        },
+      })),
+      replaceSchemaRows: jest.fn(() => ({ rows: [], errors: [] })),
+    };
+    const createDataPopulationPanelComponentFn = jest.fn(({ callbacks }) => {
+      panel.callbacks = callbacks;
+      return panel;
+    });
+    const loadingError = new Error('status torn down');
+
+    const control = createTestDataGenerationPanelManager({
+      documentObj: document,
+      initializeSchemaErrorDisplayFn: jest.fn(),
+      identifyFakerCommandsFn: jest.fn(),
+      createTestDataGenerationServiceFn: jest.fn(() => ({
+        updatePairwiseButtonVisibility: jest.fn(),
+        generateTestData: jest.fn(),
+        generatePairwiseTestData: jest.fn(),
+      })),
+      createDataPopulationPanelComponentFn,
+      createTestDataUiStatusServiceFn: jest.fn(() => ({
+        setTestDataStatus: jest.fn(),
+        setTestDataLoadingStatus: jest.fn(() => {
+          throw loadingError;
+        }),
+        clearPendingTestDataStatusReset: jest.fn(),
+        scheduleTestDataStatusReset: jest.fn(),
+        destroy: jest.fn(),
+      })),
+      createCombinationsDialogComponentFn: jest.fn(() => ({ destroy: jest.fn() })),
+    });
+
+    control.mountTestDataGenerationPanel(
+      'host',
+      {},
+      {},
+      {
+        getGridAsGenericDataTable: jest.fn(() => ({
+          getHeaders: () => ['Status'],
+          getRowCount: () => 1,
+          getCell: () => 'active',
+        })),
+      }
+    );
+
+    await expect(panel.callbacks.onGenerateSchemaFromGrid()).rejects.toThrow(loadingError);
+    expect(panel.setGenerateSchemaBusy.mock.calls).toEqual([[true], [false]]);
+  });
 });

packages/core-ui/src/tests/grid/schema/grid-to-enum-schema.test.js

@@ -74,4 +74,24 @@ describe('grid-to-enum-schema', () => {
       }),
     ]);
   });
+
+  test('quotes enum values that contain commas so they stay single choices', () => {
+    const table = createTable({
+      headers: ['City'],
+      rows: [['New York, NY'], ['London'], ['New York, NY']],
+    });
+
+    const result = createEnumSchemaRowsFromGrid({
+      dataTable: table,
+      createBlankRow: () => ({ id: 'row', sourceType: 'regex', value: 'seed' }),
+    });
+
+    expect(result.rows).toEqual([
+      expect.objectContaining({
+        name: 'City',
+        sourceType: 'enum',
+        value: '"New York, NY",London',
+      }),
+    ]);
+  });
 });

packages/core/js/data_generation/utils/enumParser.js

@@ -3,6 +3,10 @@
  * Handles both simple comma-separated and function-based enum formats
  */
 export class EnumParser {
+  static unescapeQuotedEnumValue(value) {
+    return String(value ?? '').replace(/\\(["\\])/g, '$1');
+  }
+
   static isShorthandEnumFormat(ruleSpec) {
     return /^enum\s+/.test(String(ruleSpec || '').trim());
   }
@@ -51,7 +55,7 @@ export class EnumParser {
       .map((v) => {
         const trimmed = v.trim();
         if (trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.length >= 2) {
-          return trimmed.slice(1, -1);
+          return this.unescapeQuotedEnumValue(trimmed.slice(1, -1));
         }
         return trimmed;
       });
@@ -108,7 +112,7 @@ export class EnumParser {
     return values.map((value) => {
       const trimmed = value.trim();
       if (trimmed.startsWith('"') && trimmed.endsWith('"') && trimmed.length >= 2) {
-        return trimmed.slice(1, -1);
+        return this.unescapeQuotedEnumValue(trimmed.slice(1, -1));
       }
       return trimmed;
     });