mirror of
https://github.com/wailsapp/wails.git
synced 2026-03-14 22:55:48 +01:00
* Refactor Manager API to use singular naming convention This is a RENAME-ONLY exercise that converts the Wails v3 Manager API from plural to singular naming for better consistency and clarity. ## Changes Applied ### API Transformations: - `app.Windows.*` → `app.Window.*` - `app.Events.*` → `app.Event.*` - `app.ContextMenus.*` → `app.ContextMenu.*` - `app.KeyBindings.*` → `app.KeyBinding.*` - `app.Dialogs.*` → `app.Dialog.*` - `app.Menus.*` → `app.Menu.*` - `app.Screens.*` → `app.Screen.*` ### Files Updated: - **Core Application**: 22 files in `v3/pkg/application/` - **Examples**: 43+ files in `v3/examples/` - **Documentation**: 13 files in `docs/src/content/docs/` - **CLI Tests**: 1 file in `v3/internal/commands/` ### Critical Constraints Preserved: - ✅ Event string constants unchanged (e.g., "windows:WindowShow") - ✅ Platform event names preserved (events.Windows, events.Mac, etc.) - ✅ TypeScript API remains compatible - ✅ All functionality intact ### Verification: - ✅ All examples build successfully (`task test:examples` passes) - ✅ Application package compiles without errors - ✅ Documentation reflects new API patterns ## Benefits - **Improved Clarity**: Singular names are more intuitive (`app.Window` vs `app.Windows`) - **Better Consistency**: Aligns with Go naming conventions - **Enhanced Developer Experience**: Clearer autocomplete and API discovery 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix generator testcases and add cross-platform test cleanup - Update 28 generator testcase files to use singular API (app.Window.New() vs app.Windows.New()) - Add cross-platform cleanup system with Go script to remove test artifacts - Add test:all task with comprehensive testing and automatic cleanup - Fix cleanup to target files vs directories correctly (preserves source directories) 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix remaining Windows CI failures by updating all plural API usage to singular Fixed the last remaining instances of old plural Manager API usage: - tests/window-visibility-test/main.go: Updated all app.Windows -> app.Window and app.Menus -> app.Menu - internal/templates/_common/main.go.tmpl: Updated app.Windows -> app.Window and app.Events -> app.Event - pkg/services/badge/badge_windows.go: Updated app.Windows -> app.Window (Windows-specific fix) These fixes address the Windows CI failures where platform-specific files still used the old API. The tests didn't catch this locally because Windows-specific files only compile on Windows. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
168 lines
4.7 KiB
Go
168 lines
4.7 KiB
Go
package application
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"runtime"
|
|
)
|
|
|
|
const (
|
|
DialogInfo = 0
|
|
DialogWarning = 1
|
|
DialogError = 2
|
|
DialogQuestion = 3
|
|
DialogOpenFile = 4
|
|
DialogSaveFile = 5
|
|
)
|
|
|
|
var dialogMethodNames = map[int]string{
|
|
DialogInfo: "Info",
|
|
DialogWarning: "Warning",
|
|
DialogError: "Error",
|
|
DialogQuestion: "Question",
|
|
DialogOpenFile: "OpenFile",
|
|
DialogSaveFile: "SaveFile",
|
|
}
|
|
|
|
func (m *MessageProcessor) dialogErrorCallback(window Window, message string, dialogID *string, err error) {
|
|
m.Error(message, "error", err)
|
|
window.DialogError(*dialogID, err.Error())
|
|
}
|
|
|
|
func (m *MessageProcessor) dialogCallback(window Window, dialogID *string, result string, isJSON bool) {
|
|
window.DialogResponse(*dialogID, result, isJSON)
|
|
}
|
|
|
|
func (m *MessageProcessor) processDialogMethod(method int, rw http.ResponseWriter, r *http.Request, window Window, params QueryParams) {
|
|
args, err := params.Args()
|
|
if err != nil {
|
|
m.httpError(rw, "Invalid dialog call:", fmt.Errorf("unable to parse arguments: %w", err))
|
|
return
|
|
}
|
|
|
|
dialogID := args.String("dialog-id")
|
|
if dialogID == nil {
|
|
m.httpError(rw, "Invalid window call:", errors.New("missing argument 'dialog-id'"))
|
|
return
|
|
}
|
|
|
|
var methodName = "Dialog." + dialogMethodNames[method]
|
|
|
|
switch method {
|
|
case DialogInfo, DialogWarning, DialogError, DialogQuestion:
|
|
var options MessageDialogOptions
|
|
err := params.ToStruct(&options)
|
|
if err != nil {
|
|
m.httpError(rw, "Invalid dialog call:", fmt.Errorf("error parsing dialog options: %w", err))
|
|
return
|
|
}
|
|
if len(options.Buttons) == 0 {
|
|
switch runtime.GOOS {
|
|
case "darwin":
|
|
options.Buttons = []*Button{{Label: "OK", IsDefault: true}}
|
|
}
|
|
}
|
|
var dialog *MessageDialog
|
|
switch method {
|
|
case DialogInfo:
|
|
dialog = InfoDialog()
|
|
case DialogWarning:
|
|
dialog = WarningDialog()
|
|
case DialogError:
|
|
dialog = ErrorDialog()
|
|
case DialogQuestion:
|
|
dialog = QuestionDialog()
|
|
}
|
|
var detached = args.Bool("Detached")
|
|
if detached == nil || !*detached {
|
|
dialog.AttachToWindow(window)
|
|
}
|
|
|
|
dialog.SetTitle(options.Title)
|
|
dialog.SetMessage(options.Message)
|
|
for _, button := range options.Buttons {
|
|
label := button.Label
|
|
button.OnClick(func() {
|
|
m.dialogCallback(window, dialogID, label, false)
|
|
})
|
|
}
|
|
dialog.AddButtons(options.Buttons)
|
|
dialog.Show()
|
|
m.ok(rw)
|
|
m.Info("Runtime call:", "method", methodName, "options", options)
|
|
|
|
case DialogOpenFile:
|
|
var options OpenFileDialogOptions
|
|
err := params.ToStruct(&options)
|
|
if err != nil {
|
|
m.httpError(rw, "Invalid dialog call:", fmt.Errorf("error parsing dialog options: %w", err))
|
|
return
|
|
}
|
|
var detached = args.Bool("Detached")
|
|
if detached == nil || !*detached {
|
|
options.Window = window.(*WebviewWindow)
|
|
}
|
|
dialog := globalApplication.Dialog.OpenFileWithOptions(&options)
|
|
|
|
go func() {
|
|
defer handlePanic()
|
|
if options.AllowsMultipleSelection {
|
|
files, err := dialog.PromptForMultipleSelection()
|
|
if err != nil {
|
|
m.dialogErrorCallback(window, "Dialog.OpenFile failed", dialogID, fmt.Errorf("error getting selection: %w", err))
|
|
return
|
|
} else {
|
|
result, err := json.Marshal(files)
|
|
if err != nil {
|
|
m.dialogErrorCallback(window, "Dialog.OpenFile failed", dialogID, fmt.Errorf("error marshaling files: %w", err))
|
|
return
|
|
}
|
|
m.dialogCallback(window, dialogID, string(result), true)
|
|
m.Info("Runtime call:", "method", methodName, "result", result)
|
|
}
|
|
} else {
|
|
file, err := dialog.PromptForSingleSelection()
|
|
if err != nil {
|
|
m.dialogErrorCallback(window, "Dialog.OpenFile failed", dialogID, fmt.Errorf("error getting selection: %w", err))
|
|
return
|
|
}
|
|
m.dialogCallback(window, dialogID, file, false)
|
|
m.Info("Runtime call:", "method", methodName, "result", file)
|
|
}
|
|
}()
|
|
m.ok(rw)
|
|
m.Info("Runtime call:", "method", methodName, "options", options)
|
|
|
|
case DialogSaveFile:
|
|
var options SaveFileDialogOptions
|
|
err := params.ToStruct(&options)
|
|
if err != nil {
|
|
m.httpError(rw, "Invalid dialog call:", fmt.Errorf("error parsing dialog options: %w", err))
|
|
return
|
|
}
|
|
var detached = args.Bool("Detached")
|
|
if detached == nil || !*detached {
|
|
options.Window = window.(*WebviewWindow)
|
|
}
|
|
dialog := globalApplication.Dialog.SaveFileWithOptions(&options)
|
|
|
|
go func() {
|
|
defer handlePanic()
|
|
file, err := dialog.PromptForSingleSelection()
|
|
if err != nil {
|
|
m.dialogErrorCallback(window, "Dialog.SaveFile failed", dialogID, fmt.Errorf("error getting selection: %w", err))
|
|
return
|
|
}
|
|
m.dialogCallback(window, dialogID, file, false)
|
|
m.Info("Runtime call:", "method", methodName, "result", file)
|
|
}()
|
|
m.ok(rw)
|
|
m.Info("Runtime call:", "method", methodName, "options", options)
|
|
|
|
default:
|
|
m.httpError(rw, "Invalid dialog call:", fmt.Errorf("unknown method: %d", method))
|
|
return
|
|
}
|
|
}
|