fix: cleanup from comments on PR #3025

Author: mgwozdz-unicon

src/taxonomy/tag-list/TagListTable.test.jsx

@@ -982,11 +982,6 @@ describe('<TagListTable />', () => {
         });
 
         it('should disable delete action if tag includes `can_delete: false`', async () => {
-          axiosMock.reset();
-          axiosMock
-            .onGet(rootTagsListUrl)
-            .reply(200, mockTagResponseDisallowingEdits);
-          axiosMock.onGet(subTagsUrl).reply(200, subTagsResponse);
           cleanup();
           ({ axiosMock } = initializeMocks({ user: adminUser }));
           axiosMock

src/taxonomy/tag-list/TagListTable.tsx

@@ -46,7 +46,7 @@ const TagListTable = ({ taxonomyId, maxDepth }: TagListTableProps) => {
   const [toast, setToast] = useState({ show: false, message: '', variant: 'success' });
   const [tagTree, setTagTree] = useState<TagTree | null>(null);
   const [isCreatingTopTag, setIsCreatingTopTag] = useState(false);
-  const [, setActiveActionMenuRowId] = useState<RowId | null>(null);
+  const [_, setActiveActionMenuRowId] = useState<RowId | null>(null);
   const [draftError, setDraftError] = useState('');
   const treeData = (tagTree?.getAllAsDeepCopy() || []) as unknown as TreeRowData[];
   const hasOpenDraft = isCreatingTopTag || creatingParentId !== null || editingRowId !== null;
@@ -154,7 +154,7 @@ const TagListTable = ({ taxonomyId, maxDepth }: TagListTableProps) => {
 
   return (
     <TreeTableContext.Provider value={contextValue}>
-      <TableView hasAdditionalError={deleteTagMutation.isError} />
+      <TableView hasDeleteError={deleteTagMutation.isError} />
     </TreeTableContext.Provider>
   );
 };

src/taxonomy/tag-list/hooks.ts

@@ -291,9 +291,9 @@ const useEditActions = ({
   const handleDeleteTag = async (row: Row<TreeRowData>) => {
     const rowData = getTagListRowData(row);
     const count = getTagWithDescendantsCount(rowData);
-    // If the tag in the frontend state does not have subtags,
-    // don't allow the backend to delete subtags.
-    // That prevents problems in case of stale frontend state.
+    // Only request recursive deletion when the frontend has loaded descendants.
+    // If this state is stale and the backend finds subtags while with_subtags is false,
+    // the backend rejects the request instead of deleting the parent alone.
     const shouldDeleteSubtags = count > 1;
     try {
       // In view mode, the table reloads on change, reflecting the deletion

src/taxonomy/tree-table/SaveErrorAlert.tsx

@@ -13,21 +13,21 @@ interface SaveErrorAlertProps {
   draftError: string | undefined;
   isError: boolean | undefined;
   isUpdateError: boolean | undefined;
-  isAdditionalError?: boolean;
+  isDeleteError?: boolean;
 }
 const SaveErrorAlert = ({
   draftError,
   isError,
   isUpdateError,
-  isAdditionalError = false,
+  isDeleteError = false,
 }: SaveErrorAlertProps) => {
   const intl = useIntl();
-  const hasError: boolean = Boolean((isError || isUpdateError || isAdditionalError) && !!draftError);
+  const hasError: boolean = Boolean((isError || isUpdateError || isDeleteError) && !!draftError);
   const [alertOpen, setAlertOpen] = React.useState(hasError);
 
   useEffect(() => {
     setAlertOpen(hasError);
-  }, [hasError, isError, isUpdateError, isAdditionalError, draftError]);
+  }, [hasError, isError, isUpdateError, isDeleteError, draftError]);
 
   if (!alertOpen) { return null; }
 

src/taxonomy/tree-table/TableView.test.tsx

@@ -113,7 +113,7 @@ describe('TableView', () => {
     const contextValue = baseContextValue();
     contextValue.draftError = 'Delete request failed';
 
-    renderTableView(contextValue, { hasAdditionalError: true });
+    renderTableView(contextValue, { hasDeleteError: true });
 
     expect(screen.getByText('Error saving changes')).toBeInTheDocument();
     expect(screen.getByText('Delete request failed. Please try again.')).toBeInTheDocument();
@@ -123,7 +123,7 @@ describe('TableView', () => {
     const contextValue = baseContextValue();
     contextValue.draftError = 'First delete failure';
 
-    const { rerender } = renderTableView(contextValue, { hasAdditionalError: true });
+    const { rerender } = renderTableView(contextValue, { hasDeleteError: true });
 
     fireEvent.click(screen.getByRole('button', { name: /dismiss/i }));
     expect(screen.queryByText('Error saving changes')).not.toBeInTheDocument();
@@ -133,7 +133,7 @@ describe('TableView', () => {
 
     rerender(
       <TreeTableContext.Provider value={nextContextValue}>
-        <TableView hasAdditionalError />
+        <TableView hasDeleteError />
       </TreeTableContext.Provider>,
     );
 

src/taxonomy/tree-table/TableView.tsx

@@ -27,12 +27,12 @@ import { TreeTable } from './types';
 
 interface TableViewProps {
   enablePagination?: boolean;
-  hasAdditionalError?: boolean;
+  hasDeleteError?: boolean;
 }
 
 const TableView = ({
   enablePagination = false,
-  hasAdditionalError = false,
+  hasDeleteError = false,
 }: TableViewProps) => {
   const intl = useIntl();
 
@@ -84,7 +84,7 @@ const TableView = ({
         draftError={draftError}
         isError={isError}
         isUpdateError={isUpdateError}
-        isAdditionalError={hasAdditionalError}
+        isDeleteError={hasDeleteError}
       />
       <Card className="tag-list-card">
         <Card.Section className="p-0">