- {row.cells.map((cell) => {
- return (
-
- {cell.render('Cell')}
-
- );
- })}
+
+
+ {row.cells.map((cell) => {
+ return (
+
+ {cell.render('Cell')}
+
+ );
+ })}
+
+ {!_.isUndefined(row) && row.isExpanded && (
+
+ {
+ /*This is intentional (SonarQube)*/
+ }}
+ viewHelperProps={{ mode: 'properties' }}
+ schema={props.schema}
+ showFooter={false}
+ onDataChange={() => { }}
+ />
+
+ )}
);
},
@@ -251,70 +345,96 @@ export default function PgTable({ columns, data, isSelectRow, ...props }) {
);
// Render the UI for your table
return (
-
- {({ height}) => (
-
-
- {headerGroups.map((headerGroup) => (
-
- {headerGroup.headers.map((column) => (
-
+
+
+ {props.customHeader && ( )}
+
+ {
+ setSearchVal(val);
+ }}
+ />
+
+
+
+ {({ height }) => (
+
+
+ {headerGroups.map((headerGroup) => (
+
+ {headerGroup.headers.map((column) => (
- {column.render('Header')}
-
- {column.isSorted
- ? column.isSortedDesc
- ? ' 🔽'
- : ' 🔼'
- : ''}
-
- {column.resizable && (
-
- )}
+
+ {column.render('Header')}
+
+ {column.isSorted
+ ? column.isSortedDesc
+ ? ' 🔽'
+ : ' 🔼'
+ : ''}
+
+ {column.resizable && (
+
+ )}
+
-
- ))}
- {/*
*/}
-
- ))}
-
+ ))}
+
+
+
+
-
- {RenderRow}
-
+ itemSize={(i) => {
+ if (_.isUndefined(rows[i].isExpanded)) {
+ rows[i].isExpanded = false;
+ }
+ if (rowRef.current && rows[i].isExpanded) {
+ setRowHeight(i, rowRef.current.offsetHeight);
+ }
+ return rows[i].isExpanded ? getRowHeight(i, 35): 35;
+ }}
+ sorted={props?.sortOptions}
+ >
+ {RenderRow}
+
+
+
-
+ )}
+
+
);
}
PgTable.propTypes = {
stepId: PropTypes.number,
height: PropTypes.number,
+ customHeader: PropTypes.func,
className: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
- children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+ children: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.node),
+ PropTypes.node,
+ ]),
getToggleAllRowsSelectedProps: PropTypes.func,
columns: PropTypes.array,
data: PropTypes.array,
@@ -324,8 +444,6 @@ PgTable.propTypes = {
getSelectedRows: PropTypes.func,
searchText: PropTypes.string,
type: PropTypes.string,
- sortOptions: PropTypes.array,
-
+ sortOptions: PropTypes.array,
+ schema: PropTypes.object
};
-
-
diff --git a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
index a0f38ea2f..015c3939d 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
+++ b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
@@ -17,7 +17,7 @@ import Wizard from '../../../../static/js/helpers/wizard/Wizard';
import WizardStep from '../../../../static/js/helpers/wizard/WizardStep';
import PgTable from 'sources/components/PgTable';
import { getNodePrivilegeRoleSchema } from '../../../../../pgadmin/browser/server_groups/servers/static/js/privilege.ui.js';
-import { InputSQL, InputText, FormFooterMessage, MESSAGE_TYPE } from '../../../../static/js/components/FormComponents';
+import { InputSQL, FormFooterMessage, MESSAGE_TYPE } from '../../../../static/js/components/FormComponents';
import getApiInstance from '../../../../static/js/api_instance';
import SchemaView from '../../../../static/js/SchemaView';
import clsx from 'clsx';
@@ -117,7 +117,6 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData }) {
const [selectedObject, setSelectedObject] = React.useState([]);
const [selectedAcl, setSelectedAcl] = React.useState({});
const [msqlData, setSQL] = React.useState('');
- const [searchVal, setSearchVal] = React.useState('');
const [loaderText, setLoaderText] = React.useState('');
const [tablebData, setTableData] = React.useState([]);
const [privOptions, setPrivOptions] = React.useState({});
@@ -314,17 +313,6 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData }) {
loaderText={loaderText}
>
-
-
- {
- setSearchVal(val);}
- }>
-
-
diff --git a/web/webpack.config.js b/web/webpack.config.js
index 3f9c5f8f4..ed9ad4472 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -469,10 +469,8 @@ module.exports = [{
options: {
type: 'commonjs',
imports: [
- 'pure|pgadmin.dashboard',
'pure|pgadmin.browser.quick_search',
'pure|pgadmin.tools.user_management',
- 'pure|pgadmin.browser.object_sql',
'pure|pgadmin.browser.bgprocess',
'pure|pgadmin.node.server_group',
'pure|pgadmin.node.server',
diff --git a/web/webpack.shim.js b/web/webpack.shim.js
index a2e8f28e7..f9af1531f 100644
--- a/web/webpack.shim.js
+++ b/web/webpack.shim.js
@@ -208,14 +208,13 @@ var webpackShimConfig = {
'pgadmin.browser.dialog': path.join(__dirname, './pgadmin/browser/static/js/dialog'),
'pgadmin.browser.node': path.join(__dirname, './pgadmin/browser/static/js/node'),
'pgadmin.browser.node.ui': path.join(__dirname, './pgadmin/browser/static/js/node.ui'),
- 'pgadmin.browser.object_sql': path.join(__dirname, './pgadmin/misc/sql/static/js/sql'),
'pgadmin.browser.panel': path.join(__dirname, './pgadmin/browser/static/js/panel'),
'pgadmin.browser.toolbar': path.join(__dirname, './pgadmin/browser/static/js/toolbar'),
'pgadmin.browser.server.privilege': path.join(__dirname, './pgadmin/browser/server_groups/servers/static/js/privilege'),
'pgadmin.browser.server.variable': path.join(__dirname, './pgadmin/browser/server_groups/servers/static/js/variable'),
'pgadmin.browser.utils': '/browser/js/utils',
'pgadmin.browser.wizard': path.join(__dirname, './pgadmin/browser/static/js/wizard'),
- 'pgadmin.dashboard': path.join(__dirname, './pgadmin/dashboard/static/js/dashboard'),
+ 'pgadmin.dashboard': path.join(__dirname, './pgadmin/dashboard/static/js/Dashboard'),
'pgadmin.datagrid': path.join(__dirname, './pgadmin/tools/datagrid/static/js/datagrid'),
'pgadmin.file_manager': path.join(__dirname, './pgadmin/misc/file_manager/static/js/file_manager'),
'pgadmin.file_utility': path.join(__dirname, './pgadmin/misc/file_manager/static/js/utility'),