From bf0da9ccffaec7bf071896b3bfe76794ca3c30db Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Fri, 9 Jun 2023 11:08:21 +0100 Subject: [PATCH] More renaming element to property --- apps/webapp/app/presenters/ProjectPresenter.server.ts | 4 ++-- apps/webapp/app/presenters/RunPresenter.server.ts | 8 ++++---- .../route.tsx | 8 ++++---- .../route.tsx | 8 ++++---- .../RunCard.tsx | 2 +- .../TaskCard.tsx | 6 +++--- .../route.tsx | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/webapp/app/presenters/ProjectPresenter.server.ts b/apps/webapp/app/presenters/ProjectPresenter.server.ts index e218b93a4..5c1dcf892 100644 --- a/apps/webapp/app/presenters/ProjectPresenter.server.ts +++ b/apps/webapp/app/presenters/ProjectPresenter.server.ts @@ -165,10 +165,10 @@ export class ProjectPresenter { } if (alias.version.properties) { - const versionElements = z + const versionProperties = z .array(DisplayPropertySchema) .parse(alias.version.properties); - properties = [...properties, ...versionElements]; + properties = [...properties, ...versionProperties]; } return { diff --git a/apps/webapp/app/presenters/RunPresenter.server.ts b/apps/webapp/app/presenters/RunPresenter.server.ts index a9856207c..38e071deb 100644 --- a/apps/webapp/app/presenters/RunPresenter.server.ts +++ b/apps/webapp/app/presenters/RunPresenter.server.ts @@ -70,17 +70,17 @@ export class RunPresenter { } //merge the properties from the version and the run, with the run properties taking precedence - const mergedElements = new Map(); + const mergedProperties = new Map(); if (run.version.properties) { const properties = DisplayPropertiesSchema.parse(run.version.properties); for (const property of properties) { - mergedElements.set(property.label, property); + mergedProperties.set(property.label, property); } } if (run.properties) { const properties = DisplayPropertiesSchema.parse(run.properties); for (const property of properties) { - mergedElements.set(property.label, property); + mergedProperties.set(property.label, property); } } @@ -130,7 +130,7 @@ export class RunPresenter { isTest: run.isTest, version: run.version.version, output: runOutput, - properties: Array.from(mergedElements.values()), + properties: Array.from(mergedProperties.values()), environment: { type: run.environment.type, slug: run.environment.slug, diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.events.$eventParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.events.$eventParam/route.tsx index 893e921cc..24c4676d9 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.events.$eventParam/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.events.$eventParam/route.tsx @@ -10,7 +10,7 @@ import { RunPanelBody, RunPanelProperties, RunPanelHeader, - RunPanelIconElement, + RunPanelIconProperty, RunPanelIconSection, } from "../_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard"; import { EventDetailsPresenter } from "~/presenters/EventDetailsPresenter.server"; @@ -54,19 +54,19 @@ export default function Page() {
- {deliveredAt && ( - )} - +
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 830130a6d..90cf00ac8 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 @@ -14,7 +14,7 @@ import { RunPanelDescription, RunPanelProperties, RunPanelHeader, - RunPanelIconElement, + RunPanelIconProperty, RunPanelIconSection, RunPanelIconTitle, } from "../_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/RunCard"; @@ -84,21 +84,21 @@ export default function Page() {
{startedAt && ( - )} {completedAt && ( - )} {delayUntil && ( - {displayKey && ( - )} {connection && ( - {/* {connection && ( - {run.startedAt && ( - )} {run.completedAt && ( - )} {run.startedAt && run.completedAt && ( -