@@ -104,7 +104,7 @@ const columns = [
key: 'type',
name: gettext('Type'),
width: 30,
- formatter({row}) {
+ formatter: ({row})=>{
const classes = useStyles();
return (
{row.type_label}
@@ -114,7 +114,7 @@ const columns = [
key: 'path',
name: gettext('Browser path'),
sortable: false,
- formatter({row}) {
+ formatter: ({row})=>{
const classes = useStyles();
return (
{row.path}
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
index 23c42a711..dc6b03c39 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
@@ -272,6 +272,32 @@ function initialiseColumns(columns, rows, totalRowCount, columnWidthBy) {
return retColumns;
}
+function RowNumColFormatter({row, rowKeyGetter, dataChangeStore, onSelectedColumnsChange}) {
+ const {rowIdx} = useContext(RowInfoContext);
+ const [isRowSelected, onRowSelectionChange] = useRowSelection();
+ const classes = useStyles();
+
+ let rowKey = rowKeyGetter(row);
+ let rownum = rowIdx+1;
+ if(rowKey in (dataChangeStore?.added || {})) {
+ rownum = rownum+'+';
+ } else if(rowKey in (dataChangeStore?.deleted || {})) {
+ rownum = rownum+'-';
+ }
+ return (
{
+ onSelectedColumnsChange(new Set());
+ onRowSelectionChange({ row: row, checked: !isRowSelected, isShiftClick: false});
+ }}>
+ {rownum}
+
);
+}
+RowNumColFormatter.propTypes = {
+ row: PropTypes.object,
+ rowKeyGetter: PropTypes.func,
+ dataChangeStore: PropTypes.object,
+ onSelectedColumnsChange: PropTypes.func,
+};
+
function formatColumns(columns, dataChangeStore, selectedColumns, onSelectedColumnsChange, rowKeyGetter, classes) {
let retColumns = [
...columns,
@@ -288,22 +314,8 @@ function formatColumns(columns, dataChangeStore, selectedColumns, onSelectedColu
let rowNumCol = retColumns[0];
rowNumCol.headerRenderer = SelectAllHeaderRenderer;
- rowNumCol.formatter = ({row})=>{
- const {rowIdx} = useContext(RowInfoContext);
- const [isRowSelected, onRowSelectionChange] = useRowSelection();
- let rowKey = rowKeyGetter(row);
- let rownum = rowIdx+1;
- if(rowKey in (dataChangeStore?.added || {})) {
- rownum = rownum+'+';
- } else if(rowKey in (dataChangeStore?.deleted || {})) {
- rownum = rownum+'-';
- }
- return (
{
- onSelectedColumnsChange(new Set());
- onRowSelectionChange({ row: row, checked: !isRowSelected, isShiftClick: false});
- }}>
- {rownum}
-
);
+ rowNumCol.formatter = (props)=>{
+ return
;
};
return retColumns;
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
index 018d82c9b..92fc3fa4f 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
@@ -1065,7 +1065,7 @@ export function ResultSet() {
return deletedKeys.indexOf(row[rsu.current.clientPK]) == -1;
});
});
- setColumns(columns);
+ setColumns((prev)=>prev);
}
dispatchDataChange({type: 'reset'});
setSelectedRows(new Set());
diff --git a/web/webpack.test.config.js b/web/webpack.test.config.js
index 40ef92477..1cca0b48b 100644
--- a/web/webpack.test.config.js
+++ b/web/webpack.test.config.js
@@ -106,7 +106,7 @@ module.exports = {
options: { esModules: true },
},
enforce: 'post',
- exclude: /node_modules|plugins|bundle|generated|regression|[Tt]est.js|[Ss]pecs.js|[Ss]pec.js|\.spec\.js$/,
+ exclude: /node_modules|plugins|bundle|generated|regression|[Tt]est.js|[Ss]pecs.js|[Ss]pec.js|\.spec\.js/,
},
],
},