Fixed review comments.

Author: pravesh-sharma

web/pgadmin/tools/sqleditor/__init__.py

@@ -2200,9 +2200,14 @@ def download_binary_data(trans_id):
     (status, error_msg, conn, trans_obj,
      session_obj) = check_transaction_status(trans_id)
 
-    if error_msg:
-        return internal_server_error(
-            errormsg=error_msg
+    if isinstance(error_msg, Response):
+        return error_msg
+    if error_msg == ERROR_MSG_TRANS_ID_NOT_FOUND:
+        return make_json_response(
+            success=0,
+            errormsg=error_msg,
+            info='DATAGRID_TRANSACTION_REQUIRED',
+            status=404
         )
 
     if not status or conn is None or trans_obj is None or \
@@ -2250,7 +2255,7 @@ def download_binary_data(trans_id):
             errormsg='Invalid row/column position.'
         )
 
-    return send_file( 
+    return send_file(
         BytesIO(binary_data),
         as_attachment=True,
         download_name='binary_data',

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Formatters.jsx

@@ -17,6 +17,7 @@ import GetAppRoundedIcon from '@mui/icons-material/GetAppRounded';
 import { PgIconButton } from '../../../../../../static/js/components/Buttons';
 import { QUERY_TOOL_EVENTS } from '../QueryToolConstants';
 import { QueryToolEventsContext } from '../QueryToolComponent';
+import { DataGridExtrasContext } from './index';
 
 const StyledNullAndDefaultFormatter = styled(NullAndDefaultFormatter)(({theme}) => ({
   '& .Formatters-disabledCell': {
@@ -73,16 +74,24 @@ export function NumberFormatter({row, column}) {
 }
 NumberFormatter.propTypes = FormatterPropTypes;
 
-export function BinaryFormatter({row, column, ...props}) {
+export function BinaryFormatter({row, column}) {
   let value = row[column.key];
   const eventBus = useContext(QueryToolEventsContext);
+  const dataGridExtras = useContext(DataGridExtrasContext);
   const downloadBinaryData = usePreferences().getPreferences('misc', 'enable_binary_data_download').value;
+
+  // Use clientPK as the absolute row position
+  // rowKeyGetter returns the clientPK value which is a sequential counter (0, 1, 2, ...)
+  // that persists across pagination and represents the 0-based absolute position in the result set
+  const absoluteRowPos = parseInt(dataGridExtras?.rowKeyGetter?.(row) ?? 0);
+  console.log(absoluteRowPos)
+
   return (
     <StyledNullAndDefaultFormatter value={value} column={column}>
       <span className='Formatters-disabledCell'>[{value}]</span>&nbsp;&nbsp;
-      {downloadBinaryData && 
+      {downloadBinaryData &&
         <PgIconButton size="xs" title={gettext('Download binary data')} icon={<GetAppRoundedIcon />}
-          onClick={()=>eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SAVE_BINARY_DATA, props.rowIdx, column.pos)}/>}
+          onClick={()=>eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SAVE_BINARY_DATA, absoluteRowPos, column.pos)}/>}
     </StyledNullAndDefaultFormatter>
   );
 }

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx

@@ -429,8 +429,8 @@ export default function QueryToolDataGrid({columns, rows, totalRowCount, dataCha
   }, []);
 
   const dataGridExtras = useMemo(()=>({
-    onSelectedCellChange, handleShortcuts, startRowNum
-  }), [onSelectedCellChange]);
+    onSelectedCellChange, handleShortcuts, startRowNum, rowKeyGetter: props.rowKeyGetter
+  }), [onSelectedCellChange, props.rowKeyGetter]);
 
   // Save column width to window object on resize
   const handleColumnResize = (column, width) => {