From fcfe7cfb7c7c284855ef3af1de1b4e0018800a7f Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Mon, 1 Jan 2024 16:24:19 +0530
Subject: [PATCH] Fixed an issue where DB Restrictions were not visible on the
 server dialog. #7059

---
 docs/en_US/release_notes_8_2.rst                    | 1 +
 web/pgadmin/static/js/components/FormComponents.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en_US/release_notes_8_2.rst b/docs/en_US/release_notes_8_2.rst
index 8adcca7a0..6d13f16e8 100644
--- a/docs/en_US/release_notes_8_2.rst
+++ b/docs/en_US/release_notes_8_2.rst
@@ -37,6 +37,7 @@ Bug fixes
   | `Issue #6815 <https://github.com/pgadmin-org/pgadmin4/issues/6815>`_ -  Fixed an issue where pgAdmin imports servers to the wrong accounts for the external authentication.
   | `Issue #7002 <https://github.com/pgadmin-org/pgadmin4/issues/7002>`_ -  Fixed an issue where an error occurred in the SQL tab when using an extended index(pgroonga).
   | `Issue #7041 <https://github.com/pgadmin-org/pgadmin4/issues/7041>`_ -  Fixed an issue where changes done to a node using edit dialog are not reflecting on the properties tab if the properties tab is active.
+  | `Issue #7059 <https://github.com/pgadmin-org/pgadmin4/issues/7059>`_ -  Fixed an issue where DB Restrictions were not visible on the server dialog.
   | `Issue #7061 <https://github.com/pgadmin-org/pgadmin4/issues/7061>`_ -  Ensure that the 'Dbo' schema is displayed as a regular schema rather than a system catalog schema.
   | `Issue #7062 <https://github.com/pgadmin-org/pgadmin4/issues/7062>`_ -  Introduce LDAP configuration parameter LDAP_IGNORE_MALFORMED_SCHEMA to ignore fetching schema from the LDAP server.
   | `Issue #7064 <https://github.com/pgadmin-org/pgadmin4/issues/7064>`_ -  Fixed an error-'amname' when generating ERD for database containing partition tables.
diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx
index 0a8342589..77d5dfdac 100644
--- a/web/pgadmin/static/js/components/FormComponents.jsx
+++ b/web/pgadmin/static/js/components/FormComponents.jsx
@@ -853,7 +853,7 @@ export function flattenSelectOptions(options) {
 
 function getRealValue(options, value, creatable, formatter) {
   let realValue = null;
-  if(options?.length == 0) {
+  if(options?.length == 0 && !creatable) {
     return realValue;
   }
   if (_.isArray(value)) {