Skip to content

Remove Config Errors from TabBar, move to Settings / WaveConfig #3060

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
sawka merged 3 commits into from
Mar 14, 2026
Merged

Remove Config Errors from TabBar, move to Settings / WaveConfig #3060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38fef0e
ui treatment for config errors in the settings widget
sawka Mar 14, 2026
53ed212
show config errors in waveconfig widget
sawka Mar 14, 2026
37f3443
remove config errors from the header
sawka Mar 14, 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
Prev Previous commit
Next Next commit
show config errors in waveconfig widget
  • Loading branch information
@sawka
sawka committed Mar 14, 2026
commit 53ed212e30ecf128b4bfc7442aa3f0733fb28143
13 changes: 11 additions & 2 deletions frontend/app/view/waveconfig/waveconfig-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { BlockNodeModel } from "@/app/block/blocktypes";
import { getApi, getBlockMetaKeyAtom, WOS } from "@/app/store/global";
import { atoms, getApi, getBlockMetaKeyAtom, WOS } from "@/app/store/global";
import { globalStore } from "@/app/store/jotaiStore";
import type { TabModel } from "@/app/store/tab-model";
import { RpcApi } from "@/app/store/wshclientapi";
Expand All @@ -11,7 +11,7 @@ import { SecretsContent } from "@/app/view/waveconfig/secretscontent";
import { WaveConfigView } from "@/app/view/waveconfig/waveconfig";
import { isWindows } from "@/util/platformutil";
import { base64ToString, stringToBase64 } from "@/util/util";
import { atom, type PrimitiveAtom } from "jotai";
import { atom, type Atom, type PrimitiveAtom } from "jotai";
import type * as MonacoTypes from "monaco-editor";
import * as React from "react";

Expand Down Expand Up @@ -156,6 +156,7 @@ export class WaveConfigViewModel implements ViewModel {
isMenuOpenAtom: PrimitiveAtom<boolean>;
presetsJsonExistsAtom: PrimitiveAtom<boolean>;
activeTabAtom: PrimitiveAtom<"visual" | "json">;
configErrorFilesAtom: Atom<Set<string>>;
configDir: string;
saveShortcut: string;
editorRef: React.RefObject<MonacoTypes.editor.IStandaloneCodeEditor>;
Expand Down Expand Up @@ -189,6 +190,14 @@ export class WaveConfigViewModel implements ViewModel {
this.isMenuOpenAtom = atom(false);
this.presetsJsonExistsAtom = atom(false);
this.activeTabAtom = atom<"visual" | "json">("visual");
this.configErrorFilesAtom = atom((get) => {
const fullConfig = get(atoms.fullConfigAtom);
const errorSet = new Set<string>();
for (const cerr of fullConfig?.configerrors ?? []) {
errorSet.add(cerr.file);
}
return errorSet;
});
this.editorRef = React.createRef();

this.secretNamesAtom = atom<string[]>([]);
Expand Down
28 changes: 26 additions & 2 deletions frontend/app/view/waveconfig/waveconfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { Tooltip } from "@/app/element/tooltip";
import { atoms } from "@/app/store/global";
import { globalStore } from "@/app/store/jotaiStore";
import { tryReinjectKey } from "@/app/store/keymodel";
import { CodeEditor } from "@/app/view/codeeditor/codeeditor";
Expand All @@ -21,6 +22,7 @@ const ConfigSidebar = memo(({ model }: ConfigSidebarProps) => {
const [isMenuOpen, setIsMenuOpen] = useAtom(model.isMenuOpenAtom);
const configFiles = model.getConfigFiles();
const deprecatedConfigFiles = model.getDeprecatedConfigFiles();
const configErrorFiles = useAtomValue(model.configErrorFilesAtom);

const handleFileSelect = (file: ConfigFile) => {
model.loadFile(file);
Expand All @@ -46,7 +48,12 @@ const ConfigSidebar = memo(({ model }: ConfigSidebarProps) => {
selectedFile?.path === file.path ? "bg-accentbg text-primary" : "hover:bg-secondary/50"
}`}
>
<div className="whitespace-nowrap overflow-hidden text-ellipsis">{file.name}</div>
<div className="flex items-center gap-1">
<div className="whitespace-nowrap overflow-hidden text-ellipsis flex-1">{file.name}</div>
{configErrorFiles.has(file.path) && (
<i className="fa fa-solid fa-circle-exclamation text-error text-[14px] shrink-0" />
)}
</div>
{file.description && (
<div className="text-xs text-muted mt-0.5 whitespace-nowrap overflow-hidden text-ellipsis">
{file.description}
Expand Down Expand Up @@ -75,6 +82,9 @@ const ConfigSidebar = memo(({ model }: ConfigSidebarProps) => {
>
deprecated
</span>
{configErrorFiles.has(file.path) && (
<i className="fa fa-solid fa-circle-exclamation text-error text-[14px] ml-auto shrink-0" />
)}
</div>
</div>
))}
Expand All @@ -96,6 +106,8 @@ const WaveConfigView = memo(({ blockId, model }: ViewComponentProps<WaveConfigVi
const [isMenuOpen, setIsMenuOpen] = useAtom(model.isMenuOpenAtom);
const hasChanges = useAtomValue(model.hasEditedAtom);
const [activeTab, setActiveTab] = useAtom(model.activeTabAtom);
const fullConfig = useAtomValue(atoms.fullConfigAtom);
const configErrors = fullConfig?.configerrors;

const handleContentChange = useCallback(
(newContent: string) => {
Expand Down Expand Up @@ -148,7 +160,8 @@ const WaveConfigView = memo(({ blockId, model }: ViewComponentProps<WaveConfigVi
const saveTooltip = `Save (${model.saveShortcut})`;

return (
<div className="@container flex flex-row w-full h-full">
<div className="@container flex flex-col w-full h-full">
<div className="flex flex-row flex-1 min-h-0">
{isMenuOpen && (
<div className="absolute inset-0 bg-black/50 z-5 @w600:hidden" onClick={() => setIsMenuOpen(false)} />
)}
Expand Down Expand Up @@ -284,6 +297,17 @@ const WaveConfigView = memo(({ blockId, model }: ViewComponentProps<WaveConfigVi
</>
)}
</div>
</div>
{configErrors?.length > 0 && (
<div className="bg-error text-primary px-4 py-1 max-h-12 overflow-y-auto border-t border-error/50 shrink-0">
{configErrors.map((cerr, i) => (
<div key={i} className="text-sm">
<span className="font-semibold">Config Error: </span>
{cerr.file}: {cerr.err}
</div>
))}
</div>
)}
</div>
);
});
Expand Down