Skip to content

Commit 2dfbb50

Browse files
committed
PR feedback
1 parent e00ed2a commit 2dfbb50

File tree

2 files changed

+19
-86
lines changed

2 files changed

+19
-86
lines changed

site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.stories.tsx

-76
This file was deleted.

site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx

+19-10
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,11 @@ export type WorkspaceStatusBadgeProps = {
9494
}
9595

9696
const ImpendingDeletionBadge: FC<
97-
PropsWithChildren<Partial<WorkspaceStatusBadgeProps>>
98-
> = ({ className }) => {
99-
const { entitlements, experiments } = useDashboard()
100-
const allowAdvancedScheduling =
101-
entitlements.features["advanced_template_scheduling"].enabled
102-
// This check can be removed when https://github.com/coder/coder/milestone/19
103-
// is merged up
104-
const allowWorkspaceActions = experiments.includes("workspace_actions")
105-
97+
Partial<WorkspaceStatusBadgeProps> & {
98+
allowAdvancedScheduling: boolean
99+
allowWorkspaceActions: boolean
100+
}
101+
> = ({ allowAdvancedScheduling, allowWorkspaceActions, className }) => {
106102
if (!allowAdvancedScheduling || !allowWorkspaceActions) {
107103
return null
108104
}
@@ -119,8 +115,21 @@ const ImpendingDeletionBadge: FC<
119115
export const WorkspaceStatusBadge: FC<
120116
PropsWithChildren<WorkspaceStatusBadgeProps>
121117
> = ({ workspace, className }) => {
118+
const { entitlements, experiments } = useDashboard()
119+
const allowAdvancedScheduling =
120+
entitlements.features["advanced_template_scheduling"].enabled
121+
// This check can be removed when https://github.com/coder/coder/milestone/19
122+
// is merged up
123+
const allowWorkspaceActions = experiments.includes("workspace_actions")
124+
122125
if (displayImpendingDeletion(workspace)) {
123-
return <ImpendingDeletionBadge className={className} />
126+
return (
127+
<ImpendingDeletionBadge
128+
className={className}
129+
allowAdvancedScheduling={allowAdvancedScheduling}
130+
allowWorkspaceActions={allowWorkspaceActions}
131+
/>
132+
)
124133
}
125134

126135
const { text, icon, type } = getStatus(workspace.latest_build.status)

0 commit comments

Comments
 (0)