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
1 change: 1 addition & 0 deletions src/components/CompareResults/ResultsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export default function ResultsTable() {
searchParams.set('test_version', testVersion);
if (testVersion !== MANN_WHITNEY_U) {
searchParams.delete('replicates');
searchParams.delete('enable_silverman_kde');
}
setSearchParams(searchParams);
};
Expand Down
7 changes: 7 additions & 0 deletions src/components/CompareResults/hashToCommitLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ export async function loader({ request }: { request: Request }) {
const baseRevsFromHash = commits_from_hashes.baseRevision;
const newRevsFromHash = [commits_from_hashes.newRevision];
const replicatesFromUrl = url.searchParams.has('replicates');
const enableSilvermanKDEFromUrl = url.searchParams.has(
'enable_silverman_kde',
);
const {
baseRev,
baseRepo,
Expand All @@ -76,6 +79,7 @@ export async function loader({ request }: { request: Request }) {
frameworkName,
replicates,
testVersion,
silvermanKDEEnabled,
} = checkValues({
baseRev: baseRevsFromHash,
baseRepo: baseRepoFromUrl,
Expand All @@ -84,6 +88,7 @@ export async function loader({ request }: { request: Request }) {
framework: frameworkFromUrl,
replicates: replicatesFromUrl,
testVersion: testVersionFromUrl,
silvermanKDEEnabled: enableSilvermanKDEFromUrl,
});
return await getComparisonInformation(
baseRev,
Expand All @@ -93,6 +98,7 @@ export async function loader({ request }: { request: Request }) {
frameworkId,
frameworkName,
replicates,
silvermanKDEEnabled,
testVersion,
);
}
Expand All @@ -110,6 +116,7 @@ type HashLoaderData = {
view: typeof compareView;
generation: number;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
};

export type HashLoaderReturnValue = HashLoaderData;
7 changes: 7 additions & 0 deletions src/components/CompareResults/landoToCommitLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ export async function loader({ request }: { request: Request }) {
);
}
const replicatesFromUrl = url.searchParams.has('replicates');
const enableSilvermanKDEFromUrl = url.searchParams.has(
'enable_silverman_kde',
);

const baseRevisionsFromLando =
await fetchRevisionFromLandoId(baseLandoIDFromUrl);
Expand All @@ -47,6 +50,7 @@ export async function loader({ request }: { request: Request }) {
frameworkName,
replicates,
testVersion,
silvermanKDEEnabled,
} = checkValues({
baseRev: baseRevisionsFromLando.commit_id,
baseRepo: baseRepoFromUrl,
Expand All @@ -55,6 +59,7 @@ export async function loader({ request }: { request: Request }) {
framework: frameworkFromUrl,
replicates: replicatesFromUrl,
testVersion: testVersionFromUrl,
silvermanKDEEnabled: enableSilvermanKDEFromUrl,
});
return await getComparisonInformation(
baseRev,
Expand All @@ -64,6 +69,7 @@ export async function loader({ request }: { request: Request }) {
frameworkId,
frameworkName,
replicates,
silvermanKDEEnabled,
testVersion,
);
}
Expand All @@ -81,6 +87,7 @@ type LandoLoaderData = {
view: typeof compareView;
generation: number;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
};

export type LandoLoaderReturnValue = LandoLoaderData;
18 changes: 18 additions & 0 deletions src/components/CompareResults/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export function checkValues({
framework,
replicates,
testVersion,
silvermanKDEEnabled,
}: {
baseRev: string | null;
baseRepo: Repository['name'] | null;
Expand All @@ -34,6 +35,7 @@ export function checkValues({
framework: string | number | null;
replicates: boolean;
testVersion: TestVersion | null;
silvermanKDEEnabled: boolean;
}): {
baseRev: string;
baseRepo: Repository['name'];
Expand All @@ -43,6 +45,7 @@ export function checkValues({
frameworkName: Framework['name'];
replicates: boolean;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
} {
if (baseRev === null) {
throw new Error('The parameter baseRev is missing.');
Expand Down Expand Up @@ -99,6 +102,7 @@ export function checkValues({
frameworkName,
replicates,
testVersion,
silvermanKDEEnabled,
};
}

Expand All @@ -124,6 +128,7 @@ export function checkValues({
frameworkName,
replicates,
testVersion,
silvermanKDEEnabled,
};
}

Expand All @@ -137,6 +142,7 @@ async function fetchCompareResultsOnTreeherder({
framework,
replicates,
testVersion,
silvermanKDEEnabled,
}: {
baseRev: string;
baseRepo: Repository['name'];
Expand All @@ -145,6 +151,7 @@ async function fetchCompareResultsOnTreeherder({
framework: Framework['id'];
replicates: boolean;
testVersion?: TestVersion;
silvermanKDEEnabled: boolean;
}) {
const promises = newRevs.map((newRev, i) =>
fetchCompareResults({
Expand All @@ -155,6 +162,7 @@ async function fetchCompareResultsOnTreeherder({
framework,
replicates,
testVersion,
silvermanKDEEnabled,
}),
);
return Promise.all(promises);
Expand Down Expand Up @@ -226,6 +234,9 @@ export async function loader({ request }: { request: Request }) {
const testVersionFromUrl = url.searchParams.get(
'test_version',
) as TestVersion;
const enableSilvermanKDEFromUrl = url.searchParams.has(
'enable_silverman_kde',
);

const {
baseRev,
Expand All @@ -236,6 +247,7 @@ export async function loader({ request }: { request: Request }) {
frameworkName,
replicates,
testVersion,
silvermanKDEEnabled,
} = checkValues({
baseRev: baseRevFromUrl,
baseRepo: baseRepoFromUrl,
Expand All @@ -244,6 +256,7 @@ export async function loader({ request }: { request: Request }) {
framework: frameworkFromUrl,
replicates: replicatesFromUrl,
testVersion: testVersionFromUrl,
silvermanKDEEnabled: enableSilvermanKDEFromUrl,
});

return await getComparisonInformation(
Expand All @@ -254,6 +267,7 @@ export async function loader({ request }: { request: Request }) {
frameworkId,
frameworkName,
replicates,
silvermanKDEEnabled,
testVersion,
);
}
Expand All @@ -266,6 +280,7 @@ export async function getComparisonInformation(
frameworkId: Framework['id'],
frameworkName: Framework['name'],
replicates: boolean,
silvermanKDEEnabled: boolean,
testVersion?: TestVersion,
) {
const resultsPromise = fetchCompareResultsOnTreeherder({
Expand All @@ -276,6 +291,7 @@ export async function getComparisonInformation(
framework: frameworkId,
replicates,
testVersion,
silvermanKDEEnabled,
});

// TODO what happens if there's no result?
Expand Down Expand Up @@ -309,6 +325,7 @@ export async function getComparisonInformation(
generation: generationCounter++,
replicates,
testVersion,
silvermanKDEEnabled,
};
}

Expand All @@ -326,6 +343,7 @@ type DeferredLoaderData = {
generation: number;
replicates: boolean;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
};

// Be explicit with the returned type to control it better than if we were
Expand Down
15 changes: 15 additions & 0 deletions src/components/CompareResults/overTimeLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function checkValues({
interval,
replicates,
testVersion,
silvermanKDEEnabled,
}: {
baseRepo: Repository['name'] | null;
newRevs: string[];
Expand All @@ -34,6 +35,7 @@ function checkValues({
interval: string | number | null;
replicates: boolean;
testVersion?: TestVersion | null;
silvermanKDEEnabled: boolean;
}): {
baseRepo: Repository['name'];
newRevs: string[];
Expand All @@ -44,6 +46,7 @@ function checkValues({
intervalText: TimeRange['text'];
replicates: boolean;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
} {
if (baseRepo === null) {
throw new Error('The parameter baseRepo is missing.');
Expand Down Expand Up @@ -124,6 +127,7 @@ function checkValues({
intervalValue,
replicates,
testVersion,
silvermanKDEEnabled,
};
}

Expand All @@ -137,6 +141,7 @@ async function fetchCompareOverTimeResultsOnTreeherder({
interval,
replicates,
testVersion,
silvermanKDEEnabled,
}: {
baseRepo: Repository['name'];
newRevs: string[];
Expand All @@ -145,6 +150,7 @@ async function fetchCompareOverTimeResultsOnTreeherder({
interval: TimeRange['value'];
replicates: boolean;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
}) {
const promises = newRevs.map((newRev, i) =>
fetchCompareOverTimeResults({
Expand All @@ -155,6 +161,7 @@ async function fetchCompareOverTimeResultsOnTreeherder({
interval,
replicates,
testVersion,
silvermanKDEEnabled,
}),
);
return Promise.all(promises);
Expand Down Expand Up @@ -186,6 +193,9 @@ export async function loader({ request }: { request: Request }) {
const testVersionFromUrl = url.searchParams.get(
'test_version',
) as TestVersion;
const enableSilvermanKDEFromUrl = url.searchParams.has(
'enable_silverman_kde',
);

const {
baseRepo,
Expand All @@ -197,6 +207,7 @@ export async function loader({ request }: { request: Request }) {
intervalText,
replicates,
testVersion,
silvermanKDEEnabled,
} = checkValues({
baseRepo: baseRepoFromUrl,
newRevs: newRevsFromUrl,
Expand All @@ -205,6 +216,7 @@ export async function loader({ request }: { request: Request }) {
interval: intervalFromUrl,
replicates: replicatesFromUrl,
testVersion: testVersionFromUrl,
silvermanKDEEnabled: enableSilvermanKDEFromUrl,
});

const resultsTimePromise = fetchCompareOverTimeResultsOnTreeherder({
Expand All @@ -215,6 +227,7 @@ export async function loader({ request }: { request: Request }) {
interval: intervalValue,
replicates,
testVersion,
silvermanKDEEnabled,
});

const newRevsInfoPromises = newRevs.map((newRev, i) =>
Expand All @@ -240,6 +253,7 @@ export async function loader({ request }: { request: Request }) {
generation: generationCounter++,
replicates,
testVersion,
silvermanKDEEnabled,
};
}

Expand All @@ -257,6 +271,7 @@ type DeferredLoaderData = {
generation: number;
replicates: boolean;
testVersion: TestVersion;
silvermanKDEEnabled: boolean;
};

// Be explicit with the returned type to control it better than if we were
Expand Down
Loading