Skip to content

fix: render disconnect tree label via className, not embedded HTML #10169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kundansable wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

fix: render disconnect tree label via className, not embedded HTML #10169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,7 @@ define('pgadmin.node.database', [
i = item,
label = data.label;
let disconnect = function() {
d.label = `<span class='text-muted'>[Disconnecting...]</span> ${label}`;
t.setLabel(i,{label:d.label});
t.setLabel(i, {label: `[Disconnecting...] ${label}`, className: 'text-muted'});
t.close(i);
let data = d;
getApiInstance().delete(
Expand Down
3 changes: 1 addition & 2 deletions web/pgadmin/browser/server_groups/servers/static/js/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,7 @@ define('pgadmin.node.server', [
label = data.label;

let disconnect = function() {
d.label = `<span class='text-muted'>[Disconnecting...]</span> ${label}`;
t.setLabel(i,{label:d.label});
t.setLabel(i, {label: `[Disconnecting...] ${label}`, className: 'text-muted'});
t.close(i);
getApiInstance().delete(
obj.generate_url(i, 'connect', d, true),
Expand Down
5 changes: 5 additions & 0 deletions web/pgadmin/static/js/components/PgTree/FileTreeX/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,10 +455,15 @@ export class FileTreeX extends React.Component<IFileTreeXProps> {
const label$ = ref.querySelector('span.file-name') as HTMLDivElement;

if (label$) {
let className = '';
if (typeof(label) == 'object' && label.label) {
className = label.className ?? '';
label = label.label;
}
// Render the label as plain text (never as an HTML string) and apply
// any requested styling via a CSS class instead of embedding markup.
label$.textContent = label;
label$.className = 'file-name' + (className ? ' ' + className : '');
}

}
Expand Down
Loading