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
22 changes: 20 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,31 @@ jobs:
working-directory: "./openslides-client"
run: make run-playwright

- uses: actions/upload-artifact@v7
if: always()
- name: Upload playwright logs
uses: actions/upload-artifact@v7
if: failure()
with:
name: playwright-report
path: "./openslides-client/client/tests/playwright-report/"
retention-days: 7

- name: Collect docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2
with:
dest: './logs'

- if: failure()
run: tar cvzf ./logs.tgz ./logs

- name: Upload docker logs
if: failure()
uses: actions/upload-artifact@master
with:
name: logs.tgz
path: ./logs.tgz
retention-days: 7

- name: Shut down setup
if: always()
working-directory: "./dev/localprod"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class CommitteeRepositoryService extends BaseRepository<ViewCommittee, Co
* https://www.typescriptlang.org/docs/handbook/decorators.html#metadata
*/
private getPartialCommitteePayload(committee: any): any {
return {
const payload = {
description: committee.description,
organization_tag_ids: committee.organization_tag_ids === null ? [] : committee.organization_tag_ids,
manager_ids: committee.manager_ids,
Expand All @@ -144,5 +144,9 @@ export class CommitteeRepositoryService extends BaseRepository<ViewCommittee, Co
all_parent_ids: committee.all_parent_ids,
all_child_ids: committee.all_child_ids
};
if (payload.external_id === ``) {
payload.external_id = null;
}
return payload;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ export class GroupRepositoryService extends BaseMeetingRelatedRepository<ViewGro
name: update.name,
external_id: update.external_id
};
if (payload.external_id === ``) {
payload.external_id = null;
}
return this.sendActionToBackend(GroupAction.UPDATE, payload);
}

Expand All @@ -60,11 +63,15 @@ export class GroupRepositoryService extends BaseMeetingRelatedRepository<ViewGro
}

private getCreatePayload(partialGroup: Partial<Group>): Partial<Group> {
return {
const payload = {
meeting_id: this.activeMeetingId!,
name: partialGroup.name,
external_id: partialGroup.external_id,
permissions: partialGroup.permissions
};
if (payload.external_id === ``) {
payload.external_id = null;
}
return payload;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ export class MediafileRepositoryService extends BaseRepository<ViewMediafile, Me
parent_id: partialMediafile.parent_id || null,
...variables
};
if (payload.title === ``) {
payload.title = null;
}
return this.sendActionToBackend(MediafileAction.CREATE_FILE, payload);
}

Expand All @@ -102,6 +105,9 @@ export class MediafileRepositoryService extends BaseRepository<ViewMediafile, Me
parent_id: partialMediafile.parent_id,
...variables
};
if (payload.title === ``) {
payload.title = null;
}
return this.sendActionToBackend(MediafileAction.CREATE_DIRECTORY, payload);
}

Expand All @@ -116,6 +122,9 @@ export class MediafileRepositoryService extends BaseRepository<ViewMediafile, Me
meeting_id: this.activeMeetingId ?? undefined,
...variables
};
if (payload.title === ``) {
payload.title = null;
}
return this.sendActionToBackend(MediafileAction.UPDATE, payload);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ export class MeetingRepositoryService extends BaseRepository<ViewMeeting, Meetin
if (!update.id && !meeting) {
throw new Error(`Either a meeting or an update.id has to be given`);
}
if (update.external_id === ``) {
update.external_id = null;
}
const actions: any[] = [
{
...update,
Expand Down Expand Up @@ -267,11 +270,15 @@ export class MeetingRepositoryService extends BaseRepository<ViewMeeting, Meetin
}

private getPartialPayload(meeting: Partial<Meeting>): any {
return {
const payload = {
...meeting,
start_time: this.anyDateToUnix(meeting.start_time),
end_time: this.anyDateToUnix(meeting.end_time)
};
if (payload.external_id === ``) {
payload.external_id = null;
}
return payload;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
partialMotion.supporter_meeting_user_ids === null ? [] : partialMotion.supporter_meeting_user_ids,
...createAgendaItem(partialMotion, false)
};
if (payload.number === ``) {
payload.number = null;
}
return this.createAction(AmendmentAction.CREATE_PARAGRAPHBASED_AMENDMENT, payload);
}

Expand Down Expand Up @@ -325,7 +328,7 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
}

private getCreatePayload(partialMotion: any): any {
return {
const payload = {
meeting_id: this.activeMeetingId,
title: partialMotion.title,
text: partialMotion.text,
Expand All @@ -346,6 +349,10 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
partialMotion.supporter_meeting_user_ids === null ? [] : partialMotion.supporter_meeting_user_ids,
...createAgendaItem(partialMotion, false)
};
if (payload['number'] === ``) {
payload['number'] = null;
}
return payload;
}

private getUpdatePayload(update: any, viewMotion: Motion & { workflow_id: Id }): any {
Expand All @@ -356,13 +363,17 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
}
return {};
});
return {
const payload = {
id: viewMotion.id,
...updatePayload,
tag_ids: update[`tag_ids`] === null ? [] : update[`tag_ids`],
attachment_mediafile_ids:
update[`attachment_mediafile_ids`] === null ? [] : update[`attachment_mediafile_ids`]
};
if (payload['number'] === ``) {
payload['number'] = null;
}
return payload;
}

/**
Expand Down
Loading