* Rename `homeMachine` and accessories to `projectsMachine` * Separate out `/home` route from `projectsMachine` * Add logic to navigate out from deleted or renamed project * Show a warning in the command palette for deleting a project * Make it navigate when you create a project * Update "New project" button to use command bar flow Closes #2585 * More explicit warning message text * Make projects watching code not run in web * Tests first version: nested loops * Tests second version: flattened * Remove console logs * Fix tsc * @jtran feedback, use the type guard util * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Fix tests that relied on one-click, no-navigation project creation * Revert "A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest)" This reverts commit7545b61b49
. * Revert "A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest)" This reverts commit3d2e48732c
. * Add a mask to the state indicator to client-side scale test * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * Fix lint * Fix tsc * Fix a couple stray tests that still relied on the old way of creating projects * De-flake another text that could be thrown off by toast-based selectors * FMT * Dumb test error because I was rushing * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * Ahhh more flaky toasts, they're everywhere! * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Re-run CI * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Re-run CI * Fix one test added since this PR was made * Fix a few tests that failed due to changes since PR was made * Prevent double selector issue in Ubuntu test * Prevent *a different* double selector issue --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
195 lines
5.3 KiB
TypeScript
195 lines
5.3 KiB
TypeScript
import {
|
|
AnyStateMachine,
|
|
ContextFrom,
|
|
EventFrom,
|
|
Actor,
|
|
StateFrom,
|
|
} from 'xstate'
|
|
import { isDesktop } from './isDesktop'
|
|
import {
|
|
Command,
|
|
CommandArgument,
|
|
CommandArgumentConfig,
|
|
CommandConfig,
|
|
StateMachineCommandSetConfig,
|
|
StateMachineCommandSetSchema,
|
|
} from './commandTypes'
|
|
|
|
interface CreateMachineCommandProps<
|
|
T extends AnyStateMachine,
|
|
S extends StateMachineCommandSetSchema<T>
|
|
> {
|
|
type: EventFrom<T>['type']
|
|
groupId: T['id']
|
|
state: StateFrom<T>
|
|
send: Function
|
|
actor: Actor<T>
|
|
commandBarConfig?: StateMachineCommandSetConfig<T, S>
|
|
onCancel?: () => void
|
|
}
|
|
|
|
// Creates a command with subcommands, ready for use in the CommandBar component,
|
|
// from a more terse Command Bar Meta definition.
|
|
export function createMachineCommand<
|
|
T extends AnyStateMachine,
|
|
S extends StateMachineCommandSetSchema<T>
|
|
>({
|
|
groupId,
|
|
type,
|
|
state,
|
|
send,
|
|
actor,
|
|
commandBarConfig,
|
|
onCancel,
|
|
}: CreateMachineCommandProps<T, S>):
|
|
| Command<T, typeof type, S[typeof type]>
|
|
| Command<T, typeof type, S[typeof type]>[]
|
|
| null {
|
|
const commandConfig = commandBarConfig && commandBarConfig[type]
|
|
|
|
// There may be no command config for this event type,
|
|
// or there may be multiple commands to create.
|
|
if (!commandConfig) {
|
|
return null
|
|
} else if (commandConfig instanceof Array) {
|
|
return commandConfig
|
|
.map((config) => {
|
|
const recursiveCommandBarConfig: Partial<
|
|
StateMachineCommandSetConfig<T, S>
|
|
> = {
|
|
[type]: config,
|
|
}
|
|
return createMachineCommand({
|
|
groupId,
|
|
type,
|
|
state,
|
|
send,
|
|
actor,
|
|
commandBarConfig: recursiveCommandBarConfig,
|
|
onCancel,
|
|
})
|
|
})
|
|
.filter((c) => c !== null) as Command<T, typeof type, S[typeof type]>[]
|
|
}
|
|
|
|
// Hide commands based on platform by returning `null`
|
|
// so the consumer can filter them out
|
|
if ('hide' in commandConfig) {
|
|
const { hide } = commandConfig
|
|
if (hide === 'both') return null
|
|
else if (hide === 'desktop' && isDesktop()) return null
|
|
else if (hide === 'web' && !isDesktop()) return null
|
|
}
|
|
|
|
const icon = ('icon' in commandConfig && commandConfig.icon) || undefined
|
|
|
|
const command: Command<T, typeof type, S[typeof type]> = {
|
|
name: type,
|
|
groupId,
|
|
icon,
|
|
description: commandConfig.description,
|
|
needsReview: commandConfig.needsReview || false,
|
|
onSubmit: (data?: S[typeof type]) => {
|
|
if (data !== undefined && data !== null) {
|
|
send({ type, data })
|
|
} else {
|
|
send({ type })
|
|
}
|
|
},
|
|
}
|
|
|
|
if (commandConfig.args) {
|
|
const newArgs = buildCommandArguments(state, commandConfig.args, actor)
|
|
|
|
command.args = newArgs
|
|
}
|
|
|
|
if (onCancel) {
|
|
command.onCancel = onCancel
|
|
}
|
|
|
|
if ('displayName' in commandConfig) {
|
|
command.displayName = commandConfig.displayName
|
|
}
|
|
if ('reviewMessage' in commandConfig) {
|
|
command.reviewMessage = commandConfig.reviewMessage
|
|
}
|
|
|
|
return command
|
|
}
|
|
|
|
// Takes the args from a CommandConfig and creates
|
|
// a finalized CommandArgument object for each one,
|
|
// bundled together into the args for a Command.
|
|
function buildCommandArguments<
|
|
T extends AnyStateMachine,
|
|
S extends StateMachineCommandSetSchema<T>,
|
|
CommandName extends EventFrom<T>['type'] = EventFrom<T>['type']
|
|
>(
|
|
state: StateFrom<T>,
|
|
args: CommandConfig<T, CommandName, S>['args'],
|
|
machineActor: Actor<T>
|
|
): NonNullable<Command<T, CommandName, S>['args']> {
|
|
const newArgs = {} as NonNullable<Command<T, CommandName, S>['args']>
|
|
|
|
for (const arg in args) {
|
|
const argConfig = args[arg] as CommandArgumentConfig<S[typeof arg], T>
|
|
const newArg = buildCommandArgument(argConfig, state.context, machineActor)
|
|
newArgs[arg] = newArg
|
|
}
|
|
|
|
return newArgs
|
|
}
|
|
|
|
export function buildCommandArgument<
|
|
T extends AnyStateMachine,
|
|
O extends StateMachineCommandSetSchema<T> = StateMachineCommandSetSchema<T>
|
|
>(
|
|
arg: CommandArgumentConfig<O, T>,
|
|
context: ContextFrom<T>,
|
|
machineActor: Actor<T>
|
|
): CommandArgument<O, T> & { inputType: typeof arg.inputType } {
|
|
const baseCommandArgument = {
|
|
description: arg.description,
|
|
required: arg.required,
|
|
skip: arg.skip,
|
|
machineActor,
|
|
valueSummary: arg.valueSummary,
|
|
warningMessage: arg.warningMessage ?? '',
|
|
} satisfies Omit<CommandArgument<O, T>, 'inputType'>
|
|
|
|
if (arg.inputType === 'options') {
|
|
return {
|
|
inputType: arg.inputType,
|
|
...baseCommandArgument,
|
|
defaultValue: arg.defaultValueFromContext
|
|
? arg.defaultValueFromContext(context)
|
|
: arg.defaultValue,
|
|
options: arg.optionsFromContext
|
|
? arg.optionsFromContext(context)
|
|
: arg.options,
|
|
} satisfies CommandArgument<O, T> & { inputType: 'options' }
|
|
} else if (arg.inputType === 'selection') {
|
|
return {
|
|
inputType: arg.inputType,
|
|
...baseCommandArgument,
|
|
multiple: arg.multiple,
|
|
selectionTypes: arg.selectionTypes,
|
|
} satisfies CommandArgument<O, T> & { inputType: 'selection' }
|
|
} else if (arg.inputType === 'kcl') {
|
|
return {
|
|
inputType: arg.inputType,
|
|
defaultValue: arg.defaultValue,
|
|
...baseCommandArgument,
|
|
} satisfies CommandArgument<O, T> & { inputType: 'kcl' }
|
|
} else {
|
|
return {
|
|
inputType: arg.inputType,
|
|
defaultValue: arg.defaultValueFromContext
|
|
? arg.defaultValueFromContext(context)
|
|
: arg.defaultValue,
|
|
...baseCommandArgument,
|
|
}
|
|
}
|
|
}
|