diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-15 15:07:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-15 15:07:44 +0300 |
commit | 6a9ab27963fc1479fe7c78581b942c8dcce322e5 (patch) | |
tree | 8d32f4f66efde1b426658a74d0276e5250091ab7 /app/assets/javascripts/google_cloud | |
parent | 389d5aa505a916b0506b7b73dcc3be342d724976 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/google_cloud')
-rw-r--r-- | app/assets/javascripts/google_cloud/components/home.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/google_cloud/components/revoke_oauth.vue | 38 |
2 files changed, 46 insertions, 0 deletions
diff --git a/app/assets/javascripts/google_cloud/components/home.vue b/app/assets/javascripts/google_cloud/components/home.vue index 5f98eaf4a05..e41337e2679 100644 --- a/app/assets/javascripts/google_cloud/components/home.vue +++ b/app/assets/javascripts/google_cloud/components/home.vue @@ -1,6 +1,7 @@ <script> import { GlTabs, GlTab } from '@gitlab/ui'; import DeploymentsServiceTable from './deployments_service_table.vue'; +import RevokeOauth from './revoke_oauth.vue'; import ServiceAccountsList from './service_accounts_list.vue'; import GcpRegionsList from './gcp_regions_list.vue'; @@ -9,6 +10,7 @@ export default { GlTabs, GlTab, DeploymentsServiceTable, + RevokeOauth, ServiceAccountsList, GcpRegionsList, }, @@ -41,6 +43,10 @@ export default { type: Array, required: true, }, + revokeOauthUrl: { + type: String, + required: true, + }, }, }; </script> @@ -61,6 +67,8 @@ export default { :create-url="configureGcpRegionsUrl" :list="gcpRegions" /> + <hr v-if="revokeOauthUrl" /> + <revoke-oauth v-if="revokeOauthUrl" :url="revokeOauthUrl" /> </gl-tab> <gl-tab :title="__('Deployments')"> <deployments-service-table diff --git a/app/assets/javascripts/google_cloud/components/revoke_oauth.vue b/app/assets/javascripts/google_cloud/components/revoke_oauth.vue new file mode 100644 index 00000000000..07d966894f6 --- /dev/null +++ b/app/assets/javascripts/google_cloud/components/revoke_oauth.vue @@ -0,0 +1,38 @@ +<script> +import { GlButton, GlForm } from '@gitlab/ui'; +import csrf from '~/lib/utils/csrf'; +import { s__ } from '~/locale'; + +export const GOOGLE_CLOUD_REVOKE_TITLE = s__('GoogleCloud|Revoke authorizations'); +export const GOOGLE_CLOUD_REVOKE_DESCRIPTION = s__( + 'GoogleCloud|Revoke authorizations granted to GitLab. This does not invalidate service accounts.', +); + +export default { + components: { GlButton, GlForm }, + csrf, + props: { + url: { + type: String, + required: true, + }, + }, + i18n: { + title: GOOGLE_CLOUD_REVOKE_TITLE, + description: GOOGLE_CLOUD_REVOKE_DESCRIPTION, + }, +}; +</script> + +<template> + <div class="gl-mx-4"> + <h2 class="gl-font-size-h2">{{ $options.i18n.title }}</h2> + <p>{{ $options.i18n.description }}</p> + <gl-form :action="url" method="post"> + <input :value="$options.csrf.token" type="hidden" name="authenticity_token" /> + <gl-button category="secondary" variant="warning" type="submit"> + {{ $options.i18n.title }} + </gl-button> + </gl-form> + </div> +</template> |