diff --git a/src/components/DrawArea.tsx b/src/components/DrawArea.tsx index 6904166d..1d6f644f 100644 --- a/src/components/DrawArea.tsx +++ b/src/components/DrawArea.tsx @@ -32,6 +32,7 @@ const useStyles = makeStyles((theme) => ({ interface IDrawArea { type: "Baseline" | "Image" | "Diff"; imageName: string; + branchName: string; ignoreAreas: IgnoreArea[]; setIgnoreAreas: (ignoreAreas: IgnoreArea[]) => void; selectedRectId: string | undefined; @@ -55,6 +56,7 @@ interface IDrawArea { export const DrawArea: FunctionComponent = ({ type, imageName, + branchName, ignoreAreas, setIgnoreAreas, selectedRectId, @@ -124,7 +126,7 @@ export const DrawArea: FunctionComponent = ({ - + {imageStatus === "loading" && ( = ({ type, imageName }) => { +const ImageDetails: React.FunctionComponent = ({ + type, + imageName, + branchName, +}) => { const [image] = useImage(staticService.getImage(imageName)); return ( {type} {imageName ? ( - Real size: {`${image?.width} x ${image?.height}`} + + + + Real size: {`${image?.width} x ${image?.height}`} + + + + + + ) : ( - No image + No image )} ); diff --git a/src/components/TestDetailsModal.tsx b/src/components/TestDetailsModal.tsx index 98a78b73..45a3129c 100644 --- a/src/components/TestDetailsModal.tsx +++ b/src/components/TestDetailsModal.tsx @@ -319,6 +319,7 @@ const TestDetailsModal: React.FunctionComponent<{ = ({ Viewport: {testVariation.viewport} )} + + + ); diff --git a/src/pages/ProjectListPage.tsx b/src/pages/ProjectListPage.tsx index 3b3963e9..99b08f55 100644 --- a/src/pages/ProjectListPage.tsx +++ b/src/pages/ProjectListPage.tsx @@ -116,6 +116,7 @@ const ProjectsListPage = () => { Key: {project.id} Name: {project.name} + Main branch: {project.mainBranchName} Created: {formatDateTime(project.createdAt)} diff --git a/src/types/project.ts b/src/types/project.ts index dec421a5..8c50bcab 100644 --- a/src/types/project.ts +++ b/src/types/project.ts @@ -3,6 +3,7 @@ import { Build } from "./build"; export interface Project { id: string; name: string; + mainBranchName: string; builds: Build[]; updatedAt: string; createdAt: string; diff --git a/src/types/testRun.ts b/src/types/testRun.ts index 9a36171b..55b19226 100644 --- a/src/types/testRun.ts +++ b/src/types/testRun.ts @@ -17,4 +17,6 @@ export interface TestRun { device: string; ignoreAreas: string; comment?: string; + branchName: string; + baselineBranchName: string; } diff --git a/src/types/testVariation.ts b/src/types/testVariation.ts index 400ded41..30df46ba 100644 --- a/src/types/testVariation.ts +++ b/src/types/testVariation.ts @@ -4,6 +4,7 @@ export interface TestVariation { id: string; name: string; baselineName: string; + branchName: string; os: string; browser: string; viewport: string;