fix onFailLoad for helpview (#1951)

wavetermdev · Feb 12, 2025 · af65c2c · af65c2c
1 parent 36bf4af
commit af65c2c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 39 deletions.
diff --git a/frontend/app/view/chat/chat.tsx b/frontend/app/view/chat/chat.tsx
@@ -31,10 +31,6 @@ class ChatModel {
     });
 }
 
-function makeChatModel(blockId: string): ChatModel {
-    return new ChatModel(blockId);
-}
-
 interface ChatProps {
     model: ChatModel;
 }
@@ -67,4 +63,4 @@ const Chat = memo(({ model }: ChatProps) => {
     );
 });
 
-export { Chat, ChatModel, makeChatModel };
+export { Chat, ChatModel };
diff --git a/frontend/app/view/helpview/helpview.tsx b/frontend/app/view/helpview/helpview.tsx
@@ -15,6 +15,10 @@ const docsiteWebUrl = "https://docs.waveterm.dev/";
 const baseUrlRegex = /http[s]?:\/\/([^:\/])+(:\d+)?/;
 
 class HelpViewModel extends WebViewModel {
+    get viewComponent(): ViewComponent {
+        return HelpView;
+    }
+
     constructor(blockId: string, nodeModel: BlockNodeModel) {
         super(blockId, nodeModel);
         this.viewText = atom((get) => {
@@ -137,10 +141,6 @@ class HelpViewModel extends WebViewModel {
     }
 }
 
-function makeHelpViewModel(blockId: string, nodeModel: BlockNodeModel) {
-    return new HelpViewModel(blockId, nodeModel);
-}
-
 function HelpView(props: ViewComponentProps<HelpViewModel>) {
     const model = props.model;
     const homepageUrl = useAtomValue(model.homepageUrl);
@@ -172,4 +172,4 @@ function HelpView(props: ViewComponentProps<HelpViewModel>) {
     );
 }
 
-export { HelpView, HelpViewModel, makeHelpViewModel };
+export { HelpViewModel };
diff --git a/frontend/app/view/preview/preview.tsx b/frontend/app/view/preview/preview.tsx
@@ -869,11 +869,6 @@ export class PreviewModel implements ViewModel {
     }
 }
 
-function makePreviewModel(blockId: string, nodeModel: BlockNodeModel): PreviewModel {
-    const previewModel = new PreviewModel(blockId, nodeModel);
-    return previewModel;
-}
-
 function MarkdownPreview({ model }: SpecializedViewProps) {
     const connName = useAtomValue(model.connection);
     const fileInfo = useAtomValue(model.statFile);
@@ -1231,4 +1226,4 @@ const OpenFileModal = memo(
     }
 );
 
-export { makePreviewModel, PreviewView };
+export { PreviewView };
diff --git a/frontend/app/view/quicktipsview/quicktipsview.tsx b/frontend/app/view/quicktipsview/quicktipsview.tsx
@@ -25,10 +25,6 @@ class QuickTipsViewModel implements ViewModel {
     }
 }
 
-function makeQuickTipsViewModel() {
-    return new QuickTipsViewModel();
-}
-
 function QuickTipsView({ model }: { model: QuickTipsViewModel }) {
     return (
         <div className="quicktips-view">
@@ -37,4 +33,4 @@ function QuickTipsView({ model }: { model: QuickTipsViewModel }) {
     );
 }
 
-export { makeQuickTipsViewModel, QuickTipsView, QuickTipsViewModel };
+export { QuickTipsViewModel };
diff --git a/frontend/app/view/sysinfo/sysinfo.tsx b/frontend/app/view/sysinfo/sysinfo.tsx
@@ -321,11 +321,6 @@ class SysinfoViewModel implements ViewModel {
     }
 }
 
-function makeSysinfoViewModel(blockId: string, viewType: string): SysinfoViewModel {
-    const sysinfoViewModel = new SysinfoViewModel(blockId, viewType);
-    return sysinfoViewModel;
-}
-
 const plotColors = ["#58C142", "#FFC107", "#FF5722", "#2196F3", "#9C27B0", "#00BCD4", "#FFEB3B", "#795548"];
 
 type SysinfoViewProps = {
@@ -562,4 +557,4 @@ const SysinfoViewInner = React.memo(({ model }: SysinfoViewProps) => {
     );
 });
 
-export { makeSysinfoViewModel, SysinfoView, SysinfoViewModel };
+export { SysinfoViewModel };
diff --git a/frontend/app/view/waveai/waveai.tsx b/frontend/app/view/waveai/waveai.tsx
@@ -434,11 +434,6 @@ export class WaveAiModel implements ViewModel {
     }
 }
 
-function makeWaveAiViewModel(blockId: string): WaveAiModel {
-    const waveAiModel = new WaveAiModel(blockId);
-    return waveAiModel;
-}
-
 const ChatItem = ({ chatItemAtom, model }: ChatItemProps) => {
     const chatItem = useAtomValue(chatItemAtom);
     const { user, text } = chatItem;
@@ -873,4 +868,4 @@ const WaveAi = ({ model }: { model: WaveAiModel; blockId: string }) => {
     );
 };
 
-export { makeWaveAiViewModel, WaveAi };
+export { WaveAi };
diff --git a/frontend/app/view/webview/webview.tsx b/frontend/app/view/webview/webview.tsx
@@ -594,11 +594,6 @@ export class WebViewModel implements ViewModel {
     }
 }
 
-function makeWebViewModel(blockId: string, nodeModel: BlockNodeModel): WebViewModel {
-    const webviewModel = new WebViewModel(blockId, nodeModel);
-    return webviewModel;
-}
-
 const BookmarkTypeahead = memo(
     ({ model, blockRef }: { model: WebViewModel; blockRef: React.RefObject<HTMLDivElement> }) => {
         const openBookmarksJson = () => {
@@ -898,4 +893,4 @@ const WebView = memo(({ model, onFailLoad, blockRef }: WebViewProps) => {
     );
 });
 
-export { WebView, makeWebViewModel };
+export { WebView };