Skip to content

Commit

Permalink
Merge pull request #2395 from shanberg/respect-tasks-feature-flag
Browse files Browse the repository at this point in the history
fix: left sidebar respects tasks ff
  • Loading branch information
shanberg authored Sep 27, 2022
2 parents fd6284e + eed5ab4 commit 2b848ca
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/cljs/athens/views/left_sidebar/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@
(defn left-sidebar
[]
(let [current-route-name (rf/subscribe [:current-route/name])
on-athena #(rf/dispatch [:athena/toggle])
on-theme #(rf/dispatch [:theme/toggle])
on-settings (fn [_]
(rf/dispatch [:settings/toggle-open]))
route-name @current-route-name
is-open? (left-sidebar-subs/get-sidebar-open?)]
on-athena #(rf/dispatch [:athena/toggle])
on-theme #(rf/dispatch [:theme/toggle])
tasks-enabled? (rf/subscribe [:feature-flags/enabled? :tasks])
on-settings (fn [_]
(rf/dispatch [:settings/toggle-open]))
route-name @current-route-name
is-open? (left-sidebar-subs/get-sidebar-open?)]
[:> MainSidebar {:isMainSidebarOpen is-open?}

[:> Flex {:flexDirection "column" :gap 6 :alignItems "stretch" :height "100%"}
Expand Down Expand Up @@ -69,7 +70,7 @@
:pane :main-pane}])
(router/navigate :graph))]]

[:f> left-sidebar-tasks/my-tasks]
(when @tasks-enabled? [:f> left-sidebar-tasks/my-tasks])

[:f> shortcuts/global-shortcuts]

Expand Down

0 comments on commit 2b848ca

Please sign in to comment.