diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue new file mode 100644 index 0000000000000000000000000000000000000000..1a225550c95e208fbe65fe14a8be95f7620b0d71 --- /dev/null +++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue @@ -0,0 +1,258 @@ + + + + + + + + + + + {{ content }} + + + + + + + + + + {{ $options.i18n.cardHeaderTitle }} + + + + + + + {{ $options.i18n.addProject }} + + {{ $options.i18n.cancel }} + + + + {{ $options.i18n.settingDisabledMessage }} + + + + + + diff --git a/app/assets/javascripts/token_access/components/token_access.vue b/app/assets/javascripts/token_access/components/outbound_token_access.vue similarity index 91% rename from app/assets/javascripts/token_access/components/token_access.vue rename to app/assets/javascripts/token_access/components/outbound_token_access.vue index 527f01f0a6fdc87524c688c66ba21e14931fbec1..47ec0910a7bd005e39688d92a44265dbe1d4d8ab 100644 --- a/app/assets/javascripts/token_access/components/token_access.vue +++ b/app/assets/javascripts/token_access/components/outbound_token_access.vue @@ -17,7 +17,6 @@ import removeProjectCIJobTokenScopeMutation from '../graphql/mutations/remove_pr import updateCIJobTokenScopeMutation from '../graphql/mutations/update_ci_job_token_scope.mutation.graphql'; import getCIJobTokenScopeQuery from '../graphql/queries/get_ci_job_token_scope.query.graphql'; import getProjectsWithCIJobTokenScopeQuery from '../graphql/queries/get_projects_with_ci_job_token_scope.query.graphql'; -import OptInJwt from './opt_in_jwt.vue'; import TokenProjectsTable from './token_projects_table.vue'; export default { @@ -36,6 +35,27 @@ export default { projectsFetchError: __('There was a problem fetching the projects'), scopeFetchError: __('There was a problem fetching the job token scope value'), }, + fields: [ + { + key: 'project', + label: __('Project that can be accessed'), + 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-text-right', + thClass: 'gl-border-t-none!', + columnClass: 'gl-w-10p', + }, + ], components: { GlAlert, GlButton, @@ -45,7 +65,6 @@ export default { GlLoadingIcon, GlSprintf, GlToggle, - OptInJwt, TokenProjectsTable, }, inject: { @@ -230,9 +249,12 @@ export default { > {{ $options.i18n.settingDisabledMessage }} - + - diff --git a/app/assets/javascripts/token_access/components/token_access_app.vue b/app/assets/javascripts/token_access/components/token_access_app.vue new file mode 100644 index 0000000000000000000000000000000000000000..410a6267dc89b488a657e8eb73ac4d94bfc022f1 --- /dev/null +++ b/app/assets/javascripts/token_access/components/token_access_app.vue @@ -0,0 +1,27 @@ + + + + + + + + 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 ce33478cbeecee71e020cc7aac55d9f02f39e8ce..c00dd8828955d3621c315b808ab3cc6f9f816655 100644 --- a/app/assets/javascripts/token_access/components/token_projects_table.vue +++ b/app/assets/javascripts/token_access/components/token_projects_table.vue @@ -1,32 +1,11 @@