From d62e7123085ab282704c9ad543e6a75c89f7951b Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 14 Jun 2021 19:13:54 +0500
Subject: [PATCH 01/11] combined create class flow

---
 Parse-Dashboard/parse-dashboard-config.json   | 70 +++++++++++++++----
 src/components/Modal/Modal.react.js           | 12 ++++
 .../Data/Browser/AddColumnDialog.react.js     |  5 +-
 src/dashboard/Data/Browser/Browser.react.js   | 34 +++++++--
 .../Data/Browser/CreateClassDialog.react.js   | 10 +++
 5 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/Parse-Dashboard/parse-dashboard-config.json b/Parse-Dashboard/parse-dashboard-config.json
index 07941d1cbb..c4d73369e7 100644
--- a/Parse-Dashboard/parse-dashboard-config.json
+++ b/Parse-Dashboard/parse-dashboard-config.json
@@ -1,14 +1,58 @@
 {
-  "apps": [
-    {
-      "serverURL": "http://localhost:1338/parse",
-      "appId": "hello",
-      "masterKey": "world",
-      "appName": "",
-      "iconName": "",
-      "primaryBackgroundColor": "",
-      "secondaryBackgroundColor": ""
-    }
-  ],
-  "iconsFolder": "icons"
-}
\ No newline at end of file
+  "apps": [{
+    "serverURL": "https://parseapi.back4app.com",
+    "appId": "IvWJni5qb3gqJWmOlwZtfCA67cw5bZDvGU539T9J",
+    "javascriptKey": "HZ8PgZPHAM9r2tNrsnsQL7DU4JakERIAPD3sVIQI",
+    "restKey": "HnIKdoowoqFxJHgK3azdsigxR4vw4RnQUzwdiqWs",
+    "clientKey": "3oFJ03aUAlCtMFPqYz8enTP89tvp7GIuwvQbQ2Oz",
+    "windowsKey": "BQDTuFI9Tw6Tlh7C3rvlbNiZ3r0JLv8yDj015b5e",
+    "webhookKey": "LnirDOXQo3PUnvHFrVJriukXtwhwxHcWROXTdm4k",
+    "apiKey": "cda6c643-056e-4006-8080-3322c125f05d",
+    "appName": "Sample Blog App",
+    "production": true,
+    "appNameForURL": "8d153178-ab63-47fc-a546-0743ba667043",
+    "feedbackEmail": "faisal@back4app.com",
+    "custom": {
+      "isGDPR": false,
+      "forceShowGDPRFields": false,
+      "showAdminPage": false,
+      "isOwner": true,
+      "isDatabasePublic": false
+    },
+    "supportedPushLocales": [],
+    "graphQLServerURL": "https://parseapi.back4app.com/graphql",
+    "masterKey": "0bdT7LmVrpSBbjWYmmOGPuhEPVFBpQk4jJnvdv2d"
+  }, {
+    "serverURL": "https://parseapi.back4app.com",
+    "appId": "dvTjcE3x2STnpZo1x3iUpccY82ptKS2s9grRYP4b",
+    "javascriptKey": "LFiEhZBtFi7LCSJshF2YTc0coBKnSfZ0cJucJOlv",
+    "restKey": "BWkv4t7tvQO4PJcQvh3DJg3v2pkb1kDJqnD11tXH",
+    "clientKey": "jkwrEAfTFDrhLaapdZLIw5mTutXQvfLjWVYqdRM1",
+    "windowsKey": "4WGzrXvmbS8SRBjka34tcqkxEs8hNumtRlnjHmbC",
+    "webhookKey": "n6pbMF39n0GR7h4yg5HoKHRxyiPsks0mk1KycCHW",
+    "apiKey": "81432ee4-5076-460c-95e0-dd2b579ab648",
+    "appName": "FirstApp",
+    "production": true,
+    "appNameForURL": "1baa601c-a967-443a-905b-d5e7df17515a",
+    "feedbackEmail": "faisal@back4app.com",
+    "custom": {
+      "isGDPR": false,
+      "forceShowGDPRFields": false,
+      "showAdminPage": false,
+      "isOwner": true,
+      "isDatabasePublic": false
+    },
+    "supportedPushLocales": [],
+    "graphQLServerURL": "https://parseapi.back4app.com/graphql",
+    "masterKey": "c05f1V3DmG04GPRD2nEbbeCQCXSEI9klRtAZ4jgh"
+  }],
+  "newFeaturesInLatestVersion": [],
+  "user": {
+    "email": "faisal@back4app.com",
+    "has_password": false,
+    "account_keys": [],
+    "name": "faisal@back4app.com",
+    "playDatabaseBrowserTutorial": true
+  }
+}
+
diff --git a/src/components/Modal/Modal.react.js b/src/components/Modal/Modal.react.js
index 25f5055170..5bea30db9d 100644
--- a/src/components/Modal/Modal.react.js
+++ b/src/components/Modal/Modal.react.js
@@ -39,6 +39,9 @@ let Modal = (({
   customFooter,
   textModal = false,
   width,
+  continueText,
+  onContinue,
+  showContinue,
   buttonsInCenter = React.Children.count(children) === 0,
 }) => {
   if (children) {
@@ -63,6 +66,15 @@ let Modal = (({
         disabled={!!disabled}
         onClick={onConfirm}
         progress={progress} />
+      {
+      showContinue === true ?
+      <Button
+        primary={true}
+        value={continueText}
+        color={buttonColors[type]}
+        disabled={!!disabled}
+        onClick={onContinue}
+        progress={progress} />: null}
     </div>
   );
 
diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js
index 4d5e970db0..d3655d3ff0 100644
--- a/src/dashboard/Data/Browser/AddColumnDialog.react.js
+++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js
@@ -206,6 +206,9 @@ export default class AddColumnDialog extends React.Component {
         confirmText='Add column'
         cancelText={'Never mind, don\u2019t.'}
         onCancel={this.props.onCancel}
+        continueText={'Create column & add another'}
+        showContinue={true}
+        onContinue={() => this.props.onContinue(this.state)}
         onConfirm={() => {
           this.props.onConfirm(this.state);
         }}>
@@ -246,4 +249,4 @@ export default class AddColumnDialog extends React.Component {
       </Modal>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 74422f9a41..7391d5a92e 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -79,6 +79,7 @@ class Browser extends DashboardView {
 
       isUnique: false,
       uniqueField: null,
+      keepAddingCols: false,
     };
 
     this.prefetchData = this.prefetchData.bind(this);
@@ -115,6 +116,7 @@ class Browser extends DashboardView {
     this.showCreateClass = this.showCreateClass.bind(this);
     this.createClass = this.createClass.bind(this);
     this.addColumn = this.addColumn.bind(this);
+    this.addColumnAndContinue = this.addColumnAndContinue.bind(this);
     this.removeColumn = this.removeColumn.bind(this);
     this.showNote = this.showNote.bind(this);
     this.showEditRowDialog = this.showEditRowDialog.bind(this);
@@ -271,6 +273,12 @@ class Browser extends DashboardView {
     });
   }
 
+  newColumn(payload) {
+    return this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload).catch((err) => {
+      this.showNote(err.message, true);
+    });
+  }
+
   addColumn({ type, name, target, required, defaultValue }) {
     let payload = {
       className: this.props.params.className,
@@ -280,13 +288,23 @@ class Browser extends DashboardView {
       required,
       defaultValue
     };
-    this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload).catch((err) => {
-      this.showNote(err.message, true);
-    }).finally(() => {
-      this.setState({ showAddColumnDialog: false });
+    this.newColumn(payload).finally(() => {
+      this.setState({ showAddColumnDialog: false, keepAddingCols: false });
     });
   }
 
+  addColumnAndContinue({ type, name, target, required, defaultValue }) {
+    let payload = {
+      className: this.props.params.className,
+      columnType: type,
+      name: name,
+      targetClass: target,
+      required,
+      defaultValue
+    };
+    this.newColumn(payload);
+  }
+
   addRow() {
     if (!this.state.newObject) {
       const relation = this.state.relation;
@@ -353,7 +371,7 @@ class Browser extends DashboardView {
           }
           this.state.counts[obj.className] += 1;
         }
-        
+
         this.setState(state);
       },
       error => {
@@ -516,7 +534,7 @@ class Browser extends DashboardView {
       // Construct complex pagination query
       let equalityQuery = queryFromFilters(source, this.state.filters);
       let comp = this.state.data[this.state.data.length - 1].get(field);
-      
+
       if (sortDir === '-') {
         query.lessThan(field, comp);
         equalityQuery.lessThan('objectId', this.state.data[this.state.data.length - 1].id);
@@ -1104,6 +1122,8 @@ class Browser extends DashboardView {
     if (this.state.showCreateClassDialog) {
       extras = (
         <CreateClassDialog
+          currentAppSlug={this.context.currentApp.slug}
+          onAddColumn={this.showAddColumn}
           currentClasses={this.props.schema.data.get('classes').keySeq().toArray()}
           onCancel={() => this.setState({ showCreateClassDialog: false })}
           onConfirm={this.createClass} />
@@ -1116,10 +1136,12 @@ class Browser extends DashboardView {
       });
       extras = (
         <AddColumnDialog
+          onAddColumn={this.showAddColumn}
           currentColumns={currentColumns}
           classes={this.props.schema.data.get('classes').keySeq().toArray()}
           onCancel={() => this.setState({ showAddColumnDialog: false })}
           onConfirm={this.addColumn}
+          onContinue={this.addColumnAndContinue}
           showNote={this.showNote}
           parseServerVersion={currentApp.serverInfo && currentApp.serverInfo.parseServerVersion} />
       );
diff --git a/src/dashboard/Data/Browser/CreateClassDialog.react.js b/src/dashboard/Data/Browser/CreateClassDialog.react.js
index 6f54ae1460..db35424d57 100644
--- a/src/dashboard/Data/Browser/CreateClassDialog.react.js
+++ b/src/dashboard/Data/Browser/CreateClassDialog.react.js
@@ -13,6 +13,7 @@ import Option             from 'components/Dropdown/Option.react';
 import React              from 'react';
 import { SpecialClasses } from 'lib/Constants';
 import TextInput          from 'components/TextInput/TextInput.react';
+import history                           from 'dashboard/history';
 
 function validClassName(name) {
   return !!name.match(/^[a-zA-Z][_a-zA-Z0-9]*$/);
@@ -68,7 +69,16 @@ export default class CreateClassDialog extends React.Component {
         disabled={!this.valid()}
         confirmText='Create class'
         cancelText={'Cancel'}
+        continueText={'Create class & add columns'}
         onCancel={this.props.onCancel}
+        showContinue={true}
+        onContinue={async () => {
+          let type = this.state.type;
+          let className = type === 'Custom' ? this.state.name : '_' + type;
+          await this.props.onConfirm(className);
+          history.push(`/apps/${this.props.currentAppSlug}/browser/${className}`);
+          this.props.onAddColumn();
+        }}
         onConfirm={() => {
           let type = this.state.type;
           let className = type === 'Custom' ? this.state.name : '_' + type;

From 4a9c72b18914edd031a5b76d744c2ae4e030f70e Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 14 Jun 2021 19:16:56 +0500
Subject: [PATCH 02/11] config revert

---
 Parse-Dashboard/parse-dashboard-config.json | 68 ++++-----------------
 1 file changed, 12 insertions(+), 56 deletions(-)

diff --git a/Parse-Dashboard/parse-dashboard-config.json b/Parse-Dashboard/parse-dashboard-config.json
index c4d73369e7..e5c4decbf3 100644
--- a/Parse-Dashboard/parse-dashboard-config.json
+++ b/Parse-Dashboard/parse-dashboard-config.json
@@ -1,58 +1,14 @@
 {
-  "apps": [{
-    "serverURL": "https://parseapi.back4app.com",
-    "appId": "IvWJni5qb3gqJWmOlwZtfCA67cw5bZDvGU539T9J",
-    "javascriptKey": "HZ8PgZPHAM9r2tNrsnsQL7DU4JakERIAPD3sVIQI",
-    "restKey": "HnIKdoowoqFxJHgK3azdsigxR4vw4RnQUzwdiqWs",
-    "clientKey": "3oFJ03aUAlCtMFPqYz8enTP89tvp7GIuwvQbQ2Oz",
-    "windowsKey": "BQDTuFI9Tw6Tlh7C3rvlbNiZ3r0JLv8yDj015b5e",
-    "webhookKey": "LnirDOXQo3PUnvHFrVJriukXtwhwxHcWROXTdm4k",
-    "apiKey": "cda6c643-056e-4006-8080-3322c125f05d",
-    "appName": "Sample Blog App",
-    "production": true,
-    "appNameForURL": "8d153178-ab63-47fc-a546-0743ba667043",
-    "feedbackEmail": "faisal@back4app.com",
-    "custom": {
-      "isGDPR": false,
-      "forceShowGDPRFields": false,
-      "showAdminPage": false,
-      "isOwner": true,
-      "isDatabasePublic": false
-    },
-    "supportedPushLocales": [],
-    "graphQLServerURL": "https://parseapi.back4app.com/graphql",
-    "masterKey": "0bdT7LmVrpSBbjWYmmOGPuhEPVFBpQk4jJnvdv2d"
-  }, {
-    "serverURL": "https://parseapi.back4app.com",
-    "appId": "dvTjcE3x2STnpZo1x3iUpccY82ptKS2s9grRYP4b",
-    "javascriptKey": "LFiEhZBtFi7LCSJshF2YTc0coBKnSfZ0cJucJOlv",
-    "restKey": "BWkv4t7tvQO4PJcQvh3DJg3v2pkb1kDJqnD11tXH",
-    "clientKey": "jkwrEAfTFDrhLaapdZLIw5mTutXQvfLjWVYqdRM1",
-    "windowsKey": "4WGzrXvmbS8SRBjka34tcqkxEs8hNumtRlnjHmbC",
-    "webhookKey": "n6pbMF39n0GR7h4yg5HoKHRxyiPsks0mk1KycCHW",
-    "apiKey": "81432ee4-5076-460c-95e0-dd2b579ab648",
-    "appName": "FirstApp",
-    "production": true,
-    "appNameForURL": "1baa601c-a967-443a-905b-d5e7df17515a",
-    "feedbackEmail": "faisal@back4app.com",
-    "custom": {
-      "isGDPR": false,
-      "forceShowGDPRFields": false,
-      "showAdminPage": false,
-      "isOwner": true,
-      "isDatabasePublic": false
-    },
-    "supportedPushLocales": [],
-    "graphQLServerURL": "https://parseapi.back4app.com/graphql",
-    "masterKey": "c05f1V3DmG04GPRD2nEbbeCQCXSEI9klRtAZ4jgh"
-  }],
-  "newFeaturesInLatestVersion": [],
-  "user": {
-    "email": "faisal@back4app.com",
-    "has_password": false,
-    "account_keys": [],
-    "name": "faisal@back4app.com",
-    "playDatabaseBrowserTutorial": true
-  }
+  "apps": [
+    {
+      "serverURL": "http://localhost:1338/parse",
+      "appId": "hello",
+      "masterKey": "world",
+      "appName": "",
+      "iconName": "",
+      "primaryBackgroundColor": "",
+      "secondaryBackgroundColor": ""
+    }
+  ],
+  "iconsFolder": "icons"
 }
-

From 12d585200d5bdea072edffe2eff9af6a3fff106c Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 19 Jul 2021 14:14:39 +0500
Subject: [PATCH 03/11] reformating -- 1

---
 src/dashboard/Data/Browser/AddColumnDialog.react.js   | 2 +-
 src/dashboard/Data/Browser/CreateClassDialog.react.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js
index d3655d3ff0..2c301cc483 100644
--- a/src/dashboard/Data/Browser/AddColumnDialog.react.js
+++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js
@@ -206,7 +206,7 @@ export default class AddColumnDialog extends React.Component {
         confirmText='Add column'
         cancelText={'Never mind, don\u2019t.'}
         onCancel={this.props.onCancel}
-        continueText={'Create column & add another'}
+        continueText={'Add column & continue'}
         showContinue={true}
         onContinue={() => this.props.onContinue(this.state)}
         onConfirm={() => {
diff --git a/src/dashboard/Data/Browser/CreateClassDialog.react.js b/src/dashboard/Data/Browser/CreateClassDialog.react.js
index db35424d57..af2fd46249 100644
--- a/src/dashboard/Data/Browser/CreateClassDialog.react.js
+++ b/src/dashboard/Data/Browser/CreateClassDialog.react.js
@@ -13,7 +13,7 @@ import Option             from 'components/Dropdown/Option.react';
 import React              from 'react';
 import { SpecialClasses } from 'lib/Constants';
 import TextInput          from 'components/TextInput/TextInput.react';
-import history                           from 'dashboard/history';
+import history            from 'dashboard/history';
 
 function validClassName(name) {
   return !!name.match(/^[a-zA-Z][_a-zA-Z0-9]*$/);

From 0e20d46910cdbb7d4b16788bfa4220fb67ea815e Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Tue, 20 Jul 2021 16:16:02 +0500
Subject: [PATCH 04/11] reset forms after submitting

---
 src/components/Modal/Modal.react.js                 | 6 +++---
 src/dashboard/Data/Browser/AddColumnDialog.react.js | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Modal/Modal.react.js b/src/components/Modal/Modal.react.js
index 5bea30db9d..c99f891633 100644
--- a/src/components/Modal/Modal.react.js
+++ b/src/components/Modal/Modal.react.js
@@ -52,7 +52,7 @@ let Modal = (({
       return c;
     });
   }
-
+  let isDisabled = !!disabled;
   let footer = customFooter || (
     <div style={{textAlign: buttonsInCenter ? 'center' : 'right'}} className={styles.footer}>
       {showCancel ? <Button
@@ -63,7 +63,7 @@ let Modal = (({
         primary={true}
         value={confirmText}
         color={buttonColors[type]}
-        disabled={!!disabled}
+        disabled={isDisabled}
         onClick={onConfirm}
         progress={progress} />
       {
@@ -72,7 +72,7 @@ let Modal = (({
         primary={true}
         value={continueText}
         color={buttonColors[type]}
-        disabled={!!disabled}
+        disabled={isDisabled}
         onClick={onContinue}
         progress={progress} />: null}
     </div>
diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js
index 2c301cc483..2e5aa5c5ce 100644
--- a/src/dashboard/Data/Browser/AddColumnDialog.react.js
+++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js
@@ -33,7 +33,7 @@ function validColumnName(name) {
 export default class AddColumnDialog extends React.Component {
   constructor(props) {
     super();
-    this.state = {
+    this.initialState = {
       type: 'String',
       target: props.classes[0],
       name: '',
@@ -42,6 +42,7 @@ export default class AddColumnDialog extends React.Component {
       isDefaultValueValid: true,
       uploadingFile: false
     };
+    this.state = this.initialState;
     this.renderDefaultValueInput = this.renderDefaultValueInput.bind(this)
     this.handleDefaultValueChange = this.handleDefaultValueChange.bind(this)
   }
@@ -208,7 +209,10 @@ export default class AddColumnDialog extends React.Component {
         onCancel={this.props.onCancel}
         continueText={'Add column & continue'}
         showContinue={true}
-        onContinue={() => this.props.onContinue(this.state)}
+        onContinue={() => {
+          this.props.onContinue(this.state);
+          this.setState(this.initialState);
+        }}
         onConfirm={() => {
           this.props.onConfirm(this.state);
         }}>

From 82812a5f6fe7c567cce6288fdc81b48ef53d2f47 Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Tue, 20 Jul 2021 18:25:43 +0500
Subject: [PATCH 05/11] Improve feed back for add column dialog

---
 src/dashboard/Data/Browser/Browser.react.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 7391d5a92e..c8a3a45706 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -302,7 +302,10 @@ class Browser extends DashboardView {
       required,
       defaultValue
     };
-    this.newColumn(payload);
+    this.newColumn(payload).finally(() => {
+      this.setState({ showAddColumnDialog: false, keepAddingCols: false });
+      this.setState({ showAddColumnDialog: true, keepAddingCols: true });
+    });
   }
 
   addRow() {

From 3b7159defc0599c7d3b062b8d3495f11b1392b95 Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Tue, 20 Jul 2021 18:39:31 +0500
Subject: [PATCH 06/11] improve add column dialog -- 2

---
 src/dashboard/Data/Browser/AddColumnDialog.react.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js
index 2e5aa5c5ce..7d25d0d2d7 100644
--- a/src/dashboard/Data/Browser/AddColumnDialog.react.js
+++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js
@@ -33,7 +33,7 @@ function validColumnName(name) {
 export default class AddColumnDialog extends React.Component {
   constructor(props) {
     super();
-    this.initialState = {
+    this.state = {
       type: 'String',
       target: props.classes[0],
       name: '',
@@ -42,7 +42,6 @@ export default class AddColumnDialog extends React.Component {
       isDefaultValueValid: true,
       uploadingFile: false
     };
-    this.state = this.initialState;
     this.renderDefaultValueInput = this.renderDefaultValueInput.bind(this)
     this.handleDefaultValueChange = this.handleDefaultValueChange.bind(this)
   }
@@ -211,7 +210,6 @@ export default class AddColumnDialog extends React.Component {
         showContinue={true}
         onContinue={() => {
           this.props.onContinue(this.state);
-          this.setState(this.initialState);
         }}
         onConfirm={() => {
           this.props.onConfirm(this.state);

From 1722afc56c14c5587d81a5c83c2d055ae81fb77c Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Tue, 20 Jul 2021 18:51:45 +0500
Subject: [PATCH 07/11] reverting isDisabled

---
 src/components/Modal/Modal.react.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Modal/Modal.react.js b/src/components/Modal/Modal.react.js
index c99f891633..5bea30db9d 100644
--- a/src/components/Modal/Modal.react.js
+++ b/src/components/Modal/Modal.react.js
@@ -52,7 +52,7 @@ let Modal = (({
       return c;
     });
   }
-  let isDisabled = !!disabled;
+
   let footer = customFooter || (
     <div style={{textAlign: buttonsInCenter ? 'center' : 'right'}} className={styles.footer}>
       {showCancel ? <Button
@@ -63,7 +63,7 @@ let Modal = (({
         primary={true}
         value={confirmText}
         color={buttonColors[type]}
-        disabled={isDisabled}
+        disabled={!!disabled}
         onClick={onConfirm}
         progress={progress} />
       {
@@ -72,7 +72,7 @@ let Modal = (({
         primary={true}
         value={continueText}
         color={buttonColors[type]}
-        disabled={isDisabled}
+        disabled={!!disabled}
         onClick={onContinue}
         progress={progress} />: null}
     </div>

From 0a641de2ec85b24a00e007a5a94c872ec6a2fd31 Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 26 Jul 2021 18:15:10 +0500
Subject: [PATCH 08/11] mergeconflicts resolve 2

---
 Parse-Dashboard/public/index.html           | 40 +++++++++++++++++++++
 src/dashboard/Data/Browser/Browser.react.js | 22 ++----------
 2 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 Parse-Dashboard/public/index.html

diff --git a/Parse-Dashboard/public/index.html b/Parse-Dashboard/public/index.html
new file mode 100644
index 0000000000..e5c9ac8c9f
--- /dev/null
+++ b/Parse-Dashboard/public/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<head>
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
+    <base href="/"/>
+    <script>
+        PARSE_DASHBOARD_PATH = "/";
+    </script>
+</head>
+<html>
+<title>Parse Dashboard</title>
+<body>
+<div id="browser_mount"></div>
+<script type="text/javascript">
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://a.back4app.com/a.js','ga');
+    ga('create', 'UA-66038885-1', 'auto');
+    ga('send', 'pageview');
+    setTimeout("ga('send','event','Profitable Engagement','time on page more than 30 seconds')",30000);
+</script>
+<!--Start of Zopim Live Chat Script-->
+<script>
+    window.zEmbed||(function(){
+      var queue = [];
+
+      window.zEmbed = function() {
+        queue.push(arguments);
+      }
+      window.zE = window.zE || window.zEmbed;
+      document.zendeskHost = "back4app.zendesk.com";
+      document.zEQueue = queue;
+    }());
+  </script>
+  <script src="https://assets.zendesk.com/embeddable_framework/main.js" data-ze-csp="true" async defer></script>
+<!--End of Zopim Live Chat Script-->
+<script src="https://survey.solucx.com.br/widget.js"></script>
+<script type="text/javascript" src="http://localhost:9000/back4app-navigation.bundle.js"></script><script type="text/javascript" src="bundles/dashboard.f18722a9d8069488bac7.js"></script><script type="text/javascript" src="bundles/login.2cc31a054b35c671c417.js"></script></body>
+</html>
diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index a3989c5bb7..48f8dd68a5 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -79,12 +79,9 @@ class Browser extends DashboardView {
 
       isUnique: false,
       uniqueField: null,
-<<<<<<< HEAD
       keepAddingCols: false,
-=======
       markRequiredField: false,
       requiredColumnFields: []
->>>>>>> 526fedd139e11b389cf64f3384abd867e8000cba
     };
 
     this.prefetchData = this.prefetchData.bind(this);
@@ -294,7 +291,6 @@ class Browser extends DashboardView {
       required,
       defaultValue
     };
-<<<<<<< HEAD
     this.newColumn(payload).finally(() => {
       this.setState({ showAddColumnDialog: false, keepAddingCols: false });
     });
@@ -312,20 +308,6 @@ class Browser extends DashboardView {
     this.newColumn(payload).finally(() => {
       this.setState({ showAddColumnDialog: false, keepAddingCols: false });
       this.setState({ showAddColumnDialog: true, keepAddingCols: true });
-=======
-    this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload).then(() => {
-      // if new required field column is added, then add field in requiredColumn
-      if (required) {
-        let requiredCols = [...this.state.requiredColumnFields, name];
-        this.setState({
-          requiredColumnFields: requiredCols
-        });
-      }
-    }).catch((err) => {
-      this.showNote(err.message, true);
-    }).finally(() => {
-      this.setState({ showAddColumnDialog: false });
->>>>>>> 526fedd139e11b389cf64f3384abd867e8000cba
     });
   }
 
@@ -750,7 +732,7 @@ class Browser extends DashboardView {
     } else {
       obj.set(attr, value);
     }
-    
+
     if (isNewObject) {
       // for dynamically changing required placeholder text for _User class new row object
       if (obj.className === '_User' && attr === 'authData' && value !== undefined) {
@@ -770,7 +752,7 @@ class Browser extends DashboardView {
       if (obj.className === '_User' && obj.get('username') === undefined && obj.get('password') === undefined && obj.get('authData') === undefined) {
         this.setRequiredColumnFields();
       }
-      
+
       this.setState({
         isNewObject: obj
       });

From e8c784dede01c820537c4d779881e2bfba7852cf Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 26 Jul 2021 18:18:29 +0500
Subject: [PATCH 09/11] required column changes

---
 src/dashboard/Data/Browser/Browser.react.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 48f8dd68a5..7573d14db3 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -276,10 +276,19 @@ class Browser extends DashboardView {
     });
   }
 
-  newColumn(payload) {
-    return this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload).catch((err) => {
-      this.showNote(err.message, true);
-    });
+  newColumn(payload, required) {
+    return this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload)
+      .then(() => {
+        if (required) {
+          let requiredCols = [...this.state.requiredColumnFields, name];
+          this.setState({
+            requiredColumnFields: requiredCols
+          });
+        }
+      })
+      .catch((err) => {
+        this.showNote(err.message, true);
+      });
   }
 
   addColumn({ type, name, target, required, defaultValue }) {
@@ -291,7 +300,7 @@ class Browser extends DashboardView {
       required,
       defaultValue
     };
-    this.newColumn(payload).finally(() => {
+    this.newColumn(payload, required).finally(() => {
       this.setState({ showAddColumnDialog: false, keepAddingCols: false });
     });
   }

From 0d20dabfc72d9040aafa4155e2a402e98a2c8d8c Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 26 Jul 2021 18:19:43 +0500
Subject: [PATCH 10/11] required col in addAndContinue

---
 src/dashboard/Data/Browser/Browser.react.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 7573d14db3..71b9d26981 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -314,7 +314,7 @@ class Browser extends DashboardView {
       required,
       defaultValue
     };
-    this.newColumn(payload).finally(() => {
+    this.newColumn(payload, required).finally(() => {
       this.setState({ showAddColumnDialog: false, keepAddingCols: false });
       this.setState({ showAddColumnDialog: true, keepAddingCols: true });
     });

From 9c76a49768e8b37a1f530fbd3c691272fa916a35 Mon Sep 17 00:00:00 2001
From: Faisal Nadeem <mfaisalnadeem@hotmail.com>
Date: Mon, 26 Jul 2021 19:04:22 +0500
Subject: [PATCH 11/11] removed index.html

---
 Parse-Dashboard/public/index.html | 40 -------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 Parse-Dashboard/public/index.html

diff --git a/Parse-Dashboard/public/index.html b/Parse-Dashboard/public/index.html
deleted file mode 100644
index e5c9ac8c9f..0000000000
--- a/Parse-Dashboard/public/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
-    <base href="/"/>
-    <script>
-        PARSE_DASHBOARD_PATH = "/";
-    </script>
-</head>
-<html>
-<title>Parse Dashboard</title>
-<body>
-<div id="browser_mount"></div>
-<script type="text/javascript">
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://a.back4app.com/a.js','ga');
-    ga('create', 'UA-66038885-1', 'auto');
-    ga('send', 'pageview');
-    setTimeout("ga('send','event','Profitable Engagement','time on page more than 30 seconds')",30000);
-</script>
-<!--Start of Zopim Live Chat Script-->
-<script>
-    window.zEmbed||(function(){
-      var queue = [];
-
-      window.zEmbed = function() {
-        queue.push(arguments);
-      }
-      window.zE = window.zE || window.zEmbed;
-      document.zendeskHost = "back4app.zendesk.com";
-      document.zEQueue = queue;
-    }());
-  </script>
-  <script src="https://assets.zendesk.com/embeddable_framework/main.js" data-ze-csp="true" async defer></script>
-<!--End of Zopim Live Chat Script-->
-<script src="https://survey.solucx.com.br/widget.js"></script>
-<script type="text/javascript" src="http://localhost:9000/back4app-navigation.bundle.js"></script><script type="text/javascript" src="bundles/dashboard.f18722a9d8069488bac7.js"></script><script type="text/javascript" src="bundles/login.2cc31a054b35c671c417.js"></script></body>
-</html>