Skip to content
Snippets Groups Projects

Hide file browser and display options from empty state changes tab

All threads resolved!
Compare and
4 files
+ 25
8
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -145,8 +145,6 @@ export default {
@@ -145,8 +145,6 @@ export default {
isBatchLoading: (state) => state.diffs.isBatchLoading,
isBatchLoading: (state) => state.diffs.isBatchLoading,
diffFiles: (state) => state.diffs.diffFiles,
diffFiles: (state) => state.diffs.diffFiles,
diffViewType: (state) => state.diffs.diffViewType,
diffViewType: (state) => state.diffs.diffViewType,
mergeRequestDiffs: (state) => state.diffs.mergeRequestDiffs,
mergeRequestDiff: (state) => state.diffs.mergeRequestDiff,
commit: (state) => state.diffs.commit,
commit: (state) => state.diffs.commit,
renderOverflowWarning: (state) => state.diffs.renderOverflowWarning,
renderOverflowWarning: (state) => state.diffs.renderOverflowWarning,
numTotalFiles: (state) => state.diffs.realSize,
numTotalFiles: (state) => state.diffs.realSize,
@@ -186,17 +184,16 @@ export default {
@@ -186,17 +184,16 @@ export default {
return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request;
return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request;
},
},
renderDiffFiles() {
renderDiffFiles() {
return (
return this.diffFiles.length > 0;
this.diffFiles.length > 0 ||
},
(this.startVersion &&
renderFileTree() {
this.startVersion.version_index === this.mergeRequestDiff.version_index)
return this.renderDiffFiles && this.showTreeList;
);
},
},
hideFileStats() {
hideFileStats() {
return this.treeWidth <= TREE_HIDE_STATS_WIDTH;
return this.treeWidth <= TREE_HIDE_STATS_WIDTH;
},
},
isLimitedContainer() {
isLimitedContainer() {
return !this.showTreeList && !this.isParallelView && !this.isFluidLayout;
return !this.renderFileTree && !this.isParallelView && !this.isFluidLayout;
},
},
isDiffHead() {
isDiffHead() {
return parseBoolean(getParameterByName('diff_head'));
return parseBoolean(getParameterByName('diff_head'));
@@ -259,7 +256,7 @@ export default {
@@ -259,7 +256,7 @@ export default {
this.adjustView();
this.adjustView();
},
},
isLoading: 'adjustView',
isLoading: 'adjustView',
showTreeList: 'adjustView',
renderFileTree: 'adjustView',
},
},
mounted() {
mounted() {
this.setBaseConfig({
this.setBaseConfig({
@@ -467,7 +464,6 @@ export default {
@@ -467,7 +464,6 @@ export default {
<div v-if="isLoading || !isTreeLoaded" class="loading"><gl-loading-icon size="lg" /></div>
<div v-if="isLoading || !isTreeLoaded" class="loading"><gl-loading-icon size="lg" /></div>
<div v-else id="diffs" :class="{ active: shouldShow }" class="diffs tab-pane">
<div v-else id="diffs" :class="{ active: shouldShow }" class="diffs tab-pane">
<compare-versions
<compare-versions
:merge-request-diffs="mergeRequestDiffs"
:is-limited-container="isLimitedContainer"
:is-limited-container="isLimitedContainer"
:diff-files-count-text="numTotalFiles"
:diff-files-count-text="numTotalFiles"
/>
/>
@@ -495,7 +491,7 @@ export default {
@@ -495,7 +491,7 @@ export default {
class="files d-flex gl-mt-2"
class="files d-flex gl-mt-2"
>
>
<div
<div
v-if="showTreeList"
v-if="renderFileTree"
:style="{ width: `${treeWidth}px` }"
:style="{ width: `${treeWidth}px` }"
class="diff-tree-list js-diff-tree-list px-3 pr-md-0"
class="diff-tree-list js-diff-tree-list px-3 pr-md-0"
>
>
Loading