diff options
Diffstat (limited to 'app/assets/javascripts/token_access')
3 files changed, 23 insertions, 8 deletions
diff --git a/app/assets/javascripts/token_access/components/token_access.vue b/app/assets/javascripts/token_access/components/token_access.vue index 4b91872d80d..fe99f3e1fdd 100644 --- a/app/assets/javascripts/token_access/components/token_access.vue +++ b/app/assets/javascripts/token_access/components/token_access.vue @@ -117,7 +117,7 @@ export default { throw new Error(errors[0]); } } catch (error) { - createAlert({ message: error }); + createAlert({ message: error.message }); } }, async addProject() { @@ -140,7 +140,7 @@ export default { throw new Error(errors[0]); } } catch (error) { - createAlert({ message: error }); + createAlert({ message: error.message }); } finally { this.clearTargetProjectPath(); this.getProjects(); @@ -166,7 +166,7 @@ export default { throw new Error(errors[0]); } } catch (error) { - createAlert({ message: error }); + createAlert({ message: error.message }); } finally { this.getProjects(); } diff --git a/app/assets/javascripts/token_access/components/token_projects_table.vue b/app/assets/javascripts/token_access/components/token_projects_table.vue index 82ef3371d91..ce33478cbee 100644 --- a/app/assets/javascripts/token_access/components/token_projects_table.vue +++ b/app/assets/javascripts/token_access/components/token_projects_table.vue @@ -10,14 +10,21 @@ export default { { key: 'project', label: __('Projects that can be accessed'), - tdClass: 'gl-p-5!', - columnClass: 'gl-w-85p', + thClass: 'gl-border-t-none!', + columnClass: 'gl-w-40p', + }, + { + key: 'namespace', + label: __('Namespace'), + thClass: 'gl-border-t-none!', + columnClass: 'gl-w-40p', }, { key: 'actions', label: '', - tdClass: 'gl-p-5! gl-text-right', - columnClass: 'gl-w-15p', + tdClass: 'gl-text-right', + thClass: 'gl-border-t-none!', + columnClass: 'gl-w-10p', }, ], components: { @@ -57,7 +64,11 @@ export default { </template> <template #cell(project)="{ item }"> - {{ item.name }} + <span data-testid="token-access-project-name">{{ item.name }}</span> + </template> + + <template #cell(namespace)="{ item }"> + <span data-testid="token-access-project-namespace">{{ item.namespace.fullPath }}</span> </template> <template #cell(actions)="{ item }"> diff --git a/app/assets/javascripts/token_access/graphql/queries/get_projects_with_ci_job_token_scope.query.graphql b/app/assets/javascripts/token_access/graphql/queries/get_projects_with_ci_job_token_scope.query.graphql index 664991bc110..a243095f1b4 100644 --- a/app/assets/javascripts/token_access/graphql/queries/get_projects_with_ci_job_token_scope.query.graphql +++ b/app/assets/javascripts/token_access/graphql/queries/get_projects_with_ci_job_token_scope.query.graphql @@ -6,6 +6,10 @@ query getProjectsWithCIJobTokenScope($fullPath: ID!) { nodes { id name + namespace { + id + fullPath + } fullPath } } |