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.

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

feat(ui/tokens): delete multiple tokens #2424

Merged
merged 7 commits into from
Nov 22, 2023
Merged
Changes from 2 commits
Commits
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
52 changes: 20 additions & 32 deletions ui/src/app/tokens/Tokens.tsx
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@ import {
} from '~/types/auth/Token';

export default function Tokens() {
// const checkbox = useRef();
const [tokenAuthEnabled, setTokenAuthEnabled] = useState<boolean>(false);

const [tokens, setTokens] = useState<IAuthToken[]>([]);
@@ -37,7 +36,9 @@ export default function Tokens() {

const [showDeleteTokenModal, setShowDeleteTokenModal] =
useState<boolean>(false);
const [deletingTokens, setDeletingTokens] = useState<IAuthToken[]| null>(null);
const [deletingTokens, setDeletingTokens] = useState<IAuthToken[] | null>(
null
);

const tokenFormRef = useRef(null);

@@ -88,28 +89,6 @@ export default function Tokens() {
checkTokenAuthEnabled();
}, [checkTokenAuthEnabled]);

// const [checked, setChecked] = useState(false);
// const [indeterminate, setIndeterminate] = useState(false);
// const [selectedTokens, setSelectedTokens] = useState<IAuthenticationToken[]>(
// []
// );

// useLayoutEffect(() => {
// const isIndeterminate =
// selectedTokens.length > 0 && selectedTokens.length < tokens.length;
// setChecked(selectedTokens.length === tokens.length);
// setIndeterminate(isIndeterminate);
// if (checkbox && checkbox.current) {
// checkbox.current.indeterminate = isIndeterminate;
// }
// }, [selectedTokens]);

// const toggleAll = () => {
// setSelectedTokens(checked || indeterminate ? [] : tokens);
// setChecked(!checked && !indeterminate);
// setIndeterminate(false);
// };

return (
<>
{/* token create form */}
@@ -134,17 +113,26 @@ export default function Tokens() {
<Modal open={showDeleteTokenModal} setOpen={setShowDeleteTokenModal}>
<DeletePanel
panelMessage={
<>
Are you sure you want to delete the token(s)
<span className="text-violet-500 font-medium">
{deletingTokens?.map((t) => ' ' + t.name)}
</span>
? This action cannot be undone.
</>
deletingTokens && deletingTokens.length === 1 ? (
<>
Are you sure you want to delete the token{' '}
<span className="text-violet-500 font-medium">
{deletingTokens[0].name}
</span>
? This action cannot be undone.
</>
) : (
<>
Are you sure you want to delete the selected tokens? This action
cannot be undone.
</>
)
}
panelType="Tokens"
setOpen={setShowDeleteTokenModal}
handleDelete={() => deleteTokens(deletingTokens?.map((t)=> t.id) || [])}
handleDelete={() =>
deleteTokens(deletingTokens?.map((t) => t.id) || [])
}
onSuccess={() => {
incrementTokensVersion();
}}
134 changes: 74 additions & 60 deletions ui/src/components/tokens/TokenTable.tsx
Original file line number Diff line number Diff line change
@@ -6,16 +6,16 @@ import {
getFilteredRowModel,
getSortedRowModel,
Row,
Table,
SortingState,
RowSelectionState,
SortingState,
Table,
useReactTable
} from '@tanstack/react-table';
import { format, parseISO } from 'date-fns';
import React, { HTMLProps, useState } from 'react';
import React, { HTMLProps, useEffect, useState } from 'react';
import Button from '~/components/forms/buttons/Button';
import Searchbox from '~/components/Searchbox';
import { IAuthToken } from '~/types/auth/Token';
import Button from '~/components/forms/buttons/Button';

type TokenRowActionsProps = {
row: Row<IAuthToken>;
@@ -26,9 +26,9 @@ type TokenRowActionsProps = {
function TokenRowActions(props: TokenRowActionsProps) {
const { row, setDeletingTokens, setShowDeleteTokenModal } = props;

let className ="text-violet-600 hover:text-violet-900"
let className = 'text-violet-600 hover:text-violet-900';
if (row.getIsSelected()) {
className = "text-gray-400 hover:cursor-not-allowed"
className = 'text-gray-400 hover:cursor-not-allowed';
}

return (
@@ -37,7 +37,7 @@ function TokenRowActions(props: TokenRowActionsProps) {
className={className}
onClick={(e) => {
e.preventDefault();
if (!row.getIsSelected()){
if (!row.getIsSelected()) {
setDeletingTokens([row.original]);
setShowDeleteTokenModal(true);
}
@@ -49,57 +49,94 @@ function TokenRowActions(props: TokenRowActionsProps) {
);
}

function IndeterminateCheckbox({
indeterminate,
className = '',
...rest
}: { indeterminate?: boolean } & HTMLProps<HTMLInputElement>) {
const ref = React.useRef<HTMLInputElement>(null!);

useEffect(() => {
if (typeof indeterminate === 'boolean') {
ref.current.indeterminate = !rest.checked && indeterminate;
}
}, [ref, indeterminate, rest.checked]);

return (
<input
type="checkbox"
ref={ref}
className={
className +
' text-purple-600 bg-gray-100 border-gray-300 h-4 w-4 cursor-pointer rounded focus:ring-purple-500'
}
{...rest}
/>
);
}

type TokenTableProps = {
tokens: IAuthToken[];
setDeletingTokens: (tokens: IAuthToken[]) => void;
setShowDeleteTokenModal: (show: boolean) => void;
};


export default function TokenTable(props: TokenTableProps) {
const { tokens, setDeletingTokens, setShowDeleteTokenModal } = props;
const searchThreshold = 10;
const [sorting, setSorting] = useState<SortingState>([]);

const [filter, setFilter] = useState<string>('');
const [rowSelection, setRowSelection] = useState<RowSelectionState>({})
const [rowSelection, setRowSelection] = useState<RowSelectionState>({});
const columnHelper = createColumnHelper<IAuthToken>();

const deleteMultipleTokens = (table :Table) => {
const deleteMultipleTokens = (table: Table<IAuthToken>) => {
setDeletingTokens(table.getSelectedRowModel().rows.map((r) => r.original));
setShowDeleteTokenModal(true);
}

};

const columns = [
{
columnHelper.display({
id: 'select',
header: ({ table }: Table) => <IndeterminateCheckbox
{...{
checked: table.getIsAllRowsSelected(),
indeterminate: table.getIsSomeRowsSelected(),
onChange: table.getToggleAllRowsSelectedHandler(),
}}
/>,
cell: ({row}: Row) => <IndeterminateCheckbox
{...{
checked: row.getIsSelected(),
disabled: !row.getCanSelect(),
indeterminate: row.getIsSomeSelected(),
onChange: row.getToggleSelectedHandler(),
}}
/>,
header: ({ table }) => (
<IndeterminateCheckbox
{...{
checked: table.getIsAllRowsSelected(),
indeterminate: table.getIsSomeRowsSelected(),
onChange: table.getToggleAllRowsSelectedHandler()
}}
/>
),
cell: ({ row }) => (
<IndeterminateCheckbox
{...{
checked: row.getIsSelected(),
disabled: !row.getCanSelect(),
indeterminate: row.getIsSomeSelected(),
onChange: row.getToggleSelectedHandler()
}}
/>
),
meta: {
className:
'whitespace-nowrap py-4 pl-3 pr-4 text-left'
className: 'whitespace-nowrap py-4 pl-3 pr-4 text-left'
}
},
}),
columnHelper.accessor('name', {
header: ({ table }: Table) => {
if (table.getSelectedRowModel().rows.length > 0){
return <Button onClick={(e)=> {e.stopPropagation(); deleteMultipleTokens(table)}} title='Delete'>Delete</Button>
header: ({ table }) => {
if (table.getSelectedRowModel().rows.length > 0) {
return (
<Button
onClick={(e) => {
e.stopPropagation();
deleteMultipleTokens(table);
}}
title="Delete Selected Token(s)"
>
Delete
</Button>
);
}
return 'Name'
return 'Name';
},
cell: (info) => info.getValue(),
meta: {
@@ -150,7 +187,7 @@ export default function TokenTable(props: TokenTableProps) {
),
columnHelper.display({
id: 'actions',
cell: ({row}: Row) => (
cell: ({ row }) => (
<TokenRowActions
// eslint-disable-next-line react/prop-types
row={row}
@@ -178,7 +215,7 @@ export default function TokenTable(props: TokenTableProps) {
getCoreRowModel: getCoreRowModel(),
getSortedRowModel: getSortedRowModel(),
getFilteredRowModel: getFilteredRowModel(),
onRowSelectionChange: setRowSelection,
onRowSelectionChange: setRowSelection
});

return (
@@ -270,26 +307,3 @@ export default function TokenTable(props: TokenTableProps) {
</>
);
}

function IndeterminateCheckbox({
indeterminate,
className = '',
...rest
}: { indeterminate?: boolean } & HTMLProps<HTMLInputElement>) {
const ref = React.useRef<HTMLInputElement>(null!)

React.useEffect(() => {
if (typeof indeterminate === 'boolean') {
ref.current.indeterminate = !rest.checked && indeterminate
}
}, [ref, indeterminate])

return (
<input
type="checkbox"
ref={ref}
className={className + ' cursor-pointer w-4 h-4 text-purple-600 bg-gray-100 border-gray-300 rounded focus:ring-purple-500'}
{...rest}
/>
)
}