From 79b25901d750f70d7c9d66dd55c83b1b5924fac5 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Mon, 13 Dec 2021 15:39:56 +0000
Subject: [PATCH] ui: Change the URL prefix of partitions from `-` to `_`
 (#11801)

---
 .changelog/11801.txt                                     | 3 +++
 ui/packages/consul-ui/app/locations/fsm-with-optional.js | 4 ++--
 ui/packages/consul-ui/app/services/ui-config.js          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/11801.txt

diff --git a/.changelog/11801.txt b/.changelog/11801.txt
new file mode 100644
index 0000000000..68df58f26e
--- /dev/null
+++ b/.changelog/11801.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+ui: Change partition URL segment prefix from `-` to `_` 
+```
diff --git a/ui/packages/consul-ui/app/locations/fsm-with-optional.js b/ui/packages/consul-ui/app/locations/fsm-with-optional.js
index 0d69d8bcf1..19ed18da3c 100644
--- a/ui/packages/consul-ui/app/locations/fsm-with-optional.js
+++ b/ui/packages/consul-ui/app/locations/fsm-with-optional.js
@@ -1,7 +1,7 @@
 import { env } from 'consul-ui/env';
 const OPTIONAL = {};
 if (env('CONSUL_PARTITIONS_ENABLED')) {
-  OPTIONAL.partition = /^-([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/;
+  OPTIONAL.partition = /^_([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/;
 }
 
 if (env('CONSUL_NSPACES_ENABLED')) {
@@ -194,7 +194,7 @@ export default class FSMWithOptionalLocation {
       hash.nspace = `~${hash.nspace}`;
     }
     if (typeof hash.partition !== 'undefined') {
-      hash.partition = `-${hash.partition}`;
+      hash.partition = `_${hash.partition}`;
     }
     if (typeof this.router === 'undefined') {
       this.router = this.container.lookup('router:main');
diff --git a/ui/packages/consul-ui/app/services/ui-config.js b/ui/packages/consul-ui/app/services/ui-config.js
index 6cf971f36a..cb039bc589 100644
--- a/ui/packages/consul-ui/app/services/ui-config.js
+++ b/ui/packages/consul-ui/app/services/ui-config.js
@@ -18,7 +18,7 @@ export default class UiConfigService extends Service {
         case item.startsWith('~'):
           prev.nspace = item.substr(1);
           break;
-        case item.startsWith('-'):
+        case item.startsWith('_'):
           prev.partition = item.substr(1);
           break;
         case typeof prev.dc === 'undefined':