From 74ddd0677154a65543c56cc36d0ce573c87fc6e8 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Tue, 26 Sep 2023 14:12:52 +0000 Subject: [PATCH] more renames --- ...{ImpendingDeletionStat.tsx => DormantDeletionStat.tsx} | 6 +++--- ...{ImpendingDeletionText.tsx => DormantDeletionText.tsx} | 6 +++--- ...ndingDeletionBanner.tsx => DormantWorkspaceBanner.tsx} | 0 site/src/components/WorkspaceDeletion/index.ts | 6 +++--- site/src/components/WorkspaceDeletion/utils.test.ts | 6 +++--- site/src/components/WorkspaceDeletion/utils.ts | 2 +- .../WorkspaceStatusBadge/WorkspaceStatusBadge.tsx | 8 ++++---- site/src/pages/WorkspacePage/Workspace.tsx | 2 +- site/src/pages/WorkspacePage/WorkspaceStats.tsx | 4 ++-- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) rename site/src/components/WorkspaceDeletion/{ImpendingDeletionStat.tsx => DormantDeletionStat.tsx} (92%) rename site/src/components/WorkspaceDeletion/{ImpendingDeletionText.tsx => DormantDeletionText.tsx} (88%) rename site/src/components/WorkspaceDeletion/{ImpendingDeletionBanner.tsx => DormantWorkspaceBanner.tsx} (100%) diff --git a/site/src/components/WorkspaceDeletion/ImpendingDeletionStat.tsx b/site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx similarity index 92% rename from site/src/components/WorkspaceDeletion/ImpendingDeletionStat.tsx rename to site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx index 91db5dc680c8b..61205d86c0762 100644 --- a/site/src/components/WorkspaceDeletion/ImpendingDeletionStat.tsx +++ b/site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx @@ -4,10 +4,10 @@ import Link from "@mui/material/Link"; import { Link as RouterLink } from "react-router-dom"; import styled from "@emotion/styled"; import { Workspace } from "api/typesGenerated"; -import { displayImpendingDeletion } from "./utils"; +import { displayDormantDeletion } from "./utils"; import { useDashboard } from "components/Dashboard/DashboardProvider"; -export const ImpendingDeletionStat = ({ +export const DormantDeletionStat = ({ workspace, }: { workspace: Workspace; @@ -21,7 +21,7 @@ export const ImpendingDeletionStat = ({ return ( { +describe("displayDormantDeletion", () => { const today = new Date(); it.each<[string, boolean, boolean, boolean]>([ [ @@ -45,7 +45,7 @@ describe("displayImpendingDeletion", () => { deleting_at, }; expect( - displayImpendingDeletion( + displayDormantDeletion( workspace, allowAdvancedScheduling, allowWorkspaceActions, diff --git a/site/src/components/WorkspaceDeletion/utils.ts b/site/src/components/WorkspaceDeletion/utils.ts index f0756b4b737fe..14ac74f4a00bd 100644 --- a/site/src/components/WorkspaceDeletion/utils.ts +++ b/site/src/components/WorkspaceDeletion/utils.ts @@ -11,7 +11,7 @@ const IMPENDING_DELETION_DISPLAY_THRESHOLD = 14; // 14 days * @param {TypesGen.Workspace} workspace * @returns {boolean} */ -export const displayImpendingDeletion = ( +export const displayDormantDeletion = ( workspace: Workspace, allowAdvancedScheduling: boolean, allowWorkspaceActions: boolean, diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx index 7d121fe5120d5..17e8cafc7bebe 100644 --- a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx +++ b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx @@ -4,7 +4,7 @@ import { FC, PropsWithChildren } from "react"; import { makeStyles } from "@mui/styles"; import { combineClasses } from "utils/combineClasses"; import { ChooseOne, Cond } from "components/Conditionals/ChooseOne"; -import { ImpendingDeletionText } from "components/WorkspaceDeletion"; +import { DormantDeletionText } from "components/WorkspaceDeletion"; import { getDisplayWorkspaceStatus } from "utils/workspace"; import Tooltip, { TooltipProps, tooltipClasses } from "@mui/material/Tooltip"; import { styled } from "@mui/material/styles"; @@ -63,9 +63,9 @@ export const WorkspaceStatusText: FC< return ( - {/* determines its own visibility */} - - + {/* determines its own visibility */} + + > = ({ /> - {/* determines its own visibility */} + {/* determines its own visibility */} = ({ label="Status" value={} /> - + - {/* determines its own visibility */} + {/* determines its own visibility */}