From b8e6c5ea919f76e4d85a7559e32840fa40ab715f Mon Sep 17 00:00:00 2001
From: LP B <xAt0mZ@users.noreply.github.com>
Date: Fri, 3 Sep 2021 15:47:37 +0200
Subject: [PATCH] fix(app/namespace): allow default-ns registries edit from
 namespace page (#5554)

---
 .../resource-pools/edit/resourcePool.html     | 20 ++++++++++++-------
 .../edit/resourcePoolController.js            |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html
index a4c19c130..90b33db11 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePool.html
+++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html
@@ -317,16 +317,16 @@
                     Registries
                   </div>
 
-                  <div class="form-group" ng-if="!ctrl.isAdmin">
+                  <div class="form-group" ng-if="!ctrl.isAdmin || ctrl.isSystem">
                     <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0;">
                       Selected registries
                     </label>
                     <div class="col-sm-9 col-lg-4">
-                      {{ ctrl.selectedRegistries }}
+                      {{ ctrl.selectedRegistries ? ctrl.selectedRegistries : 'None' }}
                     </div>
                   </div>
 
-                  <div ng-if="ctrl.isAdmin">
+                  <div ng-if="ctrl.isAdmin && !ctrl.isSystem">
                     <div class="form-group">
                       <div class="col-sm-12 small text-muted">
                         <p>
@@ -405,14 +405,14 @@
                 <!-- !summary -->
 
                 <!-- actions -->
-                <div ng-if="ctrl.isAdmin && !ctrl.isDefaultNamespace" class="col-sm-12 form-section-title">
+                <div ng-if="ctrl.isAdmin" class="col-sm-12 form-section-title">
                   Actions
                 </div>
-                <div ng-if="ctrl.isAdmin && !ctrl.isDefaultNamespace" class="form-group">
+                <div ng-if="ctrl.isAdmin" class="form-group">
                   <div class="col-sm-12">
                     <button
                       type="button"
-                      ng-if="ctrl.isEditable"
+                      ng-if="!ctrl.isSystem"
                       class="btn btn-primary btn-sm"
                       ng-disabled="!resourcePoolEditForm.$valid || ctrl.isUpdateButtonDisabled()"
                       ng-click="ctrl.updateResourcePool()"
@@ -421,7 +421,13 @@
                       <span ng-hide="ctrl.state.actionInProgress" data-cy="k8sNamespaceEdit-updateNamespaceButton">Update namespace</span>
                       <span ng-show="ctrl.state.actionInProgress">Update in progress...</span>
                     </button>
-                    <button type="button" class="btn btn-primary btn-sm" ng-click="ctrl.markUnmarkAsSystem()" button-spinner="ctrl.state.actionInProgress">
+                    <button
+                      ng-if="!ctrl.isDefaultNamespace"
+                      type="button"
+                      class="btn btn-primary btn-sm"
+                      ng-click="ctrl.markUnmarkAsSystem()"
+                      button-spinner="ctrl.state.actionInProgress"
+                    >
                       <span ng-if="ctrl.isSystem">Unmark as system</span>
                       <span ng-if="!ctrl.isSystem">Mark as system</span>
                     </button>
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
index a2f94db49..1fe6e844d 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
+++ b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
@@ -325,7 +325,7 @@ class KubernetesResourcePoolController {
               this.formValues.Registries.push(reg);
             }
           });
-
+          this.selectedRegistries = this.formValues.Registries.map((r) => r.Name).join(', ');
           return;
         }