Admin status page's current tab does not preserve (#4299)

* handle a console warning about passing in string page options * preserve selected tab in the location hash
getredash · Nov 11, 2019 · a0a32be · a0a32be
1 parent e0e94d7
commit a0a32be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/client/app/components/admin/RQStatus.jsx b/client/app/components/admin/RQStatus.jsx
@@ -49,7 +49,7 @@ export function WorkersTable({ loading, items }) {
       dataSource={items}
       pagination={{
         defaultPageSize: 25,
-        pageSizeOptions: [10, 25, 50],
+        pageSizeOptions: ['10', '25', '50'],
         showSizeChanger: true,
       }}
     />

diff --git a/client/app/pages/admin/Jobs.jsx b/client/app/pages/admin/Jobs.jsx
@@ -16,6 +16,7 @@ import moment from 'moment';
 
 class Jobs extends React.Component {
   state = {
+    activeTab: location.hash.replace('#', '') || null,
     isLoading: true,
     error: null,
 
@@ -76,7 +77,12 @@ class Jobs extends React.Component {
   };
 
   render() {
-    const { isLoading, error, queueCounters, startedJobs, overallCounters, workers } = this.state;
+    const { isLoading, error, queueCounters, startedJobs, overallCounters, workers, activeTab } = this.state;
+
+    const changeTab = (newTab) => {
+      location.replace(`${location.pathname}#${newTab}`);
+      this.setState({ activeTab: newTab });
+    };
 
     return (
       <Layout activeTab="jobs">
@@ -96,7 +102,7 @@ class Jobs extends React.Component {
                 </Grid.Col>
               </Grid.Row>
 
-              <Tabs defaultActiveKey="queues" animated={false}>
+              <Tabs activeKey={activeTab || 'queues'} onTabClick={changeTab} animated={false}>
                 <Tabs.TabPane key="queues" tab="Queues">
                   <QueuesTable loading={isLoading} items={queueCounters} />
                 </Tabs.TabPane>