Commit 571ee1fc authored by Phil Hughes's avatar Phil Hughes

Merge branch '37989-non-button' into 'master'

Address lingering changes to `deployment_view_button`

See merge request gitlab-org/gitlab!25617
parents 7044df7d 8b5075d6
<script> <script>
import { GlLink } from '@gitlab/ui';
import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue'; import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue';
import ReviewAppLink from '../review_app_link.vue'; import ReviewAppLink from '../review_app_link.vue';
...@@ -6,6 +7,7 @@ export default { ...@@ -6,6 +7,7 @@ export default {
name: 'DeploymentViewButton', name: 'DeploymentViewButton',
components: { components: {
FilteredSearchDropdown, FilteredSearchDropdown,
GlLink,
ReviewAppLink, ReviewAppLink,
VisualReviewAppLink: () => VisualReviewAppLink: () =>
import('ee_component/vue_merge_request_widget/components/visual_review_app_link.vue'), import('ee_component/vue_merge_request_widget/components/visual_review_app_link.vue'),
...@@ -67,7 +69,7 @@ export default { ...@@ -67,7 +69,7 @@ export default {
</template> </template>
<template slot="result" slot-scope="slotProps"> <template slot="result" slot-scope="slotProps">
<a <gl-link
:href="slotProps.result.external_url" :href="slotProps.result.external_url"
target="_blank" target="_blank"
rel="noopener noreferrer nofollow" rel="noopener noreferrer nofollow"
...@@ -80,16 +82,15 @@ export default { ...@@ -80,16 +82,15 @@ export default {
<p class="text-secondary str-truncated-100 append-bottom-0 d-block"> <p class="text-secondary str-truncated-100 append-bottom-0 d-block">
{{ slotProps.result.external_url }} {{ slotProps.result.external_url }}
</p> </p>
</a> </gl-link>
</template> </template>
</filtered-search-dropdown> </filtered-search-dropdown>
<template v-else> <review-app-link
<review-app-link v-else
:display="appButtonText" :display="appButtonText"
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
css-class="js-deploy-url deploy-link btn btn-default btn-sm inline" css-class="js-deploy-url deploy-link btn btn-default btn-sm inline"
/> />
</template>
<visual-review-app-link <visual-review-app-link
v-if="showVisualReviewApp" v-if="showVisualReviewApp"
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment