1 Fixed the issue where db connection was getting disconnected for dashboard, if network is slow.

2 Fixed publication collection node properties issue which was missed during react node porting.
3 Removed unwanted variable from theme style sheet.
This commit is contained in:
Pradip Parkale authored and Akshay Joshi committed 2022-04-05 13:40:22 +05:30
1 parent 953a9d7fd1
commit 8f8adcf71b
13 files changed
+30 -24

No files matched your search

@@ -23,7 +23,7 @@ define('pgadmin.node.publication', [
node: 'publication',
label: gettext('Publications'),
type: 'coll-publication',
columns: ['name', 'pubowner', 'proptable', 'all_table'],
columns: ['name', 'pubowner', 'pubtable', 'all_table'],
});
}
@@ -144,11 +144,8 @@ export default class PublicationSchema extends BaseUISchema {
id: 'pubtable', label: gettext('Tables'), type: 'select',
controlProps: { allowClear: true, multiple: true, creatable: true },
options: this.fieldOptions.publicationTable,
group: gettext('Definition'), mode: ['edit', 'create'],
group: gettext('Definition'), mode: ['edit', 'create', 'properties'],
deps: ['all_table'], disabled: obj.isAllTable,
},{
id: 'proptable', label: gettext('Tables'), type: 'text', group: gettext('Definition'),
mode: ['properties'],
},{
type: 'nested-fieldset', mode: ['create','edit', 'properties'],
label: gettext('With'), group: gettext('Definition'),
+13 -1
View File
@@ -147,7 +147,7 @@ define(
});
pgBrowser.Events.on('pgadmin-browser:tree:selected', () => {
if(myPanel.isVisible() && myPanel._type !== 'properties') {
getPanelView(
pgBrowser.tree,
@@ -158,6 +158,18 @@ define(
}
});
pgBrowser.Events.on('pgadmin:database:connected', () => {
if(myPanel.isVisible() && myPanel._type == 'dashboard' && myPanel._type !== 'properties') {
getPanelView(
pgBrowser.tree,
$container[0],
pgBrowser,
myPanel._type
);
}
});
pgBrowser.Events.on('pgadmin-browser:tree:refreshing', () => {
if(myPanel.isVisible() && myPanel._type !== 'properties') {
@@ -48,6 +48,7 @@ export function getPanelView(
did={((!_.isUndefined(treeNodeInfo)) && (!_.isUndefined(treeNodeInfo['database']))) ? treeNodeInfo['database']._id: 0}
sid={!_.isUndefined(treeNodeInfo) && !_.isUndefined(treeNodeInfo['server']) ? treeNodeInfo['server']._id : ''}
serverConnected={!_.isUndefined(treeNodeInfo) && !_.isUndefined(treeNodeInfo['server']) ? treeNodeInfo.server.connected: false}
dbConnected={!_.isUndefined(treeNodeInfo) && !_.isUndefined(treeNodeInfo['database']) ? treeNodeInfo.database.connected: false}
/>
</Theme>,
container