diff options
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 19 insertions, 1 deletions
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue index 28e52bff7f3..365cbeaf6a2 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue @@ -177,6 +177,7 @@ export default { :has-project-filter="false" :start-date="createdAfter" :end-date="createdBefore" + :group-path="groupPath" @setDateRange="onSetDateRange" /> <div class="gl-display-flex gl-flex-direction-column gl-md-flex-direction-row"> diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue index 849d45b33e2..b9d1c4b0fe0 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue @@ -35,6 +35,10 @@ export default { type: String, required: true, }, + groupPath: { + type: String, + required: true, + }, startDate: { type: Date, required: false, @@ -79,7 +83,7 @@ export default { <projects-dropdown-filter v-if="hasProjectFilter" class="js-projects-dropdown-filter project-select gl-mb-2 gl-lg-mb-0" - :group-namespace="namespacePath" + :group-namespace="groupPath" :query-params="projectsQueryParams" :multi-select="$options.multiProjectSelect" :default-projects="selectedProjects" diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js index d25cfa95855..922cd3ebddc 100644 --- a/app/assets/javascripts/notes/index.js +++ b/app/assets/javascripts/notes/index.js @@ -59,6 +59,7 @@ export default () => { showTimelineViewToggle, reportAbusePath: notesDataset.reportAbusePath, newCommentTemplatePath: notesDataset.newCommentTemplatePath, + issuableId: noteableData.id, }, data() { return { diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 3abbe5457bd..8e00ff54c72 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -28,6 +28,8 @@ export default { GlTab, DrawioToolbarButton, CommentTemplatesDropdown, + AiActionsDropdown: () => + import('ee_component/vue_shared/components/markdown/ai_actions_dropdown.vue'), }, directives: { GlTooltip: GlTooltipDirective, @@ -37,6 +39,7 @@ export default { newCommentTemplatePath: { default: null, }, + issuableId: { default: null }, }, props: { previewMarkdown: { @@ -118,6 +121,14 @@ export default { const expandText = s__('MarkdownEditor|Click to expand'); return [`<details><summary>${expandText}</summary>`, `{text}`, '</details>'].join('\n'); }, + showAiActions() { + return ( + this.issuableId && + this.glFeatures.openaiExperimentation && + this.glFeatures.summarizeNotes && + this.glFeatures.summarizeComments + ); + }, }, watch: { showSuggestPopover() { @@ -269,6 +280,7 @@ export default { </gl-button> </gl-popover> </template> + <ai-actions-dropdown v-if="showAiActions" :issuable-id="issuableId" /> <toolbar-button tag="**" :button-title=" |
