Merge branch 'main' into fix-member-merge

Author: skwowet

frontend/src/modules/contributor/components/shared/contributor-work-position.vue

@@ -41,6 +41,7 @@ import { storeToRefs } from 'pinia';
 import LfAvatar from '@/ui-kit/avatar/Avatar.vue';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
 import { Contributor } from '@/modules/contributor/types/Contributor';
+import useContributorHelpers from '@/modules/contributor/helpers/contributor.helpers';
 
 const props = defineProps<{
   contributor: Contributor,
@@ -49,7 +50,9 @@ const props = defineProps<{
 const lsSegmentsStore = useLfSegmentsStore();
 const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
 
-const organization = computed(() => props.contributor.organizations?.[0]);
+const { activeOrganization } = useContributorHelpers();
+
+const organization = computed(() => activeOrganization(props.contributor));
 const jobTitle = computed(() => organization.value?.memberOrganizations?.title
     || props.contributor.attributes?.jobTitle?.default);
 </script>

frontend/src/modules/contributor/helpers/contributor.helpers.ts

@@ -66,7 +66,15 @@ const useContributorHelpers = () => {
     }));
   };
 
-  const activeOrganization = (contributor: Contributor) => contributor.organizations?.[0];
+  const activeOrganization = (contributor: Contributor) => {
+    const { organizations } = contributor;
+    console.log(organizations);
+    return organizations.find((org) => org.memberOrganizations.affiliationOverride?.isPrimaryWorkExperience
+      && !!org.memberOrganizations.dateStart
+      && !org.memberOrganizations.dateEnd)
+      || organizations.find((org) => !!org.memberOrganizations.dateStart && !org.memberOrganizations.dateEnd)
+      || organizations.find((org) => !org.memberOrganizations.dateStart && !org.memberOrganizations.dateEnd) || null;
+  };
 
   return {
     avatar,

frontend/src/modules/member/components/member-organizations-vertical.vue

@@ -94,6 +94,7 @@ import { computed } from 'vue';
 import pluralize from 'pluralize';
 import LfOrganizationLfMemberTag from '@/modules/organization/components/lf-member/organization-lf-member-tag.vue';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
+import useContributorHelpers from '@/modules/contributor/helpers/contributor.helpers';
 
 const props = defineProps({
   member: {
@@ -104,21 +105,11 @@ const props = defineProps({
 
 const lsSegmentsStore = useLfSegmentsStore();
 const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
+const { activeOrganization } = useContributorHelpers();
 
 const currentOrganizations = computed(() => {
-  const orgsWithNoEndDate = props.member.organizations
-    .filter((o) => o.memberOrganizations?.dateStart && !o.memberOrganizations?.dateEnd);
-
-  // If there are organizations with no endDate
-  if (orgsWithNoEndDate.length) {
-    // Sort by startDate descending and pick the most recent one
-    return [orgsWithNoEndDate.sort(
-      (firstOrg, secondaryOrg) => new Date(secondaryOrg.memberOrganizations?.dateStart) - new Date(firstOrg.memberOrganizations?.dateStart),
-    )[0]];
-  }
-
-  // If there are no organizations with only startDate, return all with startDate and endDate
-  return props.member.organizations.filter((o) => !o.memberOrganizations?.dateEnd);
+  const active = activeOrganization(props.member);
+  return active ? [active] : [];
 });
 
 const slicedOrganizations = computed(() => currentOrganizations.value.slice(0, 3));