From b5c0b35ef711b696aad0bed97b10b6fe9cda91c9 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Mon, 13 Dec 2021 15:04:35 +0000
Subject: [PATCH] ui: Prefer shorter partition word in certain places vs Admin
 Partition (#11772)

---
 .../app/components/consul/partition/form/index.hbs            | 2 +-
 .../app/components/consul/partition/notifications/index.hbs   | 2 +-
 .../app/components/consul/partition/selector/index.hbs        | 2 +-
 .../consul-partitions/app/templates/dc/partitions/edit.hbs    | 2 +-
 .../consul-partitions/app/templates/dc/partitions/index.hbs   | 2 +-
 ui/packages/consul-ui/app/components/auth-form/index.hbs      | 2 +-
 ui/packages/consul-ui/app/components/oidc-select/index.hbs    | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
index 07bdf92811..7b5d0858dd 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
@@ -12,7 +12,7 @@
         )
       }}
       @type={{'partition'}}
-      @label={{'Admin Partition'}}
+      @label={{'Partition'}}
       @ondelete={{fn (if @ondelete @ondelete @onsubmit) @item}}
       @onchange={{fn (optional @onsubmit) @item}}
       as |writer|>
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
index 46e0f483b8..5b50a2f661 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
@@ -9,7 +9,7 @@
     </notice.Header>
     <notice.Body>
       <p>
-        Your Admin Partition has been marked for deletion.
+        Your Partition has been marked for deletion.
       </p>
     </notice.Body>
   </Notice>
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
index f67ed1cac4..23f510e33a 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
@@ -45,7 +45,7 @@ as |partition|}}
                   @href={{href-to 'dc.partitions.index' @dc.Name}}
                 >
                   <BlockSlot @name="label">
-                    Manage Admin Partitions
+                    Manage Partitions
                   </BlockSlot>
                 </MenuItem>
       {{/if}}
diff --git a/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs b/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs
index 0396562f6d..327bc32da1 100644
--- a/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs
+++ b/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs
@@ -39,7 +39,7 @@ as |dc partition nspace item|}}
         <route.Title
           @title={{if 
             (is "new partition" item=item)
-              "New Admin Partition"
+              "New Partition"
               (concat "Edit " item.Name)
           }}
         />
diff --git a/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs b/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
index 53f96bb0d6..824a6ab4fa 100644
--- a/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
+++ b/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
@@ -72,7 +72,7 @@ as |route|>
             )
           }}
           @type="partition"
-          @label="Admin Partition"
+          @label="Partition"
           @ondelete={{refresh-route}}
         as |writer|>
           <BlockSlot @name="removed" as |after|>
diff --git a/ui/packages/consul-ui/app/components/auth-form/index.hbs b/ui/packages/consul-ui/app/components/auth-form/index.hbs
index 4eab2a8b2e..3578e467d1 100644
--- a/ui/packages/consul-ui/app/components/auth-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/auth-form/index.hbs
@@ -84,7 +84,7 @@ as |TabState IgnoredGuard IgnoredAction tabDispatch tabState|>
                   The token entered does not exist. Please enter a valid token to log in.
                 {{else if (eq this.error.status '404')}}
                   <strong>No providers</strong><br />
-                  No SSO providers are configured for that Admin Partition.
+                  No SSO providers are configured for that Partition.
                 {{else}}
                   <strong>Error</strong><br />
                   {{this.error.detail}}
diff --git a/ui/packages/consul-ui/app/components/oidc-select/index.hbs b/ui/packages/consul-ui/app/components/oidc-select/index.hbs
index 9fb61c372c..526a3e5166 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/index.hbs
+++ b/ui/packages/consul-ui/app/components/oidc-select/index.hbs
@@ -34,7 +34,7 @@ as |chart|}}
         {{on 'click' (queue (set this 'partition' '') (fn dispatch "RESET"))}}
         class="reset"
       >
-        Choose different Admin Partition
+        Choose different Partition
       </Action>
     </State>
 
@@ -53,7 +53,7 @@ as |chart|}}
           )
         )
       }}
-      @placeholder="Enter name of Admin Partition to log in to"
+      @placeholder="Enter your Partition"
       @oninput={{action (mut this.partition) value="target.value"}}
       @chart={{hash
         state=state