Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

conditionally show add label button (#854)

Browse source
This commit is contained in:
Gabe Hernandez 2021-05-26 13:10:04 +01:00 committed by GitHub
parent d3932d736d
commit c018823abf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frontend/components/side_panels/HostSidePanel/HostSidePanel.jsx
View file

@ -19,6 +19,7 @@ class HostSidePanel extends Component {
onLabelClick: PropTypes.func,
selectedFilter: PropTypes.string,
statusLabels: statusLabelsInterface,
canAddNewLabel: PropTypes.bool,
};
constructor(props) {
@ -41,6 +42,7 @@ class HostSidePanel extends Component {
onLabelClick,
selectedFilter,
statusLabels,
canAddNewLabel,
} = this.props;
const { labelFilter } = this.state;
const { onFilterLabels } = this;
@ -100,14 +102,15 @@ class HostSidePanel extends Component {
selectedFilter={selectedFilter}
type="label"
/>
<Button
variant="grey"
onClick={onAddLabelClick}
className={`${baseClass}__add-label-btn`}
>
Add new label
</Button>
{canAddNewLabel ? (
<Button
variant="grey"
onClick={onAddLabelClick}
className={`${baseClass}__add-label-btn`}
>
Add new label
</Button>
) : null}
</SecondarySidePanelContainer>
);
}

8
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx
View file

@ -42,7 +42,6 @@ import NoHosts from "./components/NoHosts";
import EmptyHosts from "./components/EmptyHosts";
import EditColumnsModal from "./components/EditColumnsModal/EditColumnsModal";
import TransferHostModal from "./components/TransferHostModal";
import EditColumnsIcon from "../../../../assets/images/icon-edit-columns-16x12@2x.png";
const NEW_LABEL_HASH = "#new_label";
@ -68,6 +67,7 @@ export class ManageHostsPage extends PureComponent {
hosts: PropTypes.arrayOf(hostInterface),
loadingHosts: PropTypes.bool,
canAddNewHosts: PropTypes.bool,
canAddNewLabels: PropTypes.bool,
teams: PropTypes.arrayOf(teamInterface),
isGlobalAdmin: PropTypes.bool,
currentUser: userInterface,
@ -523,6 +523,7 @@ export class ManageHostsPage extends PureComponent {
selectedFilter,
selectedOsqueryTable,
statusLabels,
canAddNewLabels,
} = this.props;
const { onAddLabelClick, onLabelClick, onOsqueryTableSelect } = this;
@ -543,6 +544,7 @@ export class ManageHostsPage extends PureComponent {
onLabelClick={onLabelClick}
selectedFilter={selectedFilter}
statusLabels={statusLabels}
canAddNewLabel={canAddNewLabels}
/>
);
}
@ -680,6 +682,9 @@ const mapStateToProps = (state, { location, params }) => {
const canAddNewHosts =
permissionUtils.isGlobalAdmin(currentUser) ||
permissionUtils.isGlobalMaintainer(currentUser);
const canAddNewLabels =
permissionUtils.isGlobalAdmin(currentUser) ||
permissionUtils.isGlobalMaintainer(currentUser);
const isGlobalAdmin = permissionUtils.isGlobalAdmin(currentUser);
const teams = memoizedGetEntity(state.entities.teams.data);
@ -699,6 +704,7 @@ const mapStateToProps = (state, { location, params }) => {
hosts,
loadingHosts,
canAddNewHosts,
canAddNewLabels,
isGlobalAdmin,
teams,
};