Fix review comments

Author: RohitBhati8269

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

@@ -176,29 +176,51 @@ export const PgIconButton = forwardRef(({icon, title, shortcut, className, split
     shortcutTitle = <ShortcutTitle title={title} accesskey={accesskey} shortcut={shortcut}/>;
   }
 
-  if(color == 'primary') {
+  if(props.disabled) {
+    if(color == 'primary') {
+      return (
+        <Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement}>
+          <span>
+            <PrimaryButton ref={ref} style={style}
+              className={['Buttons-iconButton', (splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
+              accessKey={accesskey} data-label={title || ''} {...props}>
+              {icon}
+            </PrimaryButton>
+          </span>
+        </Tooltip>
+      );
+    } else {
+      return (
+        <Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement}>
+          <span>
+            <DefaultButton ref={ref} style={style}
+              className={['Buttons-iconButton', 'Buttons-iconButtonDefault',(splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
+              accessKey={accesskey} data-label={title || ''} {...props}>
+              {icon}
+            </DefaultButton>
+          </span>
+        </Tooltip>
+      );
+    }
+  } else if(color == 'primary') {
     return (
       <Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement}>
-        <span>
-          <PrimaryButton ref={ref} style={style}
-            className={['Buttons-iconButton', (splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
-            accessKey={accesskey} data-label={title || ''} {...props}>
-            {icon}
-          </PrimaryButton>
-        </span>
+        <PrimaryButton ref={ref} style={style}
+          className={['Buttons-iconButton', (splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
+          accessKey={accesskey} data-label={title || ''} {...props}>
+          {icon}
+        </PrimaryButton>
       </Tooltip>
 
     );
   } else {
     return (
       <Tooltip title={shortcutTitle || title || ''} aria-label={title || ''} enterDelay={isDropdown ? 1500 : undefined} placement={tooltipPlacement}>
-        <span>    
-          <DefaultButton ref={ref} style={style}
-            className={['Buttons-iconButton', 'Buttons-iconButtonDefault',(splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
-            accessKey={accesskey} data-label={title || ''} {...props}>
-            {icon}
-          </DefaultButton>
-        </span>
+        <DefaultButton ref={ref} style={style}
+          className={['Buttons-iconButton', 'Buttons-iconButtonDefault',(splitButton ? 'Buttons-splitButton' : ''), className].join(' ')}
+          accessKey={accesskey} data-label={title || ''} {...props}>
+          {icon}
+        </DefaultButton>
       </Tooltip>
     );
   }

web/pgadmin/static/js/helpers/ObjectExplorerToolbar.jsx

@@ -18,7 +18,7 @@ import _ from 'lodash';
 import PropTypes from 'prop-types';
 import CustomPropTypes from '../custom_prop_types';
 import usePreferences from '../../../preferences/static/js/store';
-
+import gettext from 'sources/gettext';
 
 function ToolbarButton({menuItem, ...props}) {
   return (
@@ -74,9 +74,9 @@ export default function ObjectExplorerToolbar() {
       <PgButtonGroup size="small">
         <ToolbarButton icon={<QueryToolIcon />} menuItem={menus['query_tool']} shortcut={browserPref?.sub_menu_query_tool} />
         <ToolbarButton icon={<ViewDataIcon />} menuItem={menus['view_all_rows_context'] ?? 
-          {label :'All Rows'}}
+          {label :gettext('All Rows')}}
         shortcut={browserPref?.sub_menu_view_data} />
-        <ToolbarButton icon={<RowFilterIcon />} menuItem={menus['view_filtered_rows_context'] ?? { label :'Filtered Rows...'}} />
+        <ToolbarButton icon={<RowFilterIcon />} menuItem={menus['view_filtered_rows_context'] ?? { label : gettext('Filtered Rows...')}} />
         <ToolbarButton icon={<SearchOutlinedIcon style={{height: '1.4rem'}} />} menuItem={menus['search_objects']} shortcut={browserPref?.sub_menu_search_objects} />
         {!_.isUndefined(menus['psql']) && <ToolbarButton icon={<TerminalRoundedIcon style={{height: '1.4rem'}}/>} menuItem={menus['psql']} />}
       </PgButtonGroup>

web/regression/javascript/file_manager/FileManager.spec.js

@@ -153,16 +153,16 @@ describe('FileManger', ()=>{
 
     it('Change Shared Storage', async ()=>{
       networkMock.onPost('/file_manager/init').reply(200, {'data': configData});
-      networkMock.onPost(`/file_manager/save_last_dir/${transId}`).reply(200, {'success':1,'errormsg':'','info':'','result':null,'data':null});   
+      networkMock.onPost(`/file_manager/save_last_dir/${transId}`).reply(200, {'success':1,'errormsg':'','info':'','result':null,'data':null});
       let ctrl;
-      const user = userEvent.setup(); 
+      const user = userEvent.setup();
       await act(async ()=>{
         ctrl = await ctrlMount({});
       });
-    
+
       await user.click(ctrl.container.querySelector('[name="menu-shared-storage"]'));
       await user.click(ctrl.container.querySelector('[data-label="Shared Storage"]'));
-      expect(ctrl.container.querySelector('button[data-label="Shared Storage"]')).not.toBeNull();
+      expect(ctrl.container.querySelector('button[aria-label="Shared Storage"]')).not.toBeNull();
     });
 
     it('Change Storage to My Storage', async ()=>{
@@ -176,7 +176,7 @@ describe('FileManger', ()=>{
 
       await user.click(ctrl.container.querySelector('[name="menu-shared-storage"]'));
       await user.click(ctrl.container.querySelector('[data-label="My Storage"]'));
-      expect(ctrl.container.querySelector('button[data-label="My Storage"]')).not.toBeNull();
+      expect(ctrl.container.querySelector('button[aria-label="My Storage"]')).not.toBeNull();
     });
 
     describe('getComparator', ()=>{