fix: fetchComponent when common name prefix

Author: angelikatyborska

src/commands/components/pull/actions.test.ts

@@ -24,6 +24,16 @@ const mockedComponents = [{
   color: null,
   internal_tags_list: ['tag'],
   internal_tag_ids: [1],
+}, {
+  name: 'name-2',
+  display_name: 'Name 2',
+  created_at: '2021-08-09T12:00:00Z',
+  updated_at: '2021-08-09T12:00:00Z',
+  id: 12346,
+  schema: { type: 'object' },
+  color: null,
+  internal_tags_list: [],
+  internal_tag_ids: [],
 }];
 
 const handlers = [
@@ -70,6 +80,16 @@ describe('pull components actions', () => {
       color: null,
       internal_tags_list: ['tag'],
       internal_tag_ids: [1],
+    }, {
+      name: 'name-2',
+      display_name: 'Name 2',
+      created_at: '2021-08-09T12:00:00Z',
+      updated_at: '2021-08-09T12:00:00Z',
+      id: 12346,
+      schema: { type: 'object' },
+      color: null,
+      internal_tags_list: [],
+      internal_tag_ids: [],
     }];
 
     const result = await fetchComponents('12345', 'valid-token', 'eu');
@@ -94,6 +114,25 @@ describe('pull components actions', () => {
     expect(result).toEqual(mockResponse.components[0]);
   });
 
+  it('should choose the right component when multiple names match', async () => {
+    const mockResponse = {
+      components: [{
+        name: 'name-2',
+        display_name: 'Name 2',
+        created_at: '2021-08-09T12:00:00Z',
+        updated_at: '2021-08-09T12:00:00Z',
+        id: 12346,
+        schema: { type: 'object' },
+        color: null,
+        internal_tags_list: [],
+        internal_tag_ids: [],
+      }],
+    };
+    // searching for 'name-2' would match both 'component-name-2' and 'name-2'
+    const result = await fetchComponent('12345', 'name-2', 'valid-token', 'eu');
+    expect(result).toEqual(mockResponse.components[0]);
+  });
+
   it('should throw an masked error for invalid token', async () => {
     await expect(fetchComponents('12345', 'invalid-token', 'eu')).rejects.toThrow(
       expect.objectContaining({

src/commands/components/pull/actions.ts

@@ -34,7 +34,7 @@ export const fetchComponent = async (space: string, componentName: string, token
         Authorization: token,
       },
     });
-    return response.components?.[0];
+    return response.components?.find(c => c.name === componentName);
   }
   catch (error) {
     handleAPIError('pull_components', error as Error, `Failed to fetch component ${componentName}`);

src/commands/components/push/operations.ts

@@ -264,7 +264,7 @@ export async function handleComponentGroups(
     : spaceData;
 
   // First, process groups without parents
-// This conditional handles a strange scenario where group (folders) ids are equal to their parents
+  // This conditional handles a strange scenario where group (folders) ids are equal to their parents
   const rootGroups = groupsToProcess.filter(group => (!group.parent_uuid || group.parent_uuid === group.uuid) && !group.parent_id);
   for (const group of rootGroups) {
     const spinner = new Spinner({