Skip to content

Commit

Permalink
Merge branch 'main' into label-disabled-tooltip
Browse files Browse the repository at this point in the history
  • Loading branch information
RachelElysia authored Mar 22, 2024
2 parents fca3cfe + d5df239 commit 270d359
Show file tree
Hide file tree
Showing 24 changed files with 66 additions and 1,160 deletions.
48 changes: 24 additions & 24 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -132,30 +132,30 @@ go.mod @fleetdm/go
/.github/workflows/trivy-scan.yml @lukeheath
/.github/workflows/goreleaser-snapshot-fleet.yaml @lukeheath
/.github/workflows/build-and-push-fleetctl-docker.yml @lukeheath
/.github/workflows/fleetd-tuf.yml @lucasmrod
/.github/workflows/generate-desktop-targets.yml @lucasmrod
/.github/workflows/test-yml-specs.yml @lucasmrod
/.github/workflows/build-binaries.yaml @lucasmrod
/.github/workflows/fleet-and-orbit.yml @lucasmrod
/.github/workflows/build-orbit.yaml @lucasmrod
/.github/workflows/generate-osqueryd-targets.yml @lucasmrod
/.github/workflows/test-packaging.yml @lucasmrod
/.github/workflows/release-helm.yaml @rfairburn
/.github/workflows/pr-helm.yaml @rfairburn
/.github/workflows/tfvalidate.yml @rfairburn
/.github/workflows/dogfood-deploy.yml @rfairburn
/.github/workflows/test-db-changes.yml @roperzh
/.github/workflows/test-go.yaml @roperzh
/.github/workflows/golangci-lint.yml @roperzh
/.github/workflows/test-native-tooling-packaging.yml @roperzh
/.github/workflows/check-tuf-timestamps.yml @roperzh
/.github/workflows/test-puppet.yml @roperzh
/.github/workflows/generate-nudge-targets.yml @roperzh
/.github/workflows/test-js.yml @ghernandez345
/.github/workflows/dogfood-gitops.yml @getvictor
/.github/workflows/test-fleetd-chrome.yml @getvictor
/.github/workflows/release-fleetd-chrome.yml @getvictor
/.github/workflows/release-fleetd-chrome-beta.yml @getvictor
/.github/workflows/fleetd-tuf.yml @lucasmrod @lukeheath
/.github/workflows/generate-desktop-targets.yml @lucasmrod @lukeheath
/.github/workflows/test-yml-specs.yml @lucasmrod @lukeheath
/.github/workflows/build-binaries.yaml @lucasmrod @lukeheath
/.github/workflows/fleet-and-orbit.yml @lucasmrod @lukeheath
/.github/workflows/build-orbit.yaml @lucasmrod @lukeheath
/.github/workflows/generate-osqueryd-targets.yml @lucasmrod @lukeheath
/.github/workflows/test-packaging.yml @lucasmrod @lukeheath
/.github/workflows/release-helm.yaml @rfairburn @lukeheath
/.github/workflows/pr-helm.yaml @rfairburn @lukeheath
/.github/workflows/tfvalidate.yml @rfairburn @lukeheath
/.github/workflows/dogfood-deploy.yml @rfairburn @lukeheath
/.github/workflows/test-db-changes.yml @roperzh @lukeheath
/.github/workflows/test-go.yaml @roperzh @lukeheath
/.github/workflows/golangci-lint.yml @roperzh @lukeheath
/.github/workflows/test-native-tooling-packaging.yml @roperzh @lukeheath
/.github/workflows/check-tuf-timestamps.yml @roperzh @lukeheath
/.github/workflows/test-puppet.yml @roperzh @lukeheath
/.github/workflows/generate-nudge-targets.yml @roperzh @lukeheath
/.github/workflows/test-js.yml @ghernandez345 @lukeheath
/.github/workflows/dogfood-gitops.yml @getvictor @lukeheath
/.github/workflows/test-fleetd-chrome.yml @getvictor @lukeheath
/.github/workflows/release-fleetd-chrome.yml @getvictor @lukeheath
/.github/workflows/release-fleetd-chrome-beta.yml @getvictor @lukeheath

# ℹ️ But wait, there's more!
# See the comments up top to learn where else DRIs and maintainers are configured.
1 change: 1 addition & 0 deletions changes/17208-hover-states
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fleet UI: Add hover states to clickable elements
1 change: 1 addition & 0 deletions changes/17662-render-standard-query-platforms-correctly
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixes UI bug to render the query platform correctly for queries imported from the standard query library
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = function (sails){
}

