revert tabbar change, simpllify workspace-layout-model change

Author: sawka

frontend/app/tab/tabbar.tsx

@@ -75,30 +75,6 @@ const WaveAIButton = memo(({ divRef }: { divRef?: React.RefObject<HTMLDivElement
 });
 WaveAIButton.displayName = "WaveAIButton";
 
-const WidgetsSidebarButton = memo(({ divRef }: { divRef?: React.RefObject<HTMLDivElement> }) => {
-    const widgetsSidebarVisible = useAtomValue(WorkspaceLayoutModel.getInstance().widgetsSidebarVisibleAtom);
-
-    const onClick = () => {
-        const current = WorkspaceLayoutModel.getInstance().getWidgetsSidebarVisible();
-        WorkspaceLayoutModel.getInstance().setWidgetsSidebarVisible(!current);
-    };
-
-    return (
-        <Tooltip
-            content="Toggle Widgets Sidebar"
-            placement="bottom"
-            hideOnClick
-            divClassName={`flex h-[22px] px-3.5 justify-end mb-1 items-center rounded-md mr-1 box-border cursor-pointer bg-hover hover:bg-hoverbg transition-colors text-[12px] ${widgetsSidebarVisible ? "text-accent" : "text-secondary"}`}
-            divStyle={{ WebkitAppRegion: "no-drag" } as React.CSSProperties}
-            divOnClick={onClick}
-            divRef={divRef}
-        >
-            <i className="fa fa-bars" />
-        </Tooltip>
-    );
-});
-WidgetsSidebarButton.displayName = "WidgetsSidebarButton";
-
 function strArrayIsEqual(a: string[], b: string[]) {
     // null check
     if (a == null && b == null) {
@@ -147,7 +123,6 @@ const TabBar = memo(({ workspace, noTabs }: TabBarProps) => {
     const rightContainerRef = useRef<HTMLDivElement>(null);
     const workspaceSwitcherRef = useRef<HTMLDivElement>(null);
     const waveAIButtonRef = useRef<HTMLDivElement>(null);
-    const widgetsSidebarButtonRef = createRef<HTMLDivElement>();
     const appMenuButtonRef = useRef<HTMLDivElement>(null);
     const tabWidthRef = useRef<number>(TabDefaultWidth);
     const scrollableRef = useRef<boolean>(false);
@@ -690,7 +665,6 @@ const TabBar = memo(({ workspace, noTabs }: TabBarProps) => {
             </button>
             <div className="flex-1" />
             <div ref={rightContainerRef} className="flex flex-row gap-1 items-end">
-                <WidgetsSidebarButton divRef={widgetsSidebarButtonRef} />
                 <UpdateStatusBanner />
                 <div
                     className="h-full shrink-0 z-window-drag"
@@ -701,4 +675,4 @@ const TabBar = memo(({ workspace, noTabs }: TabBarProps) => {
     );
 });
 
-export { TabBar, WaveAIButton, WidgetsSidebarButton };
+export { TabBar, WaveAIButton };

frontend/app/workspace/workspace-layout-model.ts

@@ -72,7 +72,11 @@ class WorkspaceLayoutModel {
         this.vtabWidth = VTabBar_DefaultWidth;
         this.vtabVisible = false;
         this.panelVisibleAtom = jotai.atom(false);
-        this.widgetsSidebarVisibleAtom = jotai.atom((get) => get(this.getWidgetsSidebarVisibleAtom()) ?? true);
+        this.widgetsSidebarVisibleAtom = jotai.atom(
+            (get) =>
+                get(getOrefMetaKeyAtom(WOS.makeORef("workspace", this.getWorkspaceId()), "layout:widgetsvisible")) ??
+                true
+        );
         this.initializeFromMeta();
 
         this.handleWindowResize = this.handleWindowResize.bind(this);
@@ -137,10 +141,6 @@ class WorkspaceLayoutModel {
         return getOrefMetaKeyAtom(WOS.makeORef("workspace", this.getWorkspaceId()), "layout:vtabbarwidth");
     }
 
-    private getWidgetsSidebarVisibleAtom(): jotai.Atom<boolean | undefined> {
-        return getOrefMetaKeyAtom(WOS.makeORef("workspace", this.getWorkspaceId()), "layout:widgetsvisible");
-    }
-
     private initializeFromMeta(): void {
         try {
             const savedVisible = globalStore.get(this.getPanelOpenAtom());
@@ -358,18 +358,6 @@ class WorkspaceLayoutModel {
         return this.getResolvedAIWidth(window.innerWidth);
     }
 
-    getWidgetsSidebarVisible(): boolean {
-        return globalStore.get(this.widgetsSidebarVisibleAtom);
-    }
-
-    setWidgetsSidebarVisible(visible: boolean): void {
-        if (globalStore.get(this.widgetsSidebarVisibleAtom) === visible) return;
-        RpcApi.SetMetaCommand(TabRpcClient, {
-            oref: WOS.makeORef("workspace", this.getWorkspaceId()),
-            meta: { "layout:widgetsvisible": visible },
-        });
-    }
-
     // ---- Initial percentage helpers (used by workspace.tsx for defaultSize) ----
 
     getLeftGroupInitialPercentage(windowWidth: number, showLeftTabBar: boolean): number {