Merge branch 'develop' into feat/github-integration

app/javascript/dashboard/api/integrations/linear.js

@@ -33,9 +33,11 @@ class LinearAPI extends ApiClient {
     );
   }
 
-  unlinkIssue(linkId) {
+  unlinkIssue(linkId, issueIdentifier, conversationId) {
     return axios.post(`${this.url}/unlink_issue`, {
       link_id: linkId,
+      issue_id: issueIdentifier,
+      conversation_id: conversationId,
     });
   }
 

app/javascript/dashboard/api/specs/integrations/linear.spec.js

@@ -91,6 +91,19 @@ describe('#linearAPI', () => {
         issueData
       );
     });
+
+    it('creates a valid request with conversation_id', () => {
+      const issueData = {
+        title: 'New Issue',
+        description: 'Issue description',
+        conversation_id: 123,
+      };
+      LinearAPIClient.createIssue(issueData);
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/integrations/linear/create_issue',
+        issueData
+      );
+    });
   });
 
   describe('link_issue', () => {
@@ -120,6 +133,18 @@ describe('#linearAPI', () => {
         }
       );
     });
+
+    it('creates a valid request with title', () => {
+      LinearAPIClient.link_issue(1, 'ENG-123', 'Sample Issue');
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/integrations/linear/link_issue',
+        {
+          issue_id: 'ENG-123',
+          conversation_id: 1,
+          title: 'Sample Issue',
+        }
+      );
+    });
   });
 
   describe('getLinkedIssue', () => {
@@ -164,12 +189,26 @@ describe('#linearAPI', () => {
       window.axios = originalAxios;
     });
 
-    it('creates a valid request', () => {
-      LinearAPIClient.unlinkIssue(1);
+    it('creates a valid request with link_id only', () => {
+      LinearAPIClient.unlinkIssue('link123');
       expect(axiosMock.post).toHaveBeenCalledWith(
         '/api/v1/integrations/linear/unlink_issue',
         {
-          link_id: 1,
+          link_id: 'link123',
+          issue_id: undefined,
+          conversation_id: undefined,
+        }
+      );
+    });
+
+    it('creates a valid request with all parameters', () => {
+      LinearAPIClient.unlinkIssue('link123', 'ENG-456', 789);
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/integrations/linear/unlink_issue',
+        {
+          link_id: 'link123',
+          issue_id: 'ENG-456',
+          conversation_id: 789,
         }
       );
     });

app/javascript/dashboard/components/ChatList.vue

@@ -109,7 +109,6 @@ const advancedFilterTypes = ref(
     attributeName: t(`FILTER.ATTRIBUTES.${filter.attributeI18nKey}`),
   }))
 );
-const isInitialLoad = ref(false);
 
 const currentUser = useMapGetter('getCurrentUser');
 const chatLists = useMapGetter('getFilteredConversations');
