Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor(site): Refactor workspace actions #7124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 14, 2023
Merged

refactor(site): Refactor workspace actions #7124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebf0011
Refactor primary buttons
BrunoQuaresma Apr 13, 2023
d923e1b
Merge branch 'main' into bq/refactor-workspace-header
BrunoQuaresma Apr 13, 2023
4e73089
refactor(site): Always show the main actions
BrunoQuaresma Apr 13, 2023
5df1260
Merge branch 'main' into bq/refactor-workspace-header
BrunoQuaresma Apr 14, 2023
f7e681e
Merge branch 'main' into bq/refactor-workspace-header
BrunoQuaresma Apr 14, 2023
4f0bc77
Remove tests that are testes on Storybook
BrunoQuaresma Apr 14, 2023
a9bb484
Fix tests
BrunoQuaresma Apr 14, 2023
27d2d24
Fix keys
BrunoQuaresma Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Refactor primary buttons
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Apr 13, 2023
commit ebf001122d6714f6883714a80167ac2cf9bec898
54 changes: 33 additions & 21 deletions site/src/components/WorkspaceActions/WorkspaceActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next"
import { WorkspaceStatus } from "../../api/typesGenerated"
import {
ActionLoadingButton,
CancelButton,
ChangeVersionButton,
DeleteButton,
DisabledButton,
Expand Down Expand Up @@ -43,7 +44,8 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
canChangeVersions,
}) => {
const { t } = useTranslation("workspacePage")
const { canCancel, canAcceptJobs, actions } = buttonAbilities(workspaceStatus)
const { canCancel, canAcceptJobs, primaryActions, secondaryActions } =
buttonAbilities(workspaceStatus)
const canBeUpdated = isOutdated && canAcceptJobs

// A mapping of button type to the corresponding React component
Expand Down Expand Up @@ -83,26 +85,36 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
),
}

// memoize so this isn't recalculated every time we fetch the workspace
const [primaryAction, ...secondaryActions] = useMemo(
() =>
isUpdating
? [ButtonTypesEnum.updating, ...actions]
: canBeUpdated
? [ButtonTypesEnum.update, ...actions]
: actions,
[actions, canBeUpdated, isUpdating],
)

return (
<DropdownButton
primaryAction={buttonMapping[primaryAction]}
canCancel={canCancel}
handleCancel={handleCancel}
secondaryActions={secondaryActions.map((action) => ({
action,
button: buttonMapping[action],
}))}
/>
<div>
{canBeUpdated &&
(isUpdating
? buttonMapping[ButtonTypesEnum.updating]
: buttonMapping[ButtonTypesEnum.update])}
{primaryActions.map((primaryAction) => buttonMapping[primaryAction])}
{canCancel && <CancelButton handleAction={handleCancel} />}
</div>
)
// // memoize so this isn't recalculated every time we fetch the workspace
// const [primaryAction, ...secondaryActions] = useMemo(
// () =>
// isUpdating
// ? [ButtonTypesEnum.updating, ...actions]
// : canBeUpdated
// ? [ButtonTypesEnum.update, ...actions]
// : actions,
// [actions, canBeUpdated, isUpdating],
// )

// return (
// <DropdownButton
// primaryAction={buttonMapping[primaryAction]}
// canCancel={canCancel}
// handleCancel={handleCancel}
// secondaryActions={secondaryActions.map((action) => ({
// action,
// button: buttonMapping[action],
// }))}
// />
// )
}
55 changes: 22 additions & 33 deletions site/src/components/WorkspaceActions/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export type ButtonMapping = {
}

interface WorkspaceAbilities {
actions: ButtonTypesEnum[]
primaryActions: ButtonTypesEnum[]
secondaryActions?: ButtonTypesEnum[]
canCancel: boolean
canAcceptJobs: boolean
}
Expand All @@ -35,80 +36,68 @@ export const buttonAbilities = (
return statusToAbilities[status]
}

const defaultSecondaryActions = [
ButtonTypesEnum.settings,
ButtonTypesEnum.changeVersion,
ButtonTypesEnum.delete,
]

const statusToAbilities: Record<WorkspaceStatus, WorkspaceAbilities> = {
starting: {
actions: [ButtonTypesEnum.starting],
primaryActions: [ButtonTypesEnum.starting],
canCancel: true,
canAcceptJobs: false,
},
running: {
actions: [
ButtonTypesEnum.stop,
ButtonTypesEnum.settings,
ButtonTypesEnum.changeVersion,
ButtonTypesEnum.delete,
],
primaryActions: [ButtonTypesEnum.stop],
secondaryActions: defaultSecondaryActions,
canCancel: false,
canAcceptJobs: true,
},
stopping: {
actions: [ButtonTypesEnum.stopping],
primaryActions: [ButtonTypesEnum.stopping],
canCancel: true,
canAcceptJobs: false,
},
stopped: {
actions: [
ButtonTypesEnum.start,
ButtonTypesEnum.settings,
ButtonTypesEnum.changeVersion,
ButtonTypesEnum.delete,
],
primaryActions: [ButtonTypesEnum.start],
secondaryActions: defaultSecondaryActions,
canCancel: false,
canAcceptJobs: true,
},
canceled: {
actions: [
ButtonTypesEnum.start,
ButtonTypesEnum.stop,
ButtonTypesEnum.settings,
ButtonTypesEnum.changeVersion,
ButtonTypesEnum.delete,
],
primaryActions: [ButtonTypesEnum.start, ButtonTypesEnum.stop],
secondaryActions: defaultSecondaryActions,
canCancel: false,
canAcceptJobs: true,
},
// in the case of an error
failed: {
actions: [
ButtonTypesEnum.start,
ButtonTypesEnum.stop,
ButtonTypesEnum.settings,
ButtonTypesEnum.changeVersion,
ButtonTypesEnum.delete,
],
primaryActions: [ButtonTypesEnum.start, ButtonTypesEnum.stop],
secondaryActions: defaultSecondaryActions,
canCancel: false,
canAcceptJobs: true,
},
/**
* disabled states
*/
canceling: {
actions: [ButtonTypesEnum.canceling],
primaryActions: [ButtonTypesEnum.canceling],
canCancel: false,
canAcceptJobs: false,
},
deleting: {
actions: [ButtonTypesEnum.deleting],
primaryActions: [ButtonTypesEnum.deleting],
canCancel: true,
canAcceptJobs: false,
},
deleted: {
actions: [ButtonTypesEnum.deleted],
primaryActions: [ButtonTypesEnum.deleted],
canCancel: false,
canAcceptJobs: true,
},
pending: {
actions: [ButtonTypesEnum.pending],
primaryActions: [ButtonTypesEnum.pending],
canCancel: false,
canAcceptJobs: false,
},
Expand Down