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

[Fleet] UI changes on hosted policy detail view #96337

Merged
merged 13 commits into from
Apr 12, 2021

Conversation

jfsiii
Copy link
Contributor

@jfsiii jfsiii commented Apr 6, 2021

Summary

Fixes several items from https://github.com/elastic/observability-design/issues/32

  • Agent policy detail page
    • Integrations tab: 1a) Show a lock icon with hover tooltip next to host policy name
    • Integrations tab: 7a) hide the "Add integration" button
    • Integrations tab: 7b) hide the "delete integration" action which appears in the [...] actions menu
    • Settings tab: 5a) Do not show the “Delete policy” section for Hosted agent policies
    • Settings tab: 5b) Disable the "name" and "description" inputs
  • Agents detail page
    • 2b) remove the "actions" button in the page header (top right)

Screenshots

Agent policy detail page - Integrations tab
  • 1a) Show a lock icon with hover tooltip next to host policy name
  • 7a) hide the "Add integration" button
  • 7b) hide the "delete integration" action which appears in the [...] actions menu

Non-hosted policy

Screen Shot 2021-04-08 at 1 30 24 PM

Hosted policy

Screen Shot 2021-04-08 at 1 29 26 PM
Agent policy detail page - Settings tab
  • 5a) Do not show the “Delete policy” section for Hosted agent policies
  • 5b) Disable the "name" and "description" inputs

non-hosted policy: items available

Screen Shot 2021-04-07 at 1 24 39 PM

Hosted policy: items hidden / disabled

Screen Shot 2021-04-07 at 1 24 23 PM
Agents detail page: 2b) remove the "actions" button in the page header (top right)

shown on non-hosted policy

Screen Shot 2021-04-08 at 9 55 06 AM

hidden on hosted policy

Screen Shot 2021-04-08 at 9 55 31 AM

Checklist

@jfsiii jfsiii self-assigned this Apr 6, 2021
@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 8, 2021

@elasticmachine merge upstream

@jfsiii jfsiii added release_note:skip Skip the PR/issue when compiling release notes v7.13.0 v8.0.0 Team:Fleet Team label for Observability Data Collection Fleet team labels Apr 8, 2021
@jfsiii jfsiii marked this pull request as ready for review April 8, 2021 17:41
@jfsiii jfsiii requested a review from a team as a code owner April 8, 2021 17:41
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jfsiii jfsiii requested a review from hbharding April 8, 2021 17:42
@jfsiii jfsiii changed the title Hosted policy detail changes [Fleet] UI changes on hosted policy detail view Apr 8, 2021
@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 8, 2021

@elasticmachine merge upstream


const agentPolicy = agentPolicies.find((p) => p.id === agent.policy_id);
const isManaged = agent.policy_id && agentPolicy?.is_managed === true;
const agentPolicy = agentPoliciesIndexedById[agent.policy_id];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nchaulet This is the follow up mentioned in #96160 (comment)

@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 9, 2021

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

expected head sha didn’t match current head ref.

@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 11, 2021

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
fleet 710.0KB 711.2KB +1.2KB

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @jfsiii

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

Looks good to me 👍

@jfsiii jfsiii added the auto-backport Deprecated - use backport:version if exact versions are needed label Apr 12, 2021
@jfsiii jfsiii merged commit c401211 into elastic:master Apr 12, 2021
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Apr 12, 2021
## Summary

Fixes several items from elastic/observability-design#32

- Agent policy detail page
  - [x] Integrations tab: 1a) Show a lock icon with hover tooltip next to host policy name
  - [x] Integrations tab: 7a) hide the "Add integration" button
  - [x] Integrations tab: 7b) hide the "delete integration" action which appears in the [...] actions menu
  - [x] Settings tab: 5a) Do not show the “Delete policy” section for Hosted agent policies
  - [x] Settings tab: 5b) Disable the "name" and "description" inputs
 - Agents detail page
   - [x] 2b) remove the "actions" button in the page header (top right)

## Screenshots

<details><summary>Agent policy detail page - Integrations tab</summary>
<ul>
<li>1a) Show a lock icon with hover tooltip next to host policy name</li>
<li>7a) hide the "Add integration" button</li>
<li>7b) hide the "delete integration" action which appears in the [...] actions menu</li>
</ul>

<h3>Non-hosted policy</h3>
<img width="1186" alt="Screen Shot 2021-04-08 at 1 30 24 PM" src="https://user-images.githubusercontent.com/57655/114071393-0eade000-986f-11eb-847f-0c64c7d2aa5e.png">

<h3>Hosted policy</h3>
<img width="1184" alt="Screen Shot 2021-04-08 at 1 29 26 PM" src="https://user-images.githubusercontent.com/57655/114071389-0eade000-986f-11eb-9501-332509b0a85d.png">

</details>

<details><summary>Agent policy detail page - Settings tab</summary>

<ul>
<li>5a) Do not show the “Delete policy” section for Hosted agent policies</li>
<li>5b) Disable the "name" and "description" inputs</li>
</ul>

<h3>non-hosted policy: items available</h3>
<img width="1209" alt="Screen Shot 2021-04-07 at 1 24 39 PM" src="https://user-images.githubusercontent.com/57655/114069262-cdb4cc00-986c-11eb-84c8-926c98a75d47.png">

<h3>Hosted policy: items hidden / disabled</h3>
<img width="1228" alt="Screen Shot 2021-04-07 at 1 24 23 PM" src="https://user-images.githubusercontent.com/57655/114069259-cdb4cc00-986c-11eb-82fc-39509c6ef9fe.png">