// Clone the existing routes
// NOTE: Changing sails.config after the app lifts goes against Sails.js conventions and this code should not be reproduced.
let appRoutes = Object.assign({}, sails.config.routes);
// Remove the routes for the built-in login page..
delete appRoutes['GET /login'];
Expand All @@ -45,9 +46,9 @@ module.exports = function (sails){
'bodyParser',
'compress',
'poweredBy',
'www',// Note: This changes the conventions of Sails.js. Don't ever replicate this or use Passport.js.
'oktaSSO',
'router',
'www',
'favicon',
];
// Specify a custom http middleware order, placing the Okta middleware before the router. This is so the routes generated by Okta will take precedence over the sails router.
Expand Down
28 changes: 28 additions & 0 deletions frontend/components/forms/fields/Checkbox/_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
&--disabled {
&::after {
@include disabled;

&:hover {
&::after {
background-color: $core-vibrant-blue-over;
border: solid 2px $core-vibrant-blue-over;

}
}

Expand All @@ -49,6 +55,7 @@
@include size(20px);
@include position(absolute, 0 null null 0);
display: inline-block;
cursor: pointer;

&::after {
@include size(20px);
Expand All @@ -61,13 +68,34 @@
background-color: $core-white;
visibility: visible;
}
&:hover {
&::after {
border: solid 2px $core-vibrant-blue-over;
}
}

&--disabled {
&::after {
background-color: $ui-fleet-black-25;
}
cursor: default;
}

&--indeterminate {
&::after {
background-color: $core-vibrant-blue;
border: solid 1px $core-vibrant-blue;
}

&:hover {
&::after {
&::after {
background-color: $core-vibrant-blue-over;
border: solid 1px $core-vibrant-blue-over;
}
}
}

&::before {
@include position(absolute, 50% null null 50%);
box-sizing: border-box;
Expand Down
2 changes: 2 additions & 0 deletions frontend/components/forms/fields/Dropdown/_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
background-color: $ui-light-grey;
border: 0;
border-radius: $border-radius;
cursor: pointer;

.Select-value {
font-size: $small;
background-color: $ui-light-grey;
Expand Down
1 change: 1 addition & 0 deletions frontend/pages/DashboardPage/cards/MDM/MDM.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ const Mdm = ({
isAllPagesSelected={false}
disableCount
disablePagination
disableMultiRowSelect
onClickRow={handleSolutionRowClick}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
border-radius: $border-radius;
height: 40px;

:hover {
cursor: pointer;
}

&--is-focused,
&--menu-is-open,
&:hover {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ const EditQueryForm = ({
placeholder="Select"
label="Platform"
onChange={onChangeSelectPlatformOptions}
value={lastEditedQueryPlatforms}
value={lastEditedQueryPlatforms.replace(/\s/g, "")} // NOTE: FE requires no whitespace to render UI
multi
wrapperClassName={`${baseClass}__form-field form-field--platform`}
helpText="By default, your query collects data on all compatible platforms."
Expand Down
2 changes: 1 addition & 1 deletion handbook/product-design/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Every week, a member of the product team looks up whether there is:
4. a release of CIS Benchmarks for [macOS 14 Sonoma](https://workbench.cisecurity.org/community/20/benchmarks?q=sonoma&status=&sortBy=version&type=desc)
5. a new major or minor version of [ChromeOS](https://chromereleases.googleblog.com/search/label/Chrome%20OS)

The DRI should record the latest versions in the [maintenance tracker](https://docs.google.com/spreadsheets/d/1IWfQtSkOQgm_JIQZ0i2y3A8aaK5vQW1ayWRk6-4FOp0/edit#gid=0) and then notify the [#help-product-design Slack channel](https://fleetdm.slack.com/archives/C02A8BRABB5) with an update, noting the current versions and highlighting any changes.
The DRI should record the latest versions in the [maintenance tracker](https://docs.google.com/spreadsheets/d/1IWfQtSkOQgm_JIQZ0i2y3A8aaK5vQW1ayWRk6-4FOp0/edit#gid=0). If there are any changes, the DRI sends an update in the [#help-product-design Slack channel](https://fleetdm.slack.com/archives/C02A8BRABB5).

### View Fleet usage statistics
In order to understand the usage of the Fleet product, we [collect statistics](https://fleetdm.com/docs/using-fleet/usage-statistics) from installations where this functionality is enabled.
Expand Down
72 changes: 0 additions & 72 deletions website/api/controllers/deliver-premium-upgrade-form.js

This file was deleted.

27 changes: 0 additions & 27 deletions website/api/controllers/view-upgrade.js

This file was deleted.

Loading

0 comments on commit 270d359

Please sign in to comment.