diff options
Diffstat (limited to 'app/assets/javascripts/ide/components')
4 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index 93c8fc00f28..92fcb55f94f 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -1,4 +1,5 @@ <script> +import { mapActions } from 'vuex'; import Icon from '~/vue_shared/components/icon.vue'; import StageButton from './stage_button.vue'; import UnstageButton from './unstage_button.vue'; @@ -57,7 +58,7 @@ export default { </button> <component :is="actionComponent" - :file="file" + :path="file.path" /> </div> </template> diff --git a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue index 0189358d82f..ada23f2993d 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue @@ -7,8 +7,8 @@ export default { Icon, }, props: { - file: { - type: Object, + path: { + type: String, required: true, }, }, @@ -27,7 +27,7 @@ export default { type="button" class="btn btn-blank append-right-5" :aria-label="__('Stage change')" - @click.stop="stageChange(file)" + @click.stop="stageChange(path)" > <icon name="mobile-issue-close" @@ -38,7 +38,7 @@ export default { type="button" class="btn btn-blank" :aria-label="__('Discard change')" - @click.stop="discardFileChanges(file)" + @click.stop="discardFileChanges(path)" > <icon name="remove" diff --git a/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue b/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue index fd7ec0366a2..e5d57b9ecc5 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue @@ -7,8 +7,8 @@ export default { Icon, }, props: { - file: { - type: Object, + path: { + type: String, required: true, }, }, @@ -27,7 +27,7 @@ export default { type="button" class="btn btn-blank" :aria-label="__('Unstage change')" - @click="unstageChange(file)" + @click="unstageChange(path)" > <icon name="history" diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue index d8d447b80f3..caa0f25c827 100644 --- a/app/assets/javascripts/ide/components/repo_commit_section.vue +++ b/app/assets/javascripts/ide/components/repo_commit_section.vue @@ -32,9 +32,8 @@ export default { }, }, computed: { - ...mapState(['stagedFiles', 'rightPanelCollapsed']), + ...mapState(['changedFiles', 'stagedFiles', 'rightPanelCollapsed']), ...mapState('commit', ['commitMessage', 'submitCommitLoading']), - ...mapGetters(['unstagedFiles']), ...mapGetters('commit', [ 'commitButtonDisabled', 'discardDraftButtonDisabled', @@ -74,12 +73,12 @@ export default { </template> </modal> <template - v-if="unstagedFiles.length || stagedFiles.length" + v-if="changedFiles.length || stagedFiles.length" > <commit-files-list icon="unstaged" :title="__('Unstaged')" - :file-list="unstagedFiles" + :file-list="changedFiles" action="stageAllChanges" :action-btn-text="__('Stage all')" item-action-component="stage-button" |