diff --git a/.graphqlrc b/.graphqlrc index 1debc7ab4d3..19c8f2112fa 100644 --- a/.graphqlrc +++ b/.graphqlrc @@ -4,4 +4,5 @@ schema: documents: - ./app/assets/javascripts/**/*.graphql - ./ee/app/assets/javascripts/**/*.graphql + - ./jh/app/assets/javascripts/**/*.graphql - ./app/graphql/queries/**/*.graphql diff --git a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue index 409436ca6fa..e5e42998efd 100644 --- a/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue +++ b/app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue @@ -12,8 +12,10 @@ import { WIDGET_TYPE_PROGRESS, WIDGET_TYPE_START_AND_DUE_DATE, WIDGET_TYPE_TIME_TRACKING, + WIDGET_TYPE_ROLLEDUP_DATES, WIDGET_TYPE_WEIGHT, WIDGET_TYPE_COLOR, + WORK_ITEM_TYPE_VALUE_EPIC, } from '../constants'; import WorkItemAssigneesInline from './work_item_assignees_inline.vue'; import WorkItemAssigneesWithEdit from './work_item_assignees_with_edit.vue'; @@ -61,6 +63,8 @@ export default { import('ee_component/work_items/components/work_item_color_inline.vue'), WorkItemColorWithEdit: () => import('ee_component/work_items/components/work_item_color_with_edit.vue'), + WorkItemRolledupDates: () => + import('ee_component/work_items/components/work_item_rolledup_dates.vue'), }, mixins: [glFeatureFlagMixin()], props: { @@ -92,6 +96,9 @@ export default { workItemDueDate() { return this.isWidgetPresent(WIDGET_TYPE_START_AND_DUE_DATE); }, + workItemRolledupDates() { + return this.isWidgetPresent(WIDGET_TYPE_ROLLEDUP_DATES); + }, workItemWeight() { return this.isWidgetPresent(WIDGET_TYPE_WEIGHT); }, @@ -113,6 +120,11 @@ export default { workItemMilestone() { return this.isWidgetPresent(WIDGET_TYPE_MILESTONE); }, + showRolledupDates() { + return ( + this.glFeatures.workItemsRolledupDates && this.workItemType === WORK_ITEM_TYPE_VALUE_EPIC + ); + }, workItemParent() { return this.isWidgetPresent(WIDGET_TYPE_HIERARCHY)?.parent; }, @@ -211,6 +223,20 @@ export default { @error="$emit('error', $event)" /> + -