Skip to content

Commit a2da0af

Browse files
committed
Set isDefault on confirm
1 parent 8935b11 commit a2da0af

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/components/PermissionsCollaboratorDialog/PermissionsCollaboratorDialog.react.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ export default class PermissionsCollaboratorDialog extends React.Component {
7878
super();
7979

8080
const isDefault = lodash.isEqual(customPermissions, defaultPermissions)
81-
this.isDefault = isDefault
8281

8382
this.state = {
8483
transitioning: false,
8584
showLevels: false,
8685
level: 'Simple', // 'Simple' | 'Advanced'
8786
customPermissions,
8887
features,
88+
isDefault,
8989
selectedTab: (isDefault ? 'Default' : 'Custom')
9090
};
9191
}
@@ -146,7 +146,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
146146
</SliderWrap>
147147
<div className={styles.tableWrap}>
148148
<div className={styles.table}>
149-
<Tabs>
149+
<Tabs defaultIndex={(this.state.isDefault ? 0 : 1)}>
150150
<div className={styles.subHeader}>
151151
<div className={[styles.public, styles.row].join(' ')}>
152152
<div className={styles.label}>
@@ -160,7 +160,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
160160
id='tab1'
161161
name='Tab'
162162
className={styles.radiobutton}
163-
defaultChecked={this.isDefault}
163+
defaultChecked={this.state.isDefault}
164164
disabled={false}
165165
onClick={() => this.setState({ selectedTab: 'Default' })}
166166
/>
@@ -172,7 +172,7 @@ export default class PermissionsCollaboratorDialog extends React.Component {
172172
<RadioButton
173173
id='tab2'
174174
name='Tab'
175-
defaultChecked={!this.isDefault}
175+
defaultChecked={!this.state.isDefault}
176176
disabled={false}
177177
onClick={() => this.setState({ selectedTab: 'Custom' })}
178178
/>
@@ -199,12 +199,16 @@ export default class PermissionsCollaboratorDialog extends React.Component {
199199
primary={true}
200200
value={this.props.confirmText}
201201
onClick={() => {
202-
this.props.onConfirm(
203-
(this.state.selectedTab === 'Default' ?
204-
this.props.defaultPermissions :
205-
this.state.customPermissions
206-
)
207-
)
202+
let permissions = {}
203+
if (this.state.selectedTab === 'Default') {
204+
permissions = this.props.defaultPermissions
205+
this.setState({ isDefault: true })
206+
} else {
207+
permissions = this.state.customPermissions
208+
this.setState({ isDefault: false })
209+
}
210+
console.log('permissions', permissions)
211+
this.props.onConfirm(permissions)
208212
}}
209213
/>
210214
</div>

0 commit comments

Comments
 (0)