From 0d39e791c96cddab27382c7386d2b85ed656d185 Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Mon, 16 Sep 2024 13:12:41 +0530
Subject: [PATCH] Fixed the import-export 'Not null columns' and User
 Management issue #7884

---
 .../static/js/import_export.ui.js             | 14 ++--
 .../static/js/UserManagementDialog.jsx        | 74 ++++++++++++-------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/web/pgadmin/tools/import_export/static/js/import_export.ui.js b/web/pgadmin/tools/import_export/static/js/import_export.ui.js
index 52edb1154..9279d9f03 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.ui.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.ui.js
@@ -220,13 +220,15 @@ export default class ImportExportSchema extends BaseUISchema {
         id: 'icolumns',
         label: gettext('NOT NULL columns'),
         group: gettext('Columns'),
-        type: 'select',
         deps: ['format', 'is_import'],
-        options: obj.notNullColOptions,
-        optionsReloadBasis: obj.notNullColOptions.length,
-        controlProps: {
-          multiple: true, allowClear: true, placeholder: gettext('Not null columns...'),
-        },
+        type: () => ({
+          type: 'select',
+          options: obj.notNullColOptions,
+          optionsReloadBasis: obj.notNullColOptions.length,
+          controlProps: {
+            multiple: true, allowClear: true, placeholder: gettext('Not null columns...'),
+          },
+        }),
         disabled:function(state){
           return (state?.format != 'csv' || !state?.is_import);
         },
diff --git a/web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx b/web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx
index 4a0fcbe32..a5fbb84ca 100644
--- a/web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx
+++ b/web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx
@@ -31,7 +31,7 @@ const StyledBox = styled(Box)(() => ({
 }));
 
 class UserManagementCollection extends BaseUISchema {
-  constructor(authSources, roleOptions) {
+  constructor() {
     super({
       id: undefined,
       username: undefined,
@@ -46,8 +46,14 @@ class UserManagementCollection extends BaseUISchema {
 
     this.authOnlyInternal = (current_user['auth_sources'].length  == 1 &&
       current_user['auth_sources'].includes(AUTH_METHODS['INTERNAL']));
-    this.authSources = authSources;
-    this.roleOptions = roleOptions;
+  }
+
+  setAuthSources(src) {
+    this.authSources = src;
+  }
+
+  setRoleOptions(src) {
+    this.roleOptions = src;
   }
 
   get idAttribute() {
@@ -113,13 +119,17 @@ class UserManagementCollection extends BaseUISchema {
           return obj.isEditable(state) && state.auth_source != AUTH_METHODS['INTERNAL'];
         }
       }, {
-        id: 'role', label: gettext('Role'), cell: 'select',
-        options: obj.roleOptions, minWidth: 95, width: 95,
-        controlProps: {
-          allowClear: false,
-          openOnEnter: false,
-          first_empty: false,
-        },
+        id: 'role', label: gettext('Role'),
+        cell: () => ({
+          cell: 'select',
+          options: obj.roleOptions,
+          controlProps: {
+            allowClear: false,
+            openOnEnter: false,
+            first_empty: false,
+          },
+        }),
+        minWidth: 95, width: 95,
         editable: (state)=> {
           return obj.isEditable(state);
         }
@@ -238,12 +248,20 @@ class UserManagementCollection extends BaseUISchema {
 }
 
 class UserManagementSchema extends BaseUISchema {
-  constructor(authSources, roleOptions) {
+  constructor() {
     super({refreshBrowserTree: false});
-    this.userManagementCollObj = new UserManagementCollection(authSources, roleOptions);
+    this.userManagementCollObj = new UserManagementCollection();
     this.changeOwnership = false;
   }
 
+  setAuthSources(src) {
+    this.userManagementCollObj.setAuthSources(src);
+  }
+
+  setRoleOptions(src) {
+    this.userManagementCollObj.setRoleOptions(src);
+  }
+
   deleteUser(deleteRow) {
     pgAdmin.Browser.notifier.confirm(
       gettext('Delete user?'),
@@ -317,8 +335,8 @@ function UserManagementDialog({onClose}) {
   const [authSources, setAuthSources] = React.useState([]);
   const [roles, setRoles] = React.useState([]);
   const api = getApiInstance();
-
-  const fetchData = async ()=>{
+  const schema = React.useRef(null);
+  const fetchData = async () => {
     try {
       api.get(url_for('user_management.auth_sources'))
         .then(res=>{
@@ -340,7 +358,7 @@ function UserManagementDialog({onClose}) {
     }
   };
 
-  React.useEffect(()=>{
+  React.useEffect(() => {
     fetchData();
   }, []);
 
@@ -382,28 +400,32 @@ function UserManagementDialog({onClose}) {
     value: m.value,
   }));
 
-  if(authSourcesOptions.length <= 0) {
-    return <></>;
-  }
-
-  const roleOptions = roles.map((m)=>({
+  const roleOptions = roles.map((m) => ({
     label: m.name,
     value: m.id,
   }));
 
+  if (!schema.current)
+    schema.current = new UserManagementSchema();
+
+  if(authSourcesOptions.length <= 0) {
+    return <></>;
+  }
+
   if(roleOptions.length <= 0) {
     return <></>;
   }
 
+  schema.current.setAuthSources(authSourcesOptions);
+  schema.current.setRoleOptions(roleOptions);
+
   const onDialogHelp = () => {
-    window.open(url_for('help.static', { 'filename': 'user_management.html' }), 'pgadmin_help');
+    window.open(
+      url_for('help.static', { 'filename': 'user_management.html' }),
+      'pgadmin_help'
+    );
   };
 
-  const schema = React.useRef(null);
-
-  if (!schema.current)
-    schema.current = new UserManagementSchema(authSourcesOptions, roleOptions);
-
   return <StyledBox><SchemaView
     formType={'dialog'}
     getInitData={()=>{ return new Promise((resolve, reject)=>{