From 55cefe5fd89ddb26b2151c46535eb8192eb9f376 Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Thu, 20 Mar 2025 10:26:50 -0700 Subject: [PATCH 1/2] comment --- .../additionalTestInfo/TestCounts.tsx | 2 +- .../benchmark/llms/LLMsBenchmarkPage.tsx | 4 ++-- .../dashboardPicker/LLMsTimeRangePicker.tsx | 2 +- .../components/{ => commit}/CommitStatus.tsx | 8 +++---- .../{ => commit}/VersionControlLinks.tsx | 0 .../components/{ => commit}/WorkflowBox.tsx | 14 ++++++------ .../{ => commit}/WorkflowDispatcher.tsx | 0 .../components/{ => commit}/commit.module.css | 0 .../{ => common}/CheckBoxSelector.tsx | 0 torchci/components/{ => common}/CopyLink.tsx | 0 .../components/{ => common}/DrCIButton.tsx | 0 .../components/{ => common}/ErrorBoundary.tsx | 0 .../{ => common}/GranularityPicker.tsx | 0 .../components/{ => common}/LoadingPage.tsx | 0 .../{ => common}/MultiSelectPicker.tsx | 0 .../components/{ => common}/PageSelector.tsx | 0 .../{ => common}/ThemeModePicker.module.css | 0 .../{ => common}/ThemeModePicker.tsx | 0 torchci/components/{ => common}/TimeUtils.tsx | 0 .../components/{ => common}/ValuePicker.tsx | 0 .../{ => common/log}/LogAnnotationToggle.tsx | 2 +- .../components/{ => common/log}/LogViewer.tsx | 0 .../tooltipTarget}/TooltipTarget.module.css | 0 .../tooltipTarget}/TooltipTarget.tsx | 0 .../{ => hud}/GroupHudTableHeaders.tsx | 0 .../components/{ => job}/FilteredJobList.tsx | 2 +- .../{ => job}/GroupJobConclusion.tsx | 6 ++--- .../{ => job}/JobAnnotationToggle.tsx | 2 +- torchci/components/{ => job}/JobArtifact.tsx | 0 .../{ => job}/JobConclusion.module.css | 0 .../components/{ => job}/JobConclusion.tsx | 4 ++-- .../components/{ => job}/JobFilterInput.tsx | 0 .../components/{ => job}/JobLinks.module.css | 0 torchci/components/{ => job}/JobLinks.tsx | 10 ++++----- torchci/components/{ => job}/JobSummary.tsx | 0 torchci/components/{ => job}/JobTooltip.tsx | 6 ++--- .../{ => job}/ReproductionCommand.tsx | 4 ++-- .../AnnouncementBanner.module.css | 0 .../{ => layout}/AnnouncementBanner.tsx | 0 .../components/{ => layout}/DynamicTitle.tsx | 0 .../{ => layout}/LoginSection.module.css | 0 .../components/{ => layout}/LoginSection.tsx | 0 .../components/{ => layout}/NavBar.module.css | 0 torchci/components/{ => layout}/NavBar.tsx | 4 ++-- .../metrics/panels/TimeSeriesPanel.tsx | 2 +- .../{ => servReport}/SevReport.module.css | 0 .../components/{ => servReport}/SevReport.tsx | 0 torchci/lib/JobClassifierUtil.ts | 2 +- .../[repoOwner]/[repoName]/commit/[sha].tsx | 4 ++-- .../[repoName]/pull/[prNumber].tsx | 8 +++---- torchci/pages/_app.tsx | 8 +++---- .../[suite]/[compiler]/[[...page]].tsx | 4 ++-- torchci/pages/benchmark/compilers.tsx | 4 ++-- torchci/pages/benchmark/torchao.tsx | 4 ++-- torchci/pages/build_time_metrics.tsx | 4 ++-- torchci/pages/cost_analysis.tsx | 4 ++-- torchci/pages/disabled.tsx | 6 ++--- .../[repoName]/[branch]/[[...page]].tsx | 8 +++---- torchci/pages/failure.tsx | 10 ++++----- .../[repoName]/[branch]/[[...page]].tsx | 22 +++++++++---------- torchci/pages/metrics.tsx | 2 +- .../[repoName]/[branch]/[[...page]].tsx | 18 +++++++-------- torchci/pages/query_execution_metrics.tsx | 4 ++-- .../[repoOwner]/[repoName]/[[...page]].tsx | 4 ++-- torchci/pages/sli.tsx | 4 ++-- torchci/pages/tests/search.tsx | 2 +- torchci/pages/tests/testInfo.tsx | 8 +++---- .../[repoName]/[branch]/[[...page]].tsx | 8 +++---- .../[jobId]/[attempt]/[[...page]].tsx | 2 +- 69 files changed, 106 insertions(+), 106 deletions(-) rename torchci/components/{ => commit}/CommitStatus.tsx (95%) rename torchci/components/{ => commit}/VersionControlLinks.tsx (100%) rename torchci/components/{ => commit}/WorkflowBox.tsx (96%) rename torchci/components/{ => commit}/WorkflowDispatcher.tsx (100%) rename torchci/components/{ => commit}/commit.module.css (100%) rename torchci/components/{ => common}/CheckBoxSelector.tsx (100%) rename torchci/components/{ => common}/CopyLink.tsx (100%) rename torchci/components/{ => common}/DrCIButton.tsx (100%) rename torchci/components/{ => common}/ErrorBoundary.tsx (100%) rename torchci/components/{ => common}/GranularityPicker.tsx (100%) rename torchci/components/{ => common}/LoadingPage.tsx (100%) rename torchci/components/{ => common}/MultiSelectPicker.tsx (100%) rename torchci/components/{ => common}/PageSelector.tsx (100%) rename torchci/components/{ => common}/ThemeModePicker.module.css (100%) rename torchci/components/{ => common}/ThemeModePicker.tsx (100%) rename torchci/components/{ => common}/TimeUtils.tsx (100%) rename torchci/components/{ => common}/ValuePicker.tsx (100%) rename torchci/components/{ => common/log}/LogAnnotationToggle.tsx (96%) rename torchci/components/{ => common/log}/LogViewer.tsx (100%) rename torchci/components/{ => common/tooltipTarget}/TooltipTarget.module.css (100%) rename torchci/components/{ => common/tooltipTarget}/TooltipTarget.tsx (100%) rename torchci/components/{ => hud}/GroupHudTableHeaders.tsx (100%) rename torchci/components/{ => job}/FilteredJobList.tsx (97%) rename torchci/components/{ => job}/GroupJobConclusion.tsx (98%) rename torchci/components/{ => job}/JobAnnotationToggle.tsx (96%) rename torchci/components/{ => job}/JobArtifact.tsx (100%) rename torchci/components/{ => job}/JobConclusion.module.css (100%) rename torchci/components/{ => job}/JobConclusion.tsx (95%) rename torchci/components/{ => job}/JobFilterInput.tsx (100%) rename torchci/components/{ => job}/JobLinks.module.css (100%) rename torchci/components/{ => job}/JobLinks.tsx (96%) rename torchci/components/{ => job}/JobSummary.tsx (100%) rename torchci/components/{ => job}/JobTooltip.tsx (80%) rename torchci/components/{ => job}/ReproductionCommand.tsx (94%) rename torchci/components/{ => layout}/AnnouncementBanner.module.css (100%) rename torchci/components/{ => layout}/AnnouncementBanner.tsx (100%) rename torchci/components/{ => layout}/DynamicTitle.tsx (100%) rename torchci/components/{ => layout}/LoginSection.module.css (100%) rename torchci/components/{ => layout}/LoginSection.tsx (100%) rename torchci/components/{ => layout}/NavBar.module.css (100%) rename torchci/components/{ => layout}/NavBar.tsx (97%) rename torchci/components/{ => servReport}/SevReport.module.css (100%) rename torchci/components/{ => servReport}/SevReport.tsx (100%) diff --git a/torchci/components/additionalTestInfo/TestCounts.tsx b/torchci/components/additionalTestInfo/TestCounts.tsx index 1cd65761d6..7cc02857a8 100644 --- a/torchci/components/additionalTestInfo/TestCounts.tsx +++ b/torchci/components/additionalTestInfo/TestCounts.tsx @@ -1,5 +1,5 @@ import { DataGrid, GridRenderCellParams } from "@mui/x-data-grid"; -import { durationDisplay } from "components/TimeUtils"; +import { durationDisplay } from "components/common/TimeUtils"; import { fetcher } from "lib/GeneralUtils"; import { JobData } from "lib/types"; import _ from "lodash"; diff --git a/torchci/components/benchmark/llms/LLMsBenchmarkPage.tsx b/torchci/components/benchmark/llms/LLMsBenchmarkPage.tsx index d6e8e0dcbc..0b43ca1d3b 100644 --- a/torchci/components/benchmark/llms/LLMsBenchmarkPage.tsx +++ b/torchci/components/benchmark/llms/LLMsBenchmarkPage.tsx @@ -4,7 +4,7 @@ import { LAST_N_DAYS, MAIN_BRANCH, } from "components/benchmark/common"; -import CopyLink from "components/CopyLink"; +import CopyLink from "components/common/CopyLink"; import { Granularity } from "components/metrics/panels/TimeSeriesPanel"; import dayjs from "dayjs"; import _, { cloneDeep } from "lodash"; @@ -13,7 +13,7 @@ import { ParsedUrlQuery } from "querystring"; import { useEffect, useReducer, useState } from "react"; import { propsReducer } from "./context/BenchmarkProps"; -import LoadingPage from "components/LoadingPage"; +import LoadingPage from "components/common/LoadingPage"; import { DEFAULT_ARCH_NAME, DEFAULT_BACKEND_NAME, diff --git a/torchci/components/benchmark/llms/components/dashboardPicker/LLMsTimeRangePicker.tsx b/torchci/components/benchmark/llms/components/dashboardPicker/LLMsTimeRangePicker.tsx index c442e3f03e..12aa944fee 100644 --- a/torchci/components/benchmark/llms/components/dashboardPicker/LLMsTimeRangePicker.tsx +++ b/torchci/components/benchmark/llms/components/dashboardPicker/LLMsTimeRangePicker.tsx @@ -1,4 +1,4 @@ -import GranularityPicker from "components/GranularityPicker"; +import GranularityPicker from "components/common/GranularityPicker"; import { TimeRangePicker } from "pages/metrics"; import { Dispatch } from "react"; export const LLMsTimeRangePicker = ({ diff --git a/torchci/components/CommitStatus.tsx b/torchci/components/commit/CommitStatus.tsx similarity index 95% rename from torchci/components/CommitStatus.tsx rename to torchci/components/commit/CommitStatus.tsx index 00e5902c61..1fdcb35a31 100644 --- a/torchci/components/CommitStatus.tsx +++ b/torchci/components/commit/CommitStatus.tsx @@ -1,4 +1,4 @@ -import styles from "components/commit.module.css"; +import styles from "components/commit/commit.module.css"; import { isFailedJob, isRerunDisabledTestsJob, @@ -9,9 +9,9 @@ import useScrollTo from "lib/useScrollTo"; import _ from "lodash"; import { useState } from "react"; import { linkIt, UrlComponent, urlRegex } from "react-linkify-it"; -import { getConclusionSeverityForSorting } from "../lib/JobClassifierUtil"; -import FilteredJobList from "./FilteredJobList"; -import { JobStatus } from "./GroupJobConclusion"; +import { getConclusionSeverityForSorting } from "../../lib/JobClassifierUtil"; +import FilteredJobList from "../job/FilteredJobList"; +import { JobStatus } from "../job/GroupJobConclusion"; import VersionControlLinks from "./VersionControlLinks"; import WorkflowBox from "./WorkflowBox"; import WorkflowDispatcher from "./WorkflowDispatcher"; diff --git a/torchci/components/VersionControlLinks.tsx b/torchci/components/commit/VersionControlLinks.tsx similarity index 100% rename from torchci/components/VersionControlLinks.tsx rename to torchci/components/commit/VersionControlLinks.tsx diff --git a/torchci/components/WorkflowBox.tsx b/torchci/components/commit/WorkflowBox.tsx similarity index 96% rename from torchci/components/WorkflowBox.tsx rename to torchci/components/commit/WorkflowBox.tsx index 48f4685c06..40be09b1d2 100644 --- a/torchci/components/WorkflowBox.tsx +++ b/torchci/components/commit/WorkflowBox.tsx @@ -1,5 +1,5 @@ import { Button, styled } from "@mui/material"; -import styles from "components/commit.module.css"; +import styles from "components/commit/commit.module.css"; import { fetcher } from "lib/GeneralUtils"; import { isFailedJob } from "lib/jobUtils"; import { getSearchRes, LogSearchResult } from "lib/searchLogs"; @@ -10,12 +10,12 @@ import { } from "lib/utilization/types"; import React, { useEffect, useState } from "react"; import useSWR from "swr"; -import { getConclusionSeverityForSorting } from "../lib/JobClassifierUtil"; -import { TestInfo } from "./additionalTestInfo/TestInfo"; -import JobArtifact from "./JobArtifact"; -import JobSummary from "./JobSummary"; -import LogViewer, { SearchLogViewer } from "./LogViewer"; -import { durationDisplay } from "./TimeUtils"; +import { getConclusionSeverityForSorting } from "../../lib/JobClassifierUtil"; +import { TestInfo } from "../additionalTestInfo/TestInfo"; +import JobArtifact from "../job/JobArtifact"; +import JobSummary from "../job/JobSummary"; +import LogViewer, { SearchLogViewer } from "../common/log/LogViewer"; +import { durationDisplay } from "../common/TimeUtils"; function sortJobsByConclusion(jobA: JobData, jobB: JobData): number { // Show failed jobs first, then pending jobs, then successful jobs diff --git a/torchci/components/WorkflowDispatcher.tsx b/torchci/components/commit/WorkflowDispatcher.tsx similarity index 100% rename from torchci/components/WorkflowDispatcher.tsx rename to torchci/components/commit/WorkflowDispatcher.tsx diff --git a/torchci/components/commit.module.css b/torchci/components/commit/commit.module.css similarity index 100% rename from torchci/components/commit.module.css rename to torchci/components/commit/commit.module.css diff --git a/torchci/components/CheckBoxSelector.tsx b/torchci/components/common/CheckBoxSelector.tsx similarity index 100% rename from torchci/components/CheckBoxSelector.tsx rename to torchci/components/common/CheckBoxSelector.tsx diff --git a/torchci/components/CopyLink.tsx b/torchci/components/common/CopyLink.tsx similarity index 100% rename from torchci/components/CopyLink.tsx rename to torchci/components/common/CopyLink.tsx diff --git a/torchci/components/DrCIButton.tsx b/torchci/components/common/DrCIButton.tsx similarity index 100% rename from torchci/components/DrCIButton.tsx rename to torchci/components/common/DrCIButton.tsx diff --git a/torchci/components/ErrorBoundary.tsx b/torchci/components/common/ErrorBoundary.tsx similarity index 100% rename from torchci/components/ErrorBoundary.tsx rename to torchci/components/common/ErrorBoundary.tsx diff --git a/torchci/components/GranularityPicker.tsx b/torchci/components/common/GranularityPicker.tsx similarity index 100% rename from torchci/components/GranularityPicker.tsx rename to torchci/components/common/GranularityPicker.tsx diff --git a/torchci/components/LoadingPage.tsx b/torchci/components/common/LoadingPage.tsx similarity index 100% rename from torchci/components/LoadingPage.tsx rename to torchci/components/common/LoadingPage.tsx diff --git a/torchci/components/MultiSelectPicker.tsx b/torchci/components/common/MultiSelectPicker.tsx similarity index 100% rename from torchci/components/MultiSelectPicker.tsx rename to torchci/components/common/MultiSelectPicker.tsx diff --git a/torchci/components/PageSelector.tsx b/torchci/components/common/PageSelector.tsx similarity index 100% rename from torchci/components/PageSelector.tsx rename to torchci/components/common/PageSelector.tsx diff --git a/torchci/components/ThemeModePicker.module.css b/torchci/components/common/ThemeModePicker.module.css similarity index 100% rename from torchci/components/ThemeModePicker.module.css rename to torchci/components/common/ThemeModePicker.module.css diff --git a/torchci/components/ThemeModePicker.tsx b/torchci/components/common/ThemeModePicker.tsx similarity index 100% rename from torchci/components/ThemeModePicker.tsx rename to torchci/components/common/ThemeModePicker.tsx diff --git a/torchci/components/TimeUtils.tsx b/torchci/components/common/TimeUtils.tsx similarity index 100% rename from torchci/components/TimeUtils.tsx rename to torchci/components/common/TimeUtils.tsx diff --git a/torchci/components/ValuePicker.tsx b/torchci/components/common/ValuePicker.tsx similarity index 100% rename from torchci/components/ValuePicker.tsx rename to torchci/components/common/ValuePicker.tsx diff --git a/torchci/components/LogAnnotationToggle.tsx b/torchci/components/common/log/LogAnnotationToggle.tsx similarity index 96% rename from torchci/components/LogAnnotationToggle.tsx rename to torchci/components/common/log/LogAnnotationToggle.tsx index 0592925858..a6e2526ed7 100644 --- a/torchci/components/LogAnnotationToggle.tsx +++ b/torchci/components/common/log/LogAnnotationToggle.tsx @@ -1,7 +1,7 @@ import { ToggleButton, ToggleButtonGroup } from "@mui/material"; import { useSession } from "next-auth/react"; import React from "react"; -import { JobData, LogAnnotation } from "../lib/types"; +import { JobData, LogAnnotation } from "../../../lib/types"; export default function LogAnnotationToggle({ job, diff --git a/torchci/components/LogViewer.tsx b/torchci/components/common/log/LogViewer.tsx similarity index 100% rename from torchci/components/LogViewer.tsx rename to torchci/components/common/log/LogViewer.tsx diff --git a/torchci/components/TooltipTarget.module.css b/torchci/components/common/tooltipTarget/TooltipTarget.module.css similarity index 100% rename from torchci/components/TooltipTarget.module.css rename to torchci/components/common/tooltipTarget/TooltipTarget.module.css diff --git a/torchci/components/TooltipTarget.tsx b/torchci/components/common/tooltipTarget/TooltipTarget.tsx similarity index 100% rename from torchci/components/TooltipTarget.tsx rename to torchci/components/common/tooltipTarget/TooltipTarget.tsx diff --git a/torchci/components/GroupHudTableHeaders.tsx b/torchci/components/hud/GroupHudTableHeaders.tsx similarity index 100% rename from torchci/components/GroupHudTableHeaders.tsx rename to torchci/components/hud/GroupHudTableHeaders.tsx diff --git a/torchci/components/FilteredJobList.tsx b/torchci/components/job/FilteredJobList.tsx similarity index 97% rename from torchci/components/FilteredJobList.tsx rename to torchci/components/job/FilteredJobList.tsx index c34c80c04c..1d3c7a62f0 100644 --- a/torchci/components/FilteredJobList.tsx +++ b/torchci/components/job/FilteredJobList.tsx @@ -6,7 +6,7 @@ import useSWR from "swr"; import JobAnnotationToggle from "./JobAnnotationToggle"; import JobLinks from "./JobLinks"; import JobSummary from "./JobSummary"; -import LogViewer from "./LogViewer"; +import LogViewer from "../common/log/LogViewer"; function FailedJobInfo({ job, diff --git a/torchci/components/GroupJobConclusion.tsx b/torchci/components/job/GroupJobConclusion.tsx similarity index 98% rename from torchci/components/GroupJobConclusion.tsx rename to torchci/components/job/GroupJobConclusion.tsx index 8bcd0e8582..d7586b3bf0 100644 --- a/torchci/components/GroupJobConclusion.tsx +++ b/torchci/components/job/GroupJobConclusion.tsx @@ -1,4 +1,4 @@ -import TooltipTarget from "components/TooltipTarget"; +import TooltipTarget from "components/common/tooltipTarget/TooltipTarget"; import { getGroupConclusionChar } from "lib/JobClassifierUtil"; import { isFailedJob, @@ -11,10 +11,10 @@ import { PinnedTooltipContext, } from "pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]"; import { useContext } from "react"; -import hudStyles from "./hud.module.css"; +import hudStyles from "../hud.module.css"; import { getFailureEl } from "./JobConclusion"; import styles from "./JobConclusion.module.css"; -import { SingleWorkflowDispatcher } from "./WorkflowDispatcher"; +import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher"; export enum JobStatus { Success = "success", diff --git a/torchci/components/JobAnnotationToggle.tsx b/torchci/components/job/JobAnnotationToggle.tsx similarity index 96% rename from torchci/components/JobAnnotationToggle.tsx rename to torchci/components/job/JobAnnotationToggle.tsx index c5fd4ec403..297ebfb43f 100644 --- a/torchci/components/JobAnnotationToggle.tsx +++ b/torchci/components/job/JobAnnotationToggle.tsx @@ -2,7 +2,7 @@ import { ToggleButton, ToggleButtonGroup } from "@mui/material"; import _ from "lodash"; import { useSession } from "next-auth/react"; import React from "react"; -import { JobAnnotation, JobData } from "../lib/types"; +import { JobAnnotation, JobData } from "../../lib/types"; export default function JobAnnotationToggle({ job, diff --git a/torchci/components/JobArtifact.tsx b/torchci/components/job/JobArtifact.tsx similarity index 100% rename from torchci/components/JobArtifact.tsx rename to torchci/components/job/JobArtifact.tsx diff --git a/torchci/components/JobConclusion.module.css b/torchci/components/job/JobConclusion.module.css similarity index 100% rename from torchci/components/JobConclusion.module.css rename to torchci/components/job/JobConclusion.module.css diff --git a/torchci/components/JobConclusion.tsx b/torchci/components/job/JobConclusion.tsx similarity index 95% rename from torchci/components/JobConclusion.tsx rename to torchci/components/job/JobConclusion.tsx index 1123b7635c..1604623595 100644 --- a/torchci/components/JobConclusion.tsx +++ b/torchci/components/job/JobConclusion.tsx @@ -1,7 +1,7 @@ import { getConclusionChar } from "lib/JobClassifierUtil"; import { useContext } from "react"; -import { JobData } from "../lib/types"; -import { MonsterFailuresContext } from "../pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]"; +import { JobData } from "../../lib/types"; +import { MonsterFailuresContext } from "../../pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]"; import { JobStatus } from "./GroupJobConclusion"; import styles from "./JobConclusion.module.css"; diff --git a/torchci/components/JobFilterInput.tsx b/torchci/components/job/JobFilterInput.tsx similarity index 100% rename from torchci/components/JobFilterInput.tsx rename to torchci/components/job/JobFilterInput.tsx diff --git a/torchci/components/JobLinks.module.css b/torchci/components/job/JobLinks.module.css similarity index 100% rename from torchci/components/JobLinks.module.css rename to torchci/components/job/JobLinks.module.css diff --git a/torchci/components/JobLinks.tsx b/torchci/components/job/JobLinks.tsx similarity index 96% rename from torchci/components/JobLinks.tsx rename to torchci/components/job/JobLinks.tsx index 521887252b..c9796eef19 100644 --- a/torchci/components/JobLinks.tsx +++ b/torchci/components/job/JobLinks.tsx @@ -2,13 +2,13 @@ import dayjs from "dayjs"; import { useSession } from "next-auth/react"; import { IssueLabelApiResponse } from "pages/api/issue/[label]"; import useSWR from "swr"; -import { isFailure, IsJobInProgress } from "../lib/JobClassifierUtil"; -import { isFailedJob, transformJobName } from "../lib/jobUtils"; -import { IssueData, JobData } from "../lib/types"; -import CopyLink from "./CopyLink"; +import { isFailure, IsJobInProgress } from "../../lib/JobClassifierUtil"; +import { isFailedJob, transformJobName } from "../../lib/jobUtils"; +import { IssueData, JobData } from "../../lib/types"; +import CopyLink from "../common/CopyLink"; import styles from "./JobLinks.module.css"; import ReproductionCommand from "./ReproductionCommand"; -import { durationDisplay, LocalTimeHuman } from "./TimeUtils"; +import { durationDisplay, LocalTimeHuman } from "../common/TimeUtils"; const DEFAULT_REPO = "pytorch/pytorch"; function getRepoFromHtmlURL(htmlUrl?: string) { diff --git a/torchci/components/JobSummary.tsx b/torchci/components/job/JobSummary.tsx similarity index 100% rename from torchci/components/JobSummary.tsx rename to torchci/components/job/JobSummary.tsx diff --git a/torchci/components/JobTooltip.tsx b/torchci/components/job/JobTooltip.tsx similarity index 80% rename from torchci/components/JobTooltip.tsx rename to torchci/components/job/JobTooltip.tsx index 54ae9d4fc5..91ffe41358 100644 --- a/torchci/components/JobTooltip.tsx +++ b/torchci/components/job/JobTooltip.tsx @@ -1,7 +1,7 @@ -import { JobData } from "../lib/types"; +import { JobData } from "../../lib/types"; import JobLinks from "./JobLinks"; -import LogViewer from "./LogViewer"; -import { SingleWorkflowDispatcher } from "./WorkflowDispatcher"; +import LogViewer from "../common/log/LogViewer"; +import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher"; export default function JobTooltip({ job, diff --git a/torchci/components/ReproductionCommand.tsx b/torchci/components/job/ReproductionCommand.tsx similarity index 94% rename from torchci/components/ReproductionCommand.tsx rename to torchci/components/job/ReproductionCommand.tsx index 6cc7806893..189b9b644d 100644 --- a/torchci/components/ReproductionCommand.tsx +++ b/torchci/components/job/ReproductionCommand.tsx @@ -1,7 +1,7 @@ import { IsJobInProgress } from "lib/JobClassifierUtil"; import { useEffect, useState } from "react"; -import { JobData } from "../lib/types"; -import CopyLink from "./CopyLink"; +import { JobData } from "../../lib/types"; +import CopyLink from "../common/CopyLink"; import { getTestName } from "./JobLinks"; export default function ReproductionCommand({ job }: { job: JobData }) { diff --git a/torchci/components/AnnouncementBanner.module.css b/torchci/components/layout/AnnouncementBanner.module.css similarity index 100% rename from torchci/components/AnnouncementBanner.module.css rename to torchci/components/layout/AnnouncementBanner.module.css diff --git a/torchci/components/AnnouncementBanner.tsx b/torchci/components/layout/AnnouncementBanner.tsx similarity index 100% rename from torchci/components/AnnouncementBanner.tsx rename to torchci/components/layout/AnnouncementBanner.tsx diff --git a/torchci/components/DynamicTitle.tsx b/torchci/components/layout/DynamicTitle.tsx similarity index 100% rename from torchci/components/DynamicTitle.tsx rename to torchci/components/layout/DynamicTitle.tsx diff --git a/torchci/components/LoginSection.module.css b/torchci/components/layout/LoginSection.module.css similarity index 100% rename from torchci/components/LoginSection.module.css rename to torchci/components/layout/LoginSection.module.css diff --git a/torchci/components/LoginSection.tsx b/torchci/components/layout/LoginSection.tsx similarity index 100% rename from torchci/components/LoginSection.tsx rename to torchci/components/layout/LoginSection.tsx diff --git a/torchci/components/NavBar.module.css b/torchci/components/layout/NavBar.module.css similarity index 100% rename from torchci/components/NavBar.module.css rename to torchci/components/layout/NavBar.module.css diff --git a/torchci/components/NavBar.tsx b/torchci/components/layout/NavBar.tsx similarity index 97% rename from torchci/components/NavBar.tsx rename to torchci/components/layout/NavBar.tsx index dafbe87fb8..6d58c03e7f 100644 --- a/torchci/components/NavBar.tsx +++ b/torchci/components/layout/NavBar.tsx @@ -1,9 +1,9 @@ -import styles from "components/NavBar.module.css"; +import styles from "components/layout/NavBar.module.css"; import Link from "next/link"; import { useState } from "react"; import { AiFillGithub } from "react-icons/ai"; import LoginSection from "./LoginSection"; -import ThemeModePicker from "./ThemeModePicker"; +import ThemeModePicker from "../common/ThemeModePicker"; const NavBarDropdown = ({ title, diff --git a/torchci/components/metrics/panels/TimeSeriesPanel.tsx b/torchci/components/metrics/panels/TimeSeriesPanel.tsx index b9127eecb9..d6b231a20f 100644 --- a/torchci/components/metrics/panels/TimeSeriesPanel.tsx +++ b/torchci/components/metrics/panels/TimeSeriesPanel.tsx @@ -3,7 +3,7 @@ */ import { Paper, Skeleton } from "@mui/material"; -import { formatTimeForCharts, TIME_DISPLAY_FORMAT } from "components/TimeUtils"; +import { formatTimeForCharts, TIME_DISPLAY_FORMAT } from "components/common/TimeUtils"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { EChartsOption } from "echarts"; diff --git a/torchci/components/SevReport.module.css b/torchci/components/servReport/SevReport.module.css similarity index 100% rename from torchci/components/SevReport.module.css rename to torchci/components/servReport/SevReport.module.css diff --git a/torchci/components/SevReport.tsx b/torchci/components/servReport/SevReport.tsx similarity index 100% rename from torchci/components/SevReport.tsx rename to torchci/components/servReport/SevReport.tsx diff --git a/torchci/lib/JobClassifierUtil.ts b/torchci/lib/JobClassifierUtil.ts index 654143879c..49e7c70827 100644 --- a/torchci/lib/JobClassifierUtil.ts +++ b/torchci/lib/JobClassifierUtil.ts @@ -1,4 +1,4 @@ -import { GroupedJobStatus, JobStatus } from "components/GroupJobConclusion"; +import { GroupedJobStatus, JobStatus } from "components/job/GroupJobConclusion"; import { getOpenUnstableIssues } from "lib/jobUtils"; import { IssueData, RowData } from "./types"; diff --git a/torchci/pages/[repoOwner]/[repoName]/commit/[sha].tsx b/torchci/pages/[repoOwner]/[repoName]/commit/[sha].tsx index 674a5d27d5..438012912c 100644 --- a/torchci/pages/[repoOwner]/[repoName]/commit/[sha].tsx +++ b/torchci/pages/[repoOwner]/[repoName]/commit/[sha].tsx @@ -1,5 +1,5 @@ -import CommitStatus from "components/CommitStatus"; -import { useSetTitle } from "components/DynamicTitle"; +import CommitStatus from "components/commit/CommitStatus"; +import { useSetTitle } from "components/layout/DynamicTitle"; import { fetcher } from "lib/GeneralUtils"; import { useRouter } from "next/router"; import { CommitApiResponse } from "pages/api/[repoOwner]/[repoName]/commit/[sha]"; diff --git a/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx b/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx index b1a5ba5256..9224cbfa6f 100644 --- a/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx +++ b/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx @@ -1,8 +1,8 @@ import { Stack } from "@mui/material"; -import CommitStatus from "components/CommitStatus"; -import DrCIButton from "components/DrCIButton"; -import { useSetTitle } from "components/DynamicTitle"; -import ErrorBoundary from "components/ErrorBoundary"; +import CommitStatus from "components/commit/CommitStatus"; +import DrCIButton from "components/common/DrCIButton"; +import { useSetTitle } from "components/layout/DynamicTitle"; +import ErrorBoundary from "components/common/ErrorBoundary"; import { PRData } from "lib/types"; import { useRouter } from "next/router"; import { CommitApiResponse } from "pages/api/[repoOwner]/[repoName]/commit/[sha]"; diff --git a/torchci/pages/_app.tsx b/torchci/pages/_app.tsx index f628927c73..a262822b16 100644 --- a/torchci/pages/_app.tsx +++ b/torchci/pages/_app.tsx @@ -1,10 +1,10 @@ import CssBaseline from "@mui/material/CssBaseline"; import { ThemeProvider } from "@mui/material/styles"; import { Analytics } from "@vercel/analytics/react"; -import AnnouncementBanner from "components/AnnouncementBanner"; -import TitleProvider from "components/DynamicTitle"; -import NavBar from "components/NavBar"; -import SevReport from "components/SevReport"; +import AnnouncementBanner from "components/layout/AnnouncementBanner"; +import TitleProvider from "components/layout/DynamicTitle"; +import NavBar from "components/layout/NavBar"; +import SevReport from "components/servReport/SevReport"; import { DarkModeProvider } from "lib/DarkModeContext"; import { track } from "lib/track"; import { SessionProvider } from "next-auth/react"; diff --git a/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx b/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx index 0920760dc5..a878da1f96 100644 --- a/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx +++ b/torchci/pages/benchmark/[suite]/[compiler]/[[...page]].tsx @@ -25,8 +25,8 @@ import { MODES, } from "components/benchmark/ModeAndDTypePicker"; import { QUANTIZATIONS } from "components/benchmark/torchao/common"; -import CopyLink from "components/CopyLink"; -import GranularityPicker from "components/GranularityPicker"; +import CopyLink from "components/common/CopyLink"; +import GranularityPicker from "components/common/GranularityPicker"; import { Granularity } from "components/metrics/panels/TimeSeriesPanel"; import dayjs from "dayjs"; import { diff --git a/torchci/pages/benchmark/compilers.tsx b/torchci/pages/benchmark/compilers.tsx index e2926b2d44..67991abfb5 100644 --- a/torchci/pages/benchmark/compilers.tsx +++ b/torchci/pages/benchmark/compilers.tsx @@ -24,8 +24,8 @@ import { ModePicker, MODES, } from "components/benchmark/ModeAndDTypePicker"; -import CopyLink from "components/CopyLink"; -import GranularityPicker from "components/GranularityPicker"; +import CopyLink from "components/common/CopyLink"; +import GranularityPicker from "components/common/GranularityPicker"; import { Granularity } from "components/metrics/panels/TimeSeriesPanel"; import dayjs from "dayjs"; import { augmentData } from "lib/benchmark/compilerUtils"; diff --git a/torchci/pages/benchmark/torchao.tsx b/torchci/pages/benchmark/torchao.tsx index 720e5ae6c8..418fe526f0 100644 --- a/torchci/pages/benchmark/torchao.tsx +++ b/torchci/pages/benchmark/torchao.tsx @@ -14,8 +14,8 @@ import { QUANTIZATIONS, } from "components/benchmark/torchao/common"; import { SUITES } from "components/benchmark/torchao/SuitePicker"; -import CopyLink from "components/CopyLink"; -import GranularityPicker from "components/GranularityPicker"; +import CopyLink from "components/common/CopyLink"; +import GranularityPicker from "components/common/GranularityPicker"; import { Granularity } from "components/metrics/panels/TimeSeriesPanel"; import dayjs from "dayjs"; import { convertToCompilerPerformanceData } from "lib/benchmark/compilerUtils"; diff --git a/torchci/pages/build_time_metrics.tsx b/torchci/pages/build_time_metrics.tsx index 7f9a73f814..c616379119 100644 --- a/torchci/pages/build_time_metrics.tsx +++ b/torchci/pages/build_time_metrics.tsx @@ -7,9 +7,9 @@ import { } from "@mui/material"; import { BarChart } from "@mui/x-charts"; import CheckBoxList from "components/common/CheckBoxList"; -import LoadingPage from "components/LoadingPage"; +import LoadingPage from "components/common/LoadingPage"; import { TimeSeriesPanelWithData } from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay, formatTimeForCharts } from "components/TimeUtils"; +import { durationDisplay, formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { useClickHouseAPIImmutable } from "lib/GeneralUtils"; diff --git a/torchci/pages/cost_analysis.tsx b/torchci/pages/cost_analysis.tsx index be9933c837..7b5eb37985 100644 --- a/torchci/pages/cost_analysis.tsx +++ b/torchci/pages/cost_analysis.tsx @@ -16,12 +16,12 @@ import { } from "@mui/material"; import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; -import CopyLink from "components/CopyLink"; +import CopyLink from "components/common/CopyLink"; import TimeSeriesPanel, { ChartType, Granularity, } from "components/metrics/panels/TimeSeriesPanel"; -import MultiSelectPicker from "components/MultiSelectPicker"; +import MultiSelectPicker from "components/common/MultiSelectPicker"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import _ from "lodash"; diff --git a/torchci/pages/disabled.tsx b/torchci/pages/disabled.tsx index 4796b6740b..72b4c0fcb3 100644 --- a/torchci/pages/disabled.tsx +++ b/torchci/pages/disabled.tsx @@ -1,13 +1,13 @@ import { Grid2, Stack, Typography } from "@mui/material"; import { GridCellParams, GridRenderCellParams } from "@mui/x-data-grid"; -import CopyLink from "components/CopyLink"; -import GranularityPicker from "components/GranularityPicker"; +import CopyLink from "components/common/CopyLink"; +import GranularityPicker from "components/common/GranularityPicker"; import styles from "components/metrics.module.css"; import { TablePanelWithData } from "components/metrics/panels/TablePanel"; import TimeSeriesPanel, { Granularity, } from "components/metrics/panels/TimeSeriesPanel"; -import ValuePicker from "components/ValuePicker"; +import ValuePicker from "components/common/ValuePicker"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import _ from "lodash"; diff --git a/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index 7c37c1114b..a726aa1d44 100644 --- a/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,8 +1,8 @@ import { Skeleton, Stack, Typography } from "@mui/material"; -import JobAnnotationToggle from "components/JobAnnotationToggle"; -import JobLinks from "components/JobLinks"; -import JobSummary from "components/JobSummary"; -import LogViewer from "components/LogViewer"; +import JobAnnotationToggle from "components/job/JobAnnotationToggle"; +import JobLinks from "components/job/JobLinks"; +import JobSummary from "components/job/JobSummary"; +import LogViewer from "components/common/log/LogViewer"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import { isRerunDisabledTestsJob, isUnstableJob } from "lib/jobUtils"; diff --git a/torchci/pages/failure.tsx b/torchci/pages/failure.tsx index 62484f366e..fef64d4267 100644 --- a/torchci/pages/failure.tsx +++ b/torchci/pages/failure.tsx @@ -1,10 +1,10 @@ import { Button, TextField } from "@mui/material"; import { Box, Stack } from "@mui/system"; -import CheckBoxSelector from "components/CheckBoxSelector"; -import JobLinks from "components/JobLinks"; -import JobSummary from "components/JobSummary"; -import LoadingPage from "components/LoadingPage"; -import LogViewer from "components/LogViewer"; +import CheckBoxSelector from "components/common/CheckBoxSelector"; +import JobLinks from "components/job/JobLinks"; +import JobSummary from "components/job/JobSummary"; +import LoadingPage from "components/common/LoadingPage"; +import LogViewer from "components/common/log/LogViewer"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { encodeParams } from "lib/GeneralUtils"; diff --git a/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index 05eb794efa..53b214bbf9 100644 --- a/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,19 +1,19 @@ -import CheckBoxSelector from "components/CheckBoxSelector"; -import CopyLink from "components/CopyLink"; +import CheckBoxSelector from "components/common/CheckBoxSelector"; +import CopyLink from "components/common/CopyLink"; import { GroupHudTableColumns, GroupHudTableHeader, passesGroupFilter, -} from "components/GroupHudTableHeaders"; -import HudGroupedCell from "components/GroupJobConclusion"; +} from "components/hud/GroupHudTableHeaders"; +import HudGroupedCell from "components/job/GroupJobConclusion"; import styles from "components/hud.module.css"; -import JobConclusion from "components/JobConclusion"; -import JobFilterInput from "components/JobFilterInput"; -import JobTooltip from "components/JobTooltip"; -import LoadingPage from "components/LoadingPage"; -import PageSelector from "components/PageSelector"; -import { LocalTimeHuman } from "components/TimeUtils"; -import TooltipTarget from "components/TooltipTarget"; +import JobConclusion from "components/job/JobConclusion"; +import JobFilterInput from "components/job/JobFilterInput"; +import JobTooltip from "components/job/JobTooltip"; +import LoadingPage from "components/common/LoadingPage"; +import PageSelector from "components/common/PageSelector"; +import { LocalTimeHuman } from "components/common/TimeUtils"; +import TooltipTarget from "components/common/tooltipTarget/TooltipTarget"; import { fetcher } from "lib/GeneralUtils"; import { getGroupingData, diff --git a/torchci/pages/metrics.tsx b/torchci/pages/metrics.tsx index 862e8b496a..20a55e1e7b 100644 --- a/torchci/pages/metrics.tsx +++ b/torchci/pages/metrics.tsx @@ -18,7 +18,7 @@ import ScalarPanel, { } from "components/metrics/panels/ScalarPanel"; import TablePanel from "components/metrics/panels/TablePanel"; import TimeSeriesPanel from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay } from "components/TimeUtils"; +import { durationDisplay } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { EChartsOption } from "echarts"; import ReactECharts from "echarts-for-react"; diff --git a/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index fb28202023..45d90cceba 100644 --- a/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,13 +1,13 @@ -import CopyLink from "components/CopyLink"; -import { JobStatus } from "components/GroupJobConclusion"; -import JobAnnotationToggle from "components/JobAnnotationToggle"; -import JobConclusion from "components/JobConclusion"; -import JobFilterInput from "components/JobFilterInput"; -import JobLinks from "components/JobLinks"; -import LogViewer from "components/LogViewer"; +import CopyLink from "components/common/CopyLink"; +import { JobStatus } from "components/job/GroupJobConclusion"; +import JobAnnotationToggle from "components/job/JobAnnotationToggle"; +import JobConclusion from "components/job/JobConclusion"; +import JobFilterInput from "components/job/JobFilterInput"; +import JobLinks from "components/job/JobLinks"; +import LogViewer from "components/common/log/LogViewer"; import styles from "components/minihud.module.css"; -import PageSelector from "components/PageSelector"; -import { durationHuman, LocalTimeHuman } from "components/TimeUtils"; +import PageSelector from "components/common/PageSelector"; +import { durationHuman, LocalTimeHuman } from "components/common/TimeUtils"; import { isFailedJob } from "lib/jobUtils"; import { RevertModal } from "lib/RevertModal"; import { diff --git a/torchci/pages/query_execution_metrics.tsx b/torchci/pages/query_execution_metrics.tsx index 6c012752c0..7c01e04fb2 100644 --- a/torchci/pages/query_execution_metrics.tsx +++ b/torchci/pages/query_execution_metrics.tsx @@ -6,13 +6,13 @@ import { Typography, } from "@mui/material"; import { GridEventListener } from "@mui/x-data-grid"; -import GranularityPicker from "components/GranularityPicker"; +import GranularityPicker from "components/common/GranularityPicker"; import TablePanel from "components/metrics/panels/TablePanel"; import { Granularity, TimeSeriesPanelWithData, } from "components/metrics/panels/TimeSeriesPanel"; -import { formatTimeForCharts } from "components/TimeUtils"; +import { formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { useEffect, useState } from "react"; diff --git a/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx b/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx index 974b147ffe..8e1469687c 100644 --- a/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx +++ b/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx @@ -1,6 +1,6 @@ import { Grid2, Paper, Skeleton, Stack, Typography } from "@mui/material"; import { GridCellParams, GridRenderCellParams } from "@mui/x-data-grid"; -import GranularityPicker from "components/GranularityPicker"; +import GranularityPicker from "components/common/GranularityPicker"; import styles from "components/hud.module.css"; import { TablePanelWithData } from "components/metrics/panels/TablePanel"; import { @@ -8,7 +8,7 @@ import { Granularity, seriesWithInterpolatedTimes, } from "components/metrics/panels/TimeSeriesPanel"; -import { formatTimeForCharts } from "components/TimeUtils"; +import { formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { EChartsOption } from "echarts"; import ReactECharts from "echarts-for-react"; diff --git a/torchci/pages/sli.tsx b/torchci/pages/sli.tsx index d59149290b..c9b17caae0 100644 --- a/torchci/pages/sli.tsx +++ b/torchci/pages/sli.tsx @@ -13,9 +13,9 @@ import { } from "@mui/material"; import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; -import CopyLink from "components/CopyLink"; +import CopyLink from "components/common/CopyLink"; import TimeSeriesPanel from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay } from "components/TimeUtils"; +import { durationDisplay } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import { useRouter } from "next/router"; diff --git a/torchci/pages/tests/search.tsx b/torchci/pages/tests/search.tsx index 8917485dc0..9d68b47ab3 100644 --- a/torchci/pages/tests/search.tsx +++ b/torchci/pages/tests/search.tsx @@ -1,6 +1,6 @@ import { Pagination, Stack, Tooltip } from "@mui/material"; import { DataGrid, GridColDef } from "@mui/x-data-grid"; -import LoadingPage from "components/LoadingPage"; +import LoadingPage from "components/common/LoadingPage"; import TestSearchForm from "components/tests/TestSearchForm"; import { encodeParams } from "lib/GeneralUtils"; import { useRouter } from "next/router"; diff --git a/torchci/pages/tests/testInfo.tsx b/torchci/pages/tests/testInfo.tsx index 7c33ef8f5d..952c9b011e 100644 --- a/torchci/pages/tests/testInfo.tsx +++ b/torchci/pages/tests/testInfo.tsx @@ -1,10 +1,10 @@ import { Stack } from "@mui/material"; import { BarChart } from "@mui/x-charts"; import { TextFieldSubmit } from "components/common/TextFieldSubmit"; -import JobLinks from "components/JobLinks"; -import JobSummary from "components/JobSummary"; -import LoadingPage from "components/LoadingPage"; -import LogViewer from "components/LogViewer"; +import JobLinks from "components/job/JobLinks"; +import JobSummary from "components/job/JobSummary"; +import LoadingPage from "components/common/LoadingPage"; +import LogViewer from "components/common/log/LogViewer"; import TestSearchForm from "components/tests/TestSearchForm"; import dayjs from "dayjs"; import { encodeParams, fetcher } from "lib/GeneralUtils"; diff --git a/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index d962239613..3ac8a94326 100644 --- a/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,14 +1,14 @@ import { Grid2, Paper, Stack, Typography } from "@mui/material"; import CheckBoxList from "components/common/CheckBoxList"; -import CopyLink from "components/CopyLink"; -import GranularityPicker from "components/GranularityPicker"; -import LoadingPage from "components/LoadingPage"; +import CopyLink from "components/common/CopyLink"; +import GranularityPicker from "components/common/GranularityPicker"; +import LoadingPage from "components/common/LoadingPage"; import { getTooltipMarker, Granularity, seriesWithInterpolatedTimes, } from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay, formatTimeForCharts } from "components/TimeUtils"; +import { durationDisplay, formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { EChartsOption } from "echarts"; import ReactECharts from "echarts-for-react"; diff --git a/torchci/pages/utilization/[workflowId]/[jobId]/[attempt]/[[...page]].tsx b/torchci/pages/utilization/[workflowId]/[jobId]/[attempt]/[[...page]].tsx index 57fafded36..e6b00fd596 100644 --- a/torchci/pages/utilization/[workflowId]/[jobId]/[attempt]/[[...page]].tsx +++ b/torchci/pages/utilization/[workflowId]/[jobId]/[attempt]/[[...page]].tsx @@ -1,4 +1,4 @@ -import LoadingPage from "components/LoadingPage"; +import LoadingPage from "components/common/LoadingPage"; import { UtilizationPage } from "components/utilization/UtilizationPage"; import { fetcherHandleError } from "lib/GeneralUtils"; import { UtilizationAPIResponse } from "lib/utilization/types"; From 555957a566689234ff526bdecc427df38f661b0e Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Thu, 20 Mar 2025 10:31:32 -0700 Subject: [PATCH 2/2] comment --- torchci/components/commit/WorkflowBox.tsx | 4 ++-- torchci/components/job/FilteredJobList.tsx | 2 +- torchci/components/job/GroupJobConclusion.tsx | 2 +- torchci/components/job/JobLinks.tsx | 2 +- torchci/components/job/JobTooltip.tsx | 4 ++-- torchci/components/layout/NavBar.tsx | 2 +- torchci/components/metrics/panels/TimeSeriesPanel.tsx | 5 ++++- .../pages/[repoOwner]/[repoName]/pull/[prNumber].tsx | 2 +- torchci/pages/build_time_metrics.tsx | 5 ++++- torchci/pages/cost_analysis.tsx | 2 +- torchci/pages/disabled.tsx | 2 +- .../[repoOwner]/[repoName]/[branch]/[[...page]].tsx | 2 +- torchci/pages/failure.tsx | 4 ++-- .../[repoOwner]/[repoName]/[branch]/[[...page]].tsx | 10 +++++----- torchci/pages/metrics.tsx | 2 +- .../[repoOwner]/[repoName]/[branch]/[[...page]].tsx | 6 +++--- torchci/pages/query_execution_metrics.tsx | 2 +- .../reliability/[repoOwner]/[repoName]/[[...page]].tsx | 2 +- torchci/pages/sli.tsx | 2 +- torchci/pages/tests/testInfo.tsx | 4 ++-- .../[repoOwner]/[repoName]/[branch]/[[...page]].tsx | 5 ++++- 21 files changed, 40 insertions(+), 31 deletions(-) diff --git a/torchci/components/commit/WorkflowBox.tsx b/torchci/components/commit/WorkflowBox.tsx index 40be09b1d2..ce37489a68 100644 --- a/torchci/components/commit/WorkflowBox.tsx +++ b/torchci/components/commit/WorkflowBox.tsx @@ -12,10 +12,10 @@ import React, { useEffect, useState } from "react"; import useSWR from "swr"; import { getConclusionSeverityForSorting } from "../../lib/JobClassifierUtil"; import { TestInfo } from "../additionalTestInfo/TestInfo"; -import JobArtifact from "../job/JobArtifact"; -import JobSummary from "../job/JobSummary"; import LogViewer, { SearchLogViewer } from "../common/log/LogViewer"; import { durationDisplay } from "../common/TimeUtils"; +import JobArtifact from "../job/JobArtifact"; +import JobSummary from "../job/JobSummary"; function sortJobsByConclusion(jobA: JobData, jobB: JobData): number { // Show failed jobs first, then pending jobs, then successful jobs diff --git a/torchci/components/job/FilteredJobList.tsx b/torchci/components/job/FilteredJobList.tsx index 1d3c7a62f0..760ed76106 100644 --- a/torchci/components/job/FilteredJobList.tsx +++ b/torchci/components/job/FilteredJobList.tsx @@ -3,10 +3,10 @@ import { IssueData, JobAnnotation, JobData } from "lib/types"; import useScrollTo from "lib/useScrollTo"; import { useRouter } from "next/router"; import useSWR from "swr"; +import LogViewer from "../common/log/LogViewer"; import JobAnnotationToggle from "./JobAnnotationToggle"; import JobLinks from "./JobLinks"; import JobSummary from "./JobSummary"; -import LogViewer from "../common/log/LogViewer"; function FailedJobInfo({ job, diff --git a/torchci/components/job/GroupJobConclusion.tsx b/torchci/components/job/GroupJobConclusion.tsx index d7586b3bf0..2c3b56ad4f 100644 --- a/torchci/components/job/GroupJobConclusion.tsx +++ b/torchci/components/job/GroupJobConclusion.tsx @@ -11,10 +11,10 @@ import { PinnedTooltipContext, } from "pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]]"; import { useContext } from "react"; +import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher"; import hudStyles from "../hud.module.css"; import { getFailureEl } from "./JobConclusion"; import styles from "./JobConclusion.module.css"; -import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher"; export enum JobStatus { Success = "success", diff --git a/torchci/components/job/JobLinks.tsx b/torchci/components/job/JobLinks.tsx index c9796eef19..4b4486b1e8 100644 --- a/torchci/components/job/JobLinks.tsx +++ b/torchci/components/job/JobLinks.tsx @@ -6,9 +6,9 @@ import { isFailure, IsJobInProgress } from "../../lib/JobClassifierUtil"; import { isFailedJob, transformJobName } from "../../lib/jobUtils"; import { IssueData, JobData } from "../../lib/types"; import CopyLink from "../common/CopyLink"; +import { durationDisplay, LocalTimeHuman } from "../common/TimeUtils"; import styles from "./JobLinks.module.css"; import ReproductionCommand from "./ReproductionCommand"; -import { durationDisplay, LocalTimeHuman } from "../common/TimeUtils"; const DEFAULT_REPO = "pytorch/pytorch"; function getRepoFromHtmlURL(htmlUrl?: string) { diff --git a/torchci/components/job/JobTooltip.tsx b/torchci/components/job/JobTooltip.tsx index 91ffe41358..03040ee377 100644 --- a/torchci/components/job/JobTooltip.tsx +++ b/torchci/components/job/JobTooltip.tsx @@ -1,7 +1,7 @@ import { JobData } from "../../lib/types"; -import JobLinks from "./JobLinks"; -import LogViewer from "../common/log/LogViewer"; import { SingleWorkflowDispatcher } from "../commit/WorkflowDispatcher"; +import LogViewer from "../common/log/LogViewer"; +import JobLinks from "./JobLinks"; export default function JobTooltip({ job, diff --git a/torchci/components/layout/NavBar.tsx b/torchci/components/layout/NavBar.tsx index 6d58c03e7f..7159b31b07 100644 --- a/torchci/components/layout/NavBar.tsx +++ b/torchci/components/layout/NavBar.tsx @@ -2,8 +2,8 @@ import styles from "components/layout/NavBar.module.css"; import Link from "next/link"; import { useState } from "react"; import { AiFillGithub } from "react-icons/ai"; -import LoginSection from "./LoginSection"; import ThemeModePicker from "../common/ThemeModePicker"; +import LoginSection from "./LoginSection"; const NavBarDropdown = ({ title, diff --git a/torchci/components/metrics/panels/TimeSeriesPanel.tsx b/torchci/components/metrics/panels/TimeSeriesPanel.tsx index d6b231a20f..3f4935af80 100644 --- a/torchci/components/metrics/panels/TimeSeriesPanel.tsx +++ b/torchci/components/metrics/panels/TimeSeriesPanel.tsx @@ -3,7 +3,10 @@ */ import { Paper, Skeleton } from "@mui/material"; -import { formatTimeForCharts, TIME_DISPLAY_FORMAT } from "components/common/TimeUtils"; +import { + formatTimeForCharts, + TIME_DISPLAY_FORMAT, +} from "components/common/TimeUtils"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { EChartsOption } from "echarts"; diff --git a/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx b/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx index 9224cbfa6f..099ffd216e 100644 --- a/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx +++ b/torchci/pages/[repoOwner]/[repoName]/pull/[prNumber].tsx @@ -1,8 +1,8 @@ import { Stack } from "@mui/material"; import CommitStatus from "components/commit/CommitStatus"; import DrCIButton from "components/common/DrCIButton"; -import { useSetTitle } from "components/layout/DynamicTitle"; import ErrorBoundary from "components/common/ErrorBoundary"; +import { useSetTitle } from "components/layout/DynamicTitle"; import { PRData } from "lib/types"; import { useRouter } from "next/router"; import { CommitApiResponse } from "pages/api/[repoOwner]/[repoName]/commit/[sha]"; diff --git a/torchci/pages/build_time_metrics.tsx b/torchci/pages/build_time_metrics.tsx index c616379119..c814604190 100644 --- a/torchci/pages/build_time_metrics.tsx +++ b/torchci/pages/build_time_metrics.tsx @@ -8,8 +8,11 @@ import { import { BarChart } from "@mui/x-charts"; import CheckBoxList from "components/common/CheckBoxList"; import LoadingPage from "components/common/LoadingPage"; +import { + durationDisplay, + formatTimeForCharts, +} from "components/common/TimeUtils"; import { TimeSeriesPanelWithData } from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay, formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { useClickHouseAPIImmutable } from "lib/GeneralUtils"; diff --git a/torchci/pages/cost_analysis.tsx b/torchci/pages/cost_analysis.tsx index 7b5eb37985..b69510560a 100644 --- a/torchci/pages/cost_analysis.tsx +++ b/torchci/pages/cost_analysis.tsx @@ -17,11 +17,11 @@ import { import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import CopyLink from "components/common/CopyLink"; +import MultiSelectPicker from "components/common/MultiSelectPicker"; import TimeSeriesPanel, { ChartType, Granularity, } from "components/metrics/panels/TimeSeriesPanel"; -import MultiSelectPicker from "components/common/MultiSelectPicker"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import _ from "lodash"; diff --git a/torchci/pages/disabled.tsx b/torchci/pages/disabled.tsx index 72b4c0fcb3..0da9451bac 100644 --- a/torchci/pages/disabled.tsx +++ b/torchci/pages/disabled.tsx @@ -2,12 +2,12 @@ import { Grid2, Stack, Typography } from "@mui/material"; import { GridCellParams, GridRenderCellParams } from "@mui/x-data-grid"; import CopyLink from "components/common/CopyLink"; import GranularityPicker from "components/common/GranularityPicker"; +import ValuePicker from "components/common/ValuePicker"; import styles from "components/metrics.module.css"; import { TablePanelWithData } from "components/metrics/panels/TablePanel"; import TimeSeriesPanel, { Granularity, } from "components/metrics/panels/TimeSeriesPanel"; -import ValuePicker from "components/common/ValuePicker"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import _ from "lodash"; diff --git a/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index a726aa1d44..5e203d2ce1 100644 --- a/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/failedjobs/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,8 +1,8 @@ import { Skeleton, Stack, Typography } from "@mui/material"; +import LogViewer from "components/common/log/LogViewer"; import JobAnnotationToggle from "components/job/JobAnnotationToggle"; import JobLinks from "components/job/JobLinks"; import JobSummary from "components/job/JobSummary"; -import LogViewer from "components/common/log/LogViewer"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import { isRerunDisabledTestsJob, isUnstableJob } from "lib/jobUtils"; diff --git a/torchci/pages/failure.tsx b/torchci/pages/failure.tsx index fef64d4267..66c88e24ac 100644 --- a/torchci/pages/failure.tsx +++ b/torchci/pages/failure.tsx @@ -1,10 +1,10 @@ import { Button, TextField } from "@mui/material"; import { Box, Stack } from "@mui/system"; import CheckBoxSelector from "components/common/CheckBoxSelector"; -import JobLinks from "components/job/JobLinks"; -import JobSummary from "components/job/JobSummary"; import LoadingPage from "components/common/LoadingPage"; import LogViewer from "components/common/log/LogViewer"; +import JobLinks from "components/job/JobLinks"; +import JobSummary from "components/job/JobSummary"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { encodeParams } from "lib/GeneralUtils"; diff --git a/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index 53b214bbf9..0f7424e4a4 100644 --- a/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/hud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,19 +1,19 @@ import CheckBoxSelector from "components/common/CheckBoxSelector"; import CopyLink from "components/common/CopyLink"; +import LoadingPage from "components/common/LoadingPage"; +import PageSelector from "components/common/PageSelector"; +import { LocalTimeHuman } from "components/common/TimeUtils"; +import TooltipTarget from "components/common/tooltipTarget/TooltipTarget"; +import styles from "components/hud.module.css"; import { GroupHudTableColumns, GroupHudTableHeader, passesGroupFilter, } from "components/hud/GroupHudTableHeaders"; import HudGroupedCell from "components/job/GroupJobConclusion"; -import styles from "components/hud.module.css"; import JobConclusion from "components/job/JobConclusion"; import JobFilterInput from "components/job/JobFilterInput"; import JobTooltip from "components/job/JobTooltip"; -import LoadingPage from "components/common/LoadingPage"; -import PageSelector from "components/common/PageSelector"; -import { LocalTimeHuman } from "components/common/TimeUtils"; -import TooltipTarget from "components/common/tooltipTarget/TooltipTarget"; import { fetcher } from "lib/GeneralUtils"; import { getGroupingData, diff --git a/torchci/pages/metrics.tsx b/torchci/pages/metrics.tsx index 20a55e1e7b..3c67227075 100644 --- a/torchci/pages/metrics.tsx +++ b/torchci/pages/metrics.tsx @@ -13,12 +13,12 @@ import { import { GridRenderCellParams } from "@mui/x-data-grid"; import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; +import { durationDisplay } from "components/common/TimeUtils"; import ScalarPanel, { ScalarPanelWithValue, } from "components/metrics/panels/ScalarPanel"; import TablePanel from "components/metrics/panels/TablePanel"; import TimeSeriesPanel from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { EChartsOption } from "echarts"; import ReactECharts from "echarts-for-react"; diff --git a/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index 45d90cceba..8d52f02e96 100644 --- a/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/minihud/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -1,13 +1,13 @@ import CopyLink from "components/common/CopyLink"; +import LogViewer from "components/common/log/LogViewer"; +import PageSelector from "components/common/PageSelector"; +import { durationHuman, LocalTimeHuman } from "components/common/TimeUtils"; import { JobStatus } from "components/job/GroupJobConclusion"; import JobAnnotationToggle from "components/job/JobAnnotationToggle"; import JobConclusion from "components/job/JobConclusion"; import JobFilterInput from "components/job/JobFilterInput"; import JobLinks from "components/job/JobLinks"; -import LogViewer from "components/common/log/LogViewer"; import styles from "components/minihud.module.css"; -import PageSelector from "components/common/PageSelector"; -import { durationHuman, LocalTimeHuman } from "components/common/TimeUtils"; import { isFailedJob } from "lib/jobUtils"; import { RevertModal } from "lib/RevertModal"; import { diff --git a/torchci/pages/query_execution_metrics.tsx b/torchci/pages/query_execution_metrics.tsx index 7c01e04fb2..f91bb3971a 100644 --- a/torchci/pages/query_execution_metrics.tsx +++ b/torchci/pages/query_execution_metrics.tsx @@ -7,12 +7,12 @@ import { } from "@mui/material"; import { GridEventListener } from "@mui/x-data-grid"; import GranularityPicker from "components/common/GranularityPicker"; +import { formatTimeForCharts } from "components/common/TimeUtils"; import TablePanel from "components/metrics/panels/TablePanel"; import { Granularity, TimeSeriesPanelWithData, } from "components/metrics/panels/TimeSeriesPanel"; -import { formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { useEffect, useState } from "react"; diff --git a/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx b/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx index 8e1469687c..66f1eb87e8 100644 --- a/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx +++ b/torchci/pages/reliability/[repoOwner]/[repoName]/[[...page]].tsx @@ -1,6 +1,7 @@ import { Grid2, Paper, Skeleton, Stack, Typography } from "@mui/material"; import { GridCellParams, GridRenderCellParams } from "@mui/x-data-grid"; import GranularityPicker from "components/common/GranularityPicker"; +import { formatTimeForCharts } from "components/common/TimeUtils"; import styles from "components/hud.module.css"; import { TablePanelWithData } from "components/metrics/panels/TablePanel"; import { @@ -8,7 +9,6 @@ import { Granularity, seriesWithInterpolatedTimes, } from "components/metrics/panels/TimeSeriesPanel"; -import { formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { EChartsOption } from "echarts"; import ReactECharts from "echarts-for-react"; diff --git a/torchci/pages/sli.tsx b/torchci/pages/sli.tsx index c9b17caae0..84fe8bd65f 100644 --- a/torchci/pages/sli.tsx +++ b/torchci/pages/sli.tsx @@ -14,8 +14,8 @@ import { import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import CopyLink from "components/common/CopyLink"; -import TimeSeriesPanel from "components/metrics/panels/TimeSeriesPanel"; import { durationDisplay } from "components/common/TimeUtils"; +import TimeSeriesPanel from "components/metrics/panels/TimeSeriesPanel"; import dayjs from "dayjs"; import { fetcher } from "lib/GeneralUtils"; import { useRouter } from "next/router"; diff --git a/torchci/pages/tests/testInfo.tsx b/torchci/pages/tests/testInfo.tsx index 952c9b011e..cf660b971e 100644 --- a/torchci/pages/tests/testInfo.tsx +++ b/torchci/pages/tests/testInfo.tsx @@ -1,10 +1,10 @@ import { Stack } from "@mui/material"; import { BarChart } from "@mui/x-charts"; +import LoadingPage from "components/common/LoadingPage"; +import LogViewer from "components/common/log/LogViewer"; import { TextFieldSubmit } from "components/common/TextFieldSubmit"; import JobLinks from "components/job/JobLinks"; import JobSummary from "components/job/JobSummary"; -import LoadingPage from "components/common/LoadingPage"; -import LogViewer from "components/common/log/LogViewer"; import TestSearchForm from "components/tests/TestSearchForm"; import dayjs from "dayjs"; import { encodeParams, fetcher } from "lib/GeneralUtils"; diff --git a/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx b/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx index 3ac8a94326..31040e3c1d 100644 --- a/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx +++ b/torchci/pages/tts/[repoOwner]/[repoName]/[branch]/[[...page]].tsx @@ -3,12 +3,15 @@ import CheckBoxList from "components/common/CheckBoxList"; import CopyLink from "components/common/CopyLink"; import GranularityPicker from "components/common/GranularityPicker"; import LoadingPage from "components/common/LoadingPage"; +import { + durationDisplay, + formatTimeForCharts, +} from "components/common/TimeUtils"; import { getTooltipMarker, Granularity, seriesWithInterpolatedTimes, } from "components/metrics/panels/TimeSeriesPanel"; -import { durationDisplay, formatTimeForCharts } from "components/common/TimeUtils"; import dayjs from "dayjs"; import { EChartsOption } from "echarts"; import ReactECharts from "echarts-for-react";