fix(participant exports): fix participants by returning the export type as well as the file path

We previously used the Apollo context but that's really unreliable.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2023-06-20 12:11:52 +02:00
parent a5a86a5e1b
commit 49b04c9b19
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
4 changed files with 28 additions and 25 deletions

View File

@ -482,6 +482,9 @@ export const EXPORT_EVENT_PARTICIPATIONS = gql`
$format: ExportFormatEnum
$roles: [ParticipantRoleEnum]
) {
exportEventParticipants(eventId: $eventId, format: $format, roles: $roles)
exportEventParticipants(eventId: $eventId, format: $format, roles: $roles) {
path
format
}
}
`;

View File

@ -55,22 +55,16 @@
:key="format"
aria-role="listitem"
@click="
exportParticipants(
{
eventId: event?.id,
format,
},
{ context: { type: format } }
)
exportParticipants({
eventId: event.id ?? '',
format,
})
"
@keyup.enter="
exportParticipants(
{
eventId: event?.id,
format,
},
{ context: { type: format } }
)
exportParticipants({
eventId: event.id ?? '',
format,
})
"
>
<button class="dropdown-button">
@ -380,15 +374,15 @@ const {
mutate: exportParticipants,
onDone: onExportParticipantsMutationDone,
onError: onExportParticipantsMutationError,
} = useMutation(EXPORT_EVENT_PARTICIPATIONS);
} = useMutation<
{ exportEventParticipants: { path: string; format: string } },
{ eventId: string; format?: exportFormat; roles?: string[] }
>(EXPORT_EVENT_PARTICIPATIONS);
onExportParticipantsMutationDone(({ data, context }) => {
const link =
window.origin +
"/exports/" +
context?.type.toLowerCase() +
"/" +
data?.exportEventParticipants;
onExportParticipantsMutationDone(({ data }) => {
const path = data?.exportEventParticipants?.path;
const format = data?.exportEventParticipants?.format;
const link = window.origin + "/exports/" + format?.toLowerCase() + "/" + path;
console.debug(link);
const a = document.createElement("a");
a.style.display = "none";

View File

@ -302,7 +302,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
if can_event_be_updated_by?(event, moderator_actor) do
case export_format(format, event, roles, locale) do
{:ok, path} ->
{:ok, path}
{:ok, %{path: path, format: format}}
{:error, :export_dependency_not_installed} ->
{:error,

View File

@ -61,6 +61,12 @@ defmodule Mobilizon.GraphQL.Schema.Events.ParticipantType do
field(:total, :integer, description: "The total number of participants in the list")
end
object :participant_export do
meta(:authorize, :user)
field(:path, :string, description: "The path to the exported file")
field(:format, :export_format_enum, description: "The path to the exported file")
end
@desc """
The possible values for a participant role
"""
@ -132,7 +138,7 @@ defmodule Mobilizon.GraphQL.Schema.Events.ParticipantType do
end
@desc "Export the event participants as a file"
field :export_event_participants, :string do
field :export_event_participants, :participant_export do
arg(:event_id, non_null(:id),
description: "The ID from the event for which to export participants"
)