Skip to content

Fix participations not being directly edited with dropwdown #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Francisca105 merged 1 commit into from
Nov 16, 2025
Merged

Fix participations not being directly edited with dropwdown #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 26 additions & 7 deletions frontend/src/components/companies/EditableCompanyParticipation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,18 @@
Edit
</Button>
<div v-else class="flex gap-2">
<Button size="sm" :disabled="isSaving" @click="saveChanges">
{{ isSaving ? "Saving..." : "Save" }}
<Button
size="sm"
:disabled="isSaving || isStatusUpdating"
@click="saveChanges"
>
{{
isSaving
? "Saving..."
: isStatusUpdating
? "Updating..."
: "Save"
}}
</Button>
<Button variant="outline" size="sm" @click="cancelEditing">
Cancel
Expand Down Expand Up @@ -183,6 +193,7 @@ const props = defineProps<Props>();
const isEditing = ref(false);
const isSaving = ref(false);
const isStatusMenuOpen = ref(false);
const isStatusUpdating = ref(false);
const selectedStatus = ref<ParticipationStatus>(props.participation.status);

const updateMutation = useCompanyParticipationMutation();
Expand Down Expand Up @@ -243,9 +254,21 @@ const { data: membersData } = useQuery({
query: () => getAllMembers(),
});

const selectStatus = (status: ParticipationStatus) => {
const selectStatus = async (status: ParticipationStatus) => {
const previous = selectedStatus.value;
selectedStatus.value = status;
isStatusMenuOpen.value = false;
try {
isStatusUpdating.value = true;
statusMutation.companyId.value = props.companyId;
await statusMutation.mutate(status);
} catch (err) {
console.error("Failed to update participation status:", err);
// revert value on error
selectedStatus.value = previous;
} finally {
isStatusUpdating.value = false;
}
};

const startEditing = () => {
Expand All @@ -267,10 +290,6 @@ const saveChanges = async () => {
isSaving.value = true;

try {
if (selectedStatus.value !== props.participation.status) {
statusMutation.mutate(selectedStatus.value);
}

const dataToSend = {
...editForm,
confirmed: convertDatetimeLocalToISO(editForm.confirmed!),
Expand Down
33 changes: 26 additions & 7 deletions frontend/src/components/speakers/EditableSpeakerParticipation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,18 @@
Edit
</Button>
<div v-else class="flex gap-2">
<Button size="sm" :disabled="isSaving" @click="saveChanges">
{{ isSaving ? "Saving..." : "Save" }}
<Button
size="sm"
:disabled="isSaving || isStatusUpdating"
@click="saveChanges"
>
{{
isSaving
? "Saving..."
: isStatusUpdating
? "Updating..."
: "Save"
}}
</Button>
<Button variant="outline" size="sm" @click="cancelEditing">
Cancel
Expand Down Expand Up @@ -217,6 +227,7 @@ const props = defineProps<Props>();
const isEditing = ref(false);
const isSaving = ref(false);
const isStatusMenuOpen = ref(false);
const isStatusUpdating = ref(false);
const selectedStatus = ref<ParticipationStatus>(props.participation.status);

const editForm = reactive<UpdateSpeakerParticipationData>({
Expand Down Expand Up @@ -266,10 +277,6 @@ const saveChanges = async () => {
isSaving.value = true;

try {
if (selectedStatus.value !== props.participation.status) {
statusMutation.mutate(selectedStatus.value);
}

updateMutation.mutate(editForm);
isEditing.value = false;
} catch (error) {
Expand All @@ -279,9 +286,21 @@ const saveChanges = async () => {
}
};

const selectStatus = (status: ParticipationStatus) => {
const selectStatus = async (status: ParticipationStatus) => {
const previous = selectedStatus.value;
selectedStatus.value = status;
isStatusMenuOpen.value = false;

try {
isStatusUpdating.value = true;
statusMutation.speakerId.value = props.speakerId;
await statusMutation.mutate(status);
} catch (err) {
console.error("Failed to update participation status:", err);
selectedStatus.value = previous;
} finally {
isStatusUpdating.value = false;
}
};

const getEventName = (eventId: number) => {
Expand Down