From ed5ee2dfb625379546ef24e582af0dec8ee48586 Mon Sep 17 00:00:00 2001
From: Rana Al-Khulaidi <ralkhulaidi@gmail.com>
Date: Thu, 27 Aug 2026 16:23:09 -0400
Subject: [PATCH] fix(nimbus): Move application out of overview and into the
 page header

Because

* Application is set at creation and can never be edited so a read-only row could be confusing

This commit

* Moves application under the slug in the page header, with the form's wording kept as a tooltip

Fixes #17048
---
 experimenter/experimenter/nimbus_ui/constants.py  |  5 ++++-
 .../nimbus_ui/templates/new/common/base.html      |  7 +++++++
 .../templates/new/rollouts/overview/card.html     |  7 -------
 .../new/rollouts/overview/edit_form.html          | 15 ---------------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/experimenter/experimenter/nimbus_ui/constants.py b/experimenter/experimenter/nimbus_ui/constants.py
index 36da57089..45e4aa249 100644
--- a/experimenter/experimenter/nimbus_ui/constants.py
+++ b/experimenter/experimenter/nimbus_ui/constants.py
@@ -387,6 +387,10 @@ class NimbusUIConstants:
         "Resolve the highlighted errors above before saving this plan."
     )
     ERROR_ROLLOUT_PHASE_LOCKED = "This rollout phase is locked and cannot be changed."
+    ROLLOUT_APPLICATION_TOOLTIP = (
+        "Rollouts can only target one Application at a time. Application can "
+        "not be changed after a rollout is created."
+    )
     ROLLOUT_REVIEW_PENDING_TOOLTIP = "A review is currently pending."
     ROLLOUT_NO_NEXT_PHASE_TOOLTIP = "There is no further phase to start."
     ROLLOUT_HAS_ISSUES_TOOLTIP = "All rollout issues must be resolved first."
@@ -457,7 +461,6 @@ class NimbusUIConstants:
                 ("Name", ("name",)),
                 ("Observations & Problem Space", ("hypothesis",)),
                 ("Public Description", ("public_description",)),
-                ("Application", ("application",)),
                 ("Important Links", ("documentation_links",)),
                 ("Project Tags", ()),
                 ("Subscribers", ()),
diff --git a/experimenter/experimenter/nimbus_ui/templates/new/common/base.html b/experimenter/experimenter/nimbus_ui/templates/new/common/base.html
index 43b77081d..5262ff353 100644
--- a/experimenter/experimenter/nimbus_ui/templates/new/common/base.html
+++ b/experimenter/experimenter/nimbus_ui/templates/new/common/base.html
@@ -53,6 +53,13 @@ <h1 id="experiment-header-name" class="mb-0 fw-semibold fs-4 text-body">{{ exper
                 <span>{{ experiment.slug }}</span>
                 <i class="fa-regular fa-copy"></i>
               </button>
+              <div class="d-flex align-items-center gap-1 small text-secondary">
+                <span id="experiment-application">{{ experiment.get_application_display }}</span>
+                <i class="fa-regular fa-circle-question"
+                   data-bs-toggle="tooltip"
+                   data-bs-placement="right"
+                   title="{{ NimbusUIConstants.ROLLOUT_APPLICATION_TOOLTIP }}"></i>
+              </div>
               {% if experiment.parent %}
                 <p class="text-secondary small mb-0">
                   Cloned from
diff --git a/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/card.html b/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/card.html
index f36da41f5..5040c1799 100644
--- a/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/card.html
+++ b/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/card.html
@@ -26,13 +26,6 @@
            style="white-space: pre-wrap">{{ experiment.public_description|default:"—" }}</div>
       {% include "new/common/validation_errors.html" with errors=validation_errors.public_description %}
 
-    </div>
-    {# Application #}
-    <div>
-      <div class="text-secondary mb-1" style="font-size: 12px;">Application</div>
-      <div class="small text-body">{{ experiment.get_application_display }}</div>
-      {% include "new/common/validation_errors.html" with errors=validation_errors.application %}
-
     </div>
     {# Important Links #}
     <div>
diff --git a/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/edit_form.html b/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/edit_form.html
index 975a3ed63..fde657d19 100644
--- a/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/edit_form.html
+++ b/experimenter/experimenter/nimbus_ui/templates/new/rollouts/overview/edit_form.html
@@ -40,21 +40,6 @@
 
         <p class="form-text mb-0">{{ NimbusUIConstants.PUBLIC_DESCRIPTION_TEXT }}</p>
       </div>
-      {# Application #}
-      <div>
-        <label for="id_application" class="small text-body mb-1">Application</label>
-        {{ form.application }}
-        {% if form.application.errors %}
-          <div class="text-danger small mt-1">{{ form.application.errors|join:", " }}</div>
-        {% endif %}
-        {% include "new/common/validation_errors.html" with errors=validation_errors.application %}
-
-        <p class="form-text mb-0">
-          Rollouts can only target one Application at a time.
-          <br>
-          Application can not be changed after a rollout is created.
-        </p>
-      </div>
       {# Important Links #}
       <div>
         <label class="small text-body mb-1">Important Links</label>