mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-05 18:26:42 +00:00
Merge branch 'feat/suborg-scope-support' of https://github.com/Infisical/infisical into feat/suborg-scope-support
This commit is contained in:
+5
-5
@@ -200,7 +200,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
|
|||||||
</DropdownSubMenuTrigger>
|
</DropdownSubMenuTrigger>
|
||||||
<DropdownSubMenuContent className="max-h-80 thin-scrollbar overflow-y-auto rounded-l-none">
|
<DropdownSubMenuContent className="max-h-80 thin-scrollbar overflow-y-auto rounded-l-none">
|
||||||
<DropdownMenuLabel className="sticky top-0 bg-mineshaft-900">
|
<DropdownMenuLabel className="sticky top-0 bg-mineshaft-900">
|
||||||
Filter Organization Machine Identities by Role
|
Filter {isSubOrganization ? "Sub-" : ""}Organization Machine Identities by Role
|
||||||
</DropdownMenuLabel>
|
</DropdownMenuLabel>
|
||||||
{roles?.map(({ id, slug, name }) => (
|
{roles?.map(({ id, slug, name }) => (
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
@@ -229,7 +229,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
|
|||||||
value={search}
|
value={search}
|
||||||
onChange={(e) => setSearch(e.target.value)}
|
onChange={(e) => setSearch(e.target.value)}
|
||||||
leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
|
leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
|
||||||
placeholder="Search machine identities by name..."
|
placeholder={`Search ${isSubOrganization ? "sub-organization" : "organization"} machine identities by name...`}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<TableContainer>
|
<TableContainer>
|
||||||
@@ -258,7 +258,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
|
|||||||
</Th>
|
</Th>
|
||||||
<Th>
|
<Th>
|
||||||
<div className="flex items-center">
|
<div className="flex items-center">
|
||||||
Organization Role
|
{isSubOrganization ? "Sub-" : ""}Organization Role
|
||||||
<IconButton
|
<IconButton
|
||||||
variant="plain"
|
variant="plain"
|
||||||
className={`ml-2 ${orderBy === OrgIdentityOrderBy.Role ? "" : "opacity-30"}`}
|
className={`ml-2 ${orderBy === OrgIdentityOrderBy.Role ? "" : "opacity-30"}`}
|
||||||
@@ -455,8 +455,8 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
|
|||||||
<EmptyState
|
<EmptyState
|
||||||
title={
|
title={
|
||||||
debouncedSearch.trim().length > 0 || filter.roles?.length > 0
|
debouncedSearch.trim().length > 0 || filter.roles?.length > 0
|
||||||
? "No machine identities match search filter"
|
? `No ${isSubOrganization ? "sub-" : ""}organization machine identities match search filter`
|
||||||
: "No machine identities have been created in this organization"
|
: `No machine identities have been created in this ${isSubOrganization ? "sub-" : ""}organization`
|
||||||
}
|
}
|
||||||
icon={faServer}
|
icon={faServer}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user