From 64ddfc0eb7735890a32514a9f352481565fc5335 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Tue, 21 Mar 2023 17:39:37 +0530 Subject: [PATCH] Fix an issue where server foreground/background color was not getting applied after jQuery changes. #5701 --- docs/en_US/release_notes_7_0.rst | 8 ++++---- web/pgadmin/browser/static/js/node.js | 2 +- web/pgadmin/static/js/components/PgTree/scss/styles.scss | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en_US/release_notes_7_0.rst b/docs/en_US/release_notes_7_0.rst index 452c07da5..98932816a 100644 --- a/docs/en_US/release_notes_7_0.rst +++ b/docs/en_US/release_notes_7_0.rst @@ -27,7 +27,7 @@ New features Housekeeping ************ - | `Issue #5011 `_ - Added support for psycopg3 along with psycopg2. + | `Issue #5011 `_ - Upgrade from psycopg2 to psycopg3. | `Issue #5701 `_ - Remove Bootstrap and jQuery usage. | `Issue #5830 `_ - Add .ts and .tsx files under linter and fix linter issues. | `Issue #5901 `_ - Update SQLAlchemy, Flask, Flask-SQLAlchemy, and other packages to current versions. @@ -35,14 +35,14 @@ Housekeeping Bug fixes ********* - | `Issue #4423 `_ - Fixed an issue where list of tables is not displayed. + | `Issue #4423 `_ - Fixed an issue where list of tables is not displayed in a SQL_ASCII database. | `Issue #4784 `_ - Handle errors occurring during decoding UTF-8 encoded query result data which contains ascii characters. | `Issue #4884 `_ - Fixed an issue where it is not possible to import csv data to tables having columns with german umlauts in their name. - | `Issue #4891 `_ - Fixed 'rawunicodeescape' codec can't decode issue. + | `Issue #4891 `_ - Fixed 'rawunicodeescape' codec can't decode issue in a SQL_ASCII database. | `Issue #5504 `_ - Fixed an issue where incorrect view of text[] fields in query and table results when use other then UTF8 (win1251) codepage and symbols. | `Issue #5735 `_ - Show appropriate error message when master password is not set instead of 'Crypt key missing'. | `Issue #5775 `_ - Display the 'No menu available for this object' message if the selected tree node does not have any options. - | `Issue #5824 `_ - Ensure that the user's storage directory is created when the users are created, as well as for those users who have not yet been created. + | `Issue #5824 `_ - Ensure that the user's storage directory is created when the users are created, as well as for those users whose directories have not yet been created. | `Issue #5833 `_ - Fixed an issue where user MFA entry was not getting delete after deleting a user. | `Issue #5874 `_ - Make "using" and "with check" fields a textarea in the RLS policy. | `Issue #5894 `_ - Use fetch instead of axios to close connections in SQLEditor, ERD, Schema Diff and Debugger to ensure it completes. diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index 9929427e8..97bca296f 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -838,7 +838,7 @@ define('pgadmin.browser.node', [ `; // Prepare dynamic style tag using template - document.querySelector(`style[id="${dynamic_class}"]`).remove(); + document.querySelector(`style[id="${dynamic_class}"]`)?.remove(); document.head.appendChild(styleTag); // Add dynamic class to the tree node. pgBrowser.tree.addCssClass(item, dynamic_class); diff --git a/web/pgadmin/static/js/components/PgTree/scss/styles.scss b/web/pgadmin/static/js/components/PgTree/scss/styles.scss index f6d2cb92d..b88b606f5 100644 --- a/web/pgadmin/static/js/components/PgTree/scss/styles.scss +++ b/web/pgadmin/static/js/components/PgTree/scss/styles.scss @@ -92,7 +92,7 @@ span.file-label { span.file-name { - color: $tree-text-hover-fg !important; + color: $tree-text-hover-fg; } } } @@ -106,7 +106,7 @@ span.file-label { span.file-name { - color: $tree-text-hover-fg !important; + color: $tree-text-hover-fg; } } }