Add isDefault flag

Author: alencarlucas

src/components/PermissionsCollaboratorDialog/PermissionsCollaboratorDialog.react.js

@@ -19,6 +19,8 @@ import Label     from 'components/Label/Label.react';
 import Field from '../Field/Field.react'
 import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
 import 'components/PermissionsCollaboratorDialog/Tabs.css'
+import lodash from 'lodash'
+
 
 let origin = new Position(0, 0);
 
@@ -75,13 +77,16 @@ export default class PermissionsCollaboratorDialog extends React.Component {
               }) {
     super();
 
+    const isDefault = lodash.isEqual(customPermissions, defaultPermissions)
+    this.isDefault = isDefault
+
     this.state = {
       transitioning: false,
       showLevels: false,
       level: 'Simple', // 'Simple' | 'Advanced'
       customPermissions,
       features,
-      selectedTab: 'Default' // 'Default' | 'Custom'
+      selectedTab: (isDefault ? 'Default' : 'Custom')
     };
   }
 
@@ -155,7 +160,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
                           id='tab1'
                           name='Tab'
                           className={styles.radiobutton}
-                          defaultChecked={true}
+                          defaultChecked={this.isDefault}
                           disabled={false}
                           onClick={() => this.setState({ selectedTab: 'Default' })}
                         />
@@ -167,6 +172,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
                         <RadioButton
                           id='tab2'
                           name='Tab'
+                          defaultChecked={!this.isDefault}
                           disabled={false}
                           onClick={() => this.setState({ selectedTab: 'Custom' })}
                         />

src/dashboard/Settings/GeneralSettings.react.js

@@ -41,7 +41,6 @@ import validateAndSubmitConnectionString from 'lib/validateAndSubmitConnectionSt
 import { cost, features }                from 'dashboard/Settings/GeneralSettings.scss';
 import { get }                           from 'lib/AJAX';
 import { Link }                          from 'react-router';
-import lodash                            from 'lodash'
 
 const DEFAULT_SETTINGS_LABEL_WIDTH = 55;
 
@@ -514,8 +513,7 @@ export default class GeneralSettings extends DashboardView {
       let removedCollaborators = setDifference(initialFields.collaborators, allCollabs, compareCollaborators);
       if (addedCollaborators.length === 0 && removedCollaborators.length === 0) {
         //If there isn't a added or removed collaborator verify if there is a edited one.
-        let editedCollaborators = verifyEditedCollaborators(allCollabs, initialFields.collaborators);
-        console.log('setCollaborators', allCollabs, initialFields.collaborators)
+        let editedCollaborators = verifyEditedCollaborators(allCollabs);
         if (editedCollaborators.length === 0) {
           //This is neccessary because the footer computes whether or not show a change by reference equality.
           allCollabs = initialFields.collaborators;
@@ -550,7 +548,7 @@ export default class GeneralSettings extends DashboardView {
             promiseList.push(this.context.currentApp.removeCollaboratorById(id));
           });
 
-          let editedCollaborators = verifyEditedCollaborators(changes.collaborators, initialFields.collaborators);
+          let editedCollaborators = verifyEditedCollaborators(changes.collaborators);
           editedCollaborators.forEach(({ id, featuresPermission }) => {
             promiseList.push(this.context.currentApp.editCollaboratorById(id, featuresPermission));
           });
@@ -668,19 +666,11 @@ export default class GeneralSettings extends DashboardView {
 }
 
 let compareCollaborators = (collab1, collab2) => (collab1.userEmail === collab2.userEmail);
-let verifyEditedCollaborators = (modified, initial) => {
+let verifyEditedCollaborators = (modified) => {
   let editedCollabs = []
-  if (modified.length === initial.length)
-    modified.forEach((modifiedCollab) => {
-      initial.forEach((initialCollab) => {
-        console.log('verifyEditedCollaborators step', modifiedCollab, initialCollab);
-        //if (modifiedCollab.userEmail === initialCollab.userEmail &&
-          //  !lodash.isEqual(modifiedCollab, initialCollab))
-          if (modifiedCollab.isEdited)
-          editedCollabs.push(modifiedCollab);
-      })
-    })
-  console.log('editedCollabs', editedCollabs)
+  modified.forEach((modifiedCollab) => {
+    if (modifiedCollab.isEdited) editedCollabs.push(modifiedCollab);
+  })
   return editedCollabs;
 }