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.

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

Merge last changes into cloud/4.0-7.9 #2715

Merged
merged 49 commits into from
Jan 4, 2021
Merged

Merge last changes into cloud/4.0-7.9 #2715

merged 49 commits into from
Jan 4, 2021

Conversation

frankeros
Copy link
Contributor

@frankeros frankeros commented Dec 29, 2020

Hi team, this added these changes to the cloud branch

Added

  • Show the wui_ rules belong to wazuh-wui API user #2702
  • Modified agent registration adding groups and architecture #2666#2652

Fixed

  • Create index pattern even if there aren´t available indices #2620
  • Top bar overlayed over expanded visualizations #2667
  • Empty inventory data in Solaris agents #2680
  • Wrong parameters in the dev-tools autocomplete section #2675
  • Wrong permissions on edit CDB list #2665
  • fix(frontend): add the metafields when refreshing the index pattern #2681
  • Error toast is showing about Elasticsearch users for environments without security #2713
  • Error about Handler.error in Role Mapping fixed #2702
  • Fixed message in reserved users actions #2702

Closes #2712

pablomarga and others added 30 commits December 2, 2020 17:49
…ions

[FIX] Fullscreen visualizations overlayed
Create Index Pattern without available indices
* Fixed correct render view when inventory data is empty for Solaris agents.

* Resolved in one line.

* Moved all method to const function.

* Updated CHANGELOG.md
* Added new action and reducer to get status and context of server (clustar or manager).

* Added new method isClusterOrManager to get cluster status, set on redux and used to set dynamic actions.

* Fixed and replaced all permissions by contextConfigServer (cluster or manager)

* Rollback, wrong change.

* Request changes of validation null properties.

* Added initial state of clusterStatus

* Moved method isClusterOrManager to management-main.js to distribute to all components with clusterStatus prop.

* Fixed permissions to edit and export to csv.

* Fixed permissions for manager or cluster. Added on wz-user-permissions.ts logic for posible combinations with & in resources.

* Changed to const permissions declaration.

* Fixed user-permissions to support cominations of resources with &. Refactor, prettier and lint.

* Refactor Withe and Black mode. (juts simplify code)

* Fixed typo error

* Fixed errors detected on PR.

* Removed unnecessary request, to update list content, we have this value. This resolve error when we create new list and dont have permissions to view all lists.

* First commit scaffolding test wz-users-permissions

* Fixed mock of userPermissions and requiredPermissions

* Implemented a basic suite of test for wz-user-permissions.ts

* Removed import.

* Added header Wazuh Copyright.

* Added CHANGELOG.md
  - Replaced OS buttons by button group
  - Show a message with OS, OS version or OS architecture are missing.
    Hide the command to install the agent when some of these options are
    missing.
  - The start agent step is showing when OS options are all selected
…2681)

* fix(frontend): add metafields when refresh index pattern and default known fields

* fix(changelog): added PR to changelog about metafields when refreshing index pattern
@Desvelao Desvelao added the cloud label Dec 31, 2020
return notAllowInWazuhPermissions(resource);
}
})
: userPartialResources?.length
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The App's tsconfig.json doesn't transpile the optional channing. We should modify this line or adapt the tsconfig.json

? !isAllow(userPermissions[actionName][userResource])
: true;
} else {
!isAllow(userPermissions[actionName][userResource]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this line be returned?

Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Desvelao Desvelao marked this pull request as ready for review January 4, 2021 13:58
@Desvelao Desvelao merged commit cd56392 into cloud/4.0-7.9 Jan 4, 2021
@Desvelao Desvelao deleted the 4.0-7.9 branch January 4, 2021 14:08
@Desvelao Desvelao restored the 4.0-7.9 branch January 4, 2021 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants