Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Filter credentials by createUser property #2006

Merged
merged 1 commit into from
Jul 11, 2024
Merged

🐛 Filter credentials by createUser property #2006

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions client/src/app/pages/identities/identities.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,7 @@ export const Identities: React.FC = () => {
description: t("terms.description"),
type: t("terms.type"),

//TODO: Enable conditional rendering for createdBy column
// ...(isAuthRequired && { createdBy: t("terms.createdBy") }
// ? { createdBy: t("terms.createdBy") }
// : {}),
createdBy: t("terms.createdBy"),
},
isFilterEnabled: true,
isSortEnabled: true,
Expand Down Expand Up @@ -182,29 +179,25 @@ export const Identities: React.FC = () => {
return item.kind || "";
},
},
//TODO: Enable conditional rendering for createdBy column
// ...(isAuthRequired
// ? [
// {
// categoryKey: "createdBy",
// title: "Created By",
// type: FilterType.search,
// placeholderText: "Filter by created by User...",
// getItemValue: (item: Identity) => {
// return item.createUser || "";
// },
// } as const,
// ]
// : []),
{
categoryKey: "createdBy",
title: t("terms.createdBy"),
type: FilterType.search,
placeholderText: t("actions.filterBy", {
what: t("terms.createdBy") + "...",
}),
getItemValue: (item: Identity) => {
return item.createUser || "";
},
},
],
initialItemsPerPage: 10,
sortableColumns: ["name", "type"],
sortableColumns: ["name", "type", "createdBy"],
initialSort: { columnKey: "name", direction: "asc" },
getSortValues: (item) => ({
name: item?.name || "",
type: item?.kind || "",
//TODO: Enable conditional rendering for createdBy column
// ...(isAuthRequired && { createdBy: item?.createUser } ? { createdBy: item?.createUser } : {}),
createdBy: item?.createUser || "",
}),
isLoading: isFetching,
});
Expand Down Expand Up @@ -275,10 +268,7 @@ export const Identities: React.FC = () => {
{...getThProps({ columnKey: "description" })}
/>
<Th width={25} {...getThProps({ columnKey: "type" })} />

{/*
//TODO: Enable conditional rendering for createdBy column
<Th {...getThProps({ columnKey: "createdBy" })} /> */}
<Th {...getThProps({ columnKey: "createdBy" })} />
</TableHeaderContentWithControls>
</Tr>
</Thead>
Expand Down Expand Up @@ -340,14 +330,12 @@ export const Identities: React.FC = () => {
>
{typeFormattedString?.value}
</Td>
{/*
Todo: Enable conditional rendering for createdBy column
<Td
width={10}
{...getTdProps({ columnKey: "createdBy" })}
>
{identity.createdBy}
</Td> */}
{identity.createUser}
</Td>
<AppTableActionButtons
isDeleteEnabled={
trackers.some(
Expand Down
Loading