@gitlab/ui 92.2.0 → 92.3.1

package/src/components/base/toggle/toggle.scss

@@ -55,7 +55,7 @@ $toggle-height: 2.5 * $grid-size;
 }
 
 .gl-help-label {
-  @include gl-mt-3;
+  @apply gl-mt-3;
   @include gl-text-gray-500;
   @include gl-font-weight-normal;
 }
@@ -66,13 +66,13 @@ $toggle-height: 2.5 * $grid-size;
 
   .gl-toggle-label {
     @include gl-white-space-nowrap;
-    @include gl-mb-0;
-    @include gl-mr-3;
+    @apply gl-mb-0;
+    @apply gl-mr-3;
   }
 
   .gl-help-label {
-    @include gl-mt-0;
-    @include gl-ml-3;
+    @apply gl-mt-0;
+    @apply gl-ml-3;
   }
 }
 
@@ -129,7 +129,7 @@ $toggle-height: 2.5 * $grid-size;
     top: $gl-spacing-scale-1;
     @include gl-transition-medium;
     @include gl-justify-content-center;
-    @include gl-p-1;
+    @apply gl-p-1;
 
     > svg {
       @include gl-w-4;

package/src/components/base/token/token.scss

@@ -2,14 +2,14 @@
   @include gl-text-gray-900;
   @include gl-bg-gray-100;
   @include gl-rounded-small;
-  @include gl-pl-3;
+  @apply gl-pl-3;
   @include gl-display-inline-flex;
   @include gl-flex-direction-column;
   @include gl-justify-content-center;
 
   &.gl-token-view-only {
-    @include gl-py-2;
-    @include gl-pr-3;
+    @apply gl-py-2;
+    @apply gl-pr-3;
   }
 }
 
@@ -33,12 +33,12 @@
 
   > .gl-avatar:first-child,
   > .gl-spinner-container:first-child {
-    @include gl-mr-2;
+    @apply gl-mr-2;
   }
 }
 
 .gl-token-close {
-  @include gl-ml-2;
+  @apply gl-ml-2;
   @include gl-reset-color;
   @include gl-cursor-pointer;
   opacity: 0.8;

package/src/components/base/tooltip/tooltip.scss

@@ -1,13 +1,13 @@
 .gl-tooltip {
   @include gl-font-sm;
-  @include gl-p-2;
+  @apply gl-p-2;
 
   .tooltip-inner {
     @apply gl-rounded-base;
     @include gl-line-height-normal;
     @include gl-font-weight-normal;
-    @include gl-py-3;
-    @include gl-px-4;
+    @apply gl-py-3;
+    @apply gl-px-4;
     background: var(--gl-feedback-strong-background-color);
     color: var(--gl-feedback-strong-text-color);
   }

package/src/components/charts/legend/legend.scss

@@ -37,7 +37,7 @@ $legend-body-h: $gl-spacing-scale-13 - $gl-spacing-scale-4;
     @include gl-flex-shrink-0;
     @include gl-justify-content-space-between;
     @include gl-align-items-center;
-    @include gl-pr-5;
+    @apply gl-pr-5;
 
     &:hover {
       @include gl-cursor-pointer;
@@ -45,7 +45,7 @@ $legend-body-h: $gl-spacing-scale-13 - $gl-spacing-scale-4;
     }
 
     .gl-legend-inline-series-label {
-      @include gl-mr-3;
+      @apply gl-mr-3;
     }
   }
 }
