Add new blocking view for new room page #30051
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -27,6 +27,11 @@ import compose from '../../libs/compose'; | |
| import variables from '../../styles/variables'; | ||
| import useDelayedInputFocus from '../../hooks/useDelayedInputFocus'; | ||
| import ValuePicker from '../../components/ValuePicker'; | ||
| import BlockingView from '../../components/BlockingViews/BlockingView'; | ||
| import * as Illustrations from '../../components/Icon/Illustrations'; | ||
| import Button from '../../components/Button'; | ||
| import Navigation from '../../libs/Navigation/Navigation'; | ||
| import ROUTES from '../../ROUTES'; | ||
|
|
||
| const propTypes = { | ||
| /** All reports shared with the user */ | ||
|
|
@@ -162,7 +167,7 @@ function WorkspaceNewRoomPage(props) { | |
|
|
||
| return ( | ||
| <FullPageNotFoundView | ||
| shouldShow={!Permissions.canUsePolicyRooms(props.betas)} | ||
| shouldShowBackButton={false} | ||
| linkKey="workspace.emptyWorkspace.title" | ||
| onLinkPress={() => App.createWorkspaceAndNavigateToIt('', false, '', false, false)} | ||
|
There was a problem hiding this comment. I think with our change, we should revert those changes from the previous PR #27983. It doesn't make sense when we don't have permission to use policy room, but the helper text is creating workspaces |
||
|
|
@@ -174,77 +179,96 @@ function WorkspaceNewRoomPage(props) { | |
| shouldEnablePickerAvoiding={false} | ||
| testID={WorkspaceNewRoomPage.displayName} | ||
| > | ||
| {({insets}) => | ||
| workspaceOptions.length ? ( | ||
|
There was a problem hiding this comment. It looks hard to read code. Because the children of Do you have any idea to make it more readable? Thanks There was a problem hiding this comment. @hoangzinh Updated. There was a problem hiding this comment. Why didn't we do the reverse? Lift the empty view out (because I think it's a sub/edge case view), and arrange the code to something like this: isEmpty(workspaceOptions)
? renderEmptyWorkspace()
: ...what do you think? There was a problem hiding this comment. @hoangzinh Do you think about lifting both views out? There was a problem hiding this comment. It's up to you, but I think it's not necessary. |
||
| <KeyboardAvoidingView | ||
| style={styles.h100} | ||
| behavior="padding" | ||
| // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen. | ||
| // This is because when wrapping whole screen the screen was freezing when changing Tabs. | ||
| keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top} | ||
| > | ||
| <Form | ||
| formID={ONYXKEYS.FORMS.NEW_ROOM_FORM} | ||
| submitButtonText={translate('newRoomPage.createRoom')} | ||
| style={[styles.mh5, styles.flexGrow1]} | ||
| validate={validate} | ||
| onSubmit={submit} | ||
| enabledWhenOffline | ||
| > | ||
| <View style={styles.mb5}> | ||
| <RoomNameInput | ||
| ref={(el) => (roomNameInputRef.current = el)} | ||
| inputID="roomName" | ||
| isFocused={props.isFocused} | ||
| shouldDelayFocus | ||
| autoFocus | ||
| /> | ||
| </View> | ||
| <View style={styles.mb5}> | ||
| <TextInput | ||
| inputID="welcomeMessage" | ||
| label={translate('welcomeMessagePage.welcomeMessageOptional')} | ||
| accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')} | ||
| accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT} | ||
| autoGrowHeight | ||
| maxLength={CONST.MAX_COMMENT_LENGTH} | ||
| autoCapitalize="none" | ||
| textAlignVertical="top" | ||
| containerStyles={[styles.autoGrowHeightMultilineInput]} | ||
| /> | ||
| </View> | ||
| <View style={[styles.mhn5]}> | ||
| <ValuePicker | ||
| inputID="policyID" | ||
| label={translate('workspace.common.workspace')} | ||
| placeholder={translate('newRoomPage.selectAWorkspace')} | ||
| items={workspaceOptions} | ||
| onValueChange={setPolicyID} | ||
| /> | ||
| </View> | ||
| {isPolicyAdmin && ( | ||
| <View style={styles.mhn5}> | ||
| <ValuePicker | ||
| inputID="writeCapability" | ||
| label={translate('writeCapabilityPage.label')} | ||
| items={writeCapabilityOptions} | ||
| value={writeCapability} | ||
| onValueChange={setWriteCapability} | ||
| /> | ||
| </View> | ||
| )} | ||
| <View style={[styles.mb1, styles.mhn5]}> | ||
| <ValuePicker | ||
| inputID="visibility" | ||
| label={translate('newRoomPage.visibility')} | ||
| items={visibilityOptions} | ||
| onValueChange={setVisibility} | ||
| value={visibility} | ||
| /> | ||
| </View> | ||
| <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text> | ||
| </Form> | ||
| </KeyboardAvoidingView> | ||
| ) : ( | ||
| <> | ||
| <BlockingView | ||
| icon={Illustrations.ToddBehindCloud} | ||
| iconWidth={variables.modalTopIconWidth} | ||
| iconHeight={variables.modalTopIconHeight} | ||
| title={translate('workspace.emptyWorkspace.notFound')} | ||
| subtitle={translate('workspace.emptyWorkspace.description')} | ||
| shouldShowLink={false} | ||
| /> | ||
| <Button | ||
| success | ||
| text={translate('footer.learnMore')} | ||
| onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)} | ||
| style={[styles.mh5, styles.mb5]} | ||
| /> | ||
| </> | ||
| ) | ||
| } | ||
| </ScreenWrapper> | ||
| </FullPageNotFoundView> | ||
| ); | ||
|
|
||
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.
please revert this commit