IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web.Files: MainButton: remove useless selector, add new selector

Browse Source
This commit is contained in:
Daniil Senkiv 2020-03-20 10:47:00 +03:00
parent bca5dbf28d
commit 88a6c73a8b
2 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
products/ASC.Files/Client/src/components/Article/MainButton/index.js
View File

@ -9,11 +9,11 @@ import {
} from "asc-web-components";
import { withTranslation, I18nextProvider } from 'react-i18next';
import { setAction } from '../../../store/files/actions';
import { isMyDocuments } from '../../../store/files/selectors';
import i18n from '../i18n';
import { store, utils, constants } from 'asc-web-common';
import { utils, constants } from 'asc-web-common';
const { changeLanguage } = utils;
const { isAdmin } = store.auth.selectors;
const {FileAction} = constants;
const { FileAction } = constants;
class PureArticleMainButtonContent extends React.Component {
@ -28,47 +28,42 @@ class PureArticleMainButtonContent extends React.Component {
render() {
console.log("Files ArticleMainButtonContent render");
const { isAdmin, t } = this.props;
const { t, isMyDocuments } = this.props;
return (
isAdmin ?
<>
<MainButton
isDisabled={false}
isDropdown={true}
text={t('Actions')}
>
<DropDownItem
icon="ActionsDocumentsIcon"
label={t('NewDocument')}
onClick={this.onCreate.bind(this, 'docx')}
/>
<DropDownItem
icon="SpreadsheetIcon"
label={t('NewSpreadsheet')}
onClick={this.onCreate.bind(this, 'xlsx')}
/>
<DropDownItem
icon="ActionsPresentationIcon"
label={t('NewPresentation')}
onClick={this.onCreate.bind(this, 'pptx')}
/>
<DropDownItem
icon="CatalogFolderIcon"
label={t('NewFolder')}
onClick={this.onCreate}
/>
<DropDownItem isSeparator />
<DropDownItem
icon="ActionsUploadIcon"
label={t('Upload')}
onClick={() => toastr.info("Upload click")}
disabled
/>
</MainButton>
</>
:
<></>
<MainButton
isDisabled={!isMyDocuments}
isDropdown={true}
text={t('Actions')}
>
<DropDownItem
icon="ActionsDocumentsIcon"
label={t('NewDocument')}
onClick={this.onCreate.bind(this, 'docx')}
/>
<DropDownItem
icon="SpreadsheetIcon"
label={t('NewSpreadsheet')}
onClick={this.onCreate.bind(this, 'xlsx')}
/>
<DropDownItem
icon="ActionsPresentationIcon"
label={t('NewPresentation')}
onClick={this.onCreate.bind(this, 'pptx')}
/>
<DropDownItem
icon="CatalogFolderIcon"
label={t('NewFolder')}
onClick={this.onCreate}
/>
<DropDownItem isSeparator />
<DropDownItem
icon="ActionsUploadIcon"
label={t('Upload')}
onClick={() => toastr.info("Upload click")}
disabled
/>
</MainButton>
);
};
};
@ -87,8 +82,8 @@ ArticleMainButtonContent.propTypes = {
const mapStateToProps = (state) => {
return {
isAdmin: isAdmin(state.auth.user),
settings: state.auth.settings
settings: state.auth.settings,
isMyDocuments: isMyDocuments(state.files.rootFolders.my.id, state.files.selectedFolder.id)
}
}

2
products/ASC.Files/Client/src/store/files/selectors.js
View File

@ -105,3 +105,5 @@ export const getTreeFolders = (pathParts, filterData) => {
}
return treeFolders;
};
export const isMyDocuments = (myDocFolderId, currentFolderId) => myDocFolderId === currentFolderId;