Issue 53360: User comments for domain changes are not being saved when there are naming pattern warnings. (#1818)

Author: labkey-susanh

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.52.4",
+  "version": "6.52.5",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -1,6 +1,10 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 6.52.5
+*Released*: 30 June 2025
+- Issue 53360: Pass user comment through after naming pattern warning
+
 ### version 6.52.4
 *Released*: 30 June 2025
 - Issue 53118: Filter modal change to multiValue type to account for numeric value when parsing

packages/components/releaseNotes/components.md

@@ -357,22 +357,22 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
         });
     };
 
-    onFinish = (auditUserComment?: string): void => {
+    onFinish = (comment?: string): void => {
         const { defaultSampleFieldConfig, setSubmitting, metricUnitProps } = this.props;
-        const { model, uniqueIdsConfirmed } = this.state;
+        const { model, uniqueIdsConfirmed, auditUserComment } = this.state;
 
         if (!model.isNew() && this.getNumNewUniqueIdFields() > 0 && !uniqueIdsConfirmed) {
             this.setState({
                 showUniqueIdConfirmation: true,
-                auditUserComment
+                auditUserComment: comment,
             });
             return;
         }
 
         const metricUnitRequired = metricUnitProps?.metricUnitRequired;
         const isValid = model.isValid(defaultSampleFieldConfig, metricUnitRequired);
 
-        this.props.onFinish(isValid, () => this.saveDomain(false, auditUserComment));
+        this.props.onFinish(isValid, () => this.saveDomain(false, comment ?? auditUserComment));
 
         if (isValid) return;
 
@@ -397,7 +397,7 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
             this.setState(
                 {
                     model: updatedModel,
-                    auditUserComment,
+                    auditUserComment: comment,
                 },
                 () => {
                     scrollDomainErrorIntoView();
@@ -475,6 +475,7 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
                                 nameExpressionWarnings: response.warnings,
                                 namePreviews: response.previews,
                                 showUniqueIdConfirmation: false,
+                                auditUserComment: comment,
                             }),
                             () => {
                                 scrollDomainErrorIntoView();