Skip to content

fix(web): move-template-population-to-use-dispute-template-hook #1465

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
merged 6 commits into from
Feb 1, 2024
Merged

fix(web): move-template-population-to-use-dispute-template-hook #1465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee0df24
fix(web): move-template-population-to-use-dispute-template-hook
tractorss Jan 30, 2024
99197f7
refactor(web): remove-logs
tractorss Jan 31, 2024
573fdde
chore(web): rename-use-dispute-template-to-use-populated-dispute-data
tractorss Jan 31, 2024
4617343
chore(web): spelling usePopulatedDisputeData.ts
alcercu Feb 1, 2024
f5578b2
fix(web): remove unused variable assignment
alcercu Feb 1, 2024
4dd0d16
Merge branch 'dev' into fix(web)/use-dispute-template-fix
alcercu Feb 1, 2024
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
17 changes: 4 additions & 13 deletions web/src/components/DisputeCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import DisputeInfo from "./DisputeInfo";
import PeriodBanner from "./PeriodBanner";
import { isUndefined } from "utils/index";
import { responsiveSize } from "styles/responsiveSize";
import { populateTemplate } from "@kleros/kleros-sdk/src/dataMappings/utils/populateTemplate";
import { DisputeDetails } from "@kleros/kleros-sdk/src/dataMappings/utils/disputeDetailsTypes";
import { INVALID_DISPUTE_DATA_ERROR } from "consts/index";

