fix drag drop and select

konveyor · Mar 13, 2024 · 1b53aa5 · 1b53aa5
1 parent 9ac034d
commit 1b53aa5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/client/src/app/pages/applications/applications-table/components/manage-columns-modal.tsx b/client/src/app/pages/applications/applications-table/components/manage-columns-modal.tsx
@@ -74,14 +74,26 @@ export const ManageColumnsModal = ({
     );
   };
 
-  const onDrop = (sourceIndex: any, destinationIndex: any) => {
+  const onDrop = (sourceIndex: any, destinationIndex: any): boolean => {
+    if (
+      typeof sourceIndex !== "number" ||
+      typeof destinationIndex !== "number"
+    ) {
+      return false;
+    }
+
     const result = Array.from(editedColumns);
     const [removed] = result.splice(sourceIndex, 1);
     result.splice(destinationIndex, 0, removed);
     setEditedColumns(result);
+
+    // Assuming the operation is successful
+    return true;
   };
 
   const onSelect = (id: any, isVisible: any) => {
+    console.log(`Toggling visibility for ${id}: ${isVisible}`);
+
     setEditedColumns(
       editedColumns.map((col) => ({
         ...col,
@@ -127,8 +139,7 @@ export const ManageColumnsModal = ({
         </Button>,
       ]}
     >
-      {/* <DragDrop onDrop={(source, dest) => onDrop(source.index, dest?.index)}> */}
-      <DragDrop>
+      <DragDrop onDrop={(source, dest) => onDrop(source.index, dest?.index)}>
         <Droppable>
           <DataList aria-label={title} id="table-column-management" isCompact>
             {editedColumns.map(({ id, label, isVisible }, index) => (
@@ -140,7 +151,7 @@ export const ManageColumnsModal = ({
                       <DataListCheck
                         aria-labelledby={`check-${id}`}
                         checked={isVisible}
-                        onChange={(checked) => onSelect(id, checked)}
+                        onChange={(e, checked) => onSelect(id, checked)}
                       />
                     </DataListControl>
                     <DataListItemCells

diff --git a/client/src/app/pages/applications/applications-table/components/manage-columns-toolbar.tsx b/client/src/app/pages/applications/applications-table/components/manage-columns-toolbar.tsx
@@ -30,9 +30,6 @@ export const ManageColumnsToolbar = ({
       <ToolbarItem variant="overflow-menu">
         <OverflowMenu breakpoint="md">
           <OverflowMenuGroup groupType="button" isPersistent>
-            <OverflowMenuItem>
-              <Button variant="primary">Action</Button>
-            </OverflowMenuItem>
             <OverflowMenuItem isPersistent>
               <Button variant="link" onClick={() => setIsOpen(true)}>
                 Manage columns