TagSpaces is an offline, open source, document manager with tagging support
adding hooks to tag library menu (#954)
mladensap4e8835fa49c0
diff --git a/app/components/dialogs/ImportExportTagGroupsDialog.js b/app/components/dialogs/ImportExportTagGroupsDialog.jsindex cf614fbc4..c7df639e7 100644--- a/app/components/dialogs/ImportExportTagGroupsDialog.js+++ b/app/components/dialogs/ImportExportTagGroupsDialog.js@@ -110,12 +110,10 @@ class ImportExportTagGroupsDialog extends React.Component<Props, State> {handleValidation() {let selected = false;this.state.tagGroupList.map(n => {- console.log(n.selected);if (n.selected === true) {selected = true;}});- console.log(selected);if (selected) {this.setState({ disableConfirmButton: false });} else {diff --git a/app/components/menus/TagLibraryMenu.js b/app/components/menus/TagLibraryMenu.jsindex 580673673..20ed1722e 100644--- a/app/components/menus/TagLibraryMenu.js+++ b/app/components/menus/TagLibraryMenu.js@@ -17,7 +17,7 @@* @flow*/-import React from 'react';+import React, { useState } from 'react';import ListItemText from '@material-ui/core/ListItemText';import ListItemIcon from '@material-ui/core/ListItemIcon';import Menu from '@material-ui/core/Menu';@@ -30,6 +30,7 @@ import i18n from '../../services/i18n';import AppConfig from '../../config';type Props = {+ classes: Object,anchorEl: Object,tagGroups: Array<Object>,open: boolean,@@ -39,67 +40,47 @@ type Props = {showCreateTagGroupDialog: () => void};-type State = {- open?: boolean,- tagGroups?: Array<Object>,- isCreateDirectoryDialogOpened?: boolean,- isSelectDirectoryDialogOpened?: boolean,- isImportExportTagGroupDialogOpened?: boolean,- selectedDirectoryPath?: string,- dialogModeImport?: boolean-};--class TagLibraryMenu extends React.Component<Props, State> {- fileInput: Object | null;+const TagLibraryMenu = (props: Props) => {+ let fileInput;+ const [tagGroups, setTagGroups] = useState(null);+ const [selectedDirectoryPath, setSelectedDirectoryPath] = useState('');+ const [isSelectDirectoryDialogOpened, setIsSelectDirectoryDialogOpened] = useState(false);+ const [isImportExportTagGroupDialogOpened, setIsImportExportTagGroupDialogOpened] = useState(false);+ const [dialogModeImport, setDialogModeImport] = useState(false);- state = {- open: false,- tagGroups: null,- selectedDirectoryPath: '',- isSelectDirectoryDialogOpened: false,- isImportExportTagGroupDialogOpened: false,- dialogModeImport: false- };-- handleCloseDialogs = () => {- this.setState({- isImportExportTagGroupDialogOpened: false- });- };+ function handleCloseDialogs() {+ setIsImportExportTagGroupDialogOpened(false);+ }- handleExportTagGroup = () => {- this.props.onClose();- this.setState({- dialogModeImport: false,- tagGroups: this.props.tagGroups,- isImportExportTagGroupDialogOpened: true- });- };+ function handleExportTagGroup() {+ props.onClose();+ setDialogModeImport(false);+ setTagGroups(props.tagGroups);+ setIsImportExportTagGroupDialogOpened(true);+ }- showSelectDirectoryDialog = () => {- this.setState({- isSelectDirectoryDialogOpened: true,- selectedDirectoryPath: ''- });- };+ function showSelectDirectoryDialog() {+ setIsSelectDirectoryDialogOpened(true);+ setSelectedDirectoryPath('');+ }- closeSelectDirectoryExtDialog = () => {- this.setState({ isSelectDirectoryDialogOpened: false });- };+ function closeSelectDirectoryExtDialog() {+ setIsSelectDirectoryDialogOpened(false);+ }- handleImportTagGroup = () => {- this.props.onClose();- this.setState({ dialogModeImport: true });+ function handleImportTagGroup() {+ props.onClose();+ setDialogModeImport(true);if (AppConfig.isCordovaAndroid && AppConfig.isCordovaiOS) {// TODO Select directory or file from dialog- this.showSelectDirectoryDialog();+ showSelectDirectoryDialog();} else {- this.fileInput.click();+ fileInput.click();}- };+ }- handleFileInputChange = (selection: Object) => {+ function handleFileInputChange(selection: Object) {const target = selection.currentTarget;const file = target.files[0];const reader = new FileReader();@@ -108,92 +89,88 @@ class TagLibraryMenu extends React.Component<Props, State> {try {const jsonObj = JSON.parse(reader.result);if (jsonObj.tagGroups) {- this.setState({- isImportExportTagGroupDialogOpened: true,- tagGroups: jsonObj.tagGroups- });+ setIsImportExportTagGroupDialogOpened(true);+ setTagGroups(jsonObj.tagGroups);} else {// TODO connect showNotification- /* this.props.showNotification(+ /* props.showNotification(i18n.t('core:invalidImportFile', 'warning', true)); */}} catch (e) {console.error('Error : ', e);// TODO connect showNotification- /* this.props.showNotification(+ /* props.showNotification(i18n.t('core:invalidImportFile', 'warning', true)); */}};reader.readAsText(file);target.value = null;- };+ }- render() {- return (- <div style={{ overflowY: 'hidden !important' }}>- <ImportExportTagGroupsDialog- open={this.state.isImportExportTagGroupDialogOpened}- onClose={this.handleCloseDialogs}- tagGroups={this.state.tagGroups}- dialogModeImport={this.state.dialogModeImport}- exportTagGroups={this.props.exportTagGroups}- importTagGroups={this.props.importTagGroups}- />- <SelectDirectoryDialog- open={this.state.isSelectDirectoryDialogOpened}- onClose={this.closeSelectDirectoryExtDialog}- selectedDirectoryPath={this.state.selectedDirectoryPath}- />- <Menu- anchorEl={this.props.anchorEl}- open={this.props.open}- onClose={this.props.onClose}- >- <MenuItem- data-tid="createNewTagGroup"- onClick={() => {- this.props.onClose();- this.props.showCreateTagGroupDialog();- }}- >- <ListItemIcon>- <AddIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:createTagGroupTitle')} />- </MenuItem>- <MenuItem- data-tid="importTagGroup"- onClick={this.handleImportTagGroup}- >- <ListItemIcon>- <ImportExportIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:importTags')} />- </MenuItem>- <MenuItem- data-tid="exportTagGroup"- onClick={this.handleExportTagGroup}- >- <ListItemIcon>- <ImportExportIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:exportTagGroupsButton')} />- </MenuItem>- </Menu>- <input- style={{ display: 'none' }}- ref={input => {- this.fileInput = input;+ return (+ <div style={{ overflowY: 'hidden !important' }}>+ <ImportExportTagGroupsDialog+ open={isImportExportTagGroupDialogOpened}+ onClose={handleCloseDialogs}+ tagGroups={tagGroups}+ dialogModeImport={dialogModeImport}+ exportTagGroups={props.exportTagGroups}+ importTagGroups={props.importTagGroups}+ />+ <SelectDirectoryDialog+ open={isSelectDirectoryDialogOpened}+ onClose={closeSelectDirectoryExtDialog}+ selectedDirectoryPath={selectedDirectoryPath}+ />+ <Menu+ anchorEl={props.anchorEl}+ open={props.open}+ onClose={props.onClose}+ >+ <MenuItem+ data-tid="createNewTagGroup"+ onClick={() => {+ props.onClose();+ props.showCreateTagGroupDialog();}}- accept="*"- type="file"- onChange={this.handleFileInputChange}- />- </div>- );- }-}+ >+ <ListItemIcon>+ <AddIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:createTagGroupTitle')} />+ </MenuItem>+ <MenuItem+ data-tid="importTagGroup"+ onClick={handleImportTagGroup}+ >+ <ListItemIcon>+ <ImportExportIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:importTags')} />+ </MenuItem>+ <MenuItem+ data-tid="exportTagGroup"+ onClick={handleExportTagGroup}+ >+ <ListItemIcon>+ <ImportExportIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:exportTagGroupsButton')} />+ </MenuItem>+ </Menu>+ <input+ style={{ display: 'none' }}+ ref={input => {+ fileInput = input;+ }}+ accept="*"+ type="file"+ onChange={handleFileInputChange}+ />+ </div>+ );+};export default TagLibraryMenu;