Skip to content

fix(commands): show validation errors in modal instead of globally #251

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

Open
JiahaoZhu11 wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

fix(commands): show validation errors in modal instead of globally #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1857d82
fix(commands): show validation errors in modal instead of globally (#10)
JiahaoZhu11 Jan 25, 2026
c437741
Merge remote-tracking branch 'upstream/dev' into fix/command-modal-error
JiahaoZhu11 Jan 25, 2026
ba34e95
Merge remote-tracking branch 'upstream/dev' into fix/command-modal-error
JiahaoZhu11 Jan 25, 2026
26872a4
Merge remote-tracking branch 'upstream/dev' into fix/command-modal-error
JiahaoZhu11 Jan 26, 2026
84aecde
Merge remote-tracking branch 'upstream/dev' into fix/command-modal-error
JiahaoZhu11 Jan 26, 2026
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
8 changes: 7 additions & 1 deletion packages/app/src/app/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,8 @@ export default function App() {
setCommandDraftTemplate,
commandDraftScope,
setCommandDraftScope,
commandModalError,
setCommandModalError,
runModalOpen,
runModalCommand,
runModalDetails,
Expand Down Expand Up @@ -3051,7 +3053,11 @@ export default function App() {
description={commandDraftDescription()}
template={commandDraftTemplate()}
scope={commandDraftScope()}
onClose={() => setCommandModalOpen(false)}
error={commandModalError()}
onClose={() => {
setCommandModalOpen(false);
setCommandModalError(null);
}}
onSave={saveCommand}
onNameChange={setCommandDraftName}
onDescriptionChange={setCommandDraftDescription}
Expand Down
15 changes: 10 additions & 5 deletions packages/app/src/app/command-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export function createCommandState(options: {
const [commandDraftDescription, setCommandDraftDescription] = createSignal("");
const [commandDraftTemplate, setCommandDraftTemplate] = createSignal("");
const [commandDraftScope, setCommandDraftScope] = createSignal<"workspace" | "global">("workspace");
const [commandModalError, setCommandModalError] = createSignal<string | null>(null);

const [runModalOpen, setRunModalOpen] = createSignal(false);
const [runModalCommand, setRunModalCommand] = createSignal<WorkspaceCommand | null>(null);
Expand Down Expand Up @@ -93,18 +94,19 @@ export function createCommandState(options: {
draft.template = commandDraftTemplate().trim();

const safeName = sanitizeCommandName(draft.name);
// Use modal-specific error for validation errors
if (!safeName || !draft.template) {
options.setError(t("app.error.command_name_template_required", currentLocale()));
setCommandModalError(t("app.error.command_name_template_required", currentLocale()));
return;
}

if (!isTauriRuntime()) {
options.setError(t("app.error.workspace_commands_desktop", currentLocale()));
setCommandModalError(t("app.error.workspace_commands_desktop", currentLocale()));
return;
}

if (draft.scope === "workspace" && !options.activeWorkspaceRoot().trim()) {
options.setError(t("app.error.pick_workspace_folder", currentLocale()));
setCommandModalError(t("app.error.pick_workspace_folder", currentLocale()));
return;
}

Expand All @@ -117,7 +119,7 @@ export function createCommandState(options: {
draft.scope === "workspace" ? "status.saving_workspace_command" : "status.saving_command",
);
options.setBusyStartedAt(Date.now());
options.setError(null);
setCommandModalError(null);

try {
const workspaceRoot = options.activeWorkspaceRoot().trim();
Expand Down Expand Up @@ -162,9 +164,10 @@ export function createCommandState(options: {

setJustSavedCommand({ name: safeName, scope: draft.scope });
setCommandModalOpen(false);
setCommandModalError(null);
} catch (e) {
const message = e instanceof Error ? e.message : safeStringify(e);
options.setError(addOpencodeCacheHint(message));
setCommandModalError(addOpencodeCacheHint(message));
} finally {
options.setBusy(false);
options.setBusyLabel(null);
Expand Down Expand Up @@ -362,6 +365,8 @@ export function createCommandState(options: {
setCommandDraftTemplate,
commandDraftScope,
setCommandDraftScope,
commandModalError,
setCommandModalError,
runModalOpen,
runModalCommand,
runModalDetails,
Expand Down
21 changes: 16 additions & 5 deletions packages/app/src/app/components/command-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type CommandModalProps = {
description: string;
template: string;
scope: "workspace" | "global";
error?: string | null;
onClose: () => void;
onSave: () => void;
onNameChange: (value: string) => void;
Expand Down Expand Up @@ -91,11 +92,21 @@ export default function CommandModal(props: CommandModalProps) {
</label>
</div>

<div class="mt-6 flex justify-end gap-2">
<Button variant="outline" onClick={props.onClose}>
{translate("common.cancel")}
</Button>
<Button onClick={props.onSave}>{translate("common.save")}</Button>
<div class="mt-6 flex items-center justify-between gap-2">
{/* Error message on the left */}
<div class="flex-1">
<Show when={props.error}>
<div class="text-sm text-red-11">{props.error}</div>
</Show>
</div>

{/* Buttons on the right */}
<div class="flex gap-2">
<Button variant="outline" onClick={props.onClose}>
{translate("common.cancel")}
</Button>
<Button onClick={props.onSave}>{translate("common.save")}</Button>
</div>
</div>
</div>
</div>
Expand Down