fix: reverd useless changes

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

backend/src/database/repositories/segmentRepository.ts

@@ -331,8 +331,7 @@ class SegmentRepository extends RepositoryBase<
         join segment_level sl on (sl.level = 'child' and s.id = sl.id)
             or (sl.level = 'parent' and s."parentSlug" = sl.slug and s."grandparentSlug" is not null)
             or (sl.level = 'grandparent' and s."grandparentSlug" = sl.slug)
-        where s.status = 'active'
-          and s."tenantId" = :tenantId;
+        where status = 'active';
       `,
       {
         replacements: {

frontend/src/modules/activity/config/filters/activityType/ActivityTypeFilter.vue

@@ -14,6 +14,7 @@ import {
 } from '@/shared/modules/filters/types/filterTypes/MultiSelectFilterConfig';
 import { CustomFilterConfig } from '@/shared/modules/filters/types/filterTypes/CustomFilterConfig';
 import { useActivityTypeStore } from '@/modules/activity/store/type';
+import { getSegmentsFromProjectGroup } from '@/utils/segments';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import { lfIdentities } from '@/config/identities';
 import useIntegrationsHelpers from '@/config/integrations/integrations.helpers';
@@ -76,6 +77,6 @@ watch([types, activeIntegrations], ([typesValue, activeIntegrationsValue]) => {
 });
 
 onMounted(async () => {
-  await store.dispatch('integration/doFetch', selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : []);
+  await store.dispatch('integration/doFetch', getSegmentsFromProjectGroup(selectedProjectGroup.value));
 });
 </script>

frontend/src/modules/data-quality/components/member/data-quality-member-merge-suggestions.vue

@@ -62,6 +62,8 @@ import LfSpinner from '@/ui-kit/spinner/Spinner.vue';
 import LfButton from '@/ui-kit/button/Button.vue';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
 import AppMemberMergeSuggestionsDialog from '@/modules/member/components/member-merge-suggestions-dialog.vue';
+import { storeToRefs } from 'pinia';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import LfMemberMergeSuggestionDropdown
   from '@/modules/member/components/suggestions/member-merge-suggestion-dropdown.vue';
 import LfScrollBodyControll from '@/ui-kit/scrollcontroll/ScrollBodyControll.vue';
@@ -79,7 +81,23 @@ const mergeSuggestions = ref<any[]>([]);
 const isModalOpen = ref<boolean>(false);
 const detailsOffset = ref<number>(0);
 
-const segments = computed(() => [props.projectGroup]);
+const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
+
+const segments = computed(() => (selectedProjectGroup.value?.id === props.projectGroup
+  ? [
+    selectedProjectGroup.value?.id,
+    ...selectedProjectGroup.value.projects.map((p) => [
+      ...p.subprojects.map((sp) => sp.id),
+    ]).flat(),
+  ]
+  : [
+    props.projectGroup,
+    ...selectedProjectGroup.value.projects
+      .filter((p) => p.id === props.projectGroup)
+      .map((p) => [
+        ...p.subprojects.map((sp) => sp.id),
+      ]).flat(),
+  ]));
 
 const loadMergeSuggestions = () => {
   loading.value = true;

frontend/src/modules/data-quality/components/organization/data-quality-organization-merge-suggestions.vue

@@ -58,6 +58,8 @@ import LfDataQualityOrganizationMergeSuggestionsItem
   from '@/modules/data-quality/components/organization/data-quality-organization-merge-suggestions-item.vue';
 import AppOrganizationMergeSuggestionsDialog
   from '@/modules/organization/components/organization-merge-suggestions-dialog.vue';
+import { storeToRefs } from 'pinia';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import LfScrollBodyControll from '@/ui-kit/scrollcontroll/ScrollBodyControll.vue';
 
 const props = defineProps<{
@@ -73,7 +75,23 @@ const mergeSuggestions = ref<any[]>([]);
 const isModalOpen = ref<boolean>(false);
 const detailsOffset = ref<number>(0);
 
-const segments = computed(() => [props.projectGroup]);
+const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
+
+const segments = computed(() => (selectedProjectGroup.value?.id === props.projectGroup
+  ? [
+    selectedProjectGroup.value?.id,
+    ...selectedProjectGroup.value.projects.map((p) => [
+      ...p.subprojects.map((sp) => sp.id),
+    ]).flat(),
+  ]
+  : [
+    props.projectGroup,
+    ...selectedProjectGroup.value.projects
+      .filter((p) => p.id === props.projectGroup)
+      .map((p) => [
+        ...p.subprojects.map((sp) => sp.id),
+      ]).flat(),
+  ]));
 
 const loadMergeSuggestions = () => {
   loading.value = true;

frontend/src/modules/lf/layout/components/lf-banners.vue

@@ -150,6 +150,7 @@ import {
   watch, ref, computed, onUnmounted,
 } from 'vue';
 import { IntegrationService } from '@/modules/integration/integration-service';
+import { getSegmentsFromProjectGroup } from '@/utils/segments';
 import { isCurrentDateAfterGivenWorkingDays } from '@/utils/date';
 import { useRoute } from 'vue-router';
 import usePermissions from '@/shared/modules/permissions/helpers/usePermissions';
@@ -226,7 +227,7 @@ const showBanner = computed(() => (integrationsWithErrors.value.length
 
 const fetchIntegrations = (projectGroup) => {
   if (projectGroup) {
-    IntegrationService.list(null, null, null, null, [projectGroup.id])
+    IntegrationService.list(null, null, null, null, getSegmentsFromProjectGroup(projectGroup))
       .then((response) => {
         integrations.value = response.rows;
       })

frontend/src/modules/member/components/list/member-list-table.vue

@@ -424,6 +424,7 @@ import LfTable from '@/ui-kit/table/Table.vue';
 import LfTableCell from '@/ui-kit/table/TableCell.vue';
 import LfTableHead from '@/ui-kit/table/TableHead.vue';
 import { formatNumber } from '@/utils/number';
+import { getSegmentsFromProjectGroup } from '@/utils/segments';
 import { ClickOutside as vClickOutside } from 'element-plus';
 import { storeToRefs } from 'pinia';
 import {
@@ -678,7 +679,7 @@ const doExport = () => MemberService.export({
 onMounted(async () => {
   await store.dispatch(
     'integration/doFetch',
-    selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : [],
+    getSegmentsFromProjectGroup(selectedProjectGroup.value),
   );
 });
 

frontend/src/modules/member/components/member-selection-dropdown.vue

@@ -86,7 +86,7 @@ const fetchFn = async ({ query, limit }) => {
   const options = await MemberService.listMembersAutocomplete({
     query,
     limit,
-    segments: selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : [],
+    segments: [selectedProjectGroup.value.id],
   });
 
   // Remove primary member from members that can be merged with

frontend/src/modules/member/config/filters/activityType/ActivityTypeFilter.vue

@@ -14,6 +14,7 @@ import {
 } from '@/shared/modules/filters/types/filterTypes/MultiSelectFilterConfig';
 import { CustomFilterConfig } from '@/shared/modules/filters/types/filterTypes/CustomFilterConfig';
 import { useActivityTypeStore } from '@/modules/activity/store/type';
+import { getSegmentsFromProjectGroup } from '@/utils/segments';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import useIntegrationsHelpers from '@/config/integrations/integrations.helpers';
 import { lfIntegrations } from '@/config/integrations';
@@ -76,6 +77,6 @@ watch([types, activeIntegrations], ([typesValue, activeIntegrationsValue]) => {
 });
 
 onMounted(async () => {
-  await store.dispatch('integration/doFetch', selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : []);
+  await store.dispatch('integration/doFetch', getSegmentsFromProjectGroup(selectedProjectGroup.value));
 });
 </script>

frontend/src/modules/organization/organization-service.js

@@ -1,6 +1,7 @@
 import authAxios from '@/shared/axios/auth-axios';
 import { AuthService } from '@/modules/auth/services/auth.service'; import { storeToRefs } from 'pinia';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
+import { getSegmentsFromProjectGroup } from '@/utils/segments';
 
 const getSelectedProjectGroup = () => {
   const lsSegmentsStore = useLfSegmentsStore();
@@ -215,9 +216,10 @@ export class OrganizationService {
   }
 
   static async fetchMergeSuggestions(limit, offset, query) {
-    const segments = getSelectedProjectGroup()?.id
-      ? [getSelectedProjectGroup().id]
-      : [];
+    const segments = [
+      ...getSegmentsFromProjectGroup(getSelectedProjectGroup()),
+      getSelectedProjectGroup().id,
+    ];
 
     const data = {
       limit,

frontend/src/modules/organization/services/organization.api.service.ts

@@ -1,5 +1,6 @@
 import authAxios from '@/shared/axios/auth-axios';
 import { Organization } from '@/modules/organization/types/Organization';
+import { getSegmentsFromProjectGroup } from '@/utils/segments';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import { storeToRefs } from 'pinia';
 
@@ -29,12 +30,18 @@ export class OrganizationApiService {
   }
 
   static async fetchMergeSuggestions(limit: number = 20, offset: number = 0, query: any = {}) {
-    const segments = getSelectedProjectGroupId();
+    const lsSegmentsStore = useLfSegmentsStore();
+    const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
+
+    const segments = [
+      ...getSegmentsFromProjectGroup(selectedProjectGroup.value),
+      selectedProjectGroup.value?.id,
+    ];
 
     const data = {
       limit,
       offset,
-      ...(segments ? { segments } : {}),
+      segments,
       ...query,
     };
 
@@ -46,12 +53,11 @@ export class OrganizationApiService {
   }
 
   static create(data: Partial<Organization>) {
-    const segments = getSelectedProjectGroupId();
     return authAxios.post(
       '/organization',
       {
         ...data,
-        ...(segments ? { segments } : {}),
+        segments: getSelectedProjectGroupId(),
       },
     )
       .then(({ data }) => Promise.resolve(data));