Fixed All rows and Filtered Rows tooltip

Author: RohitBhati8269

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

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

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

@@ -73,8 +73,10 @@ export default function ObjectExplorerToolbar() {
     <Box display="flex" alignItems="center" gap="2px">
       <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']} shortcut={browserPref?.sub_menu_view_data} />
-        <ToolbarButton icon={<RowFilterIcon />} menuItem={menus['view_filtered_rows_context']} />
+        <ToolbarButton icon={<ViewDataIcon />} menuItem={menus['view_all_rows_context'] ?? 
+          {label :'All Rows'}}
+        shortcut={browserPref?.sub_menu_view_data} />
+        <ToolbarButton icon={<RowFilterIcon />} menuItem={menus['view_filtered_rows_context'] ?? { label :'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[aria-label="Shared Storage"]')).not.toBeNull();
+      expect(ctrl.container.querySelector('button[data-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[aria-label="My Storage"]')).not.toBeNull();
+      expect(ctrl.container.querySelector('button[data-label="My Storage"]')).not.toBeNull();
     });
 
     describe('getComparator', ()=>{