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
4 changes: 2 additions & 2 deletions src/pages/campaigns/quote/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ const EditCampaign = () => {
subtitle="Set the price for this activity. Before proceeding, make sure to review the campaign dossier carefully and consider any previous quotes. If quotes have been created through app.unguess, they will be displayed directly on this page for easy comparison."
id="quote"
>
{data.thisCampaign.length > 0 && (
{data.history.length > 0 && (
<Card
className="aq-mb-4"
title="Previous quotes for this campaign"
>
<QuoteTable data={data.thisCampaign} />
<QuoteTable data={data.history} />
</Card>
)}
<Card
Expand Down
21 changes: 20 additions & 1 deletion src/pages/campaigns/quote/useQuoteRecap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useMemo } from "react";
import {
useGetCampaignsQuery,
useGetDossiersByCampaignQuery,
useGetDossiersByCampaignQuotesHistoryQuery,
} from "src/services/tryberApi";

const mapData = <
Expand All @@ -27,6 +28,21 @@ export const useQuoteRecap = ({ campaign }: { campaign: number }) => {
const { data: dossier } = useGetDossiersByCampaignQuery({
campaign: campaign.toString(),
});
const { data: historyData } = useGetDossiersByCampaignQuotesHistoryQuery({
campaign: campaign.toString(),
});

const historyItems = (historyData?.items || []).map((h) => ({
id: h.campaign.id,
name: h.campaign.title,
phase: { name: h.campaign.phase_name },
quote: {
id: h.quote.id,
price: h.quote.amount,
status: h.quote.status,
},
}));

const { data, isLoading, isError } = useGetCampaignsQuery(
{
fields: "id,name,quote,phase",
Expand All @@ -37,23 +53,26 @@ export const useQuoteRecap = ({ campaign }: { campaign: number }) => {
}
);

const { thisCampaign, otherCampaigns } = useMemo(() => {
const { thisCampaign, history, otherCampaigns } = useMemo(() => {
if (!data || !data.items) {
return {
thisCampaign: mapData([]),
history: mapData([]),
otherCampaigns: mapData([]),
};
}

return {
thisCampaign: mapData(data.items.filter((c) => c.id === campaign)),
history: mapData(historyItems),
otherCampaigns: mapData(data.items.filter((c) => c.id !== campaign)),
};
}, [data, campaign]);

return {
data: {
thisCampaign,
history,
otherCampaigns,
},
isLoading,
Expand Down
3 changes: 3 additions & 0 deletions src/services/tryberApi/apiTags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,9 @@ tryberApi.enhanceEndpoints({
patchDossiersByCampaignQuotationsAndQuote: {
invalidatesTags: ["Quote"],
},
getDossiersByCampaignQuotesHistory: {
providesTags: ["Quote"],
},
},
});

Expand Down
29 changes: 29 additions & 0 deletions src/services/tryberApi/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,14 @@ const injectedRtkApi = api.injectEndpoints({
body: queryArg.body,
}),
}),
getDossiersByCampaignQuotesHistory: build.query<
GetDossiersByCampaignQuotesHistoryApiResponse,
GetDossiersByCampaignQuotesHistoryApiArg
>({
query: (queryArg) => ({
url: `/dossiers/${queryArg.campaign}/quotesHistory`,
}),
}),
getEducation: build.query<GetEducationApiResponse, GetEducationApiArg>({
query: () => ({ url: `/education` }),
}),
Expand Down Expand Up @@ -1883,6 +1891,26 @@ export type PatchDossiersByCampaignQuotationsAndQuoteApiArg = {
amount?: string;
};
};
export type GetDossiersByCampaignQuotesHistoryApiResponse =
/** status 200 OK */ {
items: {
campaign: {
id: number;
title: string;
phase_id: number;
phase_name: string;
};
quote: {
id: number;
amount: string;
status: "pending" | "proposed" | "approved" | "rejected";
};
}[];
};
export type GetDossiersByCampaignQuotesHistoryApiArg = {
/** A campaign id */
campaign: string;
};
export type GetEducationApiResponse = /** status 200 OK */ {
id: number;
name: string;
Expand Down Expand Up @@ -3148,6 +3176,7 @@ export const {
usePutDossiersByCampaignPhasesMutation,
usePostDossiersByCampaignQuotationsMutation,
usePatchDossiersByCampaignQuotationsAndQuoteMutation,
useGetDossiersByCampaignQuotesHistoryQuery,
useGetEducationQuery,
useGetEmploymentsQuery,
usePostJotformsByCampaignMutation,
Expand Down