Skip to content

Refactor DashboardView.jsx : Applied Necessary changes required [Ref PR#2422] #2437

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.

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

209 changes: 79 additions & 130 deletions client/modules/User/pages/DashboardView.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
import React, { useState, useCallback } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import MediaQuery from 'react-responsive';
import { withTranslation } from 'react-i18next';
import { useLocation, useParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';

import browserHistory from '../../../browserHistory';
import Button from '../../../common/Button';
import Nav from '../../IDE/components/Header/Nav';
import Overlay from '../../App/components/Overlay';
Expand All @@ -13,7 +12,7 @@ import AssetSize from '../../IDE/components/AssetSize';
import CollectionList from '../../IDE/components/CollectionList';
import SketchList from '../../IDE/components/SketchList';
import RootPage from '../../../components/RootPage';
import * as ProjectActions from '../../IDE/actions/project';
import { newProject } from '../../IDE/actions/project';
import {
CollectionSearchbar,
SketchSearchbar
Expand All @@ -24,36 +23,24 @@ import DashboardTabSwitcherPublic, {
TabKey
} from '../components/DashboardTabSwitcher';

class DashboardView extends React.Component {
static defaultProps = {
user: null
};
const DashboardView = () => {
const { t } = useTranslation();

const params = useParams();
const location = useLocation();

constructor(props) {
super(props);
this.closeAccountPage = this.closeAccountPage.bind(this);
this.createNewSketch = this.createNewSketch.bind(this);
this.gotoHomePage = this.gotoHomePage.bind(this);
this.toggleCollectionCreate = this.toggleCollectionCreate.bind(this);
this.state = {
collectionCreateVisible: false
};
}
const dispatch = useDispatch();

closeAccountPage() {
browserHistory.push(this.props.previousPath);
}
const user = useSelector((state) => state.user);

createNewSketch() {
this.props.newProject();
}
const [collectionCreateVisible, setCollectionCreateVisible] = useState(false);

gotoHomePage() {
browserHistory.push('/');
}
const createNewSketch = () => {
dispatch(newProject());
};

selectedTabKey() {
const path = this.props.location.pathname;
const selectedTabKey = useCallback(() => {
const path = location.pathname;

if (/assets/.test(path)) {
return TabKey.assets;
Expand All @@ -62,57 +49,53 @@ class DashboardView extends React.Component {
}

return TabKey.sketches;
}
}, [location.pathname]);

ownerName() {
if (this.props.params.username) {
return this.props.params.username;
const ownerName = () => {
if (params.username) {
return params.username;
}

return this.props.user.username;
}
return user.username;
};

isOwner() {
return this.props.user.username === this.props.params.username;
}
const isOwner = () => params.username === user.username;

toggleCollectionCreate() {
this.setState((prevState) => ({
collectionCreateVisible: !prevState.collectionCreateVisible
}));
}
const toggleCollectionCreate = () => {
setCollectionCreateVisible((prevState) => !prevState);
};

renderActionButton(tabKey, username, t) {
const renderActionButton = (tabKey) => {
switch (tabKey) {
case TabKey.assets:
return this.isOwner() && <AssetSize />;
return isOwner() && <AssetSize />;
case TabKey.collections:
return (
this.isOwner() && (
<React.Fragment>
<Button onClick={this.toggleCollectionCreate}>
isOwner() && (
<>
<Button onClick={toggleCollectionCreate}>
{t('DashboardView.CreateCollection')}
</Button>
<CollectionSearchbar />
</React.Fragment>
</>
)
);
case TabKey.sketches:
default:
return (
<React.Fragment>
{this.isOwner() && (
<Button onClick={this.createNewSketch}>
<>
{isOwner() && (
<Button onClick={createNewSketch}>
{t('DashboardView.NewSketch')}
</Button>
)}
<SketchSearchbar />
</React.Fragment>
</>
);
}
}
};

renderContent(tabKey, username, mobile) {
const renderContent = (tabKey, username, mobile) => {
switch (tabKey) {
case TabKey.assets:
return <AssetList key={username} mobile={mobile} username={username} />;
Expand All @@ -126,80 +109,46 @@ class DashboardView extends React.Component {
<SketchList key={username} mobile={mobile} username={username} />
);
}
}

render() {
const currentTab = this.selectedTabKey();
const isOwner = this.isOwner();
const { username } = this.props.params;
const actions = this.renderActionButton(currentTab, username, this.props.t);

return (
<RootPage fixedHeight="100%">
<Nav layout="dashboard" />

<main className="dashboard-header">
<div className="dashboard-header__header">
<h2 className="dashboard-header__header__title">
{this.ownerName()}
</h2>
<div className="dashboard-header__nav">
<DashboardTabSwitcherPublic
currentTab={currentTab}
isOwner={isOwner}
username={username}
/>
{actions && (
<div className="dashboard-header__actions">{actions}</div>
)}
</div>
</div>

<div className="dashboard-content">
<MediaQuery maxWidth={770}>
{(mobile) => this.renderContent(currentTab, username, mobile)}
</MediaQuery>
</div>
</main>
{this.state.collectionCreateVisible && (
<Overlay
title={this.props.t('DashboardView.CreateCollectionOverlay')}
closeOverlay={this.toggleCollectionCreate}
>
<CollectionCreate />
</Overlay>
)}
</RootPage>
);
}
}

function mapStateToProps(state) {
return {
previousPath: state.ide.previousPath,
user: state.user
};
}

const mapDispatchToProps = {
...ProjectActions
};

DashboardView.propTypes = {
newProject: PropTypes.func.isRequired,
location: PropTypes.shape({
pathname: PropTypes.string.isRequired
}).isRequired,
params: PropTypes.shape({
username: PropTypes.string.isRequired
}).isRequired,
previousPath: PropTypes.string.isRequired,
user: PropTypes.shape({
username: PropTypes.string
}),
t: PropTypes.func.isRequired
const currentTab = selectedTabKey();
const actions = renderActionButton(currentTab);

return (
<RootPage fixedHeight="100%">
<Nav layout="dashboard" />

<main className="dashboard-header">
<div className="dashboard-header__header">
<h2 className="dashboard-header__header__title">{ownerName()}</h2>
<div className="dashboard-header__nav">
<DashboardTabSwitcherPublic
currentTab={currentTab}
isOwner={isOwner()}
username={params.username}
/>
{actions && (
<div className="dashboard-header__actions">{actions}</div>
)}
</div>
</div>

<div className="dashboard-content">
<MediaQuery maxWidth={770}>
{(mobile) => renderContent(currentTab, params.username, mobile)}
</MediaQuery>
</div>
</main>
{collectionCreateVisible && (
<Overlay
title={t('DashboardView.CreateCollectionOverlay')}
closeOverlay={toggleCollectionCreate}
>
<CollectionCreate />
</Overlay>
)}
</RootPage>
);
};

export default withTranslation()(
connect(mapStateToProps, mapDispatchToProps)(DashboardView)
);
export default DashboardView;