Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Group Configuration and Management configuration error after trying to going back after you save #3672

Merged
merged 5 commits into from
Nov 3, 2021
Merged

Fixed Group Configuration and Management configuration error after trying to going back after you save #3672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6e4b5e
Solving error
CPAlejandro Nov 2, 2021
a2524a2
Adding Changelog.md
CPAlejandro Nov 2, 2021
983f5fd
Fixing bug editting user
CPAlejandro Nov 2, 2021
a38c902
Merge branch '4.2-7.10' into fix/-3671-Fixing-saving-behaviour-in-man…
Nov 2, 2021
3daadd9
Merge branch '4.2-7.10' into fix/-3671-Fixing-saving-behaviour-in-man…
Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed interative register windows agent screen error [#3654](https:/wazuh/wazuh-kibana-app/pull/3654)
- Fixed breadcrumbs style compatibility for Kibana 7.14.2 [#3668](https:/wazuh/wazuh-kibana-app/pull/3668)
- Fixed Wazuh token is not removed after logout in Kibana 7.13 [#3670](https:/wazuh/wazuh-kibana-app/pull/3670)
- Fixed Group Configuration and Management configuration error after trying to going back after you save [#3672](https:/wazuh/wazuh-kibana-app/pull/3672)
- Fixing EuiPannels in Overview Sections and disabled text in WzMenu [#3674](https:/wazuh/wazuh-kibana-app/pull/3674)
- Fixing double flyout clicking in a policy [#3676](https:/wazuh/wazuh-kibana-app/pull/3676)

Expand Down
2 changes: 1 addition & 1 deletion public/components/security/users/components/edit-user.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export const EditUser = ({ currentUser, closeFlyout, rolesObject }) => {
useEffect(() => {
if (
initialPassword != password || initialPassword != confirmPassword ||
!_.isEqual(userRolesFormatted, selectedRoles) || allowRunAs
!_.isEqual(userRolesFormatted, selectedRoles) || allowRunAs !== currentUser.allow_run_as
) {
setHasChanges(true);
} else {
Expand Down
2 changes: 1 addition & 1 deletion ...s/management/components/management/configuration/edit-configuration/edit-configuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class WzEditConfiguration extends Component {
this.props.clusterNodeSelected
)
: await saveFileManager(this.state.editorValue);
this.setState({ saving: false, infoChangesAfterRestart: true });
this.setState({ saving: false, infoChangesAfterRestart: true, hasChanges: false });
this.addToast({
title: (
<Fragment>
Expand Down
2 changes: 1 addition & 1 deletion public/controllers/management/components/management/groups/groups-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class WzGroupsEditor extends Component {
this.showToast('warning', warning.savedMessage, error, 3000);
return;
}
this.setState({ isSaving: false });
this.setState({ isSaving: false, hasChanges: false });
const textSuccess = 'File successfully edited';
this.showToast('success', 'Success', textSuccess, 3000);
} catch (error) {
Expand Down