moved strings into constants file
This commit is contained in:
parent
b2cb0c6cbd
commit
9d9d952c11
|
@ -48,6 +48,10 @@ export default {
|
|||
required: false,
|
||||
default: null,
|
||||
},
|
||||
keyPrefix: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -118,7 +122,7 @@ export default {
|
|||
<list-item
|
||||
:file="file"
|
||||
:action-component="itemActionComponent"
|
||||
:key-prefix="title"
|
||||
:key-prefix="keyPrefix"
|
||||
:staged-list="stagedList"
|
||||
:active-file-key="activeFileKey"
|
||||
/>
|
||||
|
|
|
@ -45,7 +45,7 @@ export default {
|
|||
return `multi-file-${this.file.tempFile ? 'addition' : 'modified'} append-right-8`;
|
||||
},
|
||||
fullKey() {
|
||||
return `${this.keyPrefix.toLowerCase()}-${this.file.key}`;
|
||||
return `${this.keyPrefix}-${this.file.key}`;
|
||||
},
|
||||
isActive() {
|
||||
return this.activeFileKey === this.fullKey;
|
||||
|
@ -62,7 +62,7 @@ export default {
|
|||
openFileInEditor() {
|
||||
return this.openPendingTab({
|
||||
file: this.file,
|
||||
keyPrefix: this.keyPrefix.toLowerCase(),
|
||||
keyPrefix: this.keyPrefix,
|
||||
}).then(changeViewer => {
|
||||
if (changeViewer) {
|
||||
this.updateViewer(viewerTypes.diff);
|
||||
|
|
|
@ -6,7 +6,7 @@ import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
|
|||
import CommitFilesList from './commit_sidebar/list.vue';
|
||||
import EmptyState from './commit_sidebar/empty_state.vue';
|
||||
import * as consts from '../stores/modules/commit/constants';
|
||||
import { activityBarViews } from '../constants';
|
||||
import { activityBarViews, stageKeys } from '../constants';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
@ -47,7 +47,7 @@ export default {
|
|||
if (this.lastOpenedFile) {
|
||||
this.openPendingTab({
|
||||
file: this.lastOpenedFile,
|
||||
keyPrefix: this.lastOpenedFile.changed ? 'unstaged' : 'staged',
|
||||
keyPrefix: this.lastOpenedFile.changed ? stageKeys.unstaged : stageKeys.staged,
|
||||
})
|
||||
.then(changeViewer => {
|
||||
if (changeViewer) {
|
||||
|
@ -66,6 +66,7 @@ export default {
|
|||
return this.updateCommitAction(consts.COMMIT_TO_NEW_BRANCH).then(() => this.commitChanges());
|
||||
},
|
||||
},
|
||||
stageKeys,
|
||||
};
|
||||
</script>
|
||||
|
||||
|
@ -92,6 +93,7 @@ export default {
|
|||
class="is-first"
|
||||
icon-name="unstaged"
|
||||
:title="__('Unstaged')"
|
||||
:key-prefix="$options.stageKeys.unstaged"
|
||||
:file-list="changedFiles"
|
||||
action="stageAllChanges"
|
||||
:action-btn-text="__('Stage all')"
|
||||
|
@ -101,6 +103,7 @@ export default {
|
|||
<commit-files-list
|
||||
icon-name="staged"
|
||||
:title="__('Staged')"
|
||||
:key-prefix="$options.stageKeys.staged"
|
||||
:file-list="stagedFiles"
|
||||
action="unstageAllChanges"
|
||||
:action-btn-text="__('Unstage all')"
|
||||
|
|
|
@ -25,3 +25,8 @@ export const rightSidebarViews = {
|
|||
pipelines: 'pipelines-list',
|
||||
jobsDetail: 'jobs-detail',
|
||||
};
|
||||
|
||||
export const stageKeys = {
|
||||
unstaged: 'unstaged',
|
||||
staged: 'staged',
|
||||
};
|
||||
|
|
|
@ -18,6 +18,7 @@ describe('Multi-file editor commit sidebar list', () => {
|
|||
actionBtnText: 'stage all',
|
||||
itemActionComponent: 'stage-button',
|
||||
activeFileKey: 'staged-testing',
|
||||
keyPrefix: 'staged',
|
||||
});
|
||||
|
||||
vm.$store.state.rightPanelCollapsed = false;
|
||||
|
|
Loading…
Reference in New Issue