Refactor conditional in DashboardPage memo hook for toolbarColumns

koudicz · Jan 5, 2022 · 6539b2f · 6539b2f
1 parent 60f2cc0
commit 6539b2f
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/cloud/components/DashboardPage/DashboardView.tsx b/src/cloud/components/DashboardPage/DashboardView.tsx
@@ -58,18 +58,14 @@ export const DashboardView = ({
   }, [docs, removeDocInSelection])
 
   const toolbarColumns = useMemo(() => {
-    if (
-      currentView == null ||
-      !(currentView.type === 'table' || currentView.type === 'list')
-    ) {
-      return []
+    switch (currentView?.type) {
+      case 'table':
+        return sortTableViewColumns(currentView.data.columns || {})
+      case 'list':
+        return sortListViewProps(currentView.data.props)
+      default:
+        return []
     }
-
-    if (currentView.type === 'table') {
-      return sortTableViewColumns(currentView.data.columns || {})
-    }
-
-    return sortListViewProps(currentView.data.props)
   }, [currentView])
 
   return (