@@ -68,7 +68,7 @@ $legend-body-h: $gl-spacing-scale-13 - $gl-spacing-scale-4;
   .gl-legend-tabular-header-cell {
     @include gl-font-weight-bold;
     @include gl-line-height-24;
-    @include gl-px-3;
+    @apply gl-px-3;
   }
 
   .gl-legend-tabular-body {
@@ -87,7 +87,7 @@ $legend-body-h: $gl-spacing-scale-13 - $gl-spacing-scale-4;
   .gl-legend-tabular-title-cell,
   .gl-legend-tabular-details-cell {
     @include gl-line-height-24;
-    @include gl-px-3;
+    @apply gl-px-3;
   }
 
   .gl-legend-tabular-title-cell {

package/src/components/charts/series_label/series_label.scss

@@ -7,7 +7,7 @@
 
 .gl-series-label-color {
   @include gl-flex-shrink-0;
-  @include gl-mr-3;
+  @apply gl-mr-3;
 
   svg {
     @include gl-display-block;

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

@@ -1,3 +1,3 @@
-export const CONTEXT_ITEM_TYPE_ISSUE = 'issue';
-export const CONTEXT_ITEM_TYPE_MERGE_REQUEST = 'merge_request';
-export const CONTEXT_ITEM_TYPE_PROJECT_FILE = 'project_file';
+export const CONTEXT_ITEM_CATEGORY_ISSUE = 'issue';
+export const CONTEXT_ITEM_CATEGORY_MERGE_REQUEST = 'merge_request';
+export const CONTEXT_ITEM_CATEGORY_FILE = 'file';

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

@@ -77,7 +77,7 @@ export default {
       return this.open && !this.selectedCategory;
     },
     allResultsAreDisabled() {
-      return this.results.every((result) => !result.isEnabled);
+      return this.results.every((result) => !result.metadata.enabled);
     },
   },
   watch: {
@@ -90,7 +90,7 @@ export default {
       this.debouncedSearch(query);
     },
     results(newResults) {
-      const firstEnabledIndex = newResults.findIndex((result) => result.isEnabled);
+      const firstEnabledIndex = newResults.findIndex((result) => result.metadata.enabled);
       this.activeIndex = firstEnabledIndex >= 0 ? firstEnabledIndex : 0;
     },
   },
@@ -117,7 +117,7 @@ export default {
       });
     }, SEARCH_DEBOUNCE_MS),
     selectItem(item) {
-      if (!item.isEnabled) {
+      if (!item.metadata.enabled) {
         return;
       }
 
@@ -214,7 +214,7 @@ export default {
           // If we've looped through all items and found no enabled ones, keep the current index
           return;
         }
-      } while (!this.results[newIndex].isEnabled);
+      } while (!this.results[newIndex].metadata.enabled);
 
       this.activeIndex = newIndex;
     },

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

