From aa0f1221de044a40ee56819159d216230350c859 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <101994734+dakota-portainer@users.noreply.github.com>
Date: Thu, 4 Aug 2022 13:29:55 +1200
Subject: [PATCH] feat(ui): namespace access EE-3478 (#7398)

---
 .../resourcePoolsDatatable.html               |  2 +-
 .../access/resourcePoolAccess.html            | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
index 04a2ae748..242519a45 100644
--- a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
+++ b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
@@ -5,7 +5,7 @@
       <div class="toolBar !flex-col gap-1">
         <div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full">
           <div class="toolBarTitle vertical-center">
-            <pr-icon icon="'box'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
+            <pr-icon icon="'layers'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
             Namespaces
           </div>
           <div class="searchBar vertical-center">
diff --git a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
index 1054836fc..6c403b7b4 100644
--- a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
+++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
@@ -3,9 +3,9 @@
   title="'Namespace access management'"
   breadcrumbs="[
     { label:'Namespaces', link:'kubernetes.resourcePools' },
-    { 
+    {
       label:ctrl.pool.Namespace.Name,
-      link: 'kubernetes.resourcePools.resourcePool', 
+      link: 'kubernetes.resourcePools.resourcePool',
       linkParams:{id: ctrl.pool.Namespace.Name}
     },
      'Access management'
@@ -20,12 +20,12 @@
   <div class="row" ng-if="ctrl.pool">
     <div class="col-sm-12">
       <rd-widget>
-        <rd-widget-header icon="fa-plug" title-text="Namespace"></rd-widget-header>
-        <rd-widget-body classes="no-padding">
+        <rd-widget-header icon="layers" feather-icon="true" title-text="Namespace"></rd-widget-header>
+        <rd-widget-body>
           <table class="table">
             <tbody>
               <tr>
-                <td>Name</td>
+                <td class="!pl-0">Name</td>
                 <td>
                   {{ ctrl.pool.Namespace.Name }}
                 </td>
@@ -40,7 +40,7 @@
   <div class="row">
     <div class="col-sm-12">
       <rd-widget ng-if="ctrl.availableUsersAndTeams">
-        <rd-widget-header icon="fa-user-lock" title-text="Create access"></rd-widget-header>
+        <rd-widget-header icon="svg-userlock" title-text="Create access"></rd-widget-header>
         <rd-widget-body>
           <form class="form-horizontal">
             <div class="form-group">
@@ -48,7 +48,7 @@
               <div class="col-sm-9 col-lg-4">
                 <span class="small text-muted" ng-if="ctrl.availableUsersAndTeams.length === 0">
                   No user nor team access has been set on the environment. Head over to the
-                  <a ui-sref="portainer.endpoints.endpoint.access({id: ctrl.endpointId})">environment access view</a> to manage them.
+                  <a ui-sref="portainer.endpoints">Environments view</a> to manage them.
                 </span>
                 <span
                   isteven-multi-select
@@ -71,12 +71,12 @@
               <div class="col-sm-12">
                 <button
                   type="submit"
-                  class="btn btn-primary btn-sm"
+                  class="btn btn-primary btn-sm !ml-0 vertical-center"
                   ng-disabled="(ctrl.availableUsersAndTeams | filter:{ticked:true}).length === 0 || ctrl.actionInProgress"
                   ng-click="ctrl.authorizeAccess()"
                   button-spinner="ctrl.actionInProgress"
                 >
-                  <span ng-hide="ctrl.state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Create access</span>
+                  <span class="vertical-center" ng-hide="ctrl.state.actionInProgress"><pr-icon icon="'plus'" feather="true" class="vertical-center"></pr-icon> Create access</span>
                   <span ng-show="ctrl.state.actionInProgress">Creating access...</span>
                 </button>
               </div>
@@ -93,7 +93,7 @@
       <access-datatable
         ng-if="ctrl.authorizedUsersAndTeams"
         title-text="Access"
-        title-icon="fa-user-lock"
+        title-icon="svg-userlock"
         table-key="kubernetes_resourcepool_access"
         order-by="Name"
         dataset="ctrl.authorizedUsersAndTeams"