Merge contents of `7766-frontend` and `main`, all conflicts resolved #14429

jacobshandling · 2023-10-10T20:26:25Z

No description provided.

…ve modals, modify routes/URLs) (#13908)

…ngs (#14268) ## Addresses #13474 <img width="842" alt="Screenshot 2023-10-03 at 11 38 12 AM" src="https://github.com/fleetdm/fleet/assets/61553566/b8f0d81f-ba41-458f-acb5-2224e2774ef8"> - small alignment issues with tooltip-wrapped text should be fixed by upcoming TooltipWrapper refactor PR ## Checklist for submitter - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

## Addresses pt.1 of #13470 4 states + InfoBanner: <img width="746" alt="Screenshot 2023-10-03 at 2 51 36 PM" src="https://github.com/fleetdm/fleet/assets/61553566/0cffd9a1-8a96-4723-a080-10d68d7c7c70"> <img width="746" alt="Screenshot 2023-10-03 at 2 51 55 PM" src="https://github.com/fleetdm/fleet/assets/61553566/12237208-f29a-4c90-86c8-8fb71d64fbf4"> <img width="746" alt="Screenshot 2023-10-03 at 2 52 20 PM" src="https://github.com/fleetdm/fleet/assets/61553566/6bdeb8c6-250f-4edb-a630-aa978a98e428"> <img width="746" alt="Screenshot 2023-10-03 at 2 52 26 PM" src="https://github.com/fleetdm/fleet/assets/61553566/bae0e656-56f4-4f6a-9972-5ff0fa2f24bf"> <img width="735" alt="Screenshot 2023-10-03 at 5 15 44 PM" src="https://github.com/fleetdm/fleet/assets/61553566/b26ce3ed-7949-4823-a6a4-fa04e152a480"> ## Checklist for submitter - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

…#14343) ## Addresses #13470 - [x] Save query - [x] Add checkbox - [x] default unchecked - [x] If global setting is disabled (that is, "Disable query reports" is _enabled_) - [x] this box is disabled - [x] copy below is changed - [x] If enabled locally but globally disabled, box is checked and disabled - [x] If user clicks "Edit anyway", the normal checkbox state is restored, allowing them to edit it anyway., e.g. to prepare for enabling globally before doing so - [x] banner under [certain conditions](https://www.figma.com/file/ss8dSfoueq3REJxoGaxkNw/%237766-See-latest-query-results?type=design&node-id=470%3A9996&mode=design&t=XDBlQetD7kqdEdh9-1) - [x] 2 x update help text - [x] Edit query - [x] checkbox - [x] back button - [x] 2 x help text updates - [x] save changes modals when [conditions](https://www.figma.com/file/ss8dSfoueq3REJxoGaxkNw/%237766-See-latest-query-results?type=design&node-id=470%3A8745&mode=design&t=XDBlQetD7kqdEdh9-1) are met: - [x] changed SQL - [x] other - [x] Mange queries - update[ tooltip](https://www.figma.com/file/ss8dSfoueq3REJxoGaxkNw/%237766-See-latest-query-results?type=design&node-id=470%3A10035&mode=design&t=ACwsj3wVdqzCXulq-1) - [x] Significant cleanup and improvement of styles and structure around the Edit Queries page <img width="854" alt="Screenshot 2023-10-05 at 3 44 05 PM" src="https://github.com/fleetdm/fleet/assets/61553566/9831570f-3c83-4e59-b040-649d52faa257"> <img width="854" alt="Screenshot 2023-10-05 at 3 44 15 PM" src="https://github.com/fleetdm/fleet/assets/61553566/dec76eba-46d1-4e43-87e9-e7fc44e84691"> <img width="854" alt="Screenshot 2023-10-05 at 3 45 09 PM" src="https://github.com/fleetdm/fleet/assets/61553566/a7879b21-49b0-476a-81ab-6b465967510f"> <img width="854" alt="Screenshot 2023-10-05 at 3 45 29 PM" src="https://github.com/fleetdm/fleet/assets/61553566/14a90d0a-2a52-4e59-8ee8-fb76fce55417"> <img width="1105" alt="Screenshot 2023-10-05 at 3 46 58 PM" src="https://github.com/fleetdm/fleet/assets/61553566/6c488fbe-4e5a-442b-8b62-2ddd15bda1fe"> <img width="1105" alt="Screenshot 2023-10-05 at 3 47 10 PM" src="https://github.com/fleetdm/fleet/assets/61553566/649534c5-d859-41f9-8c8a-6882b1dc2219"> <img width="1105" alt="Screenshot 2023-10-05 at 3 47 24 PM" src="https://github.com/fleetdm/fleet/assets/61553566/eaa0469c-a57a-474d-87bc-21cf2133dd3c"> ## Checklist for submitter - [x] Added/updated tests - [ ] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

## Issue Cerra #13472 ## Description - Surface query report on the `/queries/{id}` route - Include table buttons to show query and export query - Include results count - Clientside sorting and filtering for columns - Add mock data to frontend integration mocks and to API mocks for concurrent development - 331 + 351 + 2 = 684 lines of code is just mocking data and not actual changes - If modifying sorting/filter, modify the exported results sorting/filter as well - Last fetched column is sentence cased, sortable by chronological order and not alpha order of the readable string (e.g., "a year ago" should be sorted _after_ "over 1 month ago" if sorted most recent to oldest even though a comes before o in the alphabet) ## Screen recordings (Uses mock data) https://github.com/fleetdm/fleet/assets/71795832/22766f2b-3387-4a95-b505-b530dda582fa https://github.com/fleetdm/fleet/assets/71795832/5c2cd8cc-d00e-4ead-b111-e3b33cb7c955 # Checklist for submitter If some of the following don't apply, delete the relevant line. - TODO for QA: Added/updated E2E tests (consider testing some of the features mentioned in the description) - [x] Manual QA for all new/changed functionality

maintenance merge of `main` into feature branch

![Screenshot 2023-10-09 at 6 02 16 PM](https://github.com/fleetdm/fleet/assets/61553566/d1c817b6-901c-4486-b14b-859503888369) --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

…ry button for observers) (#14410)

codecov · 2023-10-10T20:30:15Z

Codecov Report

All modified lines are covered by tests ✅

❗ No coverage uploaded for pull request base (7766-backend@0435431). Click here to learn what that means.

Additional details and impacted files

@@               Coverage Diff               @@
##             7766-backend   #14429   +/-   ##
===============================================
  Coverage                ?   58.80%           
===============================================
  Files                   ?      917           
  Lines                   ?    75934           
  Branches                ?     2181           
===============================================
  Hits                    ?    44650           
  Misses                  ?    27701           
  Partials                ?     3583

Flag	Coverage Δ
backend	`59.46% <0.00%> (?)`
frontend	`52.15% <0.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

RachelElysia and others added 16 commits October 2, 2023 12:26

Frontend: Step 1 for query caching (organize FE directories, build sa…

ee365ea

…ve modals, modify routes/URLs) (#13908)

Fleet UI: Surface delete previous results modals (#14257)

5ed4435

Maintenance merge of main into feature branch (#14308)

ab50f0f

Fleet UI: Fix new query bugs introduced (#14309)

11fc7ed

maintenance merge of main into feature branch (#14393)

eb327fa

maintenance merge of `main` into feature branch

13472 clipped banner (#14396)

18b80c4

Frontend: 1000 total results has tooltip (#14397)

4be39ca

Polish & cleanup, round 1 (#14402)

71a0ffc

![Screenshot 2023-10-09 at 6 02 16 PM](https://github.com/fleetdm/fleet/assets/61553566/d1c817b6-901c-4486-b14b-859503888369) --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>

Fleet UI: Small fixes (e.g. hiding last_fetched filter, hide Edit que…

c541409

…ry button for observers) (#14410)

final maintenance merge of main (#14423)

a6578ed

Merge branch '7766-frontend' into 7766-backend-frontend

fb494ca

run make-dump-test-schema

bbebbc5

jacobshandling had a problem deploying to Docker Hub October 10, 2023 20:26 — with GitHub Actions Error

update timestamp

d3b65bd

jacobshandling temporarily deployed to Docker Hub October 10, 2023 20:37 — with GitHub Actions Inactive

update timestamps 2

0422254

jacobshandling temporarily deployed to Docker Hub October 10, 2023 21:20 — with GitHub Actions Inactive

jacobshandling had a problem deploying to Docker Hub October 10, 2023 21:20 — with GitHub Actions Error

make dump-test-schema

06ec117

jacobshandling temporarily deployed to Docker Hub October 10, 2023 21:31 — with GitHub Actions Inactive

jacobshandling marked this pull request as ready for review October 10, 2023 21:39

jacobshandling requested review from mikermcneil and rachaelshaw as code owners October 10, 2023 21:39

jacobshandling requested review from edwardsb and a team as code owners October 10, 2023 21:39

fleet-release requested a review from spokanemac October 10, 2023 21:39

jacobshandling changed the title ~~7766 final test containing both back, front, and recent main~~ Merge contents of 7766-frontend and main, all conflicts resolved Oct 10, 2023

jahzielv approved these changes Oct 10, 2023

View reviewed changes

jacobshandling merged commit 1cb4121 into 7766-backend Oct 10, 2023
27 of 29 checks passed

jacobshandling deleted the 7766-final-test branch October 10, 2023 22:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge contents of `7766-frontend` and `main`, all conflicts resolved #14429

Merge contents of `7766-frontend` and `main`, all conflicts resolved #14429

jacobshandling commented Oct 10, 2023

codecov bot commented Oct 10, 2023 •

edited

Loading

Merge contents of 7766-frontend and main, all conflicts resolved #14429

Merge contents of 7766-frontend and main, all conflicts resolved #14429

Conversation

jacobshandling commented Oct 10, 2023

codecov bot commented Oct 10, 2023 • edited Loading

Codecov Report

Merge contents of `7766-frontend` and `main`, all conflicts resolved #14429

Merge contents of `7766-frontend` and `main`, all conflicts resolved #14429

codecov bot commented Oct 10, 2023 •

edited

Loading