@@ -8,9 +8,9 @@ import {
   formatMergeRequestId,
 } from '../utils';
 import {
-  CONTEXT_ITEM_TYPE_ISSUE,
-  CONTEXT_ITEM_TYPE_MERGE_REQUEST,
-  CONTEXT_ITEM_TYPE_PROJECT_FILE,
+  CONTEXT_ITEM_CATEGORY_ISSUE,
+  CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
+  CONTEXT_ITEM_CATEGORY_FILE,
 } from '../constants';
 
 export default {
@@ -30,16 +30,16 @@ export default {
   },
   computed: {
     title() {
-      return this.contextItem.metadata?.name || '';
+      return this.contextItem.metadata?.title || '';
     },
     secondaryText() {
       switch (this.category.value) {
-        case CONTEXT_ITEM_TYPE_PROJECT_FILE:
-          return this.contextItem.metadata.info.relFilePath;
-        case CONTEXT_ITEM_TYPE_ISSUE:
-          return formatIssueId(this.contextItem.metadata.info.iid);
-        case CONTEXT_ITEM_TYPE_MERGE_REQUEST:
-          return formatMergeRequestId(this.contextItem.metadata.info.iid);
+        case CONTEXT_ITEM_CATEGORY_FILE:
+          return this.contextItem.metadata.relativePath;
+        case CONTEXT_ITEM_CATEGORY_ISSUE:
+          return formatIssueId(this.contextItem.metadata.iid);
+        case CONTEXT_ITEM_CATEGORY_MERGE_REQUEST:
+          return formatMergeRequestId(this.contextItem.metadata.iid);
         default:
           return '';
       }

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

@@ -87,12 +87,12 @@ export default {
       this.$emit('keyup', e);
     },
     setActiveIndex(index) {
-      if (this.results[index]?.isEnabled) {
+      if (this.results[index]?.metadata.enabled) {
         this.$emit('active-index-change', index);
       }
     },
     isActiveItem(contextItem, index) {
-      return index === this.activeIndex && contextItem.isEnabled;
+      return index === this.activeIndex && contextItem.metadata.enabled;
     },
   },
   i18n: {
@@ -127,9 +127,10 @@ export default {
           :key="contextItem.id"
           :class="{
             'active-command': isActiveItem(contextItem, index),
-            'gl-cursor-not-allowed [&>button]:focus-within:!gl-shadow-none': !contextItem.isEnabled,
+            'gl-cursor-not-allowed [&>button]:focus-within:!gl-shadow-none':
+              !contextItem.metadata.enabled,
           }"
-          :tabindex="!contextItem.isEnabled ? -1 : undefined"
+          :tabindex="!contextItem.metadata.enabled ? -1 : undefined"
           class="duo-chat-context-search-result-item"
           data-testid="search-result-item"
           @click="selectItem(contextItem)"
@@ -138,7 +139,7 @@ export default {
             <gl-duo-chat-context-item-menu-search-item
               :context-item="contextItem"
               :category="category"
-              :class="{ 'gl-text-secondary': !contextItem.isEnabled }"
+              :class="{ 'gl-text-secondary': !contextItem.metadata.enabled }"
               data-testid="search-result-item-details"
             />
           </div>

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

@@ -3,9 +3,9 @@ import GlPopover from '../../../../../../base/popover/popover.vue';
 import GlIcon from '../../../../../../base/icon/icon.vue';
 import { translate } from '../../../../../../../utils/i18n';
 import {
-  CONTEXT_ITEM_TYPE_ISSUE,
-  CONTEXT_ITEM_TYPE_MERGE_REQUEST,
-  CONTEXT_ITEM_TYPE_PROJECT_FILE,
+  CONTEXT_ITEM_CATEGORY_ISSUE,
+  CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
+  CONTEXT_ITEM_CATEGORY_FILE,
 } from '../constants';
 import { formatIssueId, formatMergeRequestId } from '../utils';
 import GlAlert from '../../../../../../base/alert/alert.vue';
@@ -42,44 +42,44 @@ export default {
     },
   },
   computed: {
-    itemInfo() {
-      return this.contextItem.metadata?.info || {};
-    },
     id() {
       const isIssuable =
-        this.contextItem.type === CONTEXT_ITEM_TYPE_ISSUE ||
-        this.contextItem.type === CONTEXT_ITEM_TYPE_MERGE_REQUEST;
-      return isIssuable ? this.itemInfo.iid || '' : null;
+        this.contextItem.category === CONTEXT_ITEM_CATEGORY_ISSUE ||
+        this.contextItem.category === CONTEXT_ITEM_CATEGORY_MERGE_REQUEST;
+      return isIssuable ? this.contextItem.metadata.iid : null;
     },
     formattedId() {
-      switch (this.contextItem.type) {
-        case CONTEXT_ITEM_TYPE_ISSUE:
+      switch (this.contextItem.category) {
+        case CONTEXT_ITEM_CATEGORY_ISSUE:
           return formatIssueId(this.id);
-        case CONTEXT_ITEM_TYPE_MERGE_REQUEST:
+        case CONTEXT_ITEM_CATEGORY_MERGE_REQUEST:
           return formatMergeRequestId(this.id);
         default:
           return '';
       }
     },
+    title() {
+      return this.contextItem.metadata.title || '';
+    },
     filePath() {
-      return this.contextItem.type === CONTEXT_ITEM_TYPE_PROJECT_FILE
-        ? this.itemInfo.relFilePath || ''
+      return this.contextItem.category === CONTEXT_ITEM_CATEGORY_FILE
+        ? this.contextItem.metadata.relativePath || ''
         : null;
     },
     filePathArray() {
       return this.filePath?.split('/');
     },
     isEnabled() {
-      return this.contextItem.isEnabled !== false;
+      return this.contextItem.metadata.enabled !== false;
     },
     disabledMessage() {
-      return Array.isArray(this.contextItem.disabledReasons) &&
-        this.contextItem.disabledReasons.length > 0
-        ? this.contextItem.disabledReasons.join(', ')
+      return Array.isArray(this.contextItem.metadata.disabledReasons) &&
+        this.contextItem.metadata.disabledReasons.length > 0
+        ? this.contextItem.metadata.disabledReasons.join(', ')
         : translate('DuoChatContextItemPopover.DisabledReason', 'This item is disabled');
     },
     iconName() {
-      switch (this.contextItem.type) {
+      switch (this.contextItem.category) {
         case 'merge_request':
           return 'merge-request';
         case 'issue':
@@ -89,7 +89,7 @@ export default {
       }
     },
     itemTypeLabel() {
-      switch (this.contextItem.type) {
+      switch (this.contextItem.category) {
         case 'merge_request':
           return translate('DuoChatContextItemPopover.MergeRequest', 'Merge request');
         case 'issue':
@@ -109,7 +109,7 @@ export default {
     :target="target"
     triggers="hover focus"
     :placement="placement"
-    :title="contextItem.metadata.name"
+    :title="title"
     custom-class="gl-duo-chat-item-popover"
   >
     <template #title>
@@ -118,7 +118,7 @@ export default {
           class="gl-heading-3 gl-mb-1 gl-mt-2 gl-leading-1"
           data-testid="chat-context-popover-title"
         >
-          {{ contextItem.metadata.name }}
+          {{ contextItem.metadata.title }}
         </div>
         <div class="gl-font-normal gl-text-subtle">{{ itemTypeLabel }}</div>
       </div>
@@ -126,7 +126,7 @@ export default {
     <div>
       <div v-if="filePath !== null" class="gl-flex gl-flex-wrap gl-items-center">
         <gl-icon name="document" :size="12" variant="subtle" class="gl-mr-1" />
-        <span>{{ itemInfo.project }}</span
+        <span>{{ contextItem.metadata.project }}</span
         ><span v-for="(pathPart, index) in filePathArray" :key="pathPart" class="gl-break-all"
           >{{ pathPart }}{{ index + 1 < filePathArray.length ? '/' : '' }}</span
         >
@@ -138,7 +138,7 @@ export default {
       >
         <gl-icon :name="iconName" :size="12" variant="subtle" class="gl-mr-1" />
 
-        <span>{{ itemInfo.project }}</span
+        <span>{{ contextItem.metadata.project }}</span
         ><span v-if="id !== null">{{ formattedId }}</span>
       </div>
       <gl-alert

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

@@ -4,9 +4,9 @@ import GlIcon from '../../../../../../base/icon/icon.vue';
 import GlToken from '../../../../../../base/token/token.vue';
 import GlDuoChatContextItemPopover from '../duo_chat_context_item_popover/duo_chat_context_item_popover.vue';
 import {
-  CONTEXT_ITEM_TYPE_ISSUE,
-  CONTEXT_ITEM_TYPE_MERGE_REQUEST,
-  CONTEXT_ITEM_TYPE_PROJECT_FILE,
+  CONTEXT_ITEM_CATEGORY_ISSUE,
+  CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
+  CONTEXT_ITEM_CATEGORY_FILE,
 } from '../constants';
 import { contextItemsValidator } from '../utils';
 
@@ -78,13 +78,13 @@ export default {
     },
   },
   methods: {
-    getIconName(type) {
+    getIconName(category) {
       const iconMap = {
-        [CONTEXT_ITEM_TYPE_PROJECT_FILE]: 'document',
-        [CONTEXT_ITEM_TYPE_ISSUE]: 'issues',
-        [CONTEXT_ITEM_TYPE_MERGE_REQUEST]: 'merge-request',
+        [CONTEXT_ITEM_CATEGORY_FILE]: 'document',
+        [CONTEXT_ITEM_CATEGORY_ISSUE]: 'issues',
+        [CONTEXT_ITEM_CATEGORY_MERGE_REQUEST]: 'merge-request',
       };
-      return iconMap[type] || 'document';
+      return iconMap[category] || 'document';
     },
     toggleCollapse() {
       this.isCollapsed = !this.isCollapsed;
@@ -127,8 +127,8 @@ export default {
         @close="onRemoveItem(item)"
       >
         <div :id="`context-item-${item.id}-${selectionsId}`" class="gl-flex gl-items-center">
-          <gl-icon :name="getIconName(item.type)" :size="12" class="gl-mr-1" />
-          {{ item.metadata.name }}
+          <gl-icon :name="getIconName(item.category)" :size="12" class="gl-mr-1" />
+          {{ item.metadata.title }}
         </div>
         <gl-duo-chat-context-item-popover
           :context-item="item"

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

@@ -1,13 +1,13 @@
 import {
-  CONTEXT_ITEM_TYPE_ISSUE,
-  CONTEXT_ITEM_TYPE_MERGE_REQUEST,
-  CONTEXT_ITEM_TYPE_PROJECT_FILE,
+  CONTEXT_ITEM_CATEGORY_ISSUE,
+  CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
+  CONTEXT_ITEM_CATEGORY_FILE,
 } from './constants';
 
 export const MOCK_CATEGORIES = [
-  { label: 'Files', value: CONTEXT_ITEM_TYPE_PROJECT_FILE, icon: 'document' },
-  { label: 'Issues', value: CONTEXT_ITEM_TYPE_ISSUE, icon: 'issues' },
-  { label: 'Merge Requests', value: CONTEXT_ITEM_TYPE_MERGE_REQUEST, icon: 'merge-request' },
+  { label: 'Files', value: CONTEXT_ITEM_CATEGORY_FILE, icon: 'document' },
+  { label: 'Issues', value: CONTEXT_ITEM_CATEGORY_ISSUE, icon: 'issues' },
+  { label: 'Merge Requests', value: CONTEXT_ITEM_CATEGORY_MERGE_REQUEST, icon: 'merge-request' },
 ];
 
 export function getMockCategory(categoryValue) {
@@ -16,129 +16,112 @@ export function getMockCategory(categoryValue) {
 
 export const MOCK_CONTEXT_ITEM_FILE = {
   id: '123e4567-e89b-12d3-a456-426614174000',
-  isEnabled: true,
+  category: CONTEXT_ITEM_CATEGORY_FILE,
   metadata: {
-    name: 'strawberry.ts',
-    info: {
-      project: 'example/garden',
-      relFilePath: 'src/plants/strawberry.ts',
-    },
+    enabled: true,
+    title: 'strawberry.ts',
+    project: 'example/garden',
+    relativePath: 'src/plants/strawberry.ts',
   },
-  type: CONTEXT_ITEM_TYPE_PROJECT_FILE,
 };
 
 export const MOCK_CONTEXT_ITEM_FILE_DISABLED = {
   id: '323e4567-e89b-12d3-a456-426614174002',
-  isEnabled: false,
+  category: CONTEXT_ITEM_CATEGORY_FILE,
   metadata: {
-    name: 'motorbike.cs',
-    info: {
-      project: 'example/vehicles',
-      relFilePath: '/src/VehicleFoo/motorbike.cs',
-    },
+    enabled: false,
+    title: 'motorbike.cs',
+    project: 'example/vehicles',
+    relativePath: '/src/VehicleFoo/motorbike.cs',
   },
-  type: CONTEXT_ITEM_TYPE_PROJECT_FILE,
 };
 const mockFiles = [
   MOCK_CONTEXT_ITEM_FILE,
   {
     id: '223e4567-e89b-12d3-a456-426614174001',
-    isEnabled: true,
+    category: CONTEXT_ITEM_CATEGORY_FILE,
     metadata: {
-      name: 'potato.ts',
-      info: {
-        project: 'example/garden',
-        relFilePath: '/src/plants/potato.ts',
-      },
+      enabled: true,
+      title: 'potato.ts',
+      project: 'example/garden',
+      relativePath: '/src/plants/potato.ts',
     },
-    type: CONTEXT_ITEM_TYPE_PROJECT_FILE,
   },
   MOCK_CONTEXT_ITEM_FILE_DISABLED,
 ];
 
 export const MOCK_CONTEXT_ITEM_ISSUE = {
   id: '423e4567-e89b-12d3-a456-426614174003',
-  isEnabled: true,
+  category: CONTEXT_ITEM_CATEGORY_ISSUE,
   metadata: {
-    name: 'Implement watering schedule',
-    info: {
-      project: 'example/garden',
-      iid: 1234,
-    },
+    enabled: true,
+    title: 'Implement watering schedule',
+    project: 'example/garden',
+    iid: 1234,
   },
-  type: CONTEXT_ITEM_TYPE_ISSUE,
 };
 export const MOCK_CONTEXT_ITEM_ISSUE_DISABLED = {
   id: 'c463fb31-2a4c-4f8e-a609-97230ac48ae5',
-  isEnabled: false,
+  category: CONTEXT_ITEM_CATEGORY_ISSUE,
+
   metadata: {
-    name: `Fix vehicle colours and make them look real nice and colourful won't that be wonderful wow this issue title is really long I sure hope it's gonna wrap OK`,
-    info: {
-      project: 'example/vehicle',
-      iid: 91011,
-    },
+    enabled: false,
+    disabledReasons: ['This foo is not available to bar', 'Lorem something something wow?'],
+    title: `Fix vehicle colours and make them look real nice and colourful won't that be wonderful wow this issue title is really long I sure hope it's gonna wrap OK`,
+    project: 'example/vehicle',
+    iid: 91011,
   },
-  disabledReasons: ['This foo is not available to bar', 'Lorem something something wow?'],
-  type: CONTEXT_ITEM_TYPE_ISSUE,
 };
 
 const mockIssues = [
   MOCK_CONTEXT_ITEM_ISSUE,
   {
     id: '523e4567-e89b-12d3-a456-426614174004',
-    isEnabled: true,
+    category: CONTEXT_ITEM_CATEGORY_ISSUE,
     metadata: {
-      name: 'Refactor plant growth rates',
-      info: {
-        project: 'example/garden',
-        iid: 5678,
-      },
+      enabled: true,
+      title: 'Refactor plant growth rates',
+      project: 'example/garden',
+      iid: 5678,
     },
-    type: CONTEXT_ITEM_TYPE_ISSUE,
   },
   MOCK_CONTEXT_ITEM_ISSUE_DISABLED,
 ];
 
 export const MOCK_CONTEXT_ITEM_MERGE_REQUEST = {
   id: '623e4567-e89b-12d3-a456-426614174005',
-  isEnabled: true,
+  category: CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
   metadata: {
-    name: 'Improve database performance',
-    info: {
-      project: 'example/garden',
-      iid: 1122,
-    },
+    enabled: true,
+    title: 'Improve database performance',
+    project: 'example/garden',
+    iid: 1122,
   },
-  type: CONTEXT_ITEM_TYPE_MERGE_REQUEST,
 };
 export const MOCK_CONTEXT_ITEM_MERGE_REQUEST_DISABLED = {
   id: '4eb665fc-e5e1-49b0-9789-2a16964e461a',
-  isEnabled: false,
+  category: CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
   metadata: {
-    name: 'Fix broken layout at small viewports',
-    info: {
-      project: 'example/vehicle',
-      iid: 5566,
-    },
+    enabled: false,
+    disabledReasons: ['This foo is not available to bar', 'Lorem something something wow?'],
+    title: 'Fix broken layout at small viewports',
+    project: 'example/vehicle',
+    iid: 5566,
   },
-  disabledReasons: ['This foo is not available to bar', 'Lorem something something wow?'],
-  type: CONTEXT_ITEM_TYPE_MERGE_REQUEST,
 };
 
 const mockMergeRequests = [
   MOCK_CONTEXT_ITEM_MERGE_REQUEST,
   {
     id: '723e4567-e89b-12d3-a456-426614174006',
-    isEnabled: false,
+    category: CONTEXT_ITEM_CATEGORY_MERGE_REQUEST,
     metadata: {
-      name: 'Add vehicle registration details',
-      info: {
-        project: 'example/vehicle',
-        iid: 3344,
-      },
+      enabled: false,
+      disabledReasons: ['This foo is not available to bar', 'Lorem something something wow?'],
+      title: 'Add vehicle registration details',
+      project: 'example/vehicle',
+      iid: 3344,
     },
-    disabledReasons: ['This foo is not available to bar', 'Lorem something something wow?'],
-    type: CONTEXT_ITEM_TYPE_MERGE_REQUEST,
   },
   MOCK_CONTEXT_ITEM_MERGE_REQUEST_DISABLED,
 ];
@@ -147,7 +130,7 @@ export const getMockContextItems = () => {
   const allItems = [...mockFiles, ...mockIssues, ...mockMergeRequests];
 
   // put disabled items in the back
-  const disabledItems = allItems.filter((item) => !item.isEnabled);
-  const enabledItems = allItems.filter((item) => item.isEnabled);
+  const disabledItems = allItems.filter((item) => !item.metadata.enabled);
+  const enabledItems = allItems.filter((item) => item.metadata.enabled);
   return [...enabledItems, ...disabledItems];
 };

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

@@ -18,9 +18,11 @@ export function contextItemValidator(item) {
   return Boolean(
     item &&
       item.id &&
-      item.type &&
-      typeof item.isEnabled === 'boolean' &&
-      disabledReasonsValidator(item.disabledReasons)
+      item.category &&
+      item.metadata &&
+      typeof item.metadata === 'object' &&
+      typeof item.metadata.enabled === 'boolean' &&
+      disabledReasonsValidator(item.metadata.disabledReasons)
   );
 }
 

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

@@ -19,7 +19,7 @@
   }
 
   p:last-of-type {
-    @include gl-mb-0;
+    @apply gl-mb-0;
   }
 
   copy-code,