Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fixing hooks for edit tag entry dialog

Ilian Sapundshiev3bc287082457
diff --git a/app/components/dialogs/EditEntryTagDialog.js b/app/components/dialogs/EditEntryTagDialog.js
index 46d5ddbeb..1de13e500 100644
--- a/app/components/dialogs/EditEntryTagDialog.js
+++ b/app/components/dialogs/EditEntryTagDialog.js
@@ -17,7 +17,7 @@
* @flow
*/
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
import Button from '@material-ui/core/Button';
import TextField from '@material-ui/core/TextField';
import DialogActions from '@material-ui/core/DialogActions';
@@ -52,40 +52,27 @@ type Props = {
const EditEntryTagDialog = (props: Props) => {
const [disableConfirmButton, setDisableConfirmButton] = useState(true);
const [errorTag, setErrorTag] = useState(false);
- const [title, setTitle] = useState('');
+ const [title, setTitle] = useState(props.selectedTag && props.selectedTag.title);
- function componentWillReceiveProps(nextProps: any) {
- if (nextProps.open === true) {
- setDisableConfirmButton(!nextProps.selectedTag.title);
- setTitle(nextProps.selectedTag.title);
- // this.setState({
- // disableConfirmButton: !nextProps.selectedTag.title,
- // title: nextProps.selectedTag.title
- }
- }
-
- function handleInputChange(event: Object) {
- const target = event.target;
- const value = target.type === 'checkbox' ? target.checked : target.value;
- setTitle(value);
+ useEffect(() => {
handleValidation();
- }
+ });
function handleValidation() {
const tagCheck = RegExp(/^[^\#\/\\ \[\]]{1,}$/);
if (title && tagCheck.test(title)) {
setErrorTag(false);
- setDisableConfirmButton(false); // { errorTag: false, disableConfirmButton: false });
+ setDisableConfirmButton(false);
} else {
setErrorTag(true);
- setDisableConfirmButton(true); // this.setState({ errorTag: true, disableConfirmButton: true });
+ setDisableConfirmButton(true);
}
}
function onConfirm() {
if (!disableConfirmButton) {
- props.editTagForEntry(props.currentEntryPath, props.selectedTag, state.title);
- setErrorTag(false); // this.setState({ errorTag: false, disableConfirmButton: true });
+ props.editTagForEntry(props.currentEntryPath, props.selectedTag, title);
+ setErrorTag(false);
setDisableConfirmButton(true);
props.onClose();
}
@@ -110,7 +97,10 @@ const EditEntryTagDialog = (props: Props) => {
margin="dense"
name="title"
label={i18n.t('core:editTag')}
- onChange={handleInputChange}
+ onChange={event => {
+ const target = event.target;
+ setTitle(target.value);
+ }}
value={title}
data-tid="editTagEntryDialog_input"
/>
diff --git a/app/components/menus/EntryTagMenu.js b/app/components/menus/EntryTagMenu.js
index f0704ee55..f6e0b2322 100644
--- a/app/components/menus/EntryTagMenu.js
+++ b/app/components/menus/EntryTagMenu.js
@@ -18,8 +18,10 @@
*/
import React from 'react';
+import uuidv1 from 'uuid';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
+import Divider from '@material-ui/core/Divider';
import EditIcon from '@material-ui/icons/Edit';
import DeleteIcon from '@material-ui/icons/DeleteForever';
import ShowEntriesWithTagIcon from '@material-ui/icons/Launch';
@@ -123,18 +125,19 @@ class EntryTagMenu extends React.Component<Props, State> {
</MenuItem>
{!this.props.isReadOnlyMode && (
<div>
- <MenuItem data-tid="editTagDialogMenu" onClick={this.showEditTagDialog}>
- <ListItemIcon>
- <EditIcon />
- </ListItemIcon>
- <ListItemText inset primary={i18n.t('core:tagProperties')} />
- </MenuItem>
<MenuItem data-tid="deleteTagMenu" onClick={this.showDeleteTagDialog}>
<ListItemIcon>
<DeleteIcon />
</ListItemIcon>
<ListItemText inset primary={i18n.t('core:removeTag')} />
</MenuItem>
+ <Divider />
+ <MenuItem data-tid="editTagDialogMenu" onClick={this.showEditTagDialog}>
+ <ListItemIcon>
+ <EditIcon />
+ </ListItemIcon>
+ <ListItemText inset primary={i18n.t('core:tagProperties')} />
+ </MenuItem>
</div>
)}
</Menu>
@@ -153,6 +156,7 @@ class EntryTagMenu extends React.Component<Props, State> {
confirmDialogContent={'confirmDialogContent'}
/>
<EditEntryTagDialog
+ key={uuidv1()}
open={this.state.isEditTagDialogOpened}
onClose={this.handleCloseDialogs}
editTagForEntry={this.props.editTagForEntry}