diff --git a/frontend/src/components/export.tsx b/frontend/src/components/export.tsx index 3c581467d..2771ffe77 100644 --- a/frontend/src/components/export.tsx +++ b/frontend/src/components/export.tsx @@ -16,10 +16,12 @@ export const ExportButton = ({ targets, user_groups, tags, + include_variables, }: { targets?: Types.ResourceTarget[]; user_groups?: string[]; tags?: string[]; + include_variables?: boolean; }) => { const [open, setOpen] = useState(false); return ( @@ -34,8 +36,12 @@ export const ExportButton = ({ Export to Toml - {targets || user_groups ? ( - + {targets || user_groups || include_variables ? ( + ) : ( )} @@ -45,21 +51,33 @@ export const ExportButton = ({ }; const ExportTargetsLoader = ({ - user_groups, targets, + user_groups, + include_variables, }: { - user_groups?: string[]; targets?: Types.ResourceTarget[]; + user_groups?: string[]; + include_variables?: boolean; }) => { const { data, isPending } = useRead("ExportResourcesToToml", { targets: targets ? targets : [], user_groups: user_groups ? user_groups : [], + include_variables, }); return ; }; -const ExportAllLoader = ({ tags }: { tags?: string[] }) => { - const { data, isPending } = useRead("ExportAllResourcesToToml", { tags }); +const ExportAllLoader = ({ + tags, + include_variables, +}: { + tags?: string[]; + include_variables?: boolean; +}) => { + const { data, isPending } = useRead("ExportAllResourcesToToml", { + tags, + include_variables, + }); return ; }; diff --git a/frontend/src/pages/settings/users.tsx b/frontend/src/pages/settings/users.tsx index 8a13f9843..d53d213bf 100644 --- a/frontend/src/pages/settings/users.tsx +++ b/frontend/src/pages/settings/users.tsx @@ -1,3 +1,4 @@ +import { ExportButton } from "@components/export"; import { Section } from "@components/layouts"; import { NewServiceUser, NewUserGroup } from "@components/users/new"; import { UserTable } from "@components/users/table"; @@ -18,7 +19,18 @@ export const UsersPage = ({ search }: { search: string }) => {
} - actions={} + actions={ +
+ {groups && groups.length ? ( + group._id?.$oid!) + .filter((id) => id)} + /> + ) : undefined} + +
+ } > { }); return (
- setSearch(e.target.value)} - className="w-[200px] lg:w-[300px]" - /> +
+ setSearch(e.target.value)} + className="w-[200px] lg:w-[300px]" + /> + +
{updateMenuData && (