diff --git a/lib/global-admin/addon/components/new-multi-cluster-app/component.js b/lib/global-admin/addon/components/new-multi-cluster-app/component.js index a8f4416d4..946fa767b 100644 --- a/lib/global-admin/addon/components/new-multi-cluster-app/component.js +++ b/lib/global-admin/addon/components/new-multi-cluster-app/component.js @@ -35,26 +35,6 @@ const OVERRIDE_HEADERS = [ }, ]; -const ROLES_HEADERS = [ - { - translationKey: 'newMultiClusterApp.roles.table.name', - name: 'name', - sort: ['name'], - }, - { - translationKey: 'newMultiClusterApp.roles.table.builtIn', - name: 'builtIn', - sort: ['builtIn'], - }, - { - translationKey: 'newMultiClusterApp.roles.table.external', - name: 'external', - sort: ['external'], - }, -] - - - export default Component.extend(NewOrEdit, CatalogApp, { catalog: service(), intl: service(), @@ -62,7 +42,6 @@ export default Component.extend(NewOrEdit, CatalogApp, { router: service(), settings: service(), globalStore: service(), - roleTemplateService: service('roleTemplate'), layout, allTemplates: null, @@ -106,7 +85,6 @@ export default Component.extend(NewOrEdit, CatalogApp, { projectsToRemoveOnUpgrade: null, overridesHeaders: OVERRIDE_HEADERS, - rolesHeaders: ROLES_HEADERS, isGKE: alias('scope.currentCluster.isGKE'), @@ -185,25 +163,28 @@ export default Component.extend(NewOrEdit, CatalogApp, { get(this, 'multiClusterApp.targets').removeObject(target); }, - addRole(roleTemplate) { - if (roleTemplate) { - let { roles } = this.multiClusterApp; + addRole(roleId, roleToRemove) { + let { roles } = this.multiClusterApp; - if (!roles) { - roles = []; - } + if (!roles) { + roles = []; + } - roles.pushObject(get(roleTemplate, 'id')); + if (roles.indexOf(roleToRemove) > -1) { + roles.removeObject(roleToRemove); + } + + if (roleId !== '') { + roles.pushObject(roleId); set(this, 'multiClusterApp.roles', roles); - } - }, - - removeRole(roleTemplate) { - if (roleTemplate) { - let { roles } = this.multiClusterApp; - - roles.removeObject(get(roleTemplate, 'id')); + } else { + // its possible that the user set extra roles via the api, we shouldn't clobber those roles as well. + if (roles.length > 1) { + set(this, 'multiClusterApp.roles', roles); + } else { + set(this, 'multiClusterApp.roles', null); + } } }, @@ -365,24 +346,6 @@ export default Component.extend(NewOrEdit, CatalogApp, { } }), - roleChoices: computed('roleTemplateService.allFilteredRoleTemplates.@each.{name,id,locked,hidden}', function() { - return this.roleTemplateService.get('allFilteredRoleTemplates').sortBy('name') - }), - - appRoles: computed('multiClusterApp.roles.[]', function() { - let { multiClusterApp } = this; - let { allFilteredRoleTemplates } = this.roleTemplateService; - let out = []; - - if (multiClusterApp && allFilteredRoleTemplates) { - out = ( multiClusterApp.roles || [] ).map((role) => { - return allFilteredRoleTemplates.findBy('id', role); - }); - } - - return out; - }), - templateOrHelmChartQuestions: computed('selectedTemplateModel', function() { let { selectedTemplateModel, multiClusterApp } = this; let nueQuestions = []; diff --git a/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs b/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs index e85995414..c4ad790b8 100644 --- a/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs +++ b/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs @@ -233,81 +233,10 @@ expandOnInit=false expand=(action expandFn) }} -
-
- - {{searchable-select - prompt="newMultiClusterApp.roles.table.prompt" - localizedPrompt=true - optionLabelPath="displayName" - optionValuePath="id" - content=roleChoices - change="addRole" - readOnly=readOnly - }} -
-
- {{#sortable-table - classNames="grid sortable-table" - sortBy=sortBy - headers=rolesHeaders - stickyHeader=false - bulkActions=false - search=false - pagingLabel="pagination.role" - descending=descending - body=appRoles - actionsWidth="75" - as |sortable kind role dt| - }} - {{#if (eq kind "row")}} - - - {{role.displayName}} - - - {{#if role.builtin}} - - {{else}} - – - {{/if}} - - - {{#if role.external}} - - {{else}} - – - {{/if}} - - -
- -
- - - {{else if (eq kind "nomatch")}} - - {{t "newMultiClusterApp.roles.table.noMatch"}} - - {{else if (eq kind "norows")}} - - {{t "newMultiClusterApp.roles.table.noData"}} - - {{/if}} - {{/sortable-table}} -
-
+ {{form-global-resource-roles + multiClusterApp=multiClusterApp + addRole=(action "addRole") + }} {{/accordion-list-item}} diff --git a/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js b/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js index c07397c27..ff1e8948a 100644 --- a/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js +++ b/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js @@ -78,6 +78,7 @@ export default Route.extend({ catalogId: results.tpl.catalogId, targets: [], members: [], + roles: ['project-member'], }); } diff --git a/lib/shared/addon/components/form-global-resource-roles/component.js b/lib/shared/addon/components/form-global-resource-roles/component.js new file mode 100644 index 000000000..346d93b23 --- /dev/null +++ b/lib/shared/addon/components/form-global-resource-roles/component.js @@ -0,0 +1,35 @@ +import Component from '@ember/component'; +import layout from './template'; +import { computed } from '@ember/object'; +import { next } from '@ember/runloop'; + +export default Component.extend({ + layout, + + classNames: ['row'], + + multiClusterApp: null, + + didReceiveAttrs() { + let { roles } = this.multiClusterApp; + + if (!roles || roles.length === 0) { + next(() => { + this.addRole('project-member', ''); + }); + } + }, + + role: computed('multiClusterApp.roles.[]', { + get() { + let { roles = [] } = this.multiClusterApp; + + return roles.find((role) => role === 'project-member' || role === 'cluster-owner'); + }, + set(key, value) { + this.addRole(value, this.role); + + return value; + } + }), +}); diff --git a/lib/shared/addon/components/form-global-resource-roles/template.hbs b/lib/shared/addon/components/form-global-resource-roles/template.hbs new file mode 100644 index 000000000..37cd64ba7 --- /dev/null +++ b/lib/shared/addon/components/form-global-resource-roles/template.hbs @@ -0,0 +1,25 @@ +
+ +
+ +
+
+ +
+
\ No newline at end of file diff --git a/lib/shared/app/components/form-global-resource-roles/component.js b/lib/shared/app/components/form-global-resource-roles/component.js new file mode 100644 index 000000000..7b9cf200a --- /dev/null +++ b/lib/shared/app/components/form-global-resource-roles/component.js @@ -0,0 +1 @@ +export { default } from 'shared/components/form-global-resource-roles/component'; diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 7bed95593..6301e6760 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -5781,8 +5781,14 @@ newMultiClusterApp: answerOverride: placeholder: Question required roles: - title: Roles - detail: Select roles required to view this application + title: Application Access Roles + detail: Select a role to assign this app given this app the selected access. + label: Available Roles + radios: + cluster: "Cluster - This app will be able access and manage all resources in the clusters in which it is deployed" + project: "Project - This app will be able to access and manage resources in the projects in which it is deployed" + help: "Note: This may not be the full list of roles. The list is limited to the roles available to your user. If you are missing a required role, please ask your system administrator." + noRoles: "You can not add new roles because you do not have any roles available. Please speak to your system administrator about gaining role access." table: name: Name builtIn: Built In