Ditto Explorer UI - Environment selection fixed

Signed-off-by: Thomas Fries <thomas.fries0@gmail.com>
eclipse-ditto · Jul 4, 2022 · fe9dc0e · fe9dc0e
1 parent f63c6b9
commit fe9dc0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ui/modules/environments/authorization.js b/ui/modules/environments/authorization.js
@@ -53,6 +53,6 @@ function onEnvironmentChanged() {
       ':';
   dom.devOpsUserName.value = usernamePassword.split(':')[0];
   dom.devOpsPassword.value = usernamePassword.split(':')[1];
-  dom.bearer.value = Environments.current().bearer;
+  dom.bearer.value = Environments.current().bearer ? Environments.current().bearer : '';
   API.setAuthHeader();
 };
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
@@ -127,8 +127,9 @@ export function environmentsJsonChanged() {
 }
 
 function updateEnvSelector() {
-  if (!dom.environmentSelector.value || !environments[dom.environmentSelector.value]) {
-    dom.environmentSelector.value = environments[0];
+  let activeEnvironment = dom.environmentSelector.value;
+  if (!activeEnvironment || !environments[activeEnvironment]) {
+    activeEnvironment = Object.keys(environments)[0];
   };
 
   dom.environmentSelector.innerHTML = '';
@@ -138,6 +139,8 @@ function updateEnvSelector() {
     option.text = key;
     dom.environmentSelector.add(option);
   });
+
+  dom.environmentSelector.value = activeEnvironment;
 }
 
 function updateEnvEditors() {