summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/deployment.vue22
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue17
2 files changed, 14 insertions, 25 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
index 46dc823d4c3..8f4cae8ae58 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -35,15 +35,6 @@ export default {
type: Object,
required: true,
},
- issueIds: {
- type: Object,
- required: false,
- default: () => ({
- sourceProjectId: '',
- issueId: '',
- appUrl: '',
- }),
- },
showMetrics: {
type: Boolean,
required: true,
@@ -53,6 +44,15 @@ export default {
required: false,
default: false,
},
+ visualReviewAppMeta: {
+ type: Object,
+ required: false,
+ default: () => ({
+ sourceProjectId: '',
+ issueId: '',
+ appUrl: '',
+ }),
+ },
},
deployedTextMap: {
running: __('Deploying to'),
@@ -187,7 +187,7 @@ export default {
<visual-review-app-link
v-if="showVisualReviewApp"
:link="deploymentExternalUrl"
- :issue-ids="issueIds"
+ :app-metadata="visualReviewAppMeta"
/>
</template>
@@ -216,7 +216,7 @@ export default {
<visual-review-app-link
v-if="showVisualReviewApp"
:link="deploymentExternalUrl"
- :issue-ids="issueIds"
+ :app-metadata="visualReviewAppMeta"
/>
</template>
</template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
index 7a29948903d..b9f5f602117 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
@@ -37,17 +37,6 @@ export default {
return this.isPostMerge ? this.mr.targetBranch : this.mr.sourceBranchLink;
},
deployments() {
- // return [
- // {
- // id: 56789,
- // name: 'What a cool mocked deployment',
- // url: 'https://sarahghp.gitlab.io/review-app-tester/',
- // external_url: 'https://sarahghp.gitlab.io/review-app-tester/',
- // deployed_at_formatted: '',
- // metrics_url: '',
- // metrics_monitoring_url: '',
- // },
- // ];
return this.isPostMerge ? this.mr.postMergeDeployments : this.mr.deployments;
},
deploymentClass() {
@@ -56,7 +45,7 @@ export default {
hasDeploymentMetrics() {
return this.isPostMerge;
},
- issueIds() {
+ visualReviewAppMeta() {
return {
appUrl: this.mr.appUrl,
issueId: this.mr.iid,
@@ -90,8 +79,8 @@ export default {
:class="deploymentClass"
:deployment="deployment"
:show-metrics="hasDeploymentMetrics"
- :show-visual-review-app="showVisualReviewAppLink"
- :issue-ids="issueIds"
+ :show-visual-review-app="true"
+ :visual-review-app-meta="visualReviewAppMeta"
/>
</div>
</template>