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

Bug 68984 - Ldap: added scrolling to the field error, added error handling for groups, corrected the title

Browse Source
This commit is contained in:
Dmitry Sychugov 2024-07-08 20:55:43 +05:00
parent 226863bfd0
commit dfb6e72c67
3 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/PortalSettings/categories/integration/LDAP/index.js
View File

@ -60,7 +60,7 @@ const LDAP = ({
useEffect(() => {
isLdapAvailable && load(t);
onCheckView();
setDocumentTitle(t("Settings:ManagementCategoryIntegration"));
setDocumentTitle(t("Ldap:LdapSettings"));
window.addEventListener("resize", onCheckView);
return () => window.removeEventListener("resize", onCheckView);

16
packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/GroupMembership.js
View File

@ -58,6 +58,8 @@ const GroupMembership = (props) => {
setGroupAttribute,
setGroupNameAttribute,
errors,
isLdapEnabled,
isUIDisabled,
} = props;
@ -109,6 +111,7 @@ const GroupMembership = (props) => {
errorMessage={t("Common:EmptyFieldError")}
labelText={t("LdapGroupDN")}
isRequired
hasError={errors.groupDN}
tooltipContent={t("LdapGroupDNTooltip")}
>
<TextInput
@ -116,6 +119,7 @@ const GroupMembership = (props) => {
onChange={onChange}
name={GROUP_DN}
value={groupDN}
hasError={errors.groupDN}
isDisabled={!isLdapEnabled || isUIDisabled || !groupMembership}
scale
tabIndex={13}
@ -126,6 +130,7 @@ const GroupMembership = (props) => {
labelVisible={true}
style={FIELD_STYLE}
errorMessage={t("Common:EmptyFieldError")}
hasError={errors.userAttribute}
labelText={t("LdapUserAttribute")}
isRequired
tooltipContent={t("LdapGroupUserAttributeTooltip")}
@ -135,6 +140,7 @@ const GroupMembership = (props) => {
onChange={onChange}
name={USER_ATTRIBUTE}
value={userAttribute}
hasError={errors.userAttribute}
isDisabled={!isLdapEnabled || isUIDisabled || !groupMembership}
scale
tabIndex={14}
@ -146,6 +152,7 @@ const GroupMembership = (props) => {
labelVisible={true}
errorMessage={t("Common:EmptyFieldError")}
labelText={t("LdapGroupFilter")}
hasError={errors.groupFilter}
tooltipContent={t("LdapGroupFilterTooltip")}
className="ldap_group-filter"
inlineHelpButton
@ -154,6 +161,7 @@ const GroupMembership = (props) => {
<Textarea
value={groupFilter}
onChange={onChange}
hasError={errors.groupFilter}
name={GROUP_FILTER}
isDisabled={!isLdapEnabled || isUIDisabled || !groupMembership}
heightTextArea={100}
@ -165,6 +173,7 @@ const GroupMembership = (props) => {
isVertical
labelVisible={true}
errorMessage={t("Common:EmptyFieldError")}
hasError={errors.groupNameAttribute}
labelText={t("LdapGroupNameAttribute")}
isRequired
tooltipContent={t("LdapGroupNameAttributeTooltip")}
@ -173,6 +182,7 @@ const GroupMembership = (props) => {
className="field-input"
onChange={onChange}
name={GROUP_NAME_ATTRIBUTE}
hasError={errors.groupNameAttribute}
isDisabled={!isLdapEnabled || isUIDisabled || !groupMembership}
value={groupNameAttribute}
scale
@ -183,6 +193,7 @@ const GroupMembership = (props) => {
isVertical
labelVisible={true}
errorMessage={t("Common:EmptyFieldError")}
hasError={errors.groupAttribute}
labelText={t("LdapGroupAttribute")}
isRequired
tooltipContent={t("LdapGroupAttributeTooltip")}
@ -193,6 +204,7 @@ const GroupMembership = (props) => {
name={GROUP_ATTRIBUTE}
isDisabled={!isLdapEnabled || isUIDisabled || !groupMembership}
value={groupAttribute}
hasError={errors.groupAttribute}
scale
tabIndex={17}
/>
@ -217,6 +229,8 @@ export default inject(({ ldapStore }) => {
setGroupAttribute,
setGroupNameAttribute,
errors,
isLdapEnabled,
isUIDisabled,
} = ldapStore;
@ -235,6 +249,8 @@ export default inject(({ ldapStore }) => {
setGroupAttribute,
setGroupNameAttribute,
errors,
isLdapEnabled,
isUIDisabled,
};

45
packages/client/src/store/LdapFormStore.js
View File

@ -369,13 +369,6 @@ class LdapFormStore {
this.errors = {};
if (!toDefault && !turnOff) {
if (this.authentication) {
this.errors.login = this.login.trim() === "";
this.errors.password = this.password.trim() === "";
isErrorExist = this.errors.login || this.errors.password;
}
for (var key in this.requiredSettings) {
if (
typeof this.requiredSettings[key] == "string" &&
@ -386,7 +379,33 @@ class LdapFormStore {
}
}
if (isErrorExist) return;
if (this.groupMembership) {
const groupFields = [
["groupDN", this.groupDN],
["userAttribute", this.userAttribute],
["groupFilter", this.groupFilter],
["groupAttribute", this.groupAttribute],
["groupNameAttribute", this.groupNameAttribute],
];
for (var key of groupFields) {
if (key[1].trim() === "") {
this.errors[key[0]] = true;
}
}
}
if (this.authentication) {
this.errors.login = this.login.trim() === "";
this.errors.password = this.password.trim() === "";
isErrorExist = this.errors.login || this.errors.password;
}
if (isErrorExist) {
this.scrollToField();
return;
}
}
const settings = this.getSettings();
@ -402,6 +421,16 @@ class LdapFormStore {
}
};
scrollToField = () => {
for (let key in this.errors) {
const element = document.getElementsByName(key)[0];
element.focus();
element.blur();
return;
}
};
checkStatus = (t, toDefault = false) => {
if (this.alreadyChecking) {
return;