Skip to content

fix: Redirect after fresh workspace creation #6697

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
chiragsalian merged 3 commits into from
Dec 10, 2021
Merged

fix: Redirect after fresh workspace creation #6697

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f329330
fix(wkspace-popup-menu): Moved menuItems initialization to render
mananjadhav Dec 10, 2021
e074e9d
fix(wkspace-popup-menu): Changed function body to multiline
mananjadhav Dec 10, 2021
96494c8
fix(wkspace-popup-menu): Removed extra line
mananjadhav Dec 10, 2021
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
71 changes: 36 additions & 35 deletions src/pages/workspace/WorkspaceInitialPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,45 @@ class WorkspaceInitialPage extends React.Component {
constructor(props) {
super(props);

const policy = this.props.policy;
this.openEditor = this.openEditor.bind(this);
this.toggleDeleteModal = this.toggleDeleteModal.bind(this);
this.confirmDeleteAndHideModal = this.confirmDeleteAndHideModal.bind(this);

this.menuItems = [
this.state = {
isDeleteModalOpen: false,
};
}

/**
* Open Workspace Editor
*/
openEditor() {
Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(this.props.policy.id));
}

/**
* Toggle delete confirm modal visibility
* @param {Boolean} shouldOpen
*/
toggleDeleteModal(shouldOpen) {
this.setState({isDeleteModalOpen: shouldOpen});
}

/**
* Call the delete policy and hide the modal
*/
confirmDeleteAndHideModal() {
PolicyActions.deletePolicy(this.props.policy.id);
this.toggleDeleteModal(false);
}

render() {
const policy = this.props.policy;
if (_.isEmpty(policy)) {
return <FullScreenLoadingIndicator />;
}

const menuItems = [
{
translationKey: 'workspace.common.settings',
icon: Expensicons.Gear,
Expand Down Expand Up @@ -94,38 +127,6 @@ class WorkspaceInitialPage extends React.Component {
},
];

this.state = {
isDeleteModalOpen: false,
};
}

/**
* Open Workspace Editor
*/
openEditor() { Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(this.props.policy.id)); }

/**
* Toggle delete confirm modal visibility
* @param {Boolean} shouldOpen
*/
toggleDeleteModal(shouldOpen) {
this.setState({isDeleteModalOpen: shouldOpen});
}

/**
* Call the delete policy and hide the modal
*/
confirmDeleteAndHideModal() {
PolicyActions.deletePolicy(this.props.policy.id);
this.toggleDeleteModal(false);
}


render() {
if (_.isEmpty(this.props.policy)) {
return <FullScreenLoadingIndicator />;
}

return (
<ScreenWrapper>
<HeaderWithCloseButton
Expand Down Expand Up @@ -203,7 +204,7 @@ class WorkspaceInitialPage extends React.Component {
)}
</View>
</View>
{_.map(this.menuItems, (item) => {
{_.map(menuItems, (item) => {
const shouldFocus = this.props.isSmallScreenWidth ? !this.props.isFocused && item.isActive : item.isActive;
return (
<MenuItem
Expand Down