Skip to content

Commit 75366ec

Browse files
authored
more renames (#9876)
1 parent 6f0e2a7 commit 75366ec

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

site/src/components/WorkspaceDeletion/ImpendingDeletionStat.tsx renamed to site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import Link from "@mui/material/Link";
44
import { Link as RouterLink } from "react-router-dom";
55
import styled from "@emotion/styled";
66
import { Workspace } from "api/typesGenerated";
7-
import { displayImpendingDeletion } from "./utils";
7+
import { displayDormantDeletion } from "./utils";
88
import { useDashboard } from "components/Dashboard/DashboardProvider";
99

10-
export const ImpendingDeletionStat = ({
10+
export const DormantDeletionStat = ({
1111
workspace,
1212
}: {
1313
workspace: Workspace;
@@ -21,7 +21,7 @@ export const ImpendingDeletionStat = ({
2121

2222
return (
2323
<Maybe
24-
condition={displayImpendingDeletion(
24+
condition={displayDormantDeletion(
2525
workspace,
2626
allowAdvancedScheduling,
2727
allowWorkspaceActions,

site/src/components/WorkspaceDeletion/ImpendingDeletionText.tsx renamed to site/src/components/WorkspaceDeletion/DormantDeletionText.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Workspace } from "api/typesGenerated";
2-
import { displayImpendingDeletion } from "./utils";
2+
import { displayDormantDeletion } from "./utils";
33
import { useDashboard } from "components/Dashboard/DashboardProvider";
44
import styled from "@emotion/styled";
55
import { Theme as MaterialUITheme } from "@mui/material/styles";
66

7-
export const ImpendingDeletionText = ({
7+
export const DormantDeletionText = ({
88
workspace,
99
}: {
1010
workspace: Workspace;
@@ -17,7 +17,7 @@ export const ImpendingDeletionText = ({
1717
const allowWorkspaceActions = experiments.includes("workspace_actions");
1818

1919
if (
20-
!displayImpendingDeletion(
20+
!displayDormantDeletion(
2121
workspace,
2222
allowAdvancedScheduling,
2323
allowWorkspaceActions,
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export * from "./ImpendingDeletionStat";
2-
export * from "./ImpendingDeletionText";
3-
export * from "./ImpendingDeletionBanner";
1+
export * from "./DormantDeletionStat";
2+
export * from "./DormantDeletionText";
3+
export * from "./DormantWorkspaceBanner";

site/src/components/WorkspaceDeletion/utils.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as TypesGen from "api/typesGenerated";
22
import * as Mocks from "testHelpers/entities";
3-
import { displayImpendingDeletion } from "./utils";
3+
import { displayDormantDeletion } from "./utils";
44

5-
describe("displayImpendingDeletion", () => {
5+
describe("displayDormantDeletion", () => {
66
const today = new Date();
77
it.each<[string, boolean, boolean, boolean]>([
88
[
@@ -45,7 +45,7 @@ describe("displayImpendingDeletion", () => {
4545
deleting_at,
4646
};
4747
expect(
48-
displayImpendingDeletion(
48+
displayDormantDeletion(
4949
workspace,
5050
allowAdvancedScheduling,
5151
allowWorkspaceActions,

site/src/components/WorkspaceDeletion/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const IMPENDING_DELETION_DISPLAY_THRESHOLD = 14; // 14 days
1111
* @param {TypesGen.Workspace} workspace
1212
* @returns {boolean}
1313
*/
14-
export const displayImpendingDeletion = (
14+
export const displayDormantDeletion = (
1515
workspace: Workspace,
1616
allowAdvancedScheduling: boolean,
1717
allowWorkspaceActions: boolean,

site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FC, PropsWithChildren } from "react";
44
import { makeStyles } from "@mui/styles";
55
import { combineClasses } from "utils/combineClasses";
66
import { ChooseOne, Cond } from "components/Conditionals/ChooseOne";
7-
import { ImpendingDeletionText } from "components/WorkspaceDeletion";
7+
import { DormantDeletionText } from "components/WorkspaceDeletion";
88
import { getDisplayWorkspaceStatus } from "utils/workspace";
99
import Tooltip, { TooltipProps, tooltipClasses } from "@mui/material/Tooltip";
1010
import { styled } from "@mui/material/styles";
@@ -63,9 +63,9 @@ export const WorkspaceStatusText: FC<
6363

6464
return (
6565
<ChooseOne>
66-
{/* <ImpendingDeletionText/> determines its own visibility */}
67-
<Cond condition={Boolean(ImpendingDeletionText({ workspace }))}>
68-
<ImpendingDeletionText workspace={workspace} />
66+
{/* <DormantDeletionText/> determines its own visibility */}
67+
<Cond condition={Boolean(DormantDeletionText({ workspace }))}>
68+
<DormantDeletionText workspace={workspace} />
6969
</Cond>
7070
<Cond>
7171
<span

site/src/pages/WorkspacePage/Workspace.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
265265
/>
266266
</Cond>
267267
<Cond>
268-
{/* <ImpendingDeletionBanner/> determines its own visibility */}
268+
{/* <DormantWorkspaceBanner/> determines its own visibility */}
269269
<DormantWorkspaceBanner
270270
workspaces={[workspace]}
271271
shouldRedisplayBanner={

site/src/pages/WorkspacePage/WorkspaceStats.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Popover from "@mui/material/Popover";
2020
import TextField from "@mui/material/TextField";
2121
import Button from "@mui/material/Button";
2222
import { WorkspaceStatusText } from "components/WorkspaceStatusBadge/WorkspaceStatusBadge";
23-
import { ImpendingDeletionStat } from "components/WorkspaceDeletion";
23+
import { DormantDeletionStat } from "components/WorkspaceDeletion";
2424

2525
const Language = {
2626
workspaceDetails: "Workspace Details",
@@ -75,7 +75,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
7575
label="Status"
7676
value={<WorkspaceStatusText workspace={workspace} />}
7777
/>
78-
<ImpendingDeletionStat workspace={workspace} />
78+
<DormantDeletionStat workspace={workspace} />
7979
<StatsItem
8080
className={styles.statsItem}
8181
label={Language.templateLabel}

site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const WorkspacesPageView: FC<
100100
<Maybe condition={hasError(error) && !isApiValidationError(error)}>
101101
<ErrorAlert error={error} />
102102
</Maybe>
103-
{/* <ImpendingDeletionBanner/> determines its own visibility */}
103+
{/* <DormantWorkspaceBanner/> determines its own visibility */}
104104
<DormantWorkspaceBanner
105105
workspaces={dormantWorkspaces}
106106
shouldRedisplayBanner={hasDormantWorkspace}

0 commit comments

Comments
 (0)