more renames (#9876)

This commit is contained in:
Kira Pilot
2023-09-26 14:45:29 -04:00
committed by GitHub
parent 6f0e2a7968
commit 75366ec6b5
10 changed files with 21 additions and 21 deletions
@@ -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 (
<Maybe
condition={displayImpendingDeletion(
condition={displayDormantDeletion(
workspace,
allowAdvancedScheduling,
allowWorkspaceActions,
@@ -1,10 +1,10 @@
import { Workspace } from "api/typesGenerated";
import { displayImpendingDeletion } from "./utils";
import { displayDormantDeletion } from "./utils";
import { useDashboard } from "components/Dashboard/DashboardProvider";
import styled from "@emotion/styled";
import { Theme as MaterialUITheme } from "@mui/material/styles";
export const ImpendingDeletionText = ({
export const DormantDeletionText = ({
workspace,
}: {
workspace: Workspace;
@@ -17,7 +17,7 @@ export const ImpendingDeletionText = ({
const allowWorkspaceActions = experiments.includes("workspace_actions");
if (
!displayImpendingDeletion(
!displayDormantDeletion(
workspace,
allowAdvancedScheduling,
allowWorkspaceActions,
@@ -1,3 +1,3 @@
export * from "./ImpendingDeletionStat";
export * from "./ImpendingDeletionText";
export * from "./ImpendingDeletionBanner";
export * from "./DormantDeletionStat";
export * from "./DormantDeletionText";
export * from "./DormantWorkspaceBanner";
@@ -1,8 +1,8 @@
import * as TypesGen from "api/typesGenerated";
import * as Mocks from "testHelpers/entities";
import { displayImpendingDeletion } from "./utils";
import { displayDormantDeletion } from "./utils";
describe("displayImpendingDeletion", () => {
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,
@@ -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,
@@ -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 (
<ChooseOne>
{/* <ImpendingDeletionText/> determines its own visibility */}
<Cond condition={Boolean(ImpendingDeletionText({ workspace }))}>
<ImpendingDeletionText workspace={workspace} />
{/* <DormantDeletionText/> determines its own visibility */}
<Cond condition={Boolean(DormantDeletionText({ workspace }))}>
<DormantDeletionText workspace={workspace} />
</Cond>
<Cond>
<span
+1 -1
View File
@@ -265,7 +265,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
/>
</Cond>
<Cond>
{/* <ImpendingDeletionBanner/> determines its own visibility */}
{/* <DormantWorkspaceBanner/> determines its own visibility */}
<DormantWorkspaceBanner
workspaces={[workspace]}
shouldRedisplayBanner={
@@ -20,7 +20,7 @@ import Popover from "@mui/material/Popover";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
import { WorkspaceStatusText } from "components/WorkspaceStatusBadge/WorkspaceStatusBadge";
import { ImpendingDeletionStat } from "components/WorkspaceDeletion";
import { DormantDeletionStat } from "components/WorkspaceDeletion";
const Language = {
workspaceDetails: "Workspace Details",
@@ -75,7 +75,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
label="Status"
value={<WorkspaceStatusText workspace={workspace} />}
/>
<ImpendingDeletionStat workspace={workspace} />
<DormantDeletionStat workspace={workspace} />
<StatsItem
className={styles.statsItem}
label={Language.templateLabel}
@@ -100,7 +100,7 @@ export const WorkspacesPageView: FC<
<Maybe condition={hasError(error) && !isApiValidationError(error)}>
<ErrorAlert error={error} />
</Maybe>
{/* <ImpendingDeletionBanner/> determines its own visibility */}
{/* <DormantWorkspaceBanner/> determines its own visibility */}
<DormantWorkspaceBanner
workspaces={dormantWorkspaces}
shouldRedisplayBanner={hasDormantWorkspace}