summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/ide_review.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-03 10:58:08 +0100
committerPhil Hughes <me@iamphill.com>2018-05-03 10:58:08 +0100
commit129dd18535fe647e2b80472fe6ec4f6429544735 (patch)
tree6faa6cdb4b0fb1c74e13e34d534c2fe04233f6d9 /app/assets/javascripts/ide/components/ide_review.vue
parent9b8332d324c931798c30adf5517abda96212d5c3 (diff)
downloadgitlab-ce-129dd18535fe647e2b80472fe6ec4f6429544735.tar.gz
Added merge request to IDE sidebar
#44846
Diffstat (limited to 'app/assets/javascripts/ide/components/ide_review.vue')
-rw-r--r--app/assets/javascripts/ide/components/ide_review.vue41
1 files changed, 38 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/components/ide_review.vue b/app/assets/javascripts/ide/components/ide_review.vue
index ede1a753f17..230fd094d69 100644
--- a/app/assets/javascripts/ide/components/ide_review.vue
+++ b/app/assets/javascripts/ide/components/ide_review.vue
@@ -1,26 +1,61 @@
<script>
+import { mapGetters, mapState, mapActions } from 'vuex';
import IdeTreeList from './ide_tree_list.vue';
+import EditorModeDropdown from './editor_mode_dropdown.vue';
export default {
components: {
IdeTreeList,
+ EditorModeDropdown,
+ },
+ computed: {
+ ...mapGetters(['currentMergeRequest']),
+ ...mapState(['viewer']),
+ },
+ mounted() {
+ this.updateViewer(this.currentMergeRequest ? 'mrdiff' : 'diff');
+ },
+ methods: {
+ ...mapActions(['updateViewer']),
},
};
</script>
<template>
<ide-tree-list
- viewer-type="diff"
+ :viewer-type="viewer"
header-class="ide-review-header"
:disable-action-dropdown="true"
>
<template
slot="header"
>
- {{ __('Review') }}
+ <div class="ide-review-button-holder">
+ {{ __('Review') }}
+ <editor-mode-dropdown
+ v-if="currentMergeRequest"
+ :viewer="viewer"
+ :merge-request-id="currentMergeRequest.iid"
+ @click="updateViewer"
+ />
+ </div>
<div class="prepend-top-5 ide-review-sub-header">
- {{ __('Lastest changes') }}
+ <template v-if="!currentMergeRequest || viewer === 'diff'">
+ {{ __('Lastest changes') }}
+ </template>
+ <template v-else-if="currentMergeRequest && viewer === 'mrdiff'">
+ Merge request
+ (<a :href="currentMergeRequest.web_url">!{{ currentMergeRequest.iid }}</a>)
+ </template>
</div>
</template>
</ide-tree-list>
</template>
+
+<style>
+.ide-review-button-holder {
+ display: flex;
+ width: 100%;
+ align-items: center;
+}
+</style>