Reffactor

dekart-xyz · Dec 22, 2023 · 7813fe0 · 7813fe0
1 parent 899e1fa
commit 7813fe0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/client/DekartMenu.js b/src/client/DekartMenu.js
@@ -12,9 +12,20 @@ export default function DekartMenu () {
   return (
     <div className={styles.dekartMenu}>
       <Menu mode='horizontal' theme='dark'>
-        <Menu.Item key='home'>
-          <Link to='/'><MenuOutlined /></Link>
-        </Menu.Item>
+        <Menu.SubMenu popupClassName={styles.subMenu} title={<MenuOutlined />} key='home' active='yes'>
+          <Menu.Item key='my'>
+            <Link to='/'>My Reports</Link>
+          </Menu.Item>
+          <Menu.Item key='shared'>
+            <Link to='/shared'>Shared reports</Link>
+          </Menu.Item>
+          <Menu.Item key='connections'>
+            <Link to='/connections'>Connections</Link>
+          </Menu.Item>
+        </Menu.SubMenu>
+        {/* <Menu.Item key='home'>
+          <Link to='/' title='Connections'><MenuOutlined /></Link>
+        </Menu.Item> */}
         <Menu.SubMenu popupClassName={styles.subMenu} title={<MessageOutlined />} key='community' active='yes'>
           <Menu.Item key='slack'>
             <a target='_blank' rel='noopener noreferrer' href='https://slack.dekart.xyz'>Ask in Slack</a>

diff --git a/src/client/HomePage.js b/src/client/HomePage.js
@@ -113,7 +113,6 @@ function OpenConnectionButton ({ connection }) {
 
 function filterColumns (filter) {
   return filter.map(f => columns.find(c => c.dataIndex === f))
-  // return columns.filter(c => filter.includes(c.dataIndex))
 }
 
 function getColumns (reportFilter, archived) {
@@ -216,9 +215,6 @@ function Reports ({ createReportButton, reportFilter }) {
   const { loaded: envLoaded } = useSelector(state => state.env)
   const connectionList = useSelector(state => state.connection.list)
   const userDefinedConnection = useSelector(state => state.connection.userDefined)
-  // const [reportFilter, setReportFilter] = useState(
-  //   reportsList.my.length === 0 && reportsList.discoverable.length > 0 && authEnabled ? 'discoverable' : 'my'
-  // )
   useEffect(() => {
     if (reportsList.archived.length === 0) {
       setArchived(false)
@@ -239,7 +235,6 @@ function Reports ({ createReportButton, reportFilter }) {
       <div className={styles.reports}><FirstReportOnboarding createReportButton={createReportButton} /></div>
     )
   } else {
-    // const dataSource = reportFilter === 'my' ? archived ? reportsList.archived : reportsList.my : reportsList.discoverable
     let dataSource = []
     if (reportFilter === 'my') {
       dataSource = archived ? reportsList.archived : reportsList.my
@@ -252,7 +247,6 @@ function Reports ({ createReportButton, reportFilter }) {
       <div className={styles.reports}>
         <ReportsHeader
           reportFilter={reportFilter}
-          // setReportFilter={setReportFilter}
           archived={archived}
           setArchived={setArchived}
         />

diff --git a/src/client/actions/report.js b/src/client/actions/report.js
@@ -11,7 +11,6 @@ import { shouldAddQuery } from '../lib/shouldAddQuery'
 import { shouldUpdateDataset } from '../lib/shouldUpdateDataset'
 
 export function closeReport () {
-  console.log('closeReport')
   return (dispatch) => {
     dispatch(grpcStreamCancel(Dekart.GetReportStream))
     dispatch({

diff --git a/src/server/user/userstreams.go b/src/server/user/userstreams.go
@@ -117,7 +117,6 @@ func (s *Streams) PingAll() {
 		}
 		for _, ch := range streamMap {
 			go func(ch chan int64, sequence int64, user string) {
-				log.Debug().Str("user", user).Int64("sequence", sequence).Msg("PingAll sending sequence")
 				ch <- sequence
 			}(ch, s.sequence[user], user)
 		}