feat(office): mail preview, infinite scroll, pane resize, and scrollbars
Release Please / Release Please (push) Skipped
Tests / Test (Go 1.22) (push) Skipped
Tests / Test (Go stable) (push) Skipped
Release / GoReleaser (push) Failing after 38s
Release Please / Release Please (push) Skipped
Tests / Test (Go 1.22) (push) Skipped
Tests / Test (Go stable) (push) Skipped
Release / GoReleaser (push) Failing after 38s
Polish the office TUI with proportional pane layout, drag resize, live filtering, HTML mail preview, paginated mail lists, overflow scrollbars, flattened navigation, and project save/status fixes; add UpdateProjectStatus. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
package fetch
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/eslider/go-onlyoffice/cmd/office/model"
|
||||
)
|
||||
|
||||
// CalendarItemFields maps calendar API rows to list items.
|
||||
var CalendarItemFields = FieldMap{IDKey: "objectId", TitleKey: "title"}
|
||||
|
||||
// CalendarItemsFromRows converts API calendar/event rows into list items.
|
||||
func CalendarItemsFromRows(rows []map[string]any) []model.Item {
|
||||
out := make([]model.Item, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
kind, typeLabel := model.ClassifyCalendarRow(row)
|
||||
title := str(row, "title")
|
||||
if title == "" {
|
||||
title = str(row, "name")
|
||||
}
|
||||
if title == "" {
|
||||
title = "(untitled)"
|
||||
}
|
||||
raw := make(map[string]any, len(row)+1)
|
||||
for k, v := range row {
|
||||
raw[k] = v
|
||||
}
|
||||
raw["type"] = typeLabel
|
||||
out = append(out, model.Item{
|
||||
ID: idStr(row, "objectId"),
|
||||
Title: title,
|
||||
Kind: kind,
|
||||
Raw: raw,
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ListCalendar returns calendars and events for the upcoming date window.
|
||||
func (l *Loader) ListCalendar(ctx context.Context) ([]model.Item, error) {
|
||||
if l == nil || l.Client == nil {
|
||||
return nil, fmt.Errorf("fetch: client is nil")
|
||||
}
|
||||
start := time.Now().AddDate(0, 0, -7).Format("2006-01-02")
|
||||
end := time.Now().AddDate(0, 0, 30).Format("2006-01-02")
|
||||
rows, err := l.Client.ListCalendars(ctx, start, end)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return CalendarItemsFromRows(rows), nil
|
||||
}
|
||||
@@ -39,8 +39,7 @@ func TestIntegrationListAllSubjects(t *testing.T) {
|
||||
cases := []model.ListSpec{
|
||||
{Subject: model.SubjectProjects},
|
||||
{Subject: model.SubjectTasks},
|
||||
{Subject: model.SubjectCalendars},
|
||||
{Subject: model.SubjectEvents},
|
||||
{Subject: model.SubjectCalendar},
|
||||
{Subject: model.SubjectContacts},
|
||||
{Subject: model.SubjectPersons},
|
||||
{Subject: model.SubjectCompanies},
|
||||
|
||||
+47
-28
@@ -6,12 +6,14 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
onlyoffice "github.com/eslider/go-onlyoffice"
|
||||
"github.com/eslider/go-onlyoffice/cmd/office/model"
|
||||
)
|
||||
|
||||
// MailListPageSize is how many messages each infinite-scroll fetch loads.
|
||||
const MailListPageSize = 25
|
||||
|
||||
// Loader fetches list items for a menu subject using the OnlyOffice client.
|
||||
type Loader struct {
|
||||
Client *onlyoffice.Client
|
||||
@@ -30,10 +32,12 @@ func (l *Loader) List(ctx context.Context, spec model.ListSpec) ([]model.Item, e
|
||||
return l.listTasksForProject(ctx, spec.ProjectID)
|
||||
}
|
||||
return l.listTasks(ctx)
|
||||
case model.SubjectCalendar:
|
||||
return l.ListCalendar(ctx)
|
||||
case model.SubjectCalendars:
|
||||
return l.listCalendars(ctx)
|
||||
return l.ListCalendar(ctx)
|
||||
case model.SubjectEvents:
|
||||
return l.listEvents(ctx)
|
||||
return l.ListCalendar(ctx)
|
||||
case model.SubjectContacts:
|
||||
return l.listContacts(ctx, nil)
|
||||
case model.SubjectPersons:
|
||||
@@ -49,15 +53,15 @@ func (l *Loader) List(ctx context.Context, spec model.ListSpec) ([]model.Item, e
|
||||
case model.SubjectCRMTasks:
|
||||
return l.listCRMTasks(ctx)
|
||||
case model.SubjectMailInbox:
|
||||
return l.listMail(ctx, onlyoffice.MailFolderInbox)
|
||||
return l.listMail(ctx, onlyoffice.MailFolderInbox, 0)
|
||||
case model.SubjectMailSent:
|
||||
return l.listMail(ctx, onlyoffice.MailFolderSent)
|
||||
return l.listMail(ctx, onlyoffice.MailFolderSent, 0)
|
||||
case model.SubjectMailDrafts:
|
||||
return l.listMail(ctx, onlyoffice.MailFolderDrafts)
|
||||
return l.listMail(ctx, onlyoffice.MailFolderDrafts, 0)
|
||||
case model.SubjectMailTrash:
|
||||
return l.listMail(ctx, onlyoffice.MailFolderTrash)
|
||||
return l.listMail(ctx, onlyoffice.MailFolderTrash, 0)
|
||||
case model.SubjectMailSpam:
|
||||
return l.listMail(ctx, onlyoffice.MailFolderSpam)
|
||||
return l.listMail(ctx, onlyoffice.MailFolderSpam, 0)
|
||||
case model.SubjectUsers:
|
||||
return l.listUsers(ctx)
|
||||
case model.SubjectProjectFiles:
|
||||
@@ -260,6 +264,9 @@ func (l *Loader) listProjects(ctx context.Context) ([]model.Item, error) {
|
||||
if p.ParticipantCount != nil {
|
||||
raw["participantCount"] = *p.ParticipantCount
|
||||
}
|
||||
if p.Status != nil {
|
||||
raw["status"] = *p.Status
|
||||
}
|
||||
items[i] = model.Item{
|
||||
ID: id, Title: title, Kind: model.KindProject, Raw: raw,
|
||||
}
|
||||
@@ -275,24 +282,6 @@ func (l *Loader) listTasks(ctx context.Context) ([]model.Item, error) {
|
||||
return ItemsFromMaps(rows, model.KindTask, TaskItemFields), nil
|
||||
}
|
||||
|
||||
func (l *Loader) listCalendars(ctx context.Context) ([]model.Item, error) {
|
||||
rows, err := l.Client.ListCalendars(ctx, "", "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ItemsFromMaps(rows, model.KindCalendar, FieldMap{IDKey: "objectId", TitleKey: "title"}), nil
|
||||
}
|
||||
|
||||
func (l *Loader) listEvents(ctx context.Context) ([]model.Item, error) {
|
||||
start := time.Now().Format("2006-01-02")
|
||||
end := time.Now().AddDate(0, 0, 7).Format("2006-01-02")
|
||||
rows, err := l.Client.ListEvents(ctx, start, end)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ItemsFromMaps(rows, model.KindEvent, FieldMap{IDKey: "objectId", TitleKey: "title", SubtitleKey: "start"}), nil
|
||||
}
|
||||
|
||||
func (l *Loader) listContacts(ctx context.Context, companyOnly *bool) ([]model.Item, error) {
|
||||
rows, err := l.Client.ListAllContacts(ctx)
|
||||
if err != nil {
|
||||
@@ -335,14 +324,44 @@ func (l *Loader) listCRMTasks(ctx context.Context) ([]model.Item, error) {
|
||||
return ItemsFromMaps(rows, model.KindCRMTask, TaskItemFields), nil
|
||||
}
|
||||
|
||||
func (l *Loader) listMail(ctx context.Context, folder int) ([]model.Item, error) {
|
||||
rows, err := l.Client.ListMailMessages(ctx, onlyoffice.MailMessagesFilter{Folder: folder, Count: 50})
|
||||
func (l *Loader) listMail(ctx context.Context, folder int, startIndex int) ([]model.Item, error) {
|
||||
rows, err := l.Client.ListMailMessages(ctx, onlyoffice.MailMessagesFilter{
|
||||
Folder: folder,
|
||||
Count: MailListPageSize,
|
||||
StartIndex: startIndex,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ItemsFromMaps(rows, model.KindMail, MailItemFields), nil
|
||||
}
|
||||
|
||||
// ListMailMore loads the next page of messages for an active mail folder list.
|
||||
func (l *Loader) ListMailMore(ctx context.Context, spec model.ListSpec, startIndex int) ([]model.Item, error) {
|
||||
folder, ok := mailFolderForSubject(spec.Subject)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("fetch: %q is not a mail folder", spec.Subject)
|
||||
}
|
||||
return l.listMail(ctx, folder, startIndex)
|
||||
}
|
||||
|
||||
func mailFolderForSubject(subject model.Subject) (int, bool) {
|
||||
switch subject {
|
||||
case model.SubjectMailInbox:
|
||||
return onlyoffice.MailFolderInbox, true
|
||||
case model.SubjectMailSent:
|
||||
return onlyoffice.MailFolderSent, true
|
||||
case model.SubjectMailDrafts:
|
||||
return onlyoffice.MailFolderDrafts, true
|
||||
case model.SubjectMailTrash:
|
||||
return onlyoffice.MailFolderTrash, true
|
||||
case model.SubjectMailSpam:
|
||||
return onlyoffice.MailFolderSpam, true
|
||||
default:
|
||||
return 0, false
|
||||
}
|
||||
}
|
||||
|
||||
func (l *Loader) listUsers(ctx context.Context) ([]model.Item, error) {
|
||||
users, err := l.Client.GetUsers()
|
||||
if err != nil {
|
||||
|
||||
@@ -14,7 +14,7 @@ type FieldMap struct {
|
||||
}
|
||||
|
||||
// TaskItemFields is the default field map for project tasks.
|
||||
var TaskItemFields = FieldMap{IDKey: "id", TitleKey: "title", SubtitleKey: "status"}
|
||||
var TaskItemFields = FieldMap{IDKey: "id", TitleKey: "title"}
|
||||
|
||||
// ProjectItemFields is the default field map for projects.
|
||||
var ProjectItemFields = FieldMap{IDKey: "id", TitleKey: "title", SubtitleKey: "status"}
|
||||
|
||||
+33
-12
@@ -10,29 +10,50 @@ import (
|
||||
)
|
||||
|
||||
// SaveItem persists editable form fields for supported entity kinds.
|
||||
func (l *Loader) SaveItem(ctx context.Context, item model.Item, title, description string) error {
|
||||
func (l *Loader) SaveItem(ctx context.Context, item model.Item, fields model.FormFields) error {
|
||||
if l == nil || l.Client == nil {
|
||||
return fmt.Errorf("fetch: client is nil")
|
||||
}
|
||||
switch item.Kind {
|
||||
case model.KindTask:
|
||||
return l.UpdateTask(ctx, item.ID, title, description)
|
||||
return l.UpdateTask(ctx, item.ID, fields.Primary, fields.Secondary)
|
||||
case model.KindProject:
|
||||
id, err := strconv.Atoi(item.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = l.Client.UpdateProject(onlyoffice.ProjectUpdateRequest{
|
||||
ID: id,
|
||||
Title: title,
|
||||
Description: description,
|
||||
})
|
||||
return err
|
||||
return l.saveProject(ctx, item.ID, fields)
|
||||
default:
|
||||
return fmt.Errorf("save not supported for %s", item.Kind)
|
||||
}
|
||||
}
|
||||
|
||||
func (l *Loader) saveProject(ctx context.Context, projectID string, fields model.FormFields) error {
|
||||
id, err := strconv.Atoi(projectID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if fields.ResponsibleID == "" {
|
||||
raw, derr := l.Detail(ctx, model.Item{ID: projectID, Kind: model.KindProject})
|
||||
if derr == nil {
|
||||
fields.ResponsibleID = model.ResponsibleIDFromRaw(raw)
|
||||
}
|
||||
}
|
||||
req := onlyoffice.ProjectUpdateRequest{
|
||||
ID: id,
|
||||
Title: fields.Primary,
|
||||
Description: fields.Secondary,
|
||||
}
|
||||
if fields.ResponsibleID != "" {
|
||||
req.ResponsibleID = fields.ResponsibleID
|
||||
}
|
||||
if _, err := l.Client.UpdateProject(req); err != nil {
|
||||
return err
|
||||
}
|
||||
if fields.HasStatus {
|
||||
if _, err := l.Client.UpdateProjectStatus(id, string(fields.Status)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// DetailForm loads form field values for the detail pane.
|
||||
func (l *Loader) DetailForm(ctx context.Context, item model.Item) (model.FormFields, error) {
|
||||
raw, err := l.Detail(ctx, item)
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
//go:build integration
|
||||
|
||||
package fetch_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/eslider/go-onlyoffice/cmd/office/model"
|
||||
)
|
||||
|
||||
func TestIntegrationSaveProject(t *testing.T) {
|
||||
loader, ctx := liveLoader(t)
|
||||
items, err := loader.List(ctx, model.ListSpec{Subject: model.SubjectProjects})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(items) == 0 {
|
||||
t.Skip("no projects")
|
||||
}
|
||||
item := items[0]
|
||||
fields, err := loader.DetailForm(ctx, item)
|
||||
if err != nil {
|
||||
t.Fatalf("DetailForm: %v", err)
|
||||
}
|
||||
if fields.ResponsibleID == "" {
|
||||
t.Skip("project has no responsible id on this instance")
|
||||
}
|
||||
marker := " office-save-test " + time.Now().UTC().Format(time.RFC3339)
|
||||
fields.Primary = fields.Primary + marker
|
||||
if err := loader.SaveItem(ctx, item, fields); err != nil {
|
||||
t.Fatalf("SaveItem: %v", err)
|
||||
}
|
||||
after, err := loader.DetailForm(ctx, item)
|
||||
if err != nil {
|
||||
t.Fatalf("DetailForm after save: %v", err)
|
||||
}
|
||||
if after.Primary != fields.Primary {
|
||||
t.Fatalf("title not saved: got %q want %q", after.Primary, fields.Primary)
|
||||
}
|
||||
fields.Primary = stringsTrimSuffixMarker(after.Primary, marker)
|
||||
if err := loader.SaveItem(ctx, item, fields); err != nil {
|
||||
t.Logf("cleanup save: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func stringsTrimSuffixMarker(s, marker string) string {
|
||||
if len(s) >= len(marker) && s[len(s)-len(marker):] == marker {
|
||||
return s[:len(s)-len(marker)]
|
||||
}
|
||||
return s
|
||||
}
|
||||
Reference in New Issue
Block a user