DEVPROD-15240: Redirect to new waterfall from legacy waterfall (#8782)

service/waterfall.go

@@ -621,7 +621,7 @@ func (uis *UIServer) waterfallPage(w http.ResponseWriter, r *http.Request) {
 
 	newUILink := ""
 	if len(uis.Settings.Ui.UIv2Url) > 0 {
-		newUILink = fmt.Sprintf("%s/commits/%s", uis.Settings.Ui.UIv2Url, project.Identifier)
+		newUILink = fmt.Sprintf("%s/project/%s/waterfall", uis.Settings.Ui.UIv2Url, project.Identifier)
 	}
 
 	if RedirectSpruceUsers(w, r, newUILink) {
@@ -635,15 +635,23 @@ func (uis *UIServer) waterfallPage(w http.ResponseWriter, r *http.Request) {
 	}{newUILink, uis.Settings.Jira.Host, uis.GetCommonViewData(w, r, false, true)}, "base", "waterfall.html", "base_angular.html", "menu.html")
 }
 
-// Create and return a redirect to the spruce mainline commits page if the user is opted in to the new UI.
+// Create and return a redirect to the Spruce waterfall page if the user is opted in to the new UI.
 func (uis *UIServer) mainlineCommitsRedirect(w http.ResponseWriter, r *http.Request) {
+	projCtx := MustHaveProjectContext(r)
+	project, err := projCtx.GetProject()
+
+	if err != nil || project == nil {
+		uis.LoggedError(w, r, http.StatusNotFound, errors.New("project not found"))
+		return
+	}
+
 	u := gimlet.GetUser(r.Context())
 	if u != nil {
 		usr, ok := u.(*user.DBUser)
 		if ok {
 			// If the user is opted in to the new UI, redirect to the new UI.
 			if usr.Settings.UseSpruceOptions.SpruceV1 {
-				http.Redirect(w, r, fmt.Sprintf("%s/commits/", uis.Settings.Ui.UIv2Url), http.StatusSeeOther)
+				http.Redirect(w, r, fmt.Sprintf("%s/project/%s/waterfall", uis.Settings.Ui.UIv2Url, project.Identifier), http.StatusSeeOther)
 			}
 		}
 	}