multi-window support (#62)

pkg/service/clientservice/clientservice.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/wavetermdev/thenextwave/pkg/util/utilfn"
 	"github.com/wavetermdev/thenextwave/pkg/wstore"
 )
 
@@ -54,3 +55,21 @@ func (cs *ClientService) GetWindow(windowId string) (*wstore.Window, error) {
 	}
 	return window, nil
 }
+
+func (cs *ClientService) MakeWindow(ctx context.Context) (*wstore.Window, error) {
+	return wstore.CreateWindow(ctx)
+}
+
+// moves the window to the front of the windowId stack
+func (cs *ClientService) FocusWindow(ctx context.Context, windowId string) error {
+	client, err := cs.GetClientData()
+	if err != nil {
+		return err
+	}
+	winIdx := utilfn.SliceIdx(client.WindowIds, windowId)
+	if winIdx == -1 {
+		return nil
+	}
+	client.WindowIds = utilfn.MoveSliceIdxToFront(client.WindowIds, winIdx)
+	return wstore.DBUpdate(ctx, client)
+}

pkg/service/objectservice/objectservice.go

@@ -205,41 +205,6 @@ func (svc *ObjectService) CloseTab_Meta() tsgenmeta.MethodMeta {
 	}
 }
 
-func (svc *ObjectService) CloseTab(uiContext wstore.UIContext, tabId string) (wstore.UpdatesRtnType, error) {
-	ctx, cancelFn := context.WithTimeout(context.Background(), DefaultTimeout)
-	defer cancelFn()
-	ctx = wstore.ContextWithUpdates(ctx)
-	window, err := wstore.DBMustGet[*wstore.Window](ctx, uiContext.WindowId)
-	if err != nil {
-		return nil, fmt.Errorf("error getting window: %w", err)
-	}
-	tab, err := wstore.DBMustGet[*wstore.Tab](ctx, tabId)
-	if err != nil {
-		return nil, fmt.Errorf("error getting tab: %w", err)
-	}
-	for _, blockId := range tab.BlockIds {
-		blockcontroller.StopBlockController(blockId)
-	}
-	err = wstore.CloseTab(ctx, window.WorkspaceId, tabId)
-	if err != nil {
-		return nil, fmt.Errorf("error closing tab: %w", err)
-	}
-	if window.ActiveTabId == tabId {
-		ws, err := wstore.DBMustGet[*wstore.Workspace](ctx, window.WorkspaceId)
-		if err != nil {
-			return nil, fmt.Errorf("error getting workspace: %w", err)
-		}
-		var newActiveTabId string
-		if len(ws.TabIds) > 0 {
-			newActiveTabId = ws.TabIds[0]
-		} else {
-			newActiveTabId = ""
-		}
-		wstore.SetActiveTab(ctx, uiContext.WindowId, newActiveTabId)
-	}
-	return wstore.ContextGetUpdatesRtn(ctx), nil
-}
-
 func (svc *ObjectService) UpdateObjectMeta_Meta() tsgenmeta.MethodMeta {
 	return tsgenmeta.MethodMeta{
 		ArgNames: []string{"uiContext", "oref", "meta"},

pkg/service/windowservice/windowservice.go

@@ -5,10 +5,15 @@ package windowservice
 
 import (
 	"context"
+	"fmt"
+	"time"
 
+	"github.com/wavetermdev/thenextwave/pkg/blockcontroller"
 	"github.com/wavetermdev/thenextwave/pkg/wstore"
 )
 
+const DefaultTimeout = 2 * time.Second
+
 type WindowService struct{}
 
 func (ws *WindowService) SetWindowPosAndSize(ctx context.Context, windowId string, pos *wstore.Point, size *wstore.WinSize) (wstore.UpdatesRtnType, error) {
@@ -32,3 +37,64 @@ func (ws *WindowService) SetWindowPosAndSize(ctx context.Context, windowId strin
 	}
 	return wstore.ContextGetUpdatesRtn(ctx), nil
 }
+
+func (svc *WindowService) CloseTab(ctx context.Context, uiContext wstore.UIContext, tabId string) (wstore.UpdatesRtnType, error) {
+	ctx = wstore.ContextWithUpdates(ctx)
+	window, err := wstore.DBMustGet[*wstore.Window](ctx, uiContext.WindowId)
+	if err != nil {
+		return nil, fmt.Errorf("error getting window: %w", err)
+	}
+	tab, err := wstore.DBMustGet[*wstore.Tab](ctx, tabId)
+	if err != nil {
+		return nil, fmt.Errorf("error getting tab: %w", err)
+	}
+	for _, blockId := range tab.BlockIds {
+		blockcontroller.StopBlockController(blockId)
+	}
+	err = wstore.DeleteTab(ctx, window.WorkspaceId, tabId)
+	if err != nil {
+		return nil, fmt.Errorf("error closing tab: %w", err)
+	}
+	if window.ActiveTabId == tabId {
+		ws, err := wstore.DBMustGet[*wstore.Workspace](ctx, window.WorkspaceId)
+		if err != nil {
+			return nil, fmt.Errorf("error getting workspace: %w", err)
+		}
+		var newActiveTabId string
+		if len(ws.TabIds) > 0 {
+			newActiveTabId = ws.TabIds[0]
+		} else {
+			newActiveTabId = ""
+		}
+		wstore.SetActiveTab(ctx, uiContext.WindowId, newActiveTabId)
+	}
+	return wstore.ContextGetUpdatesRtn(ctx), nil
+}
+
+func (svc *WindowService) CloseWindow(ctx context.Context, windowId string) error {
+	ctx = wstore.ContextWithUpdates(ctx)
+	window, err := wstore.DBMustGet[*wstore.Window](ctx, windowId)
+	if err != nil {
+		return fmt.Errorf("error getting window: %w", err)
+	}
+	workspace, err := wstore.DBMustGet[*wstore.Workspace](ctx, window.WorkspaceId)
+	if err != nil {
+		return fmt.Errorf("error getting workspace: %w", err)
+	}
+	for _, tabId := range workspace.TabIds {
+		uiContext := wstore.UIContext{WindowId: windowId}
+		_, err := svc.CloseTab(ctx, uiContext, tabId)
+		if err != nil {
+			return fmt.Errorf("error closing tab: %w", err)
+		}
+	}
+	err = wstore.DBDelete(ctx, wstore.OType_Workspace, window.WorkspaceId)
+	if err != nil {
+		return fmt.Errorf("error deleting workspace: %w", err)
+	}
+	err = wstore.DBDelete(ctx, wstore.OType_Window, windowId)
+	if err != nil {
+		return fmt.Errorf("error deleting window: %w", err)
+	}
+	return nil
+}