Fix review comments.

khushboovashi · Jul 2, 2024 · 5d0b0ad · 5d0b0ad
1 parent 03773ca
commit 5d0b0ad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/web/pgadmin/dashboard/__init__.py b/web/pgadmin/dashboard/__init__.py
@@ -514,12 +514,12 @@ def log_formats(sid=None):
     )
 
 
-@blueprint.route('/logs/<frm>/<disp_format>/<int:sid>', endpoint='logs')
-@blueprint.route('/logs/<frm>/<disp_format>/<int:sid>/<int:page>',
+@blueprint.route('/logs/<log_format>/<disp_format>/<int:sid>', endpoint='logs')
+@blueprint.route('/logs/<log_format>/<disp_format>/<int:sid>/<int:page>',
                  endpoint='get_logs_by_server_id')
 @pga_login_required
 @check_precondition
-def logs(frm=None, disp_format=None, sid=None, page=0):
+def logs(log_format=None, disp_format=None, sid=None, page=0):
     """
     This function returns server logs details
     """
@@ -537,9 +537,9 @@ def logs(frm=None, disp_format=None, sid=None, page=0):
 
     # Check the requested format is available or not
     log_format = ''
-    if frm == 'C' and 'csvlog' in _format:
+    if log_format == 'C' and 'csvlog' in _format:
         log_format = 'csvlog'
-    elif frm == 'J' and 'jsonlog' in _format:
+    elif log_format == 'J' and 'jsonlog' in _format:
         log_format = 'jsonlog'
 
     sql = render_template(
@@ -579,7 +579,7 @@ def logs(frm=None, disp_format=None, sid=None, page=0):
 
         final_res = res['rows'][0]['pg_read_file'].split('\n')
         # Json format
-        if frm == 'J':
+        if log_format == 'J':
             for f in final_res:
                 try:
                     _tmp_log = json.loads(f)
@@ -591,7 +591,7 @@ def logs(frm=None, disp_format=None, sid=None, page=0):
                     pass
 
         # CSV format
-        elif frm == 'C':
+        elif log_format == 'C':
             for f in final_res:
                 try:
                     _tmp_log = f.split(',')

diff --git a/web/pgadmin/dashboard/static/js/Dashboard.jsx b/web/pgadmin/dashboard/static/js/Dashboard.jsx
@@ -80,6 +80,9 @@ const Root = styled('div')(({theme}) => ({
             width: '35px',
             height:'30px'
           },
+        },
+        '& .Dashboard-textArea': {
+          height: '88%',
         }
       },
     },
@@ -901,9 +904,9 @@ function Dashboard({
         url = url_for('dashboard.config', {'sid': sid});
       } else if (mainTabVal === 3) {
         if(logCol === false) {
-          url = url_for('dashboard.logs', {'frm': logFormat, 'disp_format': 'plain', 'sid': sid});
+          url = url_for('dashboard.logs', {'log_format': logFormat, 'disp_format': 'plain', 'sid': sid});
         } else if (logCol === true) {
-          url = url_for('dashboard.logs', {'frm': logFormat, 'disp_format': 'table', 'sid': sid});
+          url = url_for('dashboard.logs', {'log_format': logFormat, 'disp_format': 'table', 'sid': sid});
           setNextPage(0);
         }
       }
@@ -1011,7 +1014,7 @@ function Dashboard({
     };
   const CustomActiveOnlyHeader = () => {
     return (<Fragment>
-       <RefreshButton onClick={(e) => {
+      <RefreshButton onClick={(e) => {
         e.preventDefault();
         setRefresh(!refresh);
       }}/>
@@ -1035,7 +1038,7 @@ function Dashboard({
       label: gettext('Table based logs'),
     };
   const CustomLogHeader = () => {
-    return ( <Box height="100%" className='Dashboard-cardHeader' display="flex" flexDirection="column">
+    return ( <Box className='Dashboard-cardHeader' display="flex" flexDirection="column">
       <FormInputToggle
         label={gettext('Log Format')}
         className='Dashboard-searchInput'
@@ -1079,7 +1082,7 @@ function Dashboard({
       setHasNextPage(true);
       setIsNextPageLoading(false);
 
-      let _url = url_for('dashboard.logs', {'frm': logFormat, 'disp_format': 'table', 'sid': sid});
+      let _url = url_for('dashboard.logs', {'log_format': logFormat, 'disp_format': 'table', 'sid': sid});
       _url += '/' + (nextPage +1);
 
       const api = getApiInstance();
@@ -1194,9 +1197,7 @@ function Dashboard({
               {/* Server Logs */}
               <TabPanel value={mainTabVal} index={3} classNameRoot='Dashboard-tabPanel'>
                 {dashData &&  dashData.length != 0 &&
-                <Box>
-                  <CustomLogHeader/>
-                </Box>}
+                  <CustomLogHeader/>}
                 {dashData.length == 0 && <div className='Dashboard-emptyPanel'>
                   <EmptyPanelMessage text={ssMsg}/>
                 </div>}

diff --git a/web/pgadmin/dashboard/static/js/components/SectionContainer.jsx b/web/pgadmin/dashboard/static/js/components/SectionContainer.jsx
@@ -10,7 +10,6 @@ import React from 'react';
 import { styled } from '@mui/material/styles';
 import PropTypes from 'prop-types';
 import { Box } from '@mui/material';
-import RefreshButton from './RefreshButtons';
 
 const StyledBox = styled(Box)(({theme}) => ({
   ...theme.mixins.panelBorder.all,