Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ const isModalOpen = computed<boolean>({

const addIdentities = () => {
sending.value = true;
createContributorIdentities(props.contributor.id, form)
createContributorIdentities(
props.contributor.id,
form.map(({ id, ...identity }) => identity),
)
.then(() => {
ToastStore.success('Identities successfully added');
isModalOpen.value = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import authAxios from '@/shared/axios/auth-axios';
import { ContributorIdentity, UpdateContributorIdentityPayload } from '@/modules/contributor/types/Contributor';
import { CreateContributorIdentity, UpdateContributorIdentityPayload } from '@/modules/contributor/types/Contributor';
import { storeToRefs } from 'pinia';
import { useLfSegmentsStore } from '@/modules/lf/segments/store';

Expand All @@ -22,7 +22,7 @@ export class ContributorIdentitiesApiService {
).then(({ data }) => Promise.resolve(data));
}

static async createMultiple(memberId: string, identities: ContributorIdentity[]) {
static async createMultiple(memberId: string, identities: CreateContributorIdentity[]) {
return authAxios.put(
`/member/${memberId}/identity`,
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/contributor/store/contributor.actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useLfSegmentsStore } from '@/modules/lf/segments/store';
import { storeToRefs } from 'pinia';
import { ContributorApiService } from '@/modules/contributor/services/contributor.api.service';
import {
Contributor, ContributorAffiliation, ContributorIdentity, UpdateContributorIdentityPayload,
Contributor, ContributorAffiliation, ContributorIdentity, CreateContributorIdentity, UpdateContributorIdentityPayload,
} from '@/modules/contributor/types/Contributor';
import { ContributorIdentitiesApiService } from '@/modules/contributor/services/contributor.identities.api.service';
import { MergeActionsService } from '@/shared/modules/merge/services/merge-actions.service';
Expand Down Expand Up @@ -70,7 +70,7 @@ export default {
return ContributorIdentitiesApiService.list(id, [selectedProjectGroup.value?.id as string])
.then(this.setIdentities);
},
createContributorIdentities(memberId: string, identities: ContributorIdentity[]): Promise<ContributorIdentity[]> {
createContributorIdentities(memberId: string, identities: CreateContributorIdentity[]): Promise<ContributorIdentity[]> {
return ContributorIdentitiesApiService.createMultiple(memberId, identities)
.then(this.setIdentities);
},
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/modules/contributor/types/Contributor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ export interface ContributorIdentity {
duplicatedIdentities?: ContributorIdentity[];
}

export type CreateContributorIdentity = Omit<
ContributorIdentity,
'id' | 'platforms' | 'url' | 'duplicatedIdentities'
>;

export interface UpdateContributorIdentityPayload {
value?: string;
type?: string;
Expand Down
2 changes: 1 addition & 1 deletion services/libs/data-access-layer/src/members/identities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export async function insertMemberIdentities(
],
identities.map((i) => ({
...i,
id: i.id ?? generateUUIDv1(),
id: i.id || generateUUIDv1(),
tenantId: DEFAULT_TENANT_ID,
})),
failOnConflict ? undefined : 'DO NOTHING',
Expand Down
Loading