From fd1a0753bc3c2753853394eca3e7fecc517adda5 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Wed, 29 Nov 2023 13:09:01 +0530
Subject: [PATCH] Fixed an issue where the Schema was not visible in the
 dropdown for table properties or when creating a new table. #6964

---
 docs/en_US/release_notes_8_1.rst                               | 2 ++
 .../servers/databases/schemas/domains/static/js/domain.js      | 3 +--
 .../servers/databases/schemas/synonyms/static/js/synonym.js    | 3 +--
 .../schemas/tables/partitions/static/js/partition.ui.js        | 3 +--
 .../servers/databases/schemas/tables/static/js/table.ui.js     | 3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/en_US/release_notes_8_1.rst b/docs/en_US/release_notes_8_1.rst
index 6c60abc5e5e..0838f72e93c 100644
--- a/docs/en_US/release_notes_8_1.rst
+++ b/docs/en_US/release_notes_8_1.rst
@@ -35,5 +35,7 @@ Bug fixes
   | `Issue #6921 <https://github.com/pgadmin-org/pgadmin4/issues/6921>`_ -  Fixed an issue where on entering full screen, the option label is not changed to 'Exit Full Screen' in desktop mode.
   | `Issue #6950 <https://github.com/pgadmin-org/pgadmin4/issues/6950>`_ -  Ensure that the Authentication Source in the drop-down of the UserManagement dialog aligns with the entries specified for AUTHENTICATION_SOURCES in the configuration file.
   | `Issue #6958 <https://github.com/pgadmin-org/pgadmin4/issues/6958>`_ -  Reverse engineer serial columns when generating ERD for database/table.
+  | `Issue #6964 <https://github.com/pgadmin-org/pgadmin4/issues/6964>`_ -  Fixed an issue where the Schema was not visible in the dropdown for table properties or when creating a new table.
   | `Issue #6984 <https://github.com/pgadmin-org/pgadmin4/issues/6984>`_ -  Fixed an issue where the Vacuum option INDEX_CLEANUP have an incorrect value ('AUTO') for database versions < 14.
   | `Issue #6989 <https://github.com/pgadmin-org/pgadmin4/issues/6989>`_ -  Fixed an issue where the pgAdmin page went blank when clicking the delete button in the User Management dialog.
+  | `Issue #7000 <https://github.com/pgadmin-org/pgadmin4/issues/7000>`_ -  Ensure that correct timezone is set for Docker deployments.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
index a528be5f429..22cab65aca9 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
@@ -75,8 +75,7 @@ define('pgadmin.node.domain', [
           {
             role: ()=>getNodeListByName('role', treeNodeInfo, itemNodeData),
             schema: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {
-              cacheLevel: 'database',
-              cacheNode: 'database'
+              cacheLevel: 'database'
             }),
             basetype: ()=>getNodeAjaxOptions('get_types', this, treeNodeInfo, itemNodeData, {
               cacheNode: 'type'
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
index c06fcff0bac..1e365778140 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
@@ -78,8 +78,7 @@ define('pgadmin.node.synonym', [
           {
             role: ()=>getNodeListByName('role', treeNodeInfo, itemNodeData),
             schema: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {
-              cacheLevel: 'database',
-              cacheNode: 'database'
+              cacheLevel: 'database'
             }),
             synobjschema: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {}, (m)=>{
               // Exclude PPAS catalogs
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
index 66f37c7c8c0..78a20ce6084 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
@@ -30,8 +30,7 @@ export function getNodePartitionTableSchema(treeNodeInfo, itemNodeData, pgBrowse
     {
       relowner: ()=>getNodeListByName('role', treeNodeInfo, itemNodeData),
       schema: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {
-        cacheLevel: 'database',
-        cacheNode: 'database',
+        cacheLevel: 'database'
       }, (d)=>{
         // If schema name start with pg_* then we need to exclude them
         return !(d && d.label.match(/^pg_/));
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
index 7a1b0672cb9..19747106a71 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
@@ -35,8 +35,7 @@ export function getNodeTableSchema(treeNodeInfo, itemNodeData, pgBrowser) {
     {
       relowner: ()=>getNodeListByName('role', treeNodeInfo, itemNodeData),
       schema: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {
-        cacheLevel: 'database',
-        cacheNode: 'database',
+        cacheLevel: 'database'
       }, (d)=>{
         // If schema name start with pg_* then we need to exclude them
         return !(d && d.label.match(/^pg_/));