const StyledCard = styled(Card)`
Expand Down Expand Up @@ -106,26 +104,19 @@ const DisputeCard: React.FC<IDisputeCard> = ({
currentPeriodIndex === 4
? lastPeriodChange
: getPeriodEndTimestamp(lastPeriodChange, currentPeriodIndex, court.timesPerPeriod);
const { data: disputeTemplate } = useDisputeTemplate(id, arbitrated.id as `0x${string}`);
let disputeDetails: DisputeDetails | undefined;
try {
if (disputeTemplate) {
disputeDetails = populateTemplate(disputeTemplate.templateData, {});
}
} catch (e) {
console.error(e);
}
const { data: disputeDetails } = useDisputeTemplate(id, arbitrated.id as `0x${string}`);

const { data: courtPolicy } = useCourtPolicy(court.id);
const courtName = courtPolicy?.name;
const category = disputeTemplate?.category;
const category = disputeDetails?.category;
const navigate = useNavigate();
return (
<>
{!isList || overrideIsList ? (
<StyledCard hover onClick={() => navigate(`/cases/${id.toString()}`)}>
<PeriodBanner id={parseInt(id)} period={currentPeriodIndex} />
<CardContainer>
{isUndefined(disputeTemplate) ? (
{isUndefined(disputeDetails) ? (
<StyledSkeleton />
) : (
<TruncatedTitle text={disputeDetails?.title ?? INVALID_DISPUTE_DATA_ERROR} maxLength={100} />
Expand Down
7 changes: 2 additions & 5 deletions web/src/components/DisputePreview/DisputeContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Answer as IAnswer } from "context/NewDisputeContext";
import AliasDisplay from "./Alias";
import { responsiveSize } from "styles/responsiveSize";
import { DisputeDetails } from "@kleros/kleros-sdk/src/dataMappings/utils/disputeDetailsTypes";
import { INVALID_DISPUTE_DATA_ERROR } from "consts/index";

const StyledH1 = styled.h1`
margin: 0;
Expand Down Expand Up @@ -65,11 +66,7 @@ export const DisputeContext: React.FC<IDisputeContext> = ({ disputeDetails }) =>
return (
<>
<StyledH1>
{isUndefined(disputeDetails) ? (
<StyledSkeleton />
) : (
disputeDetails?.title ?? "The dispute's template is not correct please vote refuse to arbitrate"
)}
{isUndefined(disputeDetails) ? <StyledSkeleton /> : disputeDetails?.title ?? INVALID_DISPUTE_DATA_ERROR}
</StyledH1>
{!isUndefined(disputeDetails) && (
<QuestionAndDescription>
Expand Down
32 changes: 28 additions & 4 deletions web/src/hooks/queries/useDisputeTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ import { PublicClient } from "viem";
import { usePublicClient } from "wagmi";
import { getIArbitrableV2 } from "hooks/contracts/generated";
import { isUndefined } from "utils/index";
import { graphqlQueryFnHelper, graphqlUrl } from "utils/graphqlQueryFnHelper";
import { graphqlQueryFnHelper } from "utils/graphqlQueryFnHelper";
import { useIsCrossChainDispute } from "../useIsCrossChainDispute";
import { GENESIS_BLOCK_ARBSEPOLIA } from "consts/index";
import { populateTemplate } from "@kleros/kleros-sdk/src/dataMappings/utils/populateTemplate";
import { executeActions } from "@kleros/kleros-sdk/src/dataMappings/executeActions";
import { configureSDK } from "@kleros/kleros-sdk/src/sdk";
import { alchemyApiKey } from "context/Web3Provider";
import { DisputeDetails } from "@kleros/kleros-sdk/src/dataMappings/utils/disputeDetailsTypes";

const disputeTemplateQuery = graphql(`
query DisputeTemplate($id: ID!) {
Expand All @@ -23,7 +28,7 @@ export const useDisputeTemplate = (disputeID?: string, arbitrableAddress?: `0x${
const publicClient = usePublicClient();
const { data: crossChainData } = useIsCrossChainDispute(disputeID, arbitrableAddress);
const isEnabled = !isUndefined(disputeID) && !isUndefined(crossChainData) && !isUndefined(arbitrableAddress);
return useQuery({
return useQuery<DisputeDetails>({
queryKey: [`DisputeTemplate${disputeID}${arbitrableAddress}`],
enabled: isEnabled,
staleTime: Infinity,
Expand All @@ -40,10 +45,29 @@ export const useDisputeTemplate = (disputeID?: string, arbitrableAddress?: `0x${
true
);
console.log("useDisputeTemplate:", disputeTemplate);
const disputeTemplateInput = disputeTemplate?.templateData;
const dataMappingsInput = disputeTemplate?.templateDataMappings;

return disputeTemplate;
configureSDK({ apiKey: alchemyApiKey });

const initialContext = {
disputeID: disputeID,
arbitrable: arbitrableAddress,
};

console.log("dataMappingsInput", dataMappingsInput);
let data = {};
if (dataMappingsInput) {
const parsedMappings = JSON.parse(dataMappingsInput);
console.log("parsedMappings", parsedMappings);
data = await executeActions(parsedMappings, initialContext);
}
console.log("data", data);
const disputeDetailes = populateTemplate(disputeTemplateInput, data);

return disputeDetailes;
} catch {
return {};
return {} as DisputeDetails;
}
} else throw Error;
},
Expand Down
44 changes: 3 additions & 41 deletions web/src/pages/Cases/CaseDetails/Overview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import React, { useMemo, useState, useEffect } from "react";
import React, { useMemo } from "react";
import styled from "styled-components";
import { useParams } from "react-router-dom";
import { formatEther } from "viem";
import { useDisputeDetailsQuery } from "queries/useDisputeDetailsQuery";
import { useDisputeTemplate } from "queries/useDisputeTemplate";
import { useCourtPolicy } from "queries/useCourtPolicy";
import { populateTemplate } from "@kleros/kleros-sdk/src/dataMappings/utils/populateTemplate";
import { executeActions } from "@kleros/kleros-sdk/src/dataMappings/executeActions";
import { configureSDK } from "@kleros/kleros-sdk/src/sdk";
import { alchemyApiKey } from "context/Web3Provider";
import { DisputeDetails } from "@kleros/kleros-sdk/src/dataMappings/utils/disputeDetailsTypes";
import DisputeInfo from "components/DisputeCard/DisputeInfo";
import Verdict from "components/Verdict/index";
import { useVotingHistory } from "hooks/queries/useVotingHistory";
Expand Down Expand Up @@ -44,48 +39,15 @@ interface IOverview {

const Overview: React.FC<IOverview> = ({ arbitrable, courtID, currentPeriodIndex }) => {
const { id } = useParams();
const { data: disputeTemplate } = useDisputeTemplate(id, arbitrable);
const { data: disputeDetails } = useDisputeTemplate(id, arbitrable);
const { data: dispute } = useDisputeDetailsQuery(id);
const { data: courtPolicy } = useCourtPolicy(courtID);
const { data: votingHistory } = useVotingHistory(id);
const [disputeDetails, setDisputeDetails] = useState<DisputeDetails | undefined>(undefined);
const localRounds = getLocalRounds(votingHistory?.dispute?.disputeKitDispute);
const courtName = courtPolicy?.name;
const court = dispute?.dispute?.court;
const rewards = useMemo(() => (court ? `≥ ${formatEther(court.feeForJuror)} ETH` : undefined), [court]);
const category = disputeTemplate?.category ?? undefined;
const disputeTemplateInput = disputeTemplate?.templateData;
const dataMappingsInput = disputeTemplate?.templateDataMappings;

useEffect(() => {
configureSDK({ apiKey: alchemyApiKey });
const initialContext = {
disputeID: id,
arbitrable: arbitrable,
};

if (!disputeTemplateInput) return;

const fetchData = async () => {
try {
console.log("dataMappingsInput", dataMappingsInput);
let data = {};
if (dataMappingsInput) {
const parsedMappings = JSON.parse(dataMappingsInput);
console.log("parsedMappings", parsedMappings);
data = await executeActions(parsedMappings, initialContext);
}
console.log("data", data);
const finalDisputeDetails = populateTemplate(disputeTemplateInput, data);
setDisputeDetails(finalDisputeDetails);
} catch (e) {
console.error(e);
setDisputeDetails(undefined);
}
};

fetchData();
}, [disputeTemplateInput, dataMappingsInput, arbitrable, id]);
const category = disputeDetails?.category;

return (
<>
Expand Down