@@ -377,7 +376,6 @@ function setFiltersFromUISettings() {
 
 function emitConversationLoaded() {
   emit('conversationLoad');
-  isInitialLoad.value = false;
   // [VITE] removing this since the library has changed
   // nextTick(() => {
   //   // Addressing a known issue in the virtual list library where dynamically added items
@@ -422,7 +420,6 @@ function onApplyFilter(payload) {
   foldersQuery.value = filterQueryGenerator(payload);
   store.dispatch('conversationPage/reset');
   store.dispatch('emptyAllConversations');
-  isInitialLoad.value = true;
   fetchFilteredConversations(payload);
 }
 
@@ -577,7 +574,6 @@ function resetAndFetchData() {
   store.dispatch('conversationPage/reset');
   store.dispatch('emptyAllConversations');
   store.dispatch('clearConversationFilters');
-  isInitialLoad.value = true;
   if (hasActiveFolders.value) {
     const payload = activeFolder.value.query;
     fetchSavedFilteredConversations(payload);
@@ -858,7 +854,7 @@ watch(conversationFilters, (newVal, oldVal) => {
       :active-status="activeStatus"
       :is-on-expanded-layout="isOnExpandedLayout"
       :conversation-stats="conversationStats"
-      :is-list-loading="isInitialLoad"
+      :is-list-loading="chatListLoading && !conversationList.length"
       @add-folders="onClickOpenAddFoldersModal"
       @delete-folders="onClickOpenDeleteFoldersModal"
       @filters-modal="onToggleAdvanceFiltersModal"

app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue

@@ -183,13 +183,18 @@ const createIssue = async () => {
     state_id: formState.stateId || undefined,
     priority: formState.priority || undefined,
     label_ids: formState.labelId ? [formState.labelId] : undefined,
+    conversation_id: props.conversationId,
   };
 
   try {
     isCreating.value = true;
     const response = await LinearAPI.createIssue(payload);
-    const { id: issueId } = response.data;
-    await LinearAPI.link_issue(props.conversationId, issueId, props.title);
+    const { identifier: issueIdentifier } = response.data;
+    await LinearAPI.link_issue(
+      props.conversationId,
+      issueIdentifier,
+      props.title
+    );
     useAlert(t('INTEGRATION_SETTINGS.LINEAR.ADD_OR_LINK.CREATE_SUCCESS'));
     useTrack(LINEAR_EVENTS.CREATE_ISSUE);
     onClose();

app/javascript/dashboard/components/widgets/conversation/linear/IssuesList.vue

@@ -46,9 +46,9 @@ const loadLinkedIssues = async () => {
   }
 };
 
-const unlinkIssue = async linkId => {
+const unlinkIssue = async (linkId, issueIdentifier) => {
   try {
-    await LinearAPI.unlinkIssue(linkId);
+    await LinearAPI.unlinkIssue(linkId, issueIdentifier, props.conversationId);
     useTrack(LINEAR_EVENTS.UNLINK_ISSUE);
     linkedIssues.value = linkedIssues.value.filter(
       issue => issue.id !== linkId
@@ -110,7 +110,7 @@ onMounted(() => {
       <LinearIssueItem
         v-for="linkedIssue in linkedIssues"
         :key="linkedIssue.id"
-        class="pt-3 px-4 pb-4 border-b border-n-weak last:border-b-0"
+        class="px-4 pt-3 pb-4 border-b border-n-weak last:border-b-0"
         :linked-issue="linkedIssue"
         @unlink-issue="unlinkIssue"
       />

app/javascript/dashboard/components/widgets/conversation/linear/LinearIssueItem.vue

@@ -14,6 +14,8 @@ const props = defineProps({
 
 const emit = defineEmits(['unlinkIssue']);
 
+const { linkedIssue } = props;
+
 const priorityMap = {
   1: 'Urgent',
   2: 'High',
@@ -21,7 +23,7 @@ const priorityMap = {
   4: 'Low',
 };
 
-const issue = computed(() => props.linkedIssue.issue);
+const issue = computed(() => linkedIssue.issue);
 
 const assignee = computed(() => {
   const assigneeDetails = issue.value.assignee;
@@ -37,7 +39,7 @@ const labels = computed(() => issue.value.labels?.nodes || []);
 const priorityLabel = computed(() => priorityMap[issue.value.priority]);
 
 const unlinkIssue = () => {
-  emit('unlinkIssue', props.linkedIssue.id);
+  emit('unlinkIssue', linkedIssue.id, linkedIssue.issue.identifier);
 };
 </script>
 

app/javascript/dashboard/components/widgets/conversation/linear/LinkIssue.vue

@@ -63,7 +63,7 @@ const onSearch = async value => {
     isFetching.value = true;
     const response = await LinearAPI.searchIssues(value);
     issues.value = response.data.map(issue => ({
-      id: issue.id,
+      id: issue.identifier,
       name: `${issue.identifier} ${issue.title}`,
       icon: 'status',
       iconColor: issue.state.color,