haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-26 07:22:34 +00:00
Code Issues Releases Wiki Activity

fix validate name when create folder or file (#6704)

Browse Source
This commit is contained in:
Michael An
2024-09-04 15:11:49 +08:00
committed by GitHub
parent 2d6d557abe
commit 6f9d82d8bc
5 changed files with 75 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
frontend/src/components/dialog/rename-dirent.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { gettext } from '../../utils/constants';
import { Utils } from '../../utils/utils';
import { Utils, validateName } from '../../utils/utils';
import { Button, Modal, ModalHeader, Input, ModalBody, ModalFooter, Alert } from 'reactstrap';
const propTypes = {
@@ -47,20 +47,21 @@ class Rename extends React.Component {
};
handleSubmit = () => {
let { isValid, errMessage } = this.validateInput();
let newName = this.state.newName.trim();
let { isValid, errMessage } = validateName(newName);
if (!isValid) {
this.setState({ errMessage: errMessage });
} else {
let isDuplicated = this.checkDuplicatedName();
if (isDuplicated) {
let errMessage = gettext('The name "{name}" is already taken. Please choose a different name.');
errMessage = errMessage.replace('{name}', Utils.HTMLescape(this.state.newName));
this.setState({ errMessage: errMessage });
} else {
this.props.onRename(this.state.newName);
this.props.toggleCancel();
}
this.setState({ errMessage });
return;
}
let isDuplicated = this.props.checkDuplicatedName(newName);
if (isDuplicated) {
let errMessage = gettext('The name "{name}" is already taken. Please choose a different name.');
errMessage = errMessage.replace('{name}', Utils.HTMLescape(newName));
this.setState({ errMessage });
return;
}
this.props.onRename(newName);
this.props.toggleCancel();
};
handleKeyDown = (e) => {
@@ -79,30 +80,6 @@ class Rename extends React.Component {
this.setState({ newName: name });
};
validateInput = () => {
let newName = this.state.newName.trim();
let isValid = true;
let errMessage = '';
if (!newName) {
isValid = false;
errMessage = gettext('Name is required.');
return { isValid, errMessage };
}
if (newName.indexOf('/') > -1) {
isValid = false;
errMessage = gettext('Name should not include ' + '\'/\'' + '.');
return { isValid, errMessage };
}
return { isValid, errMessage };
};
checkDuplicatedName = () => {
let isDuplicated = this.props.checkDuplicatedName(this.state.newName);
return isDuplicated;
};
onAfterModelOpened = () => {
const inputElement = this.newInput.current;
if (inputElement) {