cluster memeber changes

app/authenticated/cluster/security/members/detail/route.js

@@ -1,22 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { get } from '@ember/object';
-import { hash } from 'rsvp';
-
-export default Route.extend({
-  globalStore: service(),
-
-  model: function (params) {
-    const store = get(this, 'globalStore');
-
-    return hash({
-      role: store.find('roleTemplate', params.role_id),
-      roles: store.find('roleTemplate', null, {
-        filter: {
-          hidden:false
-        }
-      }),
-      policies: store.find('podSecurityPolicyTemplate'),
-    });
-  },
-});

app/authenticated/cluster/security/members/detail/template.hbs

@@ -1 +0,0 @@
-{{new-edit-role model=model readOnly=true roleType=type}}

app/authenticated/cluster/security/members/edit/route.js

@@ -10,9 +10,9 @@ export default Route.extend({
     const store = get(this, 'globalStore');
 
     return hash({
-      role: store.find('roleTemplate', params.role_id),
-      roles: store.find('roleTemplate'),
-      policies: store.find('podSecurityPolicyTemplate'),
+      role: store.find('clusterroletemplatebinding', params.role_id),
+      roles: store.find('roletemplate', null, {filter: {hidden: false, context: 'cluster'}}),
+      policies: store.find('podsecuritypolicytemplate'),
     });
   },
 });

app/authenticated/cluster/security/members/index/controller.js

@@ -12,11 +12,6 @@ const headers = [
     name: 'subjectName',
     sort: ['subjectName', 'name', 'id'],
   },
-  {
-    translationKey: 'membersPage.index.table.subjectKind',
-    name: 'subjectKind',
-    sort: ['subjectKind', 'subjectName', 'name'],
-  },
   {
     translationKey: 'membersPage.index.table.template',
     name: 'roleTemplateId',

app/authenticated/cluster/security/members/index/template.hbs

@@ -1,6 +1,6 @@
 <section class="header has-tabs clearfix p-0">
   <ul class="tab-nav">
-    <li>{{#link-to "authenticated.cluster.security.members.index"}}{{t 'nav.admin.security.roles'}}{{/link-to}}</li>
+    <li>{{#link-to "authenticated.cluster.security.members.index"}}{{t 'nav.admin.security.members'}}{{/link-to}}</li>
   </ul>
   <div class="right-buttons">
     {{#link-to "authenticated.cluster.security.members.new" classNames="btn btn-sm bg-primary right-divider-btn" disabled=(rbac-prevents resource="clusterroletemplatebinding" scope="global" permission="create")}} {{t 'membersPage.index.localLink' 'Cluster'}}{{/link-to}}
@@ -23,15 +23,10 @@
           {{check-box nodeId=row.id}}
         </td>
         <td data-title="{{t 'membersPage.index.table.name'}}:" class="clip">
-          {{#link-to "authenticated.cluster.security.members.detail" clusterId row.id}}
-            {{row.name}}
-          {{/link-to}}
+          {{row.name}}
         </td>
         <td data-title="{{t 'membersPage.index.table.subjectName'}}:" >
-          {{row.subjectName}}
-        </td>
-        <td data-title="{{t 'membersPage.index.table.subjectKind'}}:" >
-          {{row.subjectKind}}
+          {{row.user.name}}
         </td>
         <td data-title="{{t 'membersPage.index.table.template'}}:" >
           {{row.roleTemplateId}}

app/models/clusterroletemplatebinding.js

@@ -7,6 +7,7 @@ export default Resource.extend({
 
   cluster: reference('clusterId'),
   roleTemplate: reference('roleTemplateId'),
+  user: reference('subjectName', 'user'),
 
   availableActions: computed('links.remove', 'name', function() {
     const l = get(this, 'links');