From d85b1fe2fdbc5cf8549fd7094a118aaf1e41b27c Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Mon, 10 Jul 2023 15:02:03 +0100 Subject: [PATCH] Moved components to the components/run folder ready for sharing --- .../run}/RunCard.tsx | 0 .../run}/TaskCard.tsx | 0 .../run}/TaskCardSkeleton.tsx | 0 .../run}/TaskStatus.tsx | 0 .../route.tsx | 8 ++++++-- .../route.tsx | 4 ++-- .../route.tsx | 2 +- .../route.tsx | 6 +++--- 8 files changed, 12 insertions(+), 8 deletions(-) rename apps/webapp/app/{routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam => components/run}/RunCard.tsx (100%) rename apps/webapp/app/{routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam => components/run}/TaskCard.tsx (100%) rename apps/webapp/app/{routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam => components/run}/TaskCardSkeleton.tsx (100%) rename apps/webapp/app/{routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam => components/run}/TaskStatus.tsx (100%) diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard.tsx b/apps/webapp/app/components/run/RunCard.tsx similarity index 100% rename from apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard.tsx rename to apps/webapp/app/components/run/RunCard.tsx diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskCard.tsx b/apps/webapp/app/components/run/TaskCard.tsx similarity index 100% rename from apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskCard.tsx rename to apps/webapp/app/components/run/TaskCard.tsx diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskCardSkeleton.tsx b/apps/webapp/app/components/run/TaskCardSkeleton.tsx similarity index 100% rename from apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskCardSkeleton.tsx rename to apps/webapp/app/components/run/TaskCardSkeleton.tsx diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskStatus.tsx b/apps/webapp/app/components/run/TaskStatus.tsx similarity index 100% rename from apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskStatus.tsx rename to apps/webapp/app/components/run/TaskStatus.tsx diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.completed/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.completed/route.tsx index 642611716..2226328b3 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.completed/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.completed/route.tsx @@ -12,7 +12,7 @@ import { RunPanelHeader, RunPanelIconProperty, RunPanelIconSection, -} from "../_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard"; +} from "../../components/run/RunCard"; export default function RunCompletedPage() { const run = useRun(); @@ -21,7 +21,11 @@ export default function RunCompletedPage() { } - title={} + title={ + + + + } /> diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.tasks.$taskParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.tasks.$taskParam/route.tsx index 51069260c..31200180c 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.tasks.$taskParam/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.tasks.$taskParam/route.tsx @@ -30,9 +30,9 @@ import { RunPanelProperties, UpdatingDelay, UpdatingDuration, -} from "../_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard"; -import { TaskStatusIcon } from "../_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/TaskStatus"; +} from "../../components/run/RunCard"; import { TaskAttemptStatusLabel } from "./TaskAttemptStatus"; +import { TaskStatusIcon } from "~/components/run/TaskStatus"; export const loader = async ({ request, params }: LoaderArgs) => { const userId = await requireUserId(request); diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.trigger/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.trigger/route.tsx index be5fedae9..4b9ab8fe1 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.trigger/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.trigger/route.tsx @@ -15,7 +15,7 @@ import { RunPanelIconProperty, RunPanelIconSection, RunPanelProperties, -} from "../_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard"; +} from "../../components/run/RunCard"; export const loader = async ({ request, params }: LoaderArgs) => { const { runParam } = RunParamsSchema.parse(params); diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx index 95fa594af..b01bf1adf 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route.tsx @@ -73,9 +73,9 @@ import { RunPanelIconSection, RunPanelIconTitle, RunPanelProperties, -} from "./RunCard"; -import { TaskCard } from "./TaskCard"; -import { TaskCardSkeleton } from "./TaskCardSkeleton"; +} from "../../components/run/RunCard"; +import { TaskCard } from "~/components/run/TaskCard"; +import { TaskCardSkeleton } from "~/components/run/TaskCardSkeleton"; export const loader = async ({ request, params }: LoaderArgs) => { const userId = await requireUserId(request);