Commit 1838b748 authored by Thomas Randolph's avatar Thomas Randolph Committed by Himanshu Kapoor

Move alert strings into constants (and $options)

parent dd066c10
...@@ -28,6 +28,9 @@ import { ...@@ -28,6 +28,9 @@ import {
TREE_HIDE_STATS_WIDTH, TREE_HIDE_STATS_WIDTH,
MR_TREE_SHOW_KEY, MR_TREE_SHOW_KEY,
CENTERED_LIMITED_CONTAINER_CLASSES, CENTERED_LIMITED_CONTAINER_CLASSES,
ALERT_OVERFLOW_HIDDEN,
ALERT_MERGE_CONFLICT,
ALERT_COLLAPSED_FILES,
} from '../constants'; } from '../constants';
export default { export default {
...@@ -47,6 +50,11 @@ export default { ...@@ -47,6 +50,11 @@ export default {
GlSprintf, GlSprintf,
}, },
mixins: [glFeatureFlagsMixin()], mixins: [glFeatureFlagsMixin()],
alerts: {
ALERT_OVERFLOW_HIDDEN,
ALERT_MERGE_CONFLICT,
ALERT_COLLAPSED_FILES,
},
props: { props: {
endpoint: { endpoint: {
type: String, type: String,
...@@ -195,15 +203,15 @@ export default { ...@@ -195,15 +203,15 @@ export default {
let visible = false; let visible = false;
if (this.renderOverflowWarning) { if (this.renderOverflowWarning) {
visible = 'overflow'; visible = this.$options.alerts.ALERT_OVERFLOW_HIDDEN;
} else if (this.isDiffHead && this.hasConflicts) { } else if (this.isDiffHead && this.hasConflicts) {
visible = 'merge-conflict'; visible = this.$options.alerts.ALERT_MERGE_CONFLICT;
} else if ( } else if (
this.hasCollapsedFile && this.hasCollapsedFile &&
!this.collapsedWarningDismissed && !this.collapsedWarningDismissed &&
!this.viewDiffsFileByFile !this.viewDiffsFileByFile
) { ) {
visible = 'collapsed'; visible = this.$options.alerts.ALERT_COLLAPSED_FILES;
} }
return visible; return visible;
...@@ -441,20 +449,20 @@ export default { ...@@ -441,20 +449,20 @@ export default {
/> />
<hidden-files-warning <hidden-files-warning
v-if="visibleWarning == 'overflow'" v-if="visibleWarning == $options.alerts.ALERT_OVERFLOW_HIDDEN"
:visible="numVisibleFiles" :visible="numVisibleFiles"
:total="numTotalFiles" :total="numTotalFiles"
:plain-diff-path="plainDiffPath" :plain-diff-path="plainDiffPath"
:email-patch-path="emailPatchPath" :email-patch-path="emailPatchPath"
/> />
<merge-conflict-warning <merge-conflict-warning
v-if="visibleWarning == 'merge-conflict'" v-if="visibleWarning == $options.alerts.ALERT_MERGE_CONFLICT"
:limited="isLimitedContainer" :limited="isLimitedContainer"
:resolution-path="conflictResolutionPath" :resolution-path="conflictResolutionPath"
:mergeable="canMerge" :mergeable="canMerge"
/> />
<collapsed-files-warning <collapsed-files-warning
v-if="visibleWarning == 'collapsed'" v-if="visibleWarning == $options.alerts.ALERT_COLLAPSED_FILES"
:limited="isLimitedContainer" :limited="isLimitedContainer"
@dismiss="dismissCollapsedWarning" @dismiss="dismissCollapsedWarning"
/> />
......
...@@ -68,6 +68,11 @@ export const DIFFS_PER_PAGE = 20; ...@@ -68,6 +68,11 @@ export const DIFFS_PER_PAGE = 20;
export const DIFF_COMPARE_BASE_VERSION_INDEX = -1; export const DIFF_COMPARE_BASE_VERSION_INDEX = -1;
export const DIFF_COMPARE_HEAD_VERSION_INDEX = -2; export const DIFF_COMPARE_HEAD_VERSION_INDEX = -2;
// Diff View Alerts
export const ALERT_OVERFLOW_HIDDEN = 'overflow';
export const ALERT_MERGE_CONFLICT = 'merge-conflict';
export const ALERT_COLLAPSED_FILES = 'collapsed';
// State machine states // State machine states
export const STATE_IDLING = 'idle'; export const STATE_IDLING = 'idle';
export const STATE_LOADING = 'loading'; export const STATE_LOADING = 'loading';
......
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