fix review comments

Author: adityatoshniwal

web/pgadmin/static/js/Theme/index.jsx

@@ -206,6 +206,12 @@ basicSettings = createTheme(basicSettings, {
           height: '100%',
           boxSizing: 'border-box',
         },
+        adornedStart: {
+          paddingLeft: basicSettings.spacing(0.75),
+        },
+        inputAdornedStart: {
+          paddingLeft: '2px',
+        },
         adornedEnd: {
           paddingRight: basicSettings.spacing(0.75),
         },
@@ -523,7 +529,7 @@ function getFinalTheme(baseTheme) {
           },
           inputSizeSmall: {
             height: '16px', // + 12px of padding = 28px;
-          }
+          },
         }
       },
       MuiSelect: {

web/pgadmin/static/js/components/PgTable.jsx

@@ -37,6 +37,7 @@ import gettext from 'sources/gettext';
 import EmptyPanelMessage from './EmptyPanelMessage';
 import { InputText } from './FormComponents';
 import { PgReactTable, PgReactTableBody, PgReactTableCell, PgReactTableHeader, PgReactTableRow, PgReactTableRowContent, PgReactTableRowExpandContent, getCheckboxCell, getCheckboxHeaderCell } from './PgReactTableStyled';
+import SearchRoundedIcon from '@mui/icons-material/SearchRounded';
 
 
 const ROW_HEIGHT = 30;
@@ -334,6 +335,7 @@ export default function PgTable({ caveTable = true, tableNoBorder = true, tableN
               onChange={(val) => {
                 setSearchVal(val);
               }}
+              startAdornment={<SearchRoundedIcon />}
             />
           </Box>
         </Box>}

web/pgadmin/tools/user_management/__init__.py

@@ -558,6 +558,8 @@ def create_user(data):
 
     try:
         new_data = validate_user(data)
+        new_data['password'] = new_data['password']\
+            if 'password' in new_data else None
 
         if 'roles' in new_data:
             new_data['roles'] = [Role.query.get(new_data['roles'])]

web/pgadmin/tools/user_management/static/js/Component.jsx

@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2025, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import React from 'react';
 import { Box, styled, Tab, Tabs } from '@mui/material';
 import TabPanel from '../../../../static/js/components/TabPanel';

web/pgadmin/tools/user_management/static/js/UserDialog.jsx

@@ -6,6 +6,7 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+
 import React, { useMemo } from 'react';
 import SchemaView from '../../../../static/js/SchemaView';
 import BaseUISchema from '../../../../static/js/SchemaView/base_schema.ui';
@@ -46,7 +47,7 @@ class UserSchema extends BaseUISchema {
   }
 
   isUserNameEnabled(state) {
-    return !(this.authOnlyInternal || state.auth_source == AUTH_METHODS['INTERNAL']);
+    return this.isNew(state) && state.auth_source != AUTH_METHODS['INTERNAL'];
   }
 
   isNotCurrentUser(state) {
@@ -81,7 +82,7 @@ class UserSchema extends BaseUISchema {
         id: 'username', label: gettext('Username'), type: 'text',
         deps: ['auth_source'],
         depChange: (state) => {
-          if (obj.isUserNameEnabled(state) && obj.isNew(state) && !isEmptyString(obj.username)) {
+          if (!obj.isUserNameEnabled(state)) {
             return { username: undefined };
           }
         },
@@ -95,7 +96,7 @@ class UserSchema extends BaseUISchema {
           if (obj.isNew(state)) {
             return false;
           } else {
-            return obj.isNotCurrentUser(state) && state.auth_source == AUTH_METHODS['INTERNAL'];
+            return !obj.isNotCurrentUser(state) || state.auth_source == AUTH_METHODS['INTERNAL'];
           }
         }
       }, {
@@ -124,13 +125,13 @@ class UserSchema extends BaseUISchema {
         deps: ['auth_source'], controlProps: {
           autoComplete: 'new-password',
         },
-        visible: obj.isNotCurrentUser,
+        visible: (state)=>obj.isNotCurrentUser(state) && state.auth_source == AUTH_METHODS['INTERNAL'],
       }, {
         id: 'confirmPassword', label: gettext('Confirm password'), type: 'password',
         deps: ['auth_source'], controlProps: {
           autoComplete: 'new-password',
         },
-        visible: obj.isNotCurrentUser,
+        visible: (state)=>obj.isNotCurrentUser(state) && state.auth_source == AUTH_METHODS['INTERNAL'],
       }, {
         id: 'locked', label: gettext('Locked'), type: 'switch',
         readonly: (state) => {
@@ -210,15 +211,15 @@ export default function UserDialog({user, options, onClose}) {
       try {
         api.post(url_for('user_management.save'), changeData)
           .then(()=>{
-            pgAdmin.Browser.notifier.success('Users Saved Successfully');
+            pgAdmin.Browser.notifier.success(gettext('Users Saved Successfully'));
             resolve();
             onClose(null, true);
           })
           .catch((err)=>{
             reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
           });
       } catch (error) {
-        reject(parseApiError(error));
+        reject(Error(parseApiError(error)));
       }
     });
   };

web/pgadmin/tools/user_management/static/js/Users.jsx

@@ -1,5 +1,14 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2025, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import React, { useEffect, useMemo, useRef } from 'react';
-import { getDeleteCell, getEditCell } from '../../../../static/js/components/PgReactTableStyled';
+import { getDeleteCell, getEditCell, getSwitchCell } from '../../../../static/js/components/PgReactTableStyled';
 import gettext from 'sources/gettext';
 import pgAdmin from 'sources/pgadmin';
 import getApiInstance, { parseApiError } from '../../../../static/js/api_instance';
@@ -80,7 +89,7 @@ export default function Users() {
 
   const onDeleteClick = (row) => {
     const deleteRow = async () => {
-      setLoading('Deleting user...');
+      setLoading(gettext('Deleting user...'));
       try {
         await api.delete(url_for('user_management.save_id', { id: row.original.id }));
         pgAdmin.Browser.notifier.success(gettext('User deleted successfully.'));
@@ -93,15 +102,16 @@ export default function Users() {
 
     pgAdmin.Browser.notifier.confirm(gettext('Delete User'), gettext('Are you sure you want to delete the user %s?', row.original.username),
       async () => {
-        setLoading('Deleting user...');
+        setLoading(gettext('Deleting user...'));
         try {
           const resp = await api.get(url_for('user_management.shared_servers', {'uid': row['id']}));
-          if (resp.data?.data?.shared_servers > 0) {
+          const noOfSharedServers = resp.data?.data?.shared_servers ?? 0;
+          if (noOfSharedServers > 0) {
             const resp = await api.get(url_for('user_management.admin_users', {'uid': row['id']}));
             showChangeOwnership(
               gettext('Change ownership'),
-              resp?.data?.data?.result?.data,
-              resp?.data?.data?.shared_servers,
+              resp.data?.data?.result?.data,
+              noOfSharedServers,
               {'id': row.original['id'], 'name': !isEmptyString(row.original['email']) ? row.original['email'] : row.original['username']},
               ()=> {
                 pgAdmin.Browser.notifier.confirm(
@@ -221,7 +231,7 @@ export default function Users() {
       size: 50,
       minSize: 50,
       enableFilters: true,
-      cell: ({ getValue }) => (getValue() ? gettext('Yes') : gettext('No')),
+      cell: getSwitchCell(),
     },
     {
       header: gettext('Locked'),
@@ -231,7 +241,7 @@ export default function Users() {
       size: 50,
       minSize: 50,
       enableFilters: true,
-      cell: ({ getValue }) => (getValue() ? gettext('Yes') : gettext('No')),
+      cell: getSwitchCell(),
     }];
   }, []);