Fixed an issue where older server group name displayed in the confirmation

pop-up when the user removes server group. Fixes #6939
This commit is contained in:
Pradip Parkale 2021-11-10 11:17:51 +05:30 committed by Akshay Joshi
parent eb8168285e
commit a61a9e5b8f
5 changed files with 6 additions and 4 deletions

View File

@ -22,6 +22,7 @@ Bug fixes
| `Issue #6780 <https://redmine.postgresql.org/issues/6780>`_ - Ensure that columns should be merged if the newly added column is present in the parent table. | `Issue #6780 <https://redmine.postgresql.org/issues/6780>`_ - Ensure that columns should be merged if the newly added column is present in the parent table.
| `Issue #6809 <https://redmine.postgresql.org/issues/6809>`_ - Fixed an issue where pgAdmin is not opening properly. | `Issue #6809 <https://redmine.postgresql.org/issues/6809>`_ - Fixed an issue where pgAdmin is not opening properly.
| `Issue #6859 <https://redmine.postgresql.org/issues/6859>`_ - Fixed an issue where properties panel is not updated when any object is added from the browser tree. | `Issue #6859 <https://redmine.postgresql.org/issues/6859>`_ - Fixed an issue where properties panel is not updated when any object is added from the browser tree.
| `Issue #6939 <https://redmine.postgresql.org/issues/6939>`_ - Fixed an issue where older server group name displayed in the confirmation pop-up when the user removes server group.
| `Issue #6940 <https://redmine.postgresql.org/issues/6940>`_ - Fixed an issue where user details are not shown when the non-admin user tries to connect to the shared server. | `Issue #6940 <https://redmine.postgresql.org/issues/6940>`_ - Fixed an issue where user details are not shown when the non-admin user tries to connect to the shared server.
| `Issue #6949 <https://redmine.postgresql.org/issues/6949>`_ - Ensure that dialog should be opened when clicking on Reassign/Drop owned menu. | `Issue #6949 <https://redmine.postgresql.org/issues/6949>`_ - Ensure that dialog should be opened when clicking on Reassign/Drop owned menu.
| `Issue #6954 <https://redmine.postgresql.org/issues/6954>`_ - Ensure that changing themes should work on Windows when system high contrast mode is enabled. | `Issue #6954 <https://redmine.postgresql.org/issues/6954>`_ - Ensure that changing themes should work on Windows when system high contrast mode is enabled.

View File

@ -136,7 +136,7 @@
"path-fx": "^2.0.0", "path-fx": "^2.0.0",
"pathfinding": "^0.4.18", "pathfinding": "^0.4.18",
"paths-js": "^0.4.9", "paths-js": "^0.4.9",
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#ab0af8e27c7bf24a750c998461c5a7aec2d4624f", "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bc37afd0dd515229364d289e5d177cc31a5492bb",
"postcss": "^8.2.15", "postcss": "^8.2.15",
"raf": "^3.4.1", "raf": "^3.4.1",
"react": "^17.0.1", "react": "^17.0.1",

View File

@ -1441,6 +1441,7 @@ define('pgadmin.browser', [
'_label': this.new._label, '_label': this.new._label,
'label': this.new.label, 'label': this.new.label,
}); });
this.t.update(ctx.i, this.new);
this.t.setLabel(ctx.i, {label: this.new.label}); this.t.setLabel(ctx.i, {label: this.new.label});
this.t.addIcon(ctx.i, {icon: this.new.icon}); this.t.addIcon(ctx.i, {icon: this.new.icon});
this.t.setId(ctx.i, {id: this.new.id}); this.t.setId(ctx.i, {id: this.new.id});

View File

@ -81,7 +81,7 @@ export class Tree {
} }
async update(item, data) { async update(item, data) {
await this.tree.update(item, data.itemData); await this.tree.update(item, data);
} }
async remove(item) { async remove(item) {

View File

@ -30,8 +30,8 @@ export class ManageTreeNodes {
}) })
public updateNode = (_path, _data) => new Promise((res, rej) => { public updateNode = (_path, _data) => new Promise((res, rej) => {
if (_path in this.tree) { const item = this.findNode(_path);
const item = this.tree[_path]; if (item) {
item.name = _data.label; item.name = _data.label;
item.metadata.data = _data; item.metadata.data = _data;
} }