Merge branch 'alpha' into feature/chart-visualization

Author: mtrezza

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,10 @@
+# [7.3.0-alpha.3](https://github.com/parse-community/parse-dashboard/compare/7.3.0-alpha.2...7.3.0-alpha.3) (2025-07-09)
+
+
+### Features
+
+* Add type mismatch warning when quick-adding entry to Cloud Config array parameter ([#2875](https://github.com/parse-community/parse-dashboard/issues/2875)) ([bb1837f](https://github.com/parse-community/parse-dashboard/commit/bb1837fd7af64e75364b53210dd710bc70d0e764))
+
 # [7.3.0-alpha.2](https://github.com/parse-community/parse-dashboard/compare/7.3.0-alpha.1...7.3.0-alpha.2) (2025-07-07)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-dashboard",
-  "version": "7.3.0-alpha.2",
+  "version": "7.3.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/parse-community/parse-dashboard"

package.json

@@ -10,11 +10,17 @@ import Label from 'components/Label/Label.react';
 import Modal from 'components/Modal/Modal.react';
 import React from 'react';
 import TextInput from 'components/TextInput/TextInput.react';
+import Checkbox from 'components/Checkbox/Checkbox.react';
 
 export default class AddArrayEntryDialog extends React.Component {
   constructor() {
     super();
-    this.state = { value: '' };
+    this.state = {
+      value: '',
+      showMismatchRow: false,
+      mismatchConfirmed: false,
+      parsedType: '',
+    };
     this.inputRef = React.createRef();
   }
 
@@ -24,9 +30,6 @@ export default class AddArrayEntryDialog extends React.Component {
     }
   }
 
-  valid() {
-    return this.state.value !== '';
-  }
 
   getValue() {
     try {
@@ -36,17 +39,66 @@ export default class AddArrayEntryDialog extends React.Component {
     }
   }
 
+  getType(value) {
+    if (Array.isArray(value)) {
+      return 'array';
+    }
+    if (value === null) {
+      return 'null';
+    }
+    return typeof value;
+  }
+
+  handleConfirm() {
+    const parsed = this.getValue();
+    const entryType = this.getType(parsed);
+    const lastType = this.props.lastType;
+
+    if (lastType && entryType !== lastType) {
+      if (!this.state.showMismatchRow) {
+        this.setState(
+          {
+            showMismatchRow: true,
+            mismatchConfirmed: false,
+            parsedType: entryType,
+          },
+          () => {
+            if (document.activeElement instanceof HTMLElement) {
+              document.activeElement.blur();
+            }
+          }
+        );
+        return;
+      }
+      if (!this.state.mismatchConfirmed) {
+        return;
+      }
+    }
+
+    this.props.onConfirm(parsed);
+    this.setState({
+      value: '',
+      showMismatchRow: false,
+      mismatchConfirmed: false,
+      parsedType: '',
+    });
+  }
+
   render() {
-    return (
+    const confirmDisabled =
+      this.state.value === '' ||
+      (this.state.showMismatchRow && !this.state.mismatchConfirmed);
+
+    const addEntryModal = (
       <Modal
         type={Modal.Types.INFO}
         icon="plus-solid"
         title="Add entry"
         confirmText="Add Unique"
         cancelText="Cancel"
         onCancel={this.props.onCancel}
-        onConfirm={() => this.props.onConfirm(this.getValue())}
-        disabled={!this.valid()}
+        onConfirm={this.handleConfirm.bind(this)}
+        disabled={confirmDisabled}
       >
         <Field
           label={
@@ -60,11 +112,39 @@ export default class AddArrayEntryDialog extends React.Component {
               placeholder={'Enter value'}
               ref={this.inputRef}
               value={this.state.value}
-              onChange={value => this.setState({ value })}
+              onChange={value =>
+                this.setState({
+                  value,
+                  showMismatchRow: false,
+                  mismatchConfirmed: false,
+                })
+              }
             />
           }
         />
+        {this.state.showMismatchRow && (
+          <Field
+            label={
+              <Label
+                text="⚠️ Ignore type mismatch"
+                description={
+                  <>
+                    Previous item type is <strong>{this.props.lastType}</strong>, new entry type is <strong>{this.state.parsedType}</strong>.
+                  </>
+                }
+              />
+            }
+            input={
+              <Checkbox
+                checked={this.state.mismatchConfirmed}
+                onChange={checked => this.setState({ mismatchConfirmed: checked })}
+              />
+            }
+          />
+        )}
       </Modal>
     );
+
+    return addEntryModal;
   }
 }

src/dashboard/Data/Config/AddArrayEntryDialog.react.js

@@ -48,6 +48,7 @@ class Config extends TableView {
       lastNote: null,
       showAddEntryDialog: false,
       addEntryParam: '',
+      addEntryLastType: null,
     };
     this.noteTimeout = null;
   }
@@ -122,6 +123,7 @@ class Config extends TableView {
           onConfirm={value =>
             this.addArrayEntry(this.state.addEntryParam, value)
           }
+          lastType={this.state.addEntryLastType}
         />
       );
     }
@@ -207,6 +209,16 @@ class Config extends TableView {
     };
   }
 
+  getEntryType(value) {
+    if (Array.isArray(value)) {
+      return 'array';
+    }
+    if (value === null) {
+      return 'null';
+    }
+    return typeof value;
+  }
+
   renderRow(data) {
     // Parse modal data
     const { value, modalValue, type } = this.parseValueForModal(data.value);
@@ -491,11 +503,25 @@ class Config extends TableView {
   }
 
   openAddEntryDialog(param) {
-    this.setState({ showAddEntryDialog: true, addEntryParam: param });
+    const params = this.props.config.data.get('params');
+    const arr = params?.get(param);
+    let lastType = null;
+    if (Array.isArray(arr) && arr.length > 0) {
+      lastType = this.getEntryType(arr[arr.length - 1]);
+    }
+    this.setState({
+      showAddEntryDialog: true,
+      addEntryParam: param,
+      addEntryLastType: lastType,
+    });
   }
 
   closeAddEntryDialog() {
-    this.setState({ showAddEntryDialog: false, addEntryParam: '' });
+    this.setState({
+      showAddEntryDialog: false,
+      addEntryParam: '',
+      addEntryLastType: null,
+    });
   }
 
   async addArrayEntry(param, value) {