From fb328821624a11c68016c651df435aaedda05111 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Sat, 20 Jan 2018 21:10:58 -0700 Subject: [PATCH 1/2] bug fixes rancher/rancher#11010 --- lib/global-admin/addon/clusters/new/cloud/route.js | 2 +- .../addon/components/driver/driver-googlegke/template.hbs | 2 ++ lib/shared/addon/components/form-members/component.js | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/global-admin/addon/clusters/new/cloud/route.js b/lib/global-admin/addon/clusters/new/cloud/route.js index e2d25912c..85d56182e 100644 --- a/lib/global-admin/addon/clusters/new/cloud/route.js +++ b/lib/global-admin/addon/clusters/new/cloud/route.js @@ -13,7 +13,7 @@ export default Ember.Route.extend({ return hash({ users: get(this, 'globalStore').findAll('user'), - user: get(this, 'globalStore').find('user', null, {forceReload: true, filter: {me:true}}), + user: get(this, 'globalStore').find('user', null, {filter: {me:true}}), clusterRoleTemplateBinding: get(this, 'globalStore').findAll('clusterRoleTemplateBinding', { forceReload: true }), }).then((hash) => { return { diff --git a/lib/global-admin/addon/components/driver/driver-googlegke/template.hbs b/lib/global-admin/addon/components/driver/driver-googlegke/template.hbs index 3de0cbddc..cdccc476e 100644 --- a/lib/global-admin/addon/components/driver/driver-googlegke/template.hbs +++ b/lib/global-admin/addon/components/driver/driver-googlegke/template.hbs @@ -92,9 +92,11 @@ editing=false memberArray=memberArray memberConfig=memberConfig + project=primaryResource roles=userData.roles users=userData.users type="cluster" + initAlert=(action "initAlert") }} diff --git a/lib/shared/addon/components/form-members/component.js b/lib/shared/addon/components/form-members/component.js index 7cc415c93..db000f1c8 100644 --- a/lib/shared/addon/components/form-members/component.js +++ b/lib/shared/addon/components/form-members/component.js @@ -42,6 +42,7 @@ export default Component.extend({ add.forEach((x) => { x.set(`${get(this, 'type')}Id`, resourceId); + x.set('name', null); }); return PromiseAll(add.map(x => x.save())).then(() => { @@ -78,8 +79,8 @@ export default Component.extend({ }, }, - filteredUsers: computed('users', function() { - return get(this, 'users').filter(u => !u.hasOwnProperty('me')).sortBy('username'); + filteredUsers: computed('users.@each.{id,state}', function() { + return get(this, 'users').filter(u => !u.hasOwnProperty('me')).sortBy('displayName'); }), }); From e8f586306f42d74fd2c71d7dc20569ecd7efbd8d Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Sat, 20 Jan 2018 22:25:40 -0700 Subject: [PATCH 2/2] fix put post errors on cluster project creation --- .../addon/clusters/detail/edit/controller.js | 6 ------ .../addon/components/form-members/component.js | 17 +++++++++++------ .../addon/components/form-members/template.hbs | 4 ++-- .../components/project-member-row/component.js | 4 +--- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/lib/global-admin/addon/clusters/detail/edit/controller.js b/lib/global-admin/addon/clusters/detail/edit/controller.js index babb007dc..50d11d646 100644 --- a/lib/global-admin/addon/clusters/detail/edit/controller.js +++ b/lib/global-admin/addon/clusters/detail/edit/controller.js @@ -22,12 +22,6 @@ export default Controller.extend(ACC, { memberArray: null, actions: { - updateLists(toAdd, toUpdate, toRemove) { - setProperties(this, { - toAdd, toUpdate, toRemove - }); - }, - cancel() { this.goBack(); }, diff --git a/lib/shared/addon/components/form-members/component.js b/lib/shared/addon/components/form-members/component.js index db000f1c8..549a5a7df 100644 --- a/lib/shared/addon/components/form-members/component.js +++ b/lib/shared/addon/components/form-members/component.js @@ -1,6 +1,7 @@ import Component from '@ember/component'; import layout from './template'; -import { get, set, computed } from '@ember/object'; +import { computed, observer, get, set } from '@ember/object'; +import { on } from '@ember/object/evented'; import { inject as service } from '@ember/service'; import { all as PromiseAll } from 'rsvp'; @@ -32,6 +33,15 @@ export default Component.extend({ this.sendAction('initAlert', this.primaryResourceSaved.bind(this)); }, + didReceiveAttrs() { + let ma = get(this, 'memberArray').filter(( m ) => { + return get(m, 'roleTemplateId').indexOf('-owner') < 0 && !get(this, 'toAdd').includes(m); + }); + if (ma && get(ma, 'length') > 0) { + set(this, 'toUpdate', ma); + } + }, + primaryResourceSaved: function() { // returns a promise of all the adds/removes/updates to the parent const pr = get(this, 'project'); @@ -68,11 +78,6 @@ export default Component.extend({ get(this, 'toAdd').pushObject(record); }, - updateMember(obj) { - get(this,'toUpdate').addObject(obj); - }, - - removeMember(obj) { get(this,'memberArray').removeObject(obj); get(this, 'toRemove').pushObject(obj); diff --git a/lib/shared/addon/components/form-members/template.hbs b/lib/shared/addon/components/form-members/template.hbs index 648a3a2df..1e3234f2b 100644 --- a/lib/shared/addon/components/form-members/template.hbs +++ b/lib/shared/addon/components/form-members/template.hbs @@ -10,9 +10,9 @@ - {{project-member-row member=member roles=roles users=users remove="removeMember" owner=creator type=type}} + {{project-member-row member=member roles=roles users=users owner=creator type=type}} {{#each memberArray as |member|}} - {{project-member-row member=member roles=roles users=filteredUsers remove="removeMember" update="updateMember"}} + {{project-member-row member=member roles=roles users=filteredUsers remove="removeMember" }} {{/each}} diff --git a/lib/shared/addon/components/project-member-row/component.js b/lib/shared/addon/components/project-member-row/component.js index 8052d6c22..e46bf423c 100644 --- a/lib/shared/addon/components/project-member-row/component.js +++ b/lib/shared/addon/components/project-member-row/component.js @@ -1,6 +1,7 @@ import Component from '@ember/component'; import layout from './template'; import { computed, observer, get, set } from '@ember/object'; +import { on } from '@ember/object/evented'; export default Component.extend({ layout, @@ -45,7 +46,4 @@ export default Component.extend({ } }), - changed: observer('member.{roleTemplateId,subjectName}', function() { - this.sendAction('update', get(this,'member')); - }), });