From 991f8b4baa7bae2f30c3e4aa901140c996aac7bb Mon Sep 17 00:00:00 2001
From: zeotuan <48720253+zeotuan@users.noreply.github.com>
Date: Wed, 11 Aug 2021 20:57:01 +1000
Subject: [PATCH] Fix Analytics Dashboard Page missing "Back To Dashboard"
 button (#14310)

* fix analytic page have no back-to-dashboard button when user have no organization

* resolve conflict with main

* remove dump

* add test for back to dashboard button
---
 app/views/dashboards/analytics.erb | 15 ++++++++-------
 spec/requests/dashboard_spec.rb    |  8 ++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/dashboards/analytics.erb b/app/views/dashboards/analytics.erb
index d5a6180d9..98ed11bfa 100644
--- a/app/views/dashboards/analytics.erb
+++ b/app/views/dashboards/analytics.erb
@@ -1,12 +1,12 @@
 <% title "Analytics" %>
 
 <main class="dashboard-container analytics-container crayons-layout" id="main-content">
-  <% if @organizations.any? %>
-    <nav aria-label="Dashboards">
-      <ul class="list-none">
-        <li>
-          <a href="<%= dashboard_path %>" class="rounded-btn crayons-link--block rounded-btn--transparent">👈 Back to Main Dashboard</a>
-        </li>
+  <nav aria-label="Dashboards">
+    <ul class="list-none">
+      <li>
+        <a href="<%= dashboard_path %>" class="rounded-btn crayons-link--block rounded-btn--transparent">👈 Back to Main Dashboard</a>
+      </li>
+      <% if @organizations.any? %>
         <li>
           <a class="rounded-btn crayons-link--block organization" 
              href="<%= dashboard_analytics_path %>"
@@ -25,9 +25,10 @@
             </a>
           </li>
         <% end %>
+      <% end %>
       </ul>
     </nav>
-  <% end %>
+      
 
   <div class="crayons-card p-3 mt-5">
     <h1 class="fs-4xl fw-medium">Analytics Dashboard for <%= @user_or_org.name %></h1>
diff --git a/spec/requests/dashboard_spec.rb b/spec/requests/dashboard_spec.rb
index 6a007e537..95880103c 100644
--- a/spec/requests/dashboard_spec.rb
+++ b/spec/requests/dashboard_spec.rb
@@ -268,6 +268,14 @@ RSpec.describe "Dashboards", type: :request do
         get "/dashboard/analytics"
         expect(response.body).to include("Analytics")
       end
+
+      it "page always contain back to dashboard button" do
+        sign_in user
+        get "/dashboard/analytics"
+        within "nav" do
+          expect(page).to have_selector("a[href='/dashboard']")
+        end
+      end
     end
 
     context "when user is an org admin" do