</details>

<details><summary>Agents detail page: 2b) remove the "actions" button in the page header (top right)</summary>

<h4>shown on non-hosted policy</h4>
<img width="1408" alt="Screen Shot 2021-04-08 at 9 55 06 AM" src="https://user-images.githubusercontent.com/57655/114068747-38193c80-986c-11eb-9fb6-b8f9eb77a1d6.png">

<h4>hidden on hosted policy</h4>
<img width="1345" alt="Screen Shot 2021-04-08 at 9 55 31 AM" src="https://user-images.githubusercontent.com/57655/114068748-38b1d300-986c-11eb-9eee-ee15f8acd718.png">

</details>

### Checklist
- [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)


Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
7.x

This backport PR will be merged automatically after passing CI.

phillipb added a commit to phillipb/kibana that referenced this pull request Apr 12, 2021
…to-metrics-tab

* 'master' of github.com:elastic/kibana: (44 commits)
  [Exploratory View]Additional metrics for kpi over time (elastic#96532)
  [Fleet] UI changes on hosted policy detail view (elastic#96337)
  Stacked line charts incorrectly shows one term as 100% (elastic#96203)
  [Fleet] Create enrollment API keys as current user (elastic#96464)
  [Lens] Make table and metric show on top Chart switcher (elastic#96601)
  skip flaky suite (elastic#96691)
  [Lens] Hide "Show more errors" once expanded (elastic#96605)
  [Discover] Unskip histogram hiding test (elastic#95759)
  skip flyout test, add linked issue elastic#96708
  skip copy_to_space_flyout_internal.test.tsx elastic#96708
  fix config validation (elastic#96502)
  Document telemetry fields for stack security features (elastic#96638)
  [Partial Results] Move inspector adapter integration into search source (elastic#96241)
  [RAC] Rule registry plugin (elastic#95903)
  [APM] Run precommit tasks sequentially (elastic#96551)
  [Maps] fix Kibana does not recognize a valid geo_shape index when attempting to create a Tracking Containment alert (elastic#96633)
  [Security Solution] [Cases] Small UI bugfixes (elastic#96511)
  [Actions UI] Changed PagerDuty action form UI to fill payload fields according to the API docs for Resolve and Acknowledge events. (elastic#96363)
  App Search: Result Component Updates (elastic#96184)
  [Alerting] Preconfigured alert history index connector (elastic#94909)
  ...
kibanamachine added a commit that referenced this pull request Apr 12, 2021
## Summary

Fixes several items from elastic/observability-design#32

- Agent policy detail page
  - [x] Integrations tab: 1a) Show a lock icon with hover tooltip next to host policy name
  - [x] Integrations tab: 7a) hide the "Add integration" button
  - [x] Integrations tab: 7b) hide the "delete integration" action which appears in the [...] actions menu
  - [x] Settings tab: 5a) Do not show the “Delete policy” section for Hosted agent policies
  - [x] Settings tab: 5b) Disable the "name" and "description" inputs
 - Agents detail page
   - [x] 2b) remove the "actions" button in the page header (top right)

## Screenshots

<details><summary>Agent policy detail page - Integrations tab</summary>
<ul>
<li>1a) Show a lock icon with hover tooltip next to host policy name</li>
<li>7a) hide the "Add integration" button</li>
<li>7b) hide the "delete integration" action which appears in the [...] actions menu</li>
</ul>

<h3>Non-hosted policy</h3>
<img width="1186" alt="Screen Shot 2021-04-08 at 1 30 24 PM" src="https://user-images.githubusercontent.com/57655/114071393-0eade000-986f-11eb-847f-0c64c7d2aa5e.png">

<h3>Hosted policy</h3>
<img width="1184" alt="Screen Shot 2021-04-08 at 1 29 26 PM" src="https://user-images.githubusercontent.com/57655/114071389-0eade000-986f-11eb-9501-332509b0a85d.png">

</details>

<details><summary>Agent policy detail page - Settings tab</summary>

<ul>
<li>5a) Do not show the “Delete policy” section for Hosted agent policies</li>
<li>5b) Disable the "name" and "description" inputs</li>
</ul>

<h3>non-hosted policy: items available</h3>
<img width="1209" alt="Screen Shot 2021-04-07 at 1 24 39 PM" src="https://user-images.githubusercontent.com/57655/114069262-cdb4cc00-986c-11eb-84c8-926c98a75d47.png">

<h3>Hosted policy: items hidden / disabled</h3>
<img width="1228" alt="Screen Shot 2021-04-07 at 1 24 23 PM" src="https://user-images.githubusercontent.com/57655/114069259-cdb4cc00-986c-11eb-82fc-39509c6ef9fe.png">

</details>

<details><summary>Agents detail page: 2b) remove the "actions" button in the page header (top right)</summary>

<h4>shown on non-hosted policy</h4>
<img width="1408" alt="Screen Shot 2021-04-08 at 9 55 06 AM" src="https://user-images.githubusercontent.com/57655/114068747-38193c80-986c-11eb-9fb6-b8f9eb77a1d6.png">

<h4>hidden on hosted policy</h4>
<img width="1345" alt="Screen Shot 2021-04-08 at 9 55 31 AM" src="https://user-images.githubusercontent.com/57655/114068748-38b1d300-986c-11eb-9eee-ee15f8acd718.png">

</details>

### Checklist
- [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)


Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: John Schulz <john.schulz@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.13.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants