tajniak81andClaude Opus 5
f3235c403c
Every tab bar in the app drags into the order you want, and then all three of them opened on a tab picked in the source anyway: "public" on Charging, "info" on a car, "personal" in Settings. Dragging Home chargers to the front of the charging bar rearranged the bar and changed nothing about where the page landed, which is the opposite of what dragging it there says. So the front of the bar is now the landing tab, everywhere. An arrangement is already the statement of what you want to see first; it just wasn't being read as one. Settings > Appearance overrides it per page for the case where reading order and landing tab are two different wishes, with "First in the bar" as the default and the meaning of no override at all. The rule lives in one place, lib/tabs.js, because it is one rule and three pages: the saved choice if that tab is actually on the bar, otherwise whatever leads it. The bar it is given is the one that will really render, hidden tabs and inapplicable ones already dropped, so a default that no longer has a button - a tab switched off for that car, Users on a non-admin - falls back to the front instead of opening nothing. The tab key lists moved there too, since the picker needs all three and would otherwise have copied them. Each page starts on no tab and keeps following the profile until the user says otherwise, rather than guessing and then correcting itself: the arrangement and the default both arrive with /api/me, which on a hard refresh lands after the view has mounted. A click ends the following, and so does the start of a drag - rearranging a bar must not pull the content out from under the pointer. In Settings ?tab= still wins over both, since that is what /admin redirects to. Stored as defaultTabs on the profile, one page->tab map validated per page: a tab that exists but on another page is an error, and an empty value is stored as an absent key so "no default" has a single representation. Also adds charger_tab_order and charger_card_order to the PocketBase setup script. They were never there - the arrangements of the last two commits had no column to persist into on a freshly set-up server - and default_tabs would have gone the same way beside them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
54 lines
2.0 KiB
Go
54 lines
2.0 KiB
Go
package api
|
|
|
|
import "testing"
|
|
|
|
// Which tab a page opens on is stored per user as a page->tab map, and every
|
|
// tabbed page in the web app is in it. The map is small, but it is the one
|
|
// preference whose keys have to line up with three different bars, so the
|
|
// validation is worth pinning down: an unknown page or an unknown tab is a stale
|
|
// or wrong client, and an empty value is how a client says "no default, open on
|
|
// whichever tab leads the bar".
|
|
|
|
func TestNormalizeDefaultTabs(t *testing.T) {
|
|
got, err := normalizeDefaultTabs(map[string]string{
|
|
"charging": " home ",
|
|
"car": "reminders",
|
|
"settings": "",
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("normalizeDefaultTabs: %v", err)
|
|
}
|
|
if got["charging"] != "home" {
|
|
t.Errorf("charging = %q, want the trimmed \"home\"", got["charging"])
|
|
}
|
|
if got["car"] != "reminders" {
|
|
t.Errorf("car = %q, want \"reminders\"", got["car"])
|
|
}
|
|
// Cleared rather than stored empty, so "no default" has one representation.
|
|
if _, ok := got["settings"]; ok {
|
|
t.Errorf("settings = %q, want the key dropped", got["settings"])
|
|
}
|
|
|
|
if empty, err := normalizeDefaultTabs(nil); err != nil || len(empty) != 0 {
|
|
t.Errorf("normalizeDefaultTabs(nil) = %v, %v; want empty and no error", empty, err)
|
|
}
|
|
|
|
if _, err := normalizeDefaultTabs(map[string]string{"garage": "info"}); err == nil {
|
|
t.Error("normalizeDefaultTabs accepted a page that has no tabs, want an error")
|
|
}
|
|
// The tab exists, but on another page: the sets are validated per page.
|
|
if _, err := normalizeDefaultTabs(map[string]string{"charging": "reminders"}); err == nil {
|
|
t.Error("normalizeDefaultTabs accepted a tab from another page, want an error")
|
|
}
|
|
|
|
// The tab sets are the contract the web app's src/lib/tabs.js mirrors.
|
|
for page, want := range map[string]int{"charging": 2, "car": 10, "settings": 4} {
|
|
if len(validDefaultTabs[page]) != want {
|
|
t.Errorf("%s has %d tabs, want %d", page, len(validDefaultTabs[page]), want)
|
|
}
|
|
}
|
|
if len(validDefaultTabs) != 3 {
|
|
t.Errorf("validDefaultTabs has %d pages, want the 3 tabbed pages", len(validDefaultTabs))
|
|
}
|
|
}
|