From 8c7c73bc7244a500d97aea421265a898de257a93 Mon Sep 17 00:00:00 2001
From: Nelson Jovel <memoryman51@hotmail.com>
Date: Fri, 13 May 2022 11:24:58 -0700
Subject: [PATCH] From the analyze page, selecting a different school should
 not navigate away from analyze page.   Finishes story #182178876

---
 CHANGELOG.md                 |  1 +
 app/helpers/header_helper.rb | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de2292fa..1cc82527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,3 +42,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Add Analyze page
+- From analyze page, selecting a different school from the dropdown.  Changed behavior so user remains on analyze page
diff --git a/app/helpers/header_helper.rb b/app/helpers/header_helper.rb
index 8872eb5f..8723799d 100644
--- a/app/helpers/header_helper.rb
+++ b/app/helpers/header_helper.rb
@@ -12,13 +12,23 @@ module HeaderHelper
   end
 
   def district_url_for(district:, academic_year:)
-    overview_link(district_slug: district.slug, school_slug: district.schools.alphabetic.first.slug,
-                  academic_year_range: academic_year.range, uri_path: request.fullpath)
+    pages = %w[overview browse analyze]
+    pages.each do |page|
+      if request.fullpath.include? page
+        return send("#{page}_link", district_slug: district.slug, school_slug: district.schools.alphabetic.first.slug,
+                                    academic_year_range: academic_year.range)
+      end
+    end
   end
 
   def school_url_for(school:, academic_year:)
-    overview_link(district_slug: school.district.slug, school_slug: school.slug,
-                  academic_year_range: academic_year.range, uri_path: request.fullpath)
+    pages = %w[overview browse analyze]
+    pages.each do |page|
+      if request.fullpath.include? page
+        return send("#{page}_link", district_slug: school.district.slug, school_slug: school.slug,
+                                    academic_year_range: academic_year.range)
+      end
+    end
   end
 
   def school_mapper(school)
@@ -35,11 +45,15 @@ module HeaderHelper
 
   private
 
-  def overview_link(district_slug:, school_slug:, academic_year_range:, uri_path:)
-    if uri_path.include?('overview')
-      return "/districts/#{district_slug}/schools/#{school_slug}/overview?year=#{academic_year_range}"
-    end
+  def overview_link(district_slug:, school_slug:, academic_year_range:)
+    "/districts/#{district_slug}/schools/#{school_slug}/overview?year=#{academic_year_range}"
+  end
+
+  def analyze_link(district_slug:, school_slug:, academic_year_range:)
+    "/districts/#{district_slug}/schools/#{school_slug}/analyze?year=#{academic_year_range}"
+  end
 
+  def browse_link(district_slug:, school_slug:, academic_year_range:)
     "/districts/#{district_slug}/schools/#{school_slug}/browse/teachers-and-leadership?year=#{academic_year_range}"
   end