Fixed fluid layout preference not being respected in diffs
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
This commit is contained in:
parent
39aa68b20c
commit
45ef6fd777
|
@ -64,6 +64,11 @@ export default {
|
|||
required: false,
|
||||
default: '',
|
||||
},
|
||||
isFluidLayout: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
const treeWidth =
|
||||
|
@ -116,7 +121,7 @@ export default {
|
|||
return this.treeWidth <= TREE_HIDE_STATS_WIDTH;
|
||||
},
|
||||
isLimitedContainer() {
|
||||
return !this.showTreeList && !this.isParallelView;
|
||||
return !this.showTreeList && !this.isParallelView && !this.isFluidLayout;
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
|
|
|
@ -71,6 +71,7 @@ export default function initDiffsApp(store) {
|
|||
helpPagePath: dataset.helpPagePath,
|
||||
currentUser: JSON.parse(dataset.currentUserData) || {},
|
||||
changesEmptyStateIllustration: dataset.changesEmptyStateIllustration,
|
||||
isFluidLayout: parseBoolean(dataset.isFluidLayout),
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
@ -97,6 +98,7 @@ export default function initDiffsApp(store) {
|
|||
helpPagePath: this.helpPagePath,
|
||||
shouldShow: this.activeTab === 'diffs',
|
||||
changesEmptyStateIllustration: this.changesEmptyStateIllustration,
|
||||
isFluidLayout: this.isFluidLayout,
|
||||
},
|
||||
});
|
||||
},
|
||||
|
|
|
@ -82,7 +82,8 @@
|
|||
help_page_path: suggest_changes_help_path,
|
||||
current_user_data: UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json,
|
||||
project_path: project_path(@merge_request.project),
|
||||
changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg') } }
|
||||
changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'),
|
||||
is_fluid_layout: fluid_layout.to_s } }
|
||||
|
||||
.mr-loading-status
|
||||
= spinner
|
||||
|
|
|
@ -75,6 +75,14 @@ describe('diffs/components/app', () => {
|
|||
expect(wrapper.contains('.container-limited.limit-container-width')).toBe(false);
|
||||
});
|
||||
|
||||
it('does not add container-limiting classes when isFluidLayout', () => {
|
||||
createComponent({ isFluidLayout: true }, ({ state }) => {
|
||||
state.diffs.isParallelView = false;
|
||||
});
|
||||
|
||||
expect(wrapper.contains('.container-limited.limit-container-width')).toBe(false);
|
||||
});
|
||||
|
||||
it('displays loading icon on loading', () => {
|
||||
createComponent({}, ({ state }) => {
|
||||
state.diffs.isLoading = true;
|
||||
|
|
Loading…
Reference in New Issue