Skip to content

Commit 5cad379

Browse files
committed
fix: send single segment for integrations
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent a389da3 commit 5cad379

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
} from '@/shared/modules/filters/types/filterTypes/MultiSelectFilterConfig';
1515
import { CustomFilterConfig } from '@/shared/modules/filters/types/filterTypes/CustomFilterConfig';
1616
import { useActivityTypeStore } from '@/modules/activity/store/type';
17-
import { getSegmentsFromProjectGroup } from '@/utils/segments';
1817
import { useLfSegmentsStore } from '@/modules/lf/segments/store';
1918
import { lfIdentities } from '@/config/identities';
2019
import useIntegrationsHelpers from '@/config/integrations/integrations.helpers';
@@ -77,6 +76,6 @@ watch([types, activeIntegrations], ([typesValue, activeIntegrationsValue]) => {
7776
});
7877
7978
onMounted(async () => {
80-
await store.dispatch('integration/doFetch', getSegmentsFromProjectGroup(selectedProjectGroup.value));
79+
await store.dispatch('integration/doFetch', selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : []);
8180
});
8281
</script>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ import {
150150
watch, ref, computed, onUnmounted,
151151
} from 'vue';
152152
import { IntegrationService } from '@/modules/integration/integration-service';
153-
import { getSegmentsFromProjectGroup } from '@/utils/segments';
154153
import { isCurrentDateAfterGivenWorkingDays } from '@/utils/date';
155154
import { useRoute } from 'vue-router';
156155
import usePermissions from '@/shared/modules/permissions/helpers/usePermissions';
@@ -227,7 +226,7 @@ const showBanner = computed(() => (integrationsWithErrors.value.length
227226
228227
const fetchIntegrations = (projectGroup) => {
229228
if (projectGroup) {
230-
IntegrationService.list(null, null, null, null, getSegmentsFromProjectGroup(projectGroup))
229+
IntegrationService.list(null, null, null, null, [projectGroup.id])
231230
.then((response) => {
232231
integrations.value = response.rows;
233232
})

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ import LfTable from '@/ui-kit/table/Table.vue';
424424
import LfTableCell from '@/ui-kit/table/TableCell.vue';
425425
import LfTableHead from '@/ui-kit/table/TableHead.vue';
426426
import { formatNumber } from '@/utils/number';
427-
import { getSegmentsFromProjectGroup } from '@/utils/segments';
428427
import { ClickOutside as vClickOutside } from 'element-plus';
429428
import { storeToRefs } from 'pinia';
430429
import {
@@ -679,7 +678,7 @@ const doExport = () => MemberService.export({
679678
onMounted(async () => {
680679
await store.dispatch(
681680
'integration/doFetch',
682-
getSegmentsFromProjectGroup(selectedProjectGroup.value),
681+
selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : [],
683682
);
684683
});
685684

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
} from '@/shared/modules/filters/types/filterTypes/MultiSelectFilterConfig';
1515
import { CustomFilterConfig } from '@/shared/modules/filters/types/filterTypes/CustomFilterConfig';
1616
import { useActivityTypeStore } from '@/modules/activity/store/type';
17-
import { getSegmentsFromProjectGroup } from '@/utils/segments';
1817
import { useLfSegmentsStore } from '@/modules/lf/segments/store';
1918
import useIntegrationsHelpers from '@/config/integrations/integrations.helpers';
2019
import { lfIntegrations } from '@/config/integrations';
@@ -77,6 +76,6 @@ watch([types, activeIntegrations], ([typesValue, activeIntegrationsValue]) => {
7776
});
7877
7978
onMounted(async () => {
80-
await store.dispatch('integration/doFetch', getSegmentsFromProjectGroup(selectedProjectGroup.value));
79+
await store.dispatch('integration/doFetch', selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : []);
8180
});
8281
</script>

0 commit comments

Comments
 (0)