Report Details and Settings for User Created Policy Rooms #7028
There are no files selected for viewing
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| import React, {Component} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import _ from 'underscore'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import CONST from '../CONST'; | ||
| import ONYXKEYS from '../ONYXKEYS'; | ||
| import styles from '../styles/styles'; | ||
| import compose from '../libs/compose'; | ||
| import withLocalize, {withLocalizePropTypes} from './withLocalize'; | ||
| import withFullPolicy, {fullPolicyDefaultProps, fullPolicyPropTypes} from '../pages/workspace/withFullPolicy'; | ||
|
|
||
| import TextInputWithPrefix from './TextInputWithPrefix'; | ||
|
|
||
| const propTypes = { | ||
| /** Callback to execute when the text input is modified correctly */ | ||
| onChangeText: PropTypes.func, | ||
|
|
||
| /** Callback to execute when an error gets found/cleared/modified */ | ||
| onChangeError: PropTypes.func, | ||
|
|
||
| /** Initial room name to show in input field. This should include the '#' already prefixed to the name */ | ||
| initialValue: PropTypes.string, | ||
|
|
||
| /** Whether we should show the input as disabled */ | ||
| disabled: PropTypes.bool, | ||
|
|
||
| /** ID of policy whose room names we should be checking for duplicates */ | ||
| policyID: PropTypes.string, | ||
|
|
||
| ...withLocalizePropTypes, | ||
| ...fullPolicyPropTypes, | ||
|
|
||
| /* Onyx Props */ | ||
|
|
||
| /** All reports shared with the user */ | ||
| reports: PropTypes.shape({ | ||
| /** The report name */ | ||
| reportName: PropTypes.string, | ||
|
|
||
| /** ID of the report */ | ||
| reportID: PropTypes.number, | ||
| }).isRequired, | ||
|
|
||
| /** The policies which the user has access to and which the report could be tied to */ | ||
| policies: PropTypes.shape({ | ||
| /** The policy name */ | ||
| name: PropTypes.string, | ||
|
|
||
| /** ID of the policy */ | ||
| id: PropTypes.string, | ||
| }).isRequired, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| onChangeText: () => {}, | ||
| onChangeError: () => {}, | ||
| initialValue: '', | ||
| disabled: false, | ||
| policyID: '', | ||
| ...fullPolicyDefaultProps, | ||
| }; | ||
|
|
||
| class RoomNameInput extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| roomName: props.initialValue, | ||
| error: '', | ||
| }; | ||
|
|
||
| this.originalRoomName = props.initialValue; | ||
|
|
||
| this.checkAndModifyRoomName = this.checkAndModifyRoomName.bind(this); | ||
| } | ||
|
|
||
| componentDidUpdate(prevProps, prevState) { | ||
| // As we are modifying the text input, we'll bubble up any changes/errors so the parent component can see it | ||
| if (prevState.roomName !== this.state.roomName) { | ||
| this.props.onChangeText(this.state.roomName); | ||
| } | ||
| if (prevState.error !== this.state.error) { | ||
| this.props.onChangeError(this.state.error); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Modifies the room name to follow our conventions: | ||
| * - Max length 80 characters | ||
| * - Cannot not include space or special characters, and we automatically apply an underscore for spaces | ||
| * - Must be lowercase | ||
| * Also checks to see if this room name already exists, and displays an error message if so. | ||
| * @param {String} roomName | ||
| * | ||
| */ | ||
| checkAndModifyRoomName(roomName) { | ||
| const modifiedRoomNameWithoutHash = roomName.substring(1) | ||
| .replace(/ /g, '_') | ||
| .replace(/[^a-zA-Z\d_]/g, '') | ||
| .substring(0, CONST.REPORT.MAX_ROOM_NAME_LENGTH) | ||
| .toLowerCase(); | ||
| const finalRoomName = `#${modifiedRoomNameWithoutHash}`; | ||
|
|
||
| const isExistingRoomName = _.some( | ||
| _.values(this.props.reports), | ||
| report => report && report.policyID === this.props.policyID && report.reportName === finalRoomName, | ||
| ); | ||
|
|
||
| // We error if the room name already exists. We don't care if it matches the original name provided in this | ||
| // component because then we are not changing the room's name. | ||
| const error = isExistingRoomName && finalRoomName !== this.originalRoomName | ||
| ? this.props.translate('newRoomPage.roomAlreadyExists') | ||
| : ''; | ||
|
|
||
| this.setState({ | ||
| roomName: finalRoomName, | ||
| error, | ||
| }); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <TextInputWithPrefix | ||
| disabled={this.props.disabled} | ||
| label={this.props.translate('newRoomPage.roomName')} | ||
| prefixCharacter="#" | ||
| placeholder={this.props.translate('newRoomPage.social')} | ||
| containerStyles={[styles.mb5]} | ||
| onChangeText={roomName => this.checkAndModifyRoomName(roomName)} | ||
| value={this.state.roomName.substring(1)} | ||
| errorText={this.state.error} | ||
| autoCapitalize="none" | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| RoomNameInput.propTypes = propTypes; | ||
| RoomNameInput.defaultProps = defaultProps; | ||
|
|
||
|
|
||
| export default compose( | ||
| withLocalize, | ||
| withFullPolicy, | ||
| withOnyx({ | ||
| reports: { | ||
| key: ONYXKEYS.COLLECTION.REPORT, | ||
| }, | ||
| policies: { | ||
| key: ONYXKEYS.COLLECTION.POLICY, | ||
| }, | ||
| }), | ||
| )(RoomNameInput); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could name this something like innerStyles, but I figured buttonStyles makes more sense here. I realized that there's no way to put in a custom height/padding for buttons because the
stylesprop actually only affects the container/Pressable portion of the button, not the inner view.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That seems odd to me because we pass
button.stylesdirectly to theOpacityViewas well?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do pass the
styles.buttonbut not the styles itself. That only happens now with this line.The
additionalStylesare getting added to the Pressable part only.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
containerStylesandinnerStylesmakes a bit more sense here, but maybe I'm not entirely understanding your reasoning.The
Pressableis the container, and theOpacityViewis the inner component. If I was looking at this component for the first time I think this makes more sense thanadditionalStylesandbuttonStyles, since the whole component is calledButton.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes a lot of sense to me. Container styles really is the most accurate way to describe that for button. I think I wanted to avoid renaming the existing "styles" prop, but it isn't too difficult to see where
<Buttonis referenced and just change the name there.