Some more review fix

Author: pravesh-sharma

web/pgadmin/tools/sqleditor/__init__.py

@@ -2200,14 +2200,24 @@ def download_binary_data(trans_id):
     (status, error_msg, conn, trans_obj,
      session_obj) = check_transaction_status(trans_id)
 
-    cur = conn._Connection__async_cursor
-    register_binary_data_typecasters(cur)
+    if error_msg:
+        return internal_server_error(
+            errormsg=error_msg
+        )
+
     if not status or conn is None or trans_obj is None or \
             session_obj is None:
         return internal_server_error(
             errormsg=TRANSACTION_STATUS_CHECK_FAILED
         )
 
+    cur = conn._Connection__async_cursor
+    if cur is None:
+        return internal_server_error(
+            errormsg=gettext('No active result cursor.')
+        )
+    register_binary_data_typecasters(cur)
+
     data = request.values if request.values else request.get_json(silent=True)
     if data is None:
         return make_json_response(
@@ -2222,7 +2232,25 @@ def download_binary_data(trans_id):
     binary_data = cur.fetchone()
     binary_data = binary_data[col_pos]
 
-    return send_file(
+    try:
+        row_pos = int(data['rowpos'])
+        col_pos = int(data['colpos'])
+        if row_pos < 0 or col_pos < 0:
+            raise ValueError
+        cur.scroll(row_pos)
+        row = cur.fetchone()
+        if row is None or col_pos >= len(row):
+            return internal_server_error(
+                errormsg=gettext('Requested cell is out of range.')
+            )
+        binary_data = row[col_pos]
+    except (ValueError, IndexError, TypeError) as e:
+        current_app.logger.error(e)
+        return internal_server_error(
+            errormsg='Invalid row/column position.'
+        )
+
+    return send_file( 
         BytesIO(binary_data),
         as_attachment=True,
         download_name='binary_data',

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

@@ -73,7 +73,7 @@ export function NumberFormatter({row, column}) {
 }
 NumberFormatter.propTypes = FormatterPropTypes;
 
-export function BinaryFormatter({row, column}) {
+export function BinaryFormatter({row, column, ...props}) {
   let value = row[column.key];
   const eventBus = useContext(QueryToolEventsContext);
   const downloadBinaryData = usePreferences().getPreferences('misc', 'enable_binary_data_download').value;
@@ -82,7 +82,7 @@ export function BinaryFormatter({row, column}) {
       <span className='Formatters-disabledCell'>[{value}]</span>&nbsp;&nbsp;
       {downloadBinaryData && 
         <PgIconButton size="xs" title={gettext('Download binary data')} icon={<GetAppRoundedIcon />}
-          onClick={()=>eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SAVE_BINARY_DATA, row.__temp_PK, column.pos)}/>}
+          onClick={()=>eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SAVE_BINARY_DATA, props.rowIdx, column.pos)}/>}
     </StyledNullAndDefaultFormatter>
   );
 }