Skip to content

Fix broken duplicate name error in User Created Policy Rooms #7446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pecanoro merged 12 commits into from
Feb 3, 2022
Merged

Fix broken duplicate name error in User Created Policy Rooms #7446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c70f6da
Include title in report name to avoid duplicates
Jan 26, 2022
6a2f52a
Use const because this is always policy room
Jan 26, 2022
0c81864
Use correct getChatReportName
Jan 26, 2022
4953cd2
Merge branch 'main' of github.com:Expensify/App into amal-ucpr-name-d…
Jan 27, 2022
1f32116
Use different name to avoid scope issue
Jan 27, 2022
047ed78
Check for policyID changes
Jan 31, 2022
937db39
Add clarifying comment
Jan 31, 2022
dbcfdcb
Merge branch 'main' of github.com:Expensify/App into amal-ucpr-name-d…
Jan 31, 2022
5064d85
Actually use error in WorkspaceNewRoomPage
Jan 31, 2022
7291c3a
Remove unneeded report name change
Jan 31, 2022
00343aa
Use same style for both props
Feb 1, 2022
a465ff4
Merge branch 'main' of github.com:Expensify/App into amal-ucpr-name-d…
Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/RoomNameInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ class RoomNameInput extends Component {
if (prevState.error !== this.state.error) {
this.props.onChangeError(this.state.error);
}

// If the selected policyID has changed we need to check if the room name already exists on this new policy.
if (prevProps.policyID !== this.props.policyID) {
this.checkAndModifyRoomName(this.state.roomName);
}
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/pages/workspace/WorkspaceNewRoomPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ class WorkspaceNewRoomPage extends React.Component {
<View style={styles.mb5}>
<Text style={[styles.formLabel]}>{this.props.translate('newRoomPage.roomName')}</Text>
<RoomNameInput
onChangeText={(roomName) => { this.setState({roomName}); }}
onChangeText={roomName => this.setState({roomName})}
onChangeError={error => this.setState({error})}
initialValue={this.state.roomName}
policyID={this.state.policyID}
/>
Expand Down