Skip to content
This repository has been archived by the owner on Sep 1, 2024. It is now read-only.

Multiple delete fix #133

Merged
merged 3 commits into from
Feb 18, 2024
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
26 changes: 22 additions & 4 deletions portal/src/app/components/all-experiments/Experiments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,41 @@ const DuplicateAriaLabel: string = ALL_EXPERIMENTS_TABLE_EN.TABLE_COLUMNS.LINKS.

export const Experiments: React.FC = () => {
const { testSuites, status }: IUseExperimentsData = useExperimentsData();
const navigate = useNavigate();
const [openDeleteModal, setOpenDeleteModal] = useState<boolean>(false);
const [checkedRows, setCheckedRows] = useState<Record<number, boolean>>({});
const experimentsData = useMemo(() => (testSuites ? parseExperimentsData(testSuites): []), [testSuites]);
const navigate = useNavigate();

const [experimentsData, setExperimentsData] = useState<ExperimentData[]>([]);

const [deleteHandled, setDeleteHandled] = useState(false);
ohadkoren marked this conversation as resolved.
Show resolved Hide resolved
const { post, status: deleteStatus, error: deleteError, cancelRequest: cancelRequestDelete }: IHttp<unknown>
= useFetch<unknown>({ url: APIS.deleteExperiments });
useFetchSpinner(deleteStatus);
useErrorMessage(deleteError);
useEffect(() => cancelRequestDelete, [cancelRequestDelete]);

// Update the experimentsData state when testSuites changes
useEffect(() => {
if (testSuites) {
setExperimentsData(parseExperimentsData(testSuites));
}
}, [testSuites]);

// Update the experimentsData state when delete operation is successful
useEffect(() => {
if (deleteStatus === FetchDataStatus.Success && !deleteHandled) {
setExperimentsData(prevExperimentsData => prevExperimentsData.filter(experiment => !checkedRows[experiment.id]));
setCheckedRows({});
setDeleteHandled(true);
}
}, [deleteStatus, deleteHandled, checkedRows]);

const handleDeleteClick: () => void = useCallback((): void => {
setOpenDeleteModal(true);
}, []);

const handleCloseDeleteExperimentModal: (confirm?: boolean) => void = useCallback((confirm?: boolean): void => {
if (confirm) {
setDeleteHandled(false);
const ids: number[] = Object.keys(checkedRows).map((key: string) => parseInt(key))
post({
data: { ids }
Expand Down Expand Up @@ -122,6 +139,7 @@ export const Experiments: React.FC = () => {
accessor: () => null,
cell: (cellInfo: CellContext<ExperimentData, unknown>) => (
<Button
key={cellInfo.row.original.id}
ariaLabel={DuplicateAriaLabel}
size={ButtonSize.NONE}
styleType={ButtonStyleType.WRAPPER}
Expand Down Expand Up @@ -151,7 +169,7 @@ export const Experiments: React.FC = () => {
<>
{ status === FetchDataStatus.Success &&
<div className={styles.title_options_container}>
<label className={styles.experiments_title}>{`${ALL_EXPERIMENTS_TABLE_EN.TITLE} (${testSuites.length})`}</label>
<label className={styles.experiments_title}>{`${ALL_EXPERIMENTS_TABLE_EN.TITLE} (${experimentsData.length})`}</label>
{Object.values(checkedRows).some((value: boolean) => value) && (
<Button
ariaLabel={DeleteAriaLabel}
Expand Down
Loading