Commit 062778f9 authored by Mark Florian's avatar Mark Florian

Fix component option order in design_management

This fixes `vue/order-in-components` violations in the
`{,ee/}app/assets/javascripts/design_management` directories.

Part of https://gitlab.com/gitlab-org/gitlab/-/issues/297216.
parent a1239653
......@@ -8,12 +8,6 @@ export default {
components: {
ApolloMutation,
},
props: {
filenames: {
type: Array,
required: true,
},
},
inject: {
projectPath: {
default: '',
......@@ -23,6 +17,12 @@ export default {
defaut: '',
},
},
props: {
filenames: {
type: Array,
required: true,
},
},
computed: {
projectQueryBody() {
return {
......
......@@ -21,6 +21,14 @@ export default {
DesignTodoButton,
},
mixins: [glFeatureFlagsMixin()],
inject: {
projectPath: {
default: '',
},
issueIid: {
default: '',
},
},
props: {
design: {
type: Object,
......@@ -41,14 +49,6 @@ export default {
discussionWithOpenForm: '',
};
},
inject: {
projectPath: {
default: '',
},
issueIid: {
default: '',
},
},
computed: {
discussions() {
return extractDiscussions(this.design.discussions);
......
......@@ -13,12 +13,6 @@ export default {
TodoButton,
},
mixins: [allVersionsMixin],
props: {
design: {
type: Object,
required: true,
},
},
inject: {
projectPath: {
default: '',
......@@ -27,6 +21,12 @@ export default {
default: '',
},
},
props: {
design: {
type: Object,
required: true,
},
},
data() {
return {
todoLoading: false,
......
......@@ -18,6 +18,14 @@ export default {
GlTooltip: GlTooltipDirective,
},
mixins: [timeagoMixin],
inject: {
projectPath: {
default: '',
},
issueIid: {
default: '',
},
},
props: {
id: {
type: String,
......@@ -58,14 +66,6 @@ export default {
},
};
},
inject: {
projectPath: {
default: '',
},
issueIid: {
default: '',
},
},
apollo: {
permissions: {
query: permissionsQuery,
......
......@@ -57,6 +57,27 @@ export default {
DesignSidebar,
},
mixins: [allVersionsMixin, glFeatureFlagsMixin()],
beforeRouteUpdate(to, from, next) {
// reset scale when the active design changes
this.scale = DEFAULT_SCALE;
next();
},
beforeRouteEnter(to, from, next) {
const pageEl = getPageLayoutElement();
if (pageEl) {
pageEl.classList.add(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
}
next();
},
beforeRouteLeave(to, from, next) {
const pageEl = getPageLayoutElement();
if (pageEl) {
pageEl.classList.remove(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
}
next();
},
props: {
id: {
type: String,
......@@ -161,11 +182,6 @@ export default {
beforeDestroy() {
Mousetrap.unbind('esc', this.closeDesign);
},
beforeRouteUpdate(to, from, next) {
// reset scale when the active design changes
this.scale = DEFAULT_SCALE;
next();
},
methods: {
addImageDiffNoteToStore(store, { data: { createImageDiffNote } }) {
updateStoreAfterAddImageDiffNote(
......@@ -296,22 +312,6 @@ export default {
this.resolvedDiscussionsExpanded = !this.resolvedDiscussionsExpanded;
},
},
beforeRouteEnter(to, from, next) {
const pageEl = getPageLayoutElement();
if (pageEl) {
pageEl.classList.add(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
}
next();
},
beforeRouteLeave(to, from, next) {
const pageEl = getPageLayoutElement();
if (pageEl) {
pageEl.classList.remove(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
}
next();
},
createImageDiffNoteMutation,
DESIGNS_ROUTE_NAME,
};
......
......@@ -72,6 +72,10 @@ export default {
update: (data) => data.project.issue.userPermissions,
},
},
beforeRouteUpdate(to, from, next) {
this.selectedDesigns = [];
next();
},
data() {
return {
permissions: {
......@@ -324,10 +328,6 @@ export default {
this.reorderedDesigns = designs;
},
},
beforeRouteUpdate(to, from, next) {
this.selectedDesigns = [];
next();
},
dragOptions: {
animation: 200,
ghostClass: 'gl-visibility-hidden',
......
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