@gitlab/ui 95.0.0 → 95.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "95.0.0",
+  "version": "95.1.1",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/base/dropdown/dropdown.scss

@@ -41,7 +41,7 @@
     @apply gl-border-1 gl-border-b-solid gl-border-dropdown;
     @apply gl-flex;
     @apply gl-text-base;
-    @apply gl-text-heading;
+    @apply gl-text-strong;
     @apply gl-font-bold;
     @apply gl-justify-center;
     @apply gl-leading-normal;

package/src/components/base/dropdown/dropdown_section_header.scss

@@ -1,6 +1,6 @@
 @mixin gl-tmp-dropdown-section-header-style {
   @apply gl-text-base;
-  @apply gl-text-heading;
+  @apply gl-text-strong;
   @apply gl-leading-normal;
   @apply gl-text-left;
   @apply gl-font-bold;

package/src/components/experimental/duo/chat/components/duo_chat_context/constants.js

@@ -5,3 +5,7 @@ export const CONTEXT_ITEM_CATEGORY_LOCAL_GIT = 'local_git';
 
 export const CONTEXT_ITEM_LOCAL_GIT_COMMIT = 'commit';
 export const CONTEXT_ITEM_LOCAL_GIT_DIFF = 'diff';
+
+export const LANGUAGE_IDENTIFIER_PREFIX = 'language-';
+export const LANGUAGE_IDENTIFIER_DIFF = 'language-diff';
+export const LANGUAGE_IDENTIFIER_PLAINTEXT = 'language-plaintext';

package/src/components/experimental/duo/chat/components/duo_chat_context/duo_chat_context_item_details_modal/duo_chat_context_item_details_modal.vue

@@ -0,0 +1,114 @@
+<script>
+import { nextTick } from 'vue';
+import { contextItemValidator } from '../utils';
+import GlModal from '../../../../../../base/modal/modal.vue';
+import { SafeHtmlDirective as SafeHtml } from '../../../../../../../directives/safe_html/safe_html';
+import GlSkeletonLoader from '../../../../../../base/skeleton_loader/skeleton_loader.vue';
+import { translate } from '../../../../../../../utils/i18n';
+import {
+  CONTEXT_ITEM_CATEGORY_LOCAL_GIT,
+  LANGUAGE_IDENTIFIER_DIFF,
+  LANGUAGE_IDENTIFIER_PLAINTEXT,
+  LANGUAGE_IDENTIFIER_PREFIX,
+} from '../constants';
+
+export default {
+  name: 'GlDuoChatContextItemDetailsModal',
+  components: {
+    GlSkeletonLoader,
+    GlModal,
+  },
+  directives: {
+    SafeHtml,
+  },
+  inject: {
+    renderGFM: {
+      from: 'renderGFM',
+      default: () => (element) => {
+        element.classList.add('gl-markdown', 'gl-compact-markdown');
+      },
+    },
+  },
+  props: {
+    /**
+     * Context items to preview. If it has no `content`, the loading state will be displayed.
+     */
+    contextItem: {
+      type: Object,
+      required: true,
+      validator: contextItemValidator,
+    },
+  },
+  computed: {
+    isLoadingContent() {
+      return this.contextItem.content === undefined;
+    },
+    languageIdentifierClass() {
+      if (this.contextItem.category === CONTEXT_ITEM_CATEGORY_LOCAL_GIT) {
+        return LANGUAGE_IDENTIFIER_DIFF;
+      }
+
+      const fileExtension = this.contextItem.metadata?.relativePath?.split('.').at(-1);
+      if (fileExtension && fileExtension !== this.contextItem.metadata?.relativePath) {
+        return `${LANGUAGE_IDENTIFIER_PREFIX}${fileExtension}`;
+      }
+
+      return LANGUAGE_IDENTIFIER_PLAINTEXT;
+    },
+    title() {
+      return (
+        this.contextItem.metadata?.title ||
+        this.contextItem.metadata?.relativePath ||
+        translate('GlDuoChatContextItemDetailsModal.title', 'Preview')
+      );
+    },
+  },
+  watch: {
+    contextItem: {
+      async handler(newVal, oldVal) {
+        const shouldFormat = newVal?.content !== oldVal?.content && newVal?.content;
+        if (shouldFormat) {
+          await nextTick();
+          await this.hydrateContentWithGFM();
+        }
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    async hydrateContentWithGFM() {
+      await nextTick();
+
+      if (this.$refs.content) {
+        this.renderGFM(this.$refs.content);
+      }
+    },
+    onModalVisibilityChange(isVisible) {
+      if (!isVisible) {
+        this.$emit('close');
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-modal
+    modal-id="context-item-details-modal"
+    :title="title"
+    :visible="true"
+    :scrollable="true"
+    hide-footer
+    size="lg"
+    @change="onModalVisibilityChange"
+  >
+    <gl-skeleton-loader v-if="isLoadingContent" />
+    <div v-else ref="content" data-testid="context-item-content">
+      <pre
+        v-safe-html="contextItem.content"
+        class="code js-syntax-highlight gl-p-3"
+        :class="languageIdentifierClass"
+      ></pre>
+    </div>
+  </gl-modal>
+</template>

package/src/components/experimental/duo/chat/components/duo_chat_context/duo_chat_context_item_menu/duo_chat_context_item_menu.vue

@@ -218,6 +218,14 @@ export default {
 
       this.activeIndex = newIndex;
     },
+    onGetContextItemContent(contextItem) {
+      /**
+       * Emit get-context-item-content event that tells clients to load the full file content for a selected context item.
+       * The fully hydrated context item should be updated in the context item selections.
+       * @param {*} event An event containing the context item to hydrate
+       */
+      this.$emit('get-context-item-content', { contextItem });
+    },
   },
   i18n: {
     selectedContextItemsTitle: translate(
@@ -233,11 +241,13 @@ export default {
     <gl-duo-chat-context-item-selections
       v-if="selections.length"
       :selections="selections"
+      :categories="categories"
       :removable="true"
       :title="$options.i18n.selectedContextItemsTitle"
       :default-collapsed="false"
       class="gl-mb-3"
       @remove="removeItem"
+      @get-content="onGetContextItemContent"
     />
     <gl-card
       v-if="open"

package/src/components/experimental/duo/chat/components/duo_chat_context/duo_chat_context_item_selections/duo_chat_context_item_selections.vue

@@ -4,12 +4,15 @@ import GlIcon from '../../../../../../base/icon/icon.vue';
 import GlToken from '../../../../../../base/token/token.vue';
 import GlTruncate from '../../../../../../utilities/truncate/truncate.vue';
 import GlDuoChatContextItemPopover from '../duo_chat_context_item_popover/duo_chat_context_item_popover.vue';
+import { CONTEXT_ITEM_CATEGORY_FILE, CONTEXT_ITEM_CATEGORY_LOCAL_GIT } from '../constants';
+import GlDuoChatContextItemDetailsModal from '../duo_chat_context_item_details_modal/duo_chat_context_item_details_modal.vue';
 import { contextItemsValidator, getContextItemIcon } from '../utils';
 
 export default {
   name: 'GlDuoChatContextItemSelections',
   components: {
     GlTruncate,
+    GlDuoChatContextItemDetailsModal,
     GlIcon,
     GlDuoChatContextItemPopover,
     GlToken,
@@ -55,6 +58,7 @@ export default {
     return {
       isCollapsed: this.defaultCollapsed,
       selectionsId: uniqueId(),
+      previewContextItemId: null,
     };
   },
   computed: {
@@ -73,6 +77,9 @@ export default {
       }
       return '';
     },
+    contextItemPreview() {
+      return this.selections.find((item) => item.id === this.previewContextItemId);
+    },
   },
   methods: {
     getContextItemIcon,
@@ -86,6 +93,30 @@ export default {
        */
       this.$emit('remove', contextItem);
     },
+    onOpenItem(event, contextItem) {
+      const isKeypressOnCloseButton =
+        event.type === 'keydown' && event.target !== event.currentTarget;
+      if (isKeypressOnCloseButton) {
+        // don't respond to events triggered by the gl-token children (e.g. the close button)
+        return;
+      }
+
+      if (!this.canOpen(contextItem)) {
+        return;
+      }
+      if (!contextItem.content) {
+        this.$emit('get-content', contextItem);
+      }
+      this.previewContextItemId = contextItem.id;
+    },
+    canOpen(contextItem) {
+      return [CONTEXT_ITEM_CATEGORY_LOCAL_GIT, CONTEXT_ITEM_CATEGORY_FILE].includes(
+        contextItem.category
+      );
+    },
+    onClosePreview() {
+      this.previewContextItemId = null;
+    },
   },
 };
 </script>
@@ -114,6 +145,11 @@ export default {
         variant="default"
         class="gl-mb-2 gl-mr-2 gl-max-w-full"
         :class="tokenVariantClasses"
+        :tabindex="canOpen(item) ? 0 : -1"
+        :role="canOpen(item) ? 'button' : undefined"
+        @click="onOpenItem($event, item)"
+        @keydown.enter="onOpenItem($event, item)"
+        @keydown.space.prevent="onOpenItem($event, item)"
         @close="onRemoveItem(item)"
       >
         <div
@@ -132,8 +168,14 @@ export default {
           :context-item="item"
           :target="`context-item-${item.id}-${selectionsId}-token`"
           placement="bottom"
+          @show-git-diff="onOpenItem(item)"
         />
       </gl-token>
     </div>
+    <gl-duo-chat-context-item-details-modal
+      v-if="contextItemPreview"
+      :context-item="contextItemPreview"
+      @close="onClosePreview"
+    />
   </div>
 </template>

package/src/components/experimental/duo/chat/components/duo_chat_context/mock_context_data.js

@@ -16,6 +16,21 @@ export function getMockCategory(categoryValue) {
   return MOCK_CATEGORIES.find((cat) => cat.value === categoryValue);
 }
 
+export const MOCK_CONTEXT_FILE_CONTENT = `export function waterPlants() {
+    console.log('sprinkle');
+}`;
+
+export const MOCK_CONTEXT_FILE_DIFF_CONTENT = `diff --git a/src/plants/strawberry.ts b/src/plants/strawberry.ts
+index 1234567..8901234 100644
+--- a/src/plants/strawberry.ts
++++ b/src/plants/strawberry.ts
+@@ -1,4 +1,4 @@
+ export const strawberry = {
+   name: 'Strawberry',
+-  waterNeeds: 'moderate',
++  waterNeeds: 'high',
+ };`;
+
 export const MOCK_CONTEXT_ITEM_FILE = {
   id: '123e4567-e89b-12d3-a456-426614174000',
   category: CONTEXT_ITEM_CATEGORY_FILE,

package/src/components/experimental/duo/chat/components/duo_chat_conversation/duo_chat_conversation.vue

@@ -57,6 +57,9 @@ export default {
     onInsertCodeSnippet(e) {
       this.$emit('insert-code-snippet', e);
     },
+    onGetContextItemContent(e) {
+      this.$emit('get-context-item-content', e);
+    },
   },
   i18n,
 };
@@ -81,6 +84,7 @@ export default {
       :is-cancelled="canceledRequestIds.includes(msg.requestId)"
       @track-feedback="onTrackFeedback"
       @insert-code-snippet="onInsertCodeSnippet"
+      @get-context-item-content="onGetContextItemContent"
     />
   </div>
 </template>

package/src/components/experimental/duo/chat/components/duo_chat_message/duo_chat_message.vue

@@ -234,6 +234,12 @@ export default {
     onInsertCodeSnippet(e) {
       this.$emit('insert-code-snippet', e);
     },
+    onGetContextItemContent(contextItem) {
+      this.$emit('get-context-item-content', {
+        messageId: this.message.id,
+        contextItem,
+      });
+    },
   },
 };
 </script>
@@ -264,6 +270,7 @@ export default {
         :title="selectedContextItemsTitle"
         :default-collapsed="selectedContextItemsDefaultCollapsed"
         variant="assistant"
+        @get-content="onGetContextItemContent"
       />
       <div
         v-if="error"
@@ -309,6 +316,7 @@ export default {
         :title="selectedContextItemsTitle"
         :default-collapsed="selectedContextItemsDefaultCollapsed"
         variant="user"
+        @get-content="onGetContextItemContent"
       />
     </div>
   </div>

package/src/components/experimental/duo/chat/duo_chat.vue

@@ -518,6 +518,14 @@ export default {
        */
       this.$emit('insert-code-snippet', e);
     },
+    onGetContextItemContent(event) {
+      /**
+       * Emit get-context-item-content event that tells clients to load the full file content for a selected context item.
+       * The fully hydrated context item should be updated in the chat message context item.
+       * @param {*} event An event containing the message ID and context item to hydrate
+       */
+      this.$emit('get-context-item-content', event);
+    },
     closeContextItemsMenuOpen() {
       this.contextItemsMenuIsOpen = false;
       this.setPromptAndFocus();
@@ -603,6 +611,7 @@ export default {
           :show-delimiter="index > 0"
           @track-feedback="onTrackFeedback"
           @insert-code-snippet="onInsertCodeSnippet"
+          @get-context-item-content="onGetContextItemContent"
         />
         <template v-if="!hasMessages && !isLoading">
           <gl-empty-state

package/translations.js

@@ -27,6 +27,7 @@ export default {
   'GlDuoChat.chatPromptPlaceholderDefault': 'GitLab Duo Chat',
   'GlDuoChat.chatPromptPlaceholderWithCommands': 'Type "/" for slash commands',
   'GlDuoChat.chatSubmitLabel': 'Send chat message.',
+  'GlDuoChatContextItemDetailsModal.title': 'Preview',
   'GlDuoChatContextItemMenu.emptyStateMessage': 'No results found',
   'GlDuoChatContextItemMenu.loadingMessage': 'Loading...',
   'GlDuoChatContextItemMenu.searchInputPlaceholder': 'Search %{categoryLabel}...',