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

Web: People: Added constants for RegExp.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2021-10-05 17:38:29 +03:00
parent 47993da131
commit a02926532c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/asc-web-common/store/SettingsStore.js
View File

@ -92,6 +92,8 @@ class SettingsStore {
};
debugInfo = false;
userFormValidation = ["^[\\p{L}\\p{M}'-]+$", "gu"];
constructor() {
makeAutoObservable(this);
}

15
products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
View File

@ -238,17 +238,21 @@ class UpdateUserForm extends React.Component {
}
onInputChange(event) {
const { userFormValidation } = this.props;
var stateCopy = Object.assign({}, this.state);
const value = event.target.value;
const title = event.target.name;
let value = event.target.value;
let title = event.target.name;
const regexp = /^[\p{L}\p{M}'\-]+$/gu;
const isValid = regexp.test(value);
const regExp = userFormValidation[0];
const flag = userFormValidation[1];
const dynamicRegExp = new RegExp(`${regExp}`, `${flag}`);
const isValid = dynamicRegExp.test(value);
if (!isValid) {
stateCopy.errors[title] = true;
} else {
if (this.state.errors[title]) stateCopy.errors[title] = false;
}
@ -1049,6 +1053,7 @@ export default withRouter(
isEditTargetUser: peopleStore.targetUserStore.isEditTargetUser,
personal: auth.settingsStore.personal,
setUserIsUpdate: auth.userStore.setUserIsUpdate,
userFormValidation: auth.settingsStore.userFormValidation,
}))(
observer(
withTranslation(["ProfileAction", "Common", "Translations"])(