Skip to content

Commit d54a8e6

Browse files
committed
feat: add data-quality api and fix bugs
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent e58e568 commit d54a8e6

4 files changed

Lines changed: 6 additions & 42 deletions

File tree

frontend/src/modules/activity/components/activity-timeline.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ const query = ref('');
267267
const activities = ref([]);
268268
const limit = ref(10);
269269
const offset = ref(0);
270-
const timestamp = ref(dateHelper(props.entity.joinedAt).toISOString());
270+
const joinedAt = dateHelper(props.entity.joinedAt);
271+
const timestamp = ref(joinedAt.isValid() ? joinedAt.toISOString() : dateHelper().toISOString());
271272
const noMore = ref(false);
272273
const selectedSegment = ref(props.selectedSegment || null);
273274
@@ -426,7 +427,7 @@ watch(platform, async (newValue, oldValue) => {
426427
onMounted(async () => {
427428
await store.dispatch(
428429
'integration/doFetch',
429-
segments.value.map((s: any) => s.id),
430+
selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : [],
430431
);
431432
await fetchActivities();
432433
});

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ import LfSpinner from '@/ui-kit/spinner/Spinner.vue';
6262
import LfButton from '@/ui-kit/button/Button.vue';
6363
import LfIcon from '@/ui-kit/icon/Icon.vue';
6464
import AppMemberMergeSuggestionsDialog from '@/modules/member/components/member-merge-suggestions-dialog.vue';
65-
import { storeToRefs } from 'pinia';
66-
import { useLfSegmentsStore } from '@/modules/lf/segments/store';
6765
import LfMemberMergeSuggestionDropdown
6866
from '@/modules/member/components/suggestions/member-merge-suggestion-dropdown.vue';
6967
import LfScrollBodyControll from '@/ui-kit/scrollcontroll/ScrollBodyControll.vue';
@@ -81,23 +79,7 @@ const mergeSuggestions = ref<any[]>([]);
8179
const isModalOpen = ref<boolean>(false);
8280
const detailsOffset = ref<number>(0);
8381
84-
const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
85-
86-
const segments = computed(() => (selectedProjectGroup.value?.id === props.projectGroup
87-
? [
88-
selectedProjectGroup.value?.id,
89-
...selectedProjectGroup.value.projects.map((p) => [
90-
...p.subprojects.map((sp) => sp.id),
91-
]).flat(),
92-
]
93-
: [
94-
props.projectGroup,
95-
...selectedProjectGroup.value.projects
96-
.filter((p) => p.id === props.projectGroup)
97-
.map((p) => [
98-
...p.subprojects.map((sp) => sp.id),
99-
]).flat(),
100-
]));
82+
const segments = computed(() => [props.projectGroup]);
10183
10284
const loadMergeSuggestions = () => {
10385
loading.value = true;

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ import LfDataQualityOrganizationMergeSuggestionsItem
5858
from '@/modules/data-quality/components/organization/data-quality-organization-merge-suggestions-item.vue';
5959
import AppOrganizationMergeSuggestionsDialog
6060
from '@/modules/organization/components/organization-merge-suggestions-dialog.vue';
61-
import { storeToRefs } from 'pinia';
62-
import { useLfSegmentsStore } from '@/modules/lf/segments/store';
6361
import LfScrollBodyControll from '@/ui-kit/scrollcontroll/ScrollBodyControll.vue';
6462
6563
const props = defineProps<{
@@ -75,23 +73,7 @@ const mergeSuggestions = ref<any[]>([]);
7573
const isModalOpen = ref<boolean>(false);
7674
const detailsOffset = ref<number>(0);
7775
78-
const { selectedProjectGroup } = storeToRefs(useLfSegmentsStore());
79-
80-
const segments = computed(() => (selectedProjectGroup.value?.id === props.projectGroup
81-
? [
82-
selectedProjectGroup.value?.id,
83-
...selectedProjectGroup.value.projects.map((p) => [
84-
...p.subprojects.map((sp) => sp.id),
85-
]).flat(),
86-
]
87-
: [
88-
props.projectGroup,
89-
...selectedProjectGroup.value.projects
90-
.filter((p) => p.id === props.projectGroup)
91-
.map((p) => [
92-
...p.subprojects.map((sp) => sp.id),
93-
]).flat(),
94-
]));
76+
const segments = computed(() => [props.projectGroup]);
9577
9678
const loadMergeSuggestions = () => {
9779
loading.value = true;

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

0 commit comments

Comments
 (0)