From c948751987e556b389c21ad2b598992a1f85d9fd Mon Sep 17 00:00:00 2001
From: Yeganathan S <hilariousengineer@protonmail.com>
Date: Mon, 16 Dec 2024 20:56:57 +0530
Subject: [PATCH 1/2] safely handle cases where error.response is undefined
 (#2728)

---
 .../apps/merge_suggestions_worker/src/activities/common.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/apps/merge_suggestions_worker/src/activities/common.ts b/services/apps/merge_suggestions_worker/src/activities/common.ts
index c55cfdb9e4..6f10a56e24 100644
--- a/services/apps/merge_suggestions_worker/src/activities/common.ts
+++ b/services/apps/merge_suggestions_worker/src/activities/common.ts
@@ -131,7 +131,7 @@ export async function mergeMembers(
   try {
     await axios(url, requestOptions)
   } catch (error) {
-    console.log(`Failed merging member wit status [${error.response.status}]. Skipping!`)
+    console.log(`Failed merging member wit status [${error.response?.status}]. Skipping!`)
   }
 }
 
@@ -156,6 +156,6 @@ export async function mergeOrganizations(
   try {
     await axios(url, requestOptions)
   } catch (error) {
-    console.log(`Failed merging organization with status [${error.response.status}]. Skipping!`)
+    console.log(`Failed merging organization with status [${error.response?.status}]. Skipping!`)
   }
 }

From 81832aa5cd663c1568e86be9d954e33ccc1a888a Mon Sep 17 00:00:00 2001
From: emlimlf <52259294+emlimlf@users.noreply.github.com>
Date: Tue, 17 Dec 2024 01:57:17 +0800
Subject: [PATCH 2/2] Improve work history display (#2716)

Signed-off-by: Efren Lim <elim@linuxfoundation.org>
---
 .../contributor-details-work-history.vue      | 54 +++++++++++++----
 .../contributor-details-work-history-item.vue | 44 ++------------
 .../src/ui-kit/timeline/Timeline.stories.ts   | 53 ++++++++++++++++
 frontend/src/ui-kit/timeline/Timeline.vue     | 60 +++++++++++++++++++
 frontend/src/ui-kit/timeline/TimelineItem.vue | 19 ++++++
 frontend/src/ui-kit/timeline/timeline.scss    | 40 +++++++++++++
 .../ui-kit/timeline/types/TimelineTypes.ts    |  9 +++
 7 files changed, 231 insertions(+), 48 deletions(-)
 create mode 100644 frontend/src/ui-kit/timeline/Timeline.stories.ts
 create mode 100644 frontend/src/ui-kit/timeline/Timeline.vue
 create mode 100644 frontend/src/ui-kit/timeline/TimelineItem.vue
 create mode 100644 frontend/src/ui-kit/timeline/timeline.scss
 create mode 100644 frontend/src/ui-kit/timeline/types/TimelineTypes.ts

diff --git a/frontend/src/modules/contributor/components/details/contributor-details-work-history.vue b/frontend/src/modules/contributor/components/details/contributor-details-work-history.vue
index e6d5779321..b19d8b10fa 100644
--- a/frontend/src/modules/contributor/components/details/contributor-details-work-history.vue
+++ b/frontend/src/modules/contributor/components/details/contributor-details-work-history.vue
@@ -31,14 +31,17 @@
     </div>
 
     <div v-if="!masked" class="flex flex-col gap-4">
-      <lf-contributor-details-work-history-item
-        v-for="org of (orgs || []).slice(0, showMore ? (orgs || []).length : 3)"
-        :key="org.id"
-        :contributor="props.contributor"
-        :organization="org"
-        @edit="isEditModalOpen = true; editOrganization = org"
-      />
-      <div v-if="orgs.length === 0" class="pt-2 flex flex-col items-center">
+      <lf-timeline v-slot="{ group }" :groups="shownGroups" @on-group-hover="onGroupHover">
+        <lf-timeline-item v-for="item in group.items" :key="item.id" :data="item">
+          <lf-contributor-details-work-history-item
+            :contributor="props.contributor"
+            :organization="item"
+            :is-group-hover="hoveredGroup?.id === group.id"
+            @edit="isEditModalOpen = true; editOrganization = item"
+          />
+        </lf-timeline-item>
+      </lf-timeline>
+      <div v-if="orgGrouped.length === 0" class="pt-2 flex flex-col items-center">
         <lf-icon-old name="survey-line" :size="40" class="text-gray-300" />
         <p class="text-center pt-3 text-medium text-gray-400">
           No work experiences
@@ -55,7 +58,7 @@
     </div>
 
     <lf-button
-      v-if="!masked && orgs.length > 3"
+      v-if="!masked && orgGrouped.length > minimumShownGroups"
       type="primary-link"
       size="medium"
       class="mt-6"
@@ -88,6 +91,12 @@ import LfContributorDetailsWorkHistoryItem
   from '@/modules/contributor/components/details/work-history/contributor-details-work-history-item.vue';
 import useContributorHelpers from '@/modules/contributor/helpers/contributor.helpers';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
+import { TimelineGroup } from '@/ui-kit/timeline/types/TimelineTypes';
+import { groupBy } from 'lodash';
+import { storeToRefs } from 'pinia';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
+import LfTimeline from '@/ui-kit/timeline/Timeline.vue';
+import LfTimelineItem from '@/ui-kit/timeline/TimelineItem.vue';
 
 const props = defineProps<{
   contributor: Contributor,
@@ -95,14 +104,39 @@ const props = defineProps<{
 
 const { hasPermission } = usePermissions();
 const { isMasked } = useContributorHelpers();
+const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
 
 const showMore = ref<boolean>(false);
 const isEditModalOpen = ref<boolean>(false);
 const editOrganization = ref<Organization | null>(null);
+const hoveredGroup = ref<TimelineGroup | null>(null);
 
-const orgs = computed(() => props.contributor.organizations);
+const orgGrouped = computed(() => {
+  const grouped = groupBy(props.contributor.organizations, 'id');
+  return Object.keys(grouped).map((id, index): TimelineGroup => ({
+    id: index,
+    label: grouped[id][0].displayName,
+    labelLink: {
+      name: 'organizationView',
+      params: {
+        id,
+      },
+      query: {
+        projectGroup: selectedProjectGroup.value?.id,
+      },
+    },
+    icon: grouped[id][0].logo,
+    items: grouped[id],
+  }));
+});
+const minimumShownGroups = 3;
+const shownGroups = computed(() => orgGrouped.value.slice(0, showMore.value ? orgGrouped.value.length : minimumShownGroups));
 
 const masked = computed(() => isMasked(props.contributor));
+
+const onGroupHover = (index: TimelineGroup | null) => {
+  hoveredGroup.value = index;
+};
 </script>
 
 <script lang="ts">
diff --git a/frontend/src/modules/contributor/components/details/work-history/contributor-details-work-history-item.vue b/frontend/src/modules/contributor/components/details/work-history/contributor-details-work-history-item.vue
index b20f6de6f5..0912278bc7 100644
--- a/frontend/src/modules/contributor/components/details/work-history/contributor-details-work-history-item.vue
+++ b/frontend/src/modules/contributor/components/details/work-history/contributor-details-work-history-item.vue
@@ -4,39 +4,10 @@
     @mouseleave="hovered = false"
   >
     <div class="flex">
-      <lf-avatar
-        :name="props.organization.displayName"
-        :src="props.organization.logo"
-        :size="24"
-        class="!rounded-md border border-gray-200 min-w-6"
-        img-class="!object-contain"
-      >
-        <template #placeholder>
-          <div class="w-full h-full bg-gray-50 flex items-center justify-center">
-            <lf-icon-old name="community-line" :size="16" class="text-gray-400" />
-          </div>
-        </template>
-      </lf-avatar>
-
-      <div class="pl-3 flex flex-auto flex-col overflow-hidden">
-        <router-link
-          :to="{
-            name: 'organizationView',
-            params: {
-              id: props.organization.id,
-            },
-            query: {
-              projectGroup: selectedProjectGroup?.id,
-            },
-          }"
-          class="font-semibold text-medium leading-6 mb-1 truncate text-black hover:text-primary-500 transition block w-full overflow-hidden"
-        >
-          {{ props.organization.displayName }}
-        </router-link>
-
-        <div v-if="props.organization?.memberOrganizations?.title" class="text-small text-gray-500 mb-1.5 flex items-center gap-1.5">
+      <div class="flex flex-auto flex-col overflow-hidden">
+        <div v-if="props.organization?.memberOrganizations?.title" class="text-small text-gray-900 mb-1.5 flex items-center gap-1.5">
           <lf-svg name="id-card" class="h-4 w-4 text-gray-400" />
-          <p class="truncate" style="max-width: 30ch">
+          <p class="truncate" style="max-width: 26ch">
             {{ props.organization?.memberOrganizations?.title }}
           </p>
         </div>
@@ -46,7 +17,7 @@
         </p>
       </div>
 
-      <lf-dropdown v-if="hovered" placement="bottom-end" width="14.5rem">
+      <lf-dropdown v-if="hovered || isGroupHover" placement="bottom-end" width="14.5rem">
         <template #trigger>
           <lf-button type="secondary-ghost" size="small" :icon-only="true">
             <lf-icon name="ellipsis" />
@@ -80,11 +51,8 @@
 import LfIconOld from '@/ui-kit/icon/IconOld.vue';
 import { Contributor } from '@/modules/contributor/types/Contributor';
 import LfSvg from '@/shared/svg/svg.vue';
-import LfAvatar from '@/ui-kit/avatar/Avatar.vue';
 import { Organization } from '@/modules/organization/types/Organization';
 import moment from 'moment';
-import { storeToRefs } from 'pinia';
-import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import LfButton from '@/ui-kit/button/Button.vue';
 import LfDropdown from '@/ui-kit/dropdown/Dropdown.vue';
 import LfDropdownItem from '@/ui-kit/dropdown/DropdownItem.vue';
@@ -103,12 +71,12 @@ import LfIcon from '@/ui-kit/icon/Icon.vue';
 
 const props = defineProps<{
   organization: Organization,
-  contributor: Contributor
+  contributor: Contributor,
+  isGroupHover: boolean,
 }>();
 
 const emit = defineEmits<{(e:'edit'): void}>();
 
-const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
 const { deleteContributorOrganization } = useContributorStore();
 const { trackEvent } = useProductTracking();
 
diff --git a/frontend/src/ui-kit/timeline/Timeline.stories.ts b/frontend/src/ui-kit/timeline/Timeline.stories.ts
new file mode 100644
index 0000000000..6098d24582
--- /dev/null
+++ b/frontend/src/ui-kit/timeline/Timeline.stories.ts
@@ -0,0 +1,53 @@
+import LfSvg from '@/shared/svg/svg.vue';
+import LfIconOld from '@/ui-kit/icon/IconOld.vue';
+import LfTimeline from './Timeline.vue';
+import LfTimelineItem from './TimelineItem.vue';
+import { TimelineGroup } from './types/TimelineTypes';
+
+export default {
+  title: 'LinuxFoundation/Timeline',
+  component: LfTimeline,
+  tags: ['autodocs'],
+  argTypes: {
+    groups: {
+      description: 'Timeline groups',
+      control: 'object',
+    },
+  },
+};
+
+export const Regular = {
+  args: {
+    groups: [
+      {
+        label: 'Group 1', labelLink: { name: 'organizationView', params: { id: '1' } }, icon: 'https://avatars.githubusercontent.com/u/38015056?v=4', items: [{ id: 1, label: 'Item 1', date: 'Aug 2024 - Dec 2024' }, { id: 2, label: 'Item 2', date: 'Aug 2024' }, { id: 3, label: 'Item 3', date: 'Aug 2024' }, { id: 4, label: 'Item 4', date: 'Aug 2024' }],
+      },
+      {
+        label: 'Group 2', labelLink: { name: 'organizationView', params: { id: '2' } }, icon: 'https://avatars.githubusercontent.com/u/38015056?v=4', items: [{ id: 3, label: 'Item 3', date: 'Aug 2024' }, { id: 4, label: 'Item 4', date: 'Aug 2024' }],
+      },
+    ],
+  },
+  render: (args: { groups: TimelineGroup[] }) => ({
+    components: {
+      LfTimeline, LfTimelineItem, LfSvg, LfIconOld,
+    },
+    setup() {
+      return { args };
+    },
+    template: `<lf-timeline :groups="args.groups" v-slot="{ group }">
+      <lf-timeline-item :data="item" v-for="item in group.items" :key="item.id">
+        <!-- SAMPLE CONTENT -->
+        <div class="text-small text-gray-900 mb-1.5 flex items-center gap-1.5">
+          <lf-svg name="id-card" class="h-4 w-4 text-gray-400" />
+          <p class="truncate text-gray-900" style="max-width: 30ch">
+            {{ item.label }}
+          </p>
+        </div>
+        <p class="text-small text-gray-500 mb-1.5 flex items-center">
+          <lf-icon-old name="calendar-line" :size="16" class="mr-1.5 text-gray-400" />
+          {{ item.date }}
+        </p>
+      </lf-timeline-item>
+    </lf-timeline>`,
+  }),
+};
diff --git a/frontend/src/ui-kit/timeline/Timeline.vue b/frontend/src/ui-kit/timeline/Timeline.vue
new file mode 100644
index 0000000000..e3613b2663
--- /dev/null
+++ b/frontend/src/ui-kit/timeline/Timeline.vue
@@ -0,0 +1,60 @@
+<template>
+  <div
+    v-for="group in props.groups"
+    :key="group.label"
+    class="c-timeline"
+    @mouseover="emit('onGroupHover', group)"
+    @mouseleave="emit('onGroupHover', null)"
+  >
+    <div class="c-timeline__group-icon">
+      <lf-avatar
+        :name="group.label"
+        :src="group.icon"
+        :size="24"
+        class="!rounded-md border border-gray-200 min-w-6"
+        img-class="!object-contain"
+      />
+    </div>
+    <div class="grow">
+      <div class="c-timeline__group-label">
+        <router-link
+          v-if="group.labelLink"
+          :to="group.labelLink"
+          class="cursor-pointer text-gray-900 hover:text-primary-500"
+        >
+          {{ group.label }}
+        </router-link>
+        <span v-else>
+          {{ group.label }}
+        </span>
+      </div>
+
+      <div class="c-timeline__items">
+        <slot name="default" :group="group" :hovered="hovered" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import LfAvatar from '@/ui-kit/avatar/Avatar.vue';
+import { ref } from 'vue';
+import { TimelineGroup } from './types/TimelineTypes';
+
+const emit = defineEmits(['onGroupHover']);
+
+const props = defineProps<{
+  groups: TimelineGroup[];
+}>();
+
+const hovered = ref(false);
+
+</script>
+
+<script lang="ts">
+export default {
+  name: 'LfTimeline',
+};
+</script>
+
+<style scoped lang="scss" src="./timeline.scss" />
diff --git a/frontend/src/ui-kit/timeline/TimelineItem.vue b/frontend/src/ui-kit/timeline/TimelineItem.vue
new file mode 100644
index 0000000000..f0fa40641c
--- /dev/null
+++ b/frontend/src/ui-kit/timeline/TimelineItem.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="c-timeline__item">
+    <div class="c-timeline__item-dot" />
+    <div class="c-timeline__item-content">
+      <slot :data="props.data" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+const props = defineProps<{
+  data: any;
+}>();
+</script>
+<script lang="ts">
+export default {
+  name: 'LfTimelineItem',
+};
+</script>
diff --git a/frontend/src/ui-kit/timeline/timeline.scss b/frontend/src/ui-kit/timeline/timeline.scss
new file mode 100644
index 0000000000..747aff3e08
--- /dev/null
+++ b/frontend/src/ui-kit/timeline/timeline.scss
@@ -0,0 +1,40 @@
+.c-timeline {
+  @apply flex items-start gap-3;
+  &__group-label {
+    @apply flex items-center font-semibold text-medium leading-6 mb-1 truncate text-black hover:text-primary-500 transition block w-full overflow-hidden;
+  }
+  // &__border {
+  //   @apply w-px h-full bg-gray-200;
+  // }
+
+  ::v-deep .c-timeline__item {
+    @apply relative mb-4;
+    .c-timeline__item-dot {
+      @apply w-3 h-3 z-[2] bg-gray-200 rounded-full absolute top-[2px] -left-[30px] border-3 border-white;
+    }
+    .c-timeline__item-content {
+      @apply relative;
+      &::before {
+        content: '';
+        @apply w-px bg-gray-200 absolute top-[2px] left-[-25px];
+        height: calc(100% + 25px);
+      }
+    }
+
+    &:first-child {
+      .c-timeline__item-dot {
+        @apply invisible;
+      }
+    }
+
+    &:last-child {
+      .c-timeline__item-content {
+        &::before {
+          @apply h-[5px];
+        }
+      }
+    }
+  }
+}
+
+
diff --git a/frontend/src/ui-kit/timeline/types/TimelineTypes.ts b/frontend/src/ui-kit/timeline/types/TimelineTypes.ts
new file mode 100644
index 0000000000..9db85110c1
--- /dev/null
+++ b/frontend/src/ui-kit/timeline/types/TimelineTypes.ts
@@ -0,0 +1,9 @@
+import type { RouteLocationRaw } from 'vue-router';
+
+export interface TimelineGroup {
+  id: number;
+  label: string;
+  labelLink?: RouteLocationRaw;
+  icon?: string;
+  items: any[];
+}