Fleet UI: Update banner to remove old icon and use InfoBanner component (#13312)

This commit is contained in:
RachelElysia 2023-08-18 09:16:10 -04:00 committed by GitHub
parent 8e74f7c42d
commit 947eaddb13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 38 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

View File

@ -10,7 +10,7 @@ export interface IInfoBannerProps {
children?: React.ReactNode; children?: React.ReactNode;
className?: string; className?: string;
/** default light purple */ /** default light purple */
color?: "yellow"; color?: "yellow" | "grey";
pageLevel?: boolean; pageLevel?: boolean;
/** cta and link are mutually exclusive */ /** cta and link are mutually exclusive */
cta?: JSX.Element; cta?: JSX.Element;

View File

@ -15,6 +15,11 @@
border-color: $ui-yellow-banner-outline; border-color: $ui-yellow-banner-outline;
} }
&__grey {
background-color: $ui-off-white;
border-color: $ui-fleet-black-50;
}
&__page-banner { &__page-banner {
padding: $pad-large $pad-xlarge; padding: $pad-large $pad-xlarge;
margin-bottom: $pad-large; margin-bottom: $pad-large;
@ -40,6 +45,10 @@
&:hover { &:hover {
cursor: pointer; cursor: pointer;
svg path {
stroke: $core-vibrant-blue;
}
} }
} }
} }

View File

@ -64,6 +64,7 @@ import Icon from "components/Icon/Icon";
// @ts-ignore // @ts-ignore
import Dropdown from "components/forms/fields/Dropdown"; import Dropdown from "components/forms/fields/Dropdown";
import TableContainer from "components/TableContainer"; import TableContainer from "components/TableContainer";
import InfoBanner from "components/InfoBanner/InfoBanner";
import { ITableQueryData } from "components/TableContainer/TableContainer"; import { ITableQueryData } from "components/TableContainer/TableContainer";
import TableDataError from "components/DataError"; import TableDataError from "components/DataError";
import { IActionButtonProps } from "components/TableContainer/DataTable/ActionButton/ActionButton"; import { IActionButtonProps } from "components/TableContainer/DataTable/ActionButton/ActionButton";
@ -84,7 +85,6 @@ import {
DEFAULT_PAGE_INDEX, DEFAULT_PAGE_INDEX,
getHostSelectStatuses, getHostSelectStatuses,
MANAGE_HOSTS_PAGE_FILTER_KEYS, MANAGE_HOSTS_PAGE_FILTER_KEYS,
ManageHostsPageQueryParams,
} from "./HostsPageConfig"; } from "./HostsPageConfig";
import { isAcceptableStatus } from "./helpers"; import { isAcceptableStatus } from "./helpers";
@ -97,7 +97,6 @@ import EditColumnsModal from "./components/EditColumnsModal/EditColumnsModal";
import TransferHostModal from "../components/TransferHostModal"; import TransferHostModal from "../components/TransferHostModal";
import DeleteHostModal from "../components/DeleteHostModal"; import DeleteHostModal from "../components/DeleteHostModal";
import DeleteLabelModal from "./components/DeleteLabelModal"; import DeleteLabelModal from "./components/DeleteLabelModal";
import CloseIconBlack from "../../../../assets/images/icon-close-fleet-black-16x16@2x.png";
import LabelFilterSelect from "./components/LabelFilterSelect"; import LabelFilterSelect from "./components/LabelFilterSelect";
import HostsFilterBlock from "./components/HostsFilterBlock"; import HostsFilterBlock from "./components/HostsFilterBlock";
@ -1470,24 +1469,19 @@ const ManageHostsPage = ({
((canEnrollHosts && noTeamEnrollSecrets) || ((canEnrollHosts && noTeamEnrollSecrets) ||
(canEnrollGlobalHosts && noGlobalEnrollSecrets)) && (canEnrollGlobalHosts && noGlobalEnrollSecrets)) &&
showNoEnrollSecretBanner && ( showNoEnrollSecretBanner && (
<div className={`${baseClass}__no-enroll-secret-banner`}> <InfoBanner
className={`${baseClass}__no-enroll-secret-banner`}
pageLevel
closable
color="grey"
>
<div> <div>
<span> <span>
You have no enroll secrets. Manage enroll secrets to enroll hosts You have no enroll secrets. Manage enroll secrets to enroll hosts
to <b>{isAnyTeamSelected ? currentTeamName : "Fleet"}</b>. to <b>{isAnyTeamSelected ? currentTeamName : "Fleet"}</b>.
</span> </span>
</div> </div>
<div className={`dismiss-banner-button`}> </InfoBanner>
<Button
variant="unstyled"
onClick={() =>
setShowNoEnrollSecretBanner(!showNoEnrollSecretBanner)
}
>
<img alt="Dismiss no enroll secret banner" src={CloseIconBlack} />
</Button>
</div>
</div>
) )
); );
}; };

View File

@ -285,29 +285,6 @@
padding-bottom: $pad-large; padding-bottom: $pad-large;
} }
&__no-enroll-secret-banner {
display: flex;
justify-content: space-between;
align-items: center;
font-size: $x-small;
background-color: $ui-off-white;
padding: $pad-large;
border-radius: 10px;
border: 1px solid $ui-fleet-black-50;
.dismiss-banner-button {
display: flex;
align-items: center;
img {
height: 16px;
width: auto;
}
}
&:not(:only-child) {
margin-bottom: $pad-medium;
}
}
.total-issues-count { .total-issues-count {
margin-left: $pad-small; margin-left: $pad-small;
} }