diff --git a/API Server/README.md b/API Server/README.md index 3a428a1..20a8d92 100644 --- a/API Server/README.md +++ b/API Server/README.md @@ -147,7 +147,8 @@ GET /api/auth/validate GET /api/auth/me GET /api/identity -# current user (profile / appearance / avatar / data / account lifecycle) +# current user (profile / appearance / garage order / avatar / data / +# account lifecycle) GET /api/me PATCH /api/me DELETE /api/me POST /api/me/password POST /api/me/avatar GET /api/me/avatar DELETE /api/me/avatar @@ -186,9 +187,11 @@ GET /api/vehicle-providers GET /api/vehicle-providers/{provider}/vehicles POST /api/vehicle-providers/{provider}/import -# cars + sharing +# cars + sharing (GET /api/cars returns the garage in the user's saved order, +# which PATCH /api/me {carOrder} sets) GET /api/cars POST /api/cars GET /api/cars/{id} PATCH /api/cars/{id} DELETE /api/cars/{id} +PUT /api/cars/{id}/view # which tabs + Information rows this car shows GET /api/cars/{id}/provider POST /api/cars/{id}/provider POST /api/cars/{id}/provider/sync GET /api/cars/{id}/service-records GET /api/cars/{id}/technical-checks diff --git a/API Server/internal/api/carorder_test.go b/API Server/internal/api/carorder_test.go new file mode 100644 index 0000000..11b2397 --- /dev/null +++ b/API Server/internal/api/carorder_test.go @@ -0,0 +1,92 @@ +package api + +import ( + "testing" + + "drivervault/apiserver/internal/models" +) + +// The garage arrangement is a per-user list of car ids, so it has to cope with +// lists that no longer line up with the cars the user actually has: a car sold +// since the last drag leaves a stale id, a car added or shared since leaves an +// id missing. These cover both directions plus the input cleaning. + +func ids(cars []models.Car) []string { + out := make([]string, len(cars)) + for i, c := range cars { + out[i] = c.ID + } + return out +} + +func carsWithIDs(list ...string) []models.Car { + out := make([]models.Car, len(list)) + for i, id := range list { + out[i] = models.Car{ID: id} + } + return out +} + +func TestApplyCarOrder(t *testing.T) { + for _, tc := range []struct { + name string + cars []string + order []string + want []string + }{ + {"arranged", []string{"a", "b", "c"}, []string{"c", "a", "b"}, []string{"c", "a", "b"}}, + {"no arrangement keeps default order", []string{"a", "b", "c"}, nil, []string{"a", "b", "c"}}, + { + // A car added or shared since the last drag isn't in the list; it + // belongs at the end rather than jumping into the middle. + "unarranged cars go last in their existing order", + []string{"a", "b", "new1", "new2"}, []string{"b", "a"}, + []string{"b", "a", "new1", "new2"}, + }, + { + // A car that was sold since the last drag just drops out. + "stale ids are ignored", + []string{"a", "b"}, []string{"gone", "b", "a"}, + []string{"b", "a"}, + }, + {"single car is untouched", []string{"a"}, []string{"b", "a"}, []string{"a"}}, + } { + t.Run(tc.name, func(t *testing.T) { + cars := carsWithIDs(tc.cars...) + applyCarOrder(cars, tc.order) + got := ids(cars) + if len(got) != len(tc.want) { + t.Fatalf("order = %v, want %v", got, tc.want) + } + for i := range got { + if got[i] != tc.want[i] { + t.Fatalf("order = %v, want %v", got, tc.want) + } + } + }) + } +} + +func TestNormalizeCarOrder(t *testing.T) { + got, err := normalizeCarOrder([]string{" a ", "", "b", "a", " ", "c"}) + if err != nil { + t.Fatalf("normalizeCarOrder: %v", err) + } + want := []string{"a", "b", "c"} // trimmed, blanks dropped, first "a" wins + if len(got) != len(want) { + t.Fatalf("normalized = %v, want %v", got, want) + } + for i := range got { + if got[i] != want[i] { + t.Fatalf("normalized = %v, want %v", got, want) + } + } + + tooLong := make([]string, maxCarOrder+1) + for i := range tooLong { + tooLong[i] = "c" + } + if _, err := normalizeCarOrder(tooLong); err == nil { + t.Error("normalizeCarOrder accepted a list over the cap, want an error") + } +} diff --git a/API Server/internal/api/cars.go b/API Server/internal/api/cars.go index 317cd48..eb10d15 100644 --- a/API Server/internal/api/cars.go +++ b/API Server/internal/api/cars.go @@ -6,6 +6,8 @@ import ( "fmt" "net/http" "net/url" + "sort" + "strings" "drivervault/apiserver/internal/models" ) @@ -136,9 +138,41 @@ func (s *Server) listCars(w http.ResponseWriter, r *http.Request) { out = append(out, m) } + // Hand the garage back in the order the user arranged it. Best effort: if the + // profile can't be read, the default order (owned by name, then shared) still + // renders a usable garage. + if rec, err := s.fetchUser(r, me); err == nil { + applyCarOrder(out, rec.carOrder()) + } + writeJSON(w, http.StatusOK, out) } +// applyCarOrder sorts cars into the user's arranged order, in place. Cars the +// arrangement doesn't mention — a car added or shared since the last drag — keep +// their relative order and follow the arranged ones, so a new car shows up at +// the end rather than jumping into the middle. +func applyCarOrder(cars []models.Car, order []string) { + if len(order) == 0 || len(cars) < 2 { + return + } + rank := make(map[string]int, len(order)) + for i, id := range order { + rank[id] = i + } + sort.SliceStable(cars, func(i, j int) bool { + ri, oki := rank[cars[i].ID] + rj, okj := rank[cars[j].ID] + if oki != okj { + return oki // an arranged car sorts before an unarranged one + } + if !oki { + return false // both unarranged: leave them as they are + } + return ri < rj + }) +} + func (s *Server) getCar(w http.ResponseWriter, r *http.Request) { level, rec, err := s.carAccessLevel(r.Context(), s.currentUserID(r), r.PathValue("id")) if err != nil { @@ -206,6 +240,103 @@ func (s *Server) updateCar(w http.ResponseWriter, r *http.Request) { writeJSON(w, http.StatusOK, m) } +// hideableCarTabs are the car-detail tabs that can be switched off. "info" is +// deliberately absent: it is the car itself, and a page with no tabs left would +// be a dead end. +var hideableCarTabs = map[string]bool{ + "provider": true, "services": true, "technical": true, "maintenance": true, + "fuel": true, "documents": true, "parts": true, "reminders": true, +} + +// hideableCarFields are the Information rows that can be switched off — every +// one of them, since unlike the tabs there is no row the page needs to keep. +// Mirrors the car.info.* labels the web app renders. +var hideableCarFields = map[string]bool{ + "oilSpec": true, "transmissionOil": true, "differentialOil": true, + "brakeFluid": true, "coolant": true, "odometer": true, "serviceInterval": true, + "nextDue": true, "registrationPlate": true, "registrationCountry": true, + "vin": true, "fuelType": true, "buildDate": true, "firstRegistration": true, +} + +// normalizeHidden validates a switched-off set against the keys that exist. +// Unknown keys are rejected rather than ignored: they can only come from a stale +// or wrong client, and dropping them silently would hide the mistake while the +// tab or field stayed visible. +func normalizeHidden(in []string, allowed map[string]bool, what string) ([]string, error) { + out := make([]string, 0, len(in)) + seen := make(map[string]bool, len(in)) + for _, key := range in { + key = strings.TrimSpace(key) + if key == "" || seen[key] { + continue + } + if !allowed[key] { + return nil, fmt.Errorf("%q is not a car %s that can be hidden", key, what) + } + seen[key] = true + out = append(out, key) + } + return out, nil +} + +// PUT /api/cars/{id}/view — choose what this car's page shows: which tabs, and +// which rows of the Information tab. Body: {hiddenTabs?: [...], hiddenFields?: +// [...]}; only the sets present are written, so a client can update one without +// knowing the other. Its own endpoint rather than fields on the car edit, so an +// ordinary save of the car form — which sends every other field — can never +// reveal something somebody deliberately switched off. Needs write access: the +// choice belongs to the car, so it is the same permission as editing it. +func (s *Server) updateCarView(w http.ResponseWriter, r *http.Request) { + var in struct { + HiddenTabs *[]string `json:"hiddenTabs"` + HiddenFields *[]string `json:"hiddenFields"` + } + if err := decodeJSON(r, &in); err != nil { + writeError(w, http.StatusBadRequest, err.Error()) + return + } + level, _, err := s.carAccessLevel(r.Context(), s.currentUserID(r), r.PathValue("id")) + if err != nil { + writePBError(w, err) + return + } + if !canWrite(level) { + writeError(w, http.StatusForbidden, "you cannot edit this car") + return + } + + payload := map[string]any{} + if in.HiddenTabs != nil { + tabs, err := normalizeHidden(*in.HiddenTabs, hideableCarTabs, "tab") + if err != nil { + writeError(w, http.StatusBadRequest, err.Error()) + return + } + payload["hidden_tabs"] = tabs + } + if in.HiddenFields != nil { + fields, err := normalizeHidden(*in.HiddenFields, hideableCarFields, "field") + if err != nil { + writeError(w, http.StatusBadRequest, err.Error()) + return + } + payload["hidden_fields"] = fields + } + if len(payload) == 0 { + writeError(w, http.StatusBadRequest, "no changes provided") + return + } + + var rec carRecord + if err := s.pb.Update(r.Context(), colCars, r.PathValue("id"), payload, &rec); err != nil { + writePBError(w, err) + return + } + m := rec.toModel() + m.Access = level + writeJSON(w, http.StatusOK, m) +} + func (s *Server) deleteCar(w http.ResponseWriter, r *http.Request) { level, _, err := s.carAccessLevel(r.Context(), s.currentUserID(r), r.PathValue("id")) if err != nil { diff --git a/API Server/internal/api/cartabs_test.go b/API Server/internal/api/cartabs_test.go new file mode 100644 index 0000000..c0eef55 --- /dev/null +++ b/API Server/internal/api/cartabs_test.go @@ -0,0 +1,86 @@ +package api + +import "testing" + +// What a car's page shows — which tabs, and which rows of the Information tab — +// is stored on the car as the hidden sets, so the validation has to keep those +// sets to keys the page actually renders. Information itself stays out of the +// hideable tabs: a car with no tabs left would be a dead end. + +func TestNormalizeHiddenTabs(t *testing.T) { + got, err := normalizeHidden([]string{" fuel ", "parts", "fuel", ""}, hideableCarTabs, "tab") + if err != nil { + t.Fatalf("normalizeHidden: %v", err) + } + want := []string{"fuel", "parts"} // trimmed, blanks dropped, deduped + assertKeys(t, got, want) + + // Clearing the list is how a car goes back to showing everything. + if empty, err := normalizeHidden(nil, hideableCarTabs, "tab"); err != nil || len(empty) != 0 { + t.Errorf("normalizeHidden(nil) = %v, %v; want empty and no error", empty, err) + } + + // Information is the car itself; hiding it would leave a page with no tabs. + if _, err := normalizeHidden([]string{"info"}, hideableCarTabs, "tab"); err == nil { + t.Error("normalizeHidden allowed hiding the info tab, want an error") + } + // A key from a stale or wrong client is an error, not something to drop + // quietly while the tab stays visible. + if _, err := normalizeHidden([]string{"fuel", "nonsense"}, hideableCarTabs, "tab"); err == nil { + t.Error("normalizeHidden accepted an unknown tab, want an error") + } + + // The hideable set is the contract the web app's HIDEABLE_TABS mirrors: + // every tab the car page renders beside Information. + for _, key := range []string{"provider", "services", "technical", "maintenance", "fuel", "documents", "parts", "reminders"} { + if !hideableCarTabs[key] { + t.Errorf("tab %q should be hideable", key) + } + } + if len(hideableCarTabs) != 8 { + t.Errorf("hideableCarTabs has %d entries, want the 8 tabs beside Information", len(hideableCarTabs)) + } +} + +func TestNormalizeHiddenFields(t *testing.T) { + got, err := normalizeHidden([]string{"vin", " differentialOil ", "vin"}, hideableCarFields, "field") + if err != nil { + t.Fatalf("normalizeHidden: %v", err) + } + assertKeys(t, got, []string{"vin", "differentialOil"}) + + if _, err := normalizeHidden([]string{"oilSpec", "nonsense"}, hideableCarFields, "field"); err == nil { + t.Error("normalizeHidden accepted an unknown field, want an error") + } + // A tab key is not a field key — the two sets are validated separately. + if _, err := normalizeHidden([]string{"fuel"}, hideableCarFields, "field"); err == nil { + t.Error("normalizeHidden accepted a tab key as a field, want an error") + } + + // Every Information row the web app renders must be hideable; unlike the + // tabs there is no row the page has to keep. + for _, key := range []string{ + "oilSpec", "transmissionOil", "differentialOil", "brakeFluid", "coolant", + "odometer", "serviceInterval", "nextDue", "registrationPlate", + "registrationCountry", "vin", "fuelType", "buildDate", "firstRegistration", + } { + if !hideableCarFields[key] { + t.Errorf("field %q should be hideable", key) + } + } + if len(hideableCarFields) != 14 { + t.Errorf("hideableCarFields has %d entries, want the 14 Information rows", len(hideableCarFields)) + } +} + +func assertKeys(t *testing.T, got, want []string) { + t.Helper() + if len(got) != len(want) { + t.Fatalf("keys = %v, want %v", got, want) + } + for i := range got { + if got[i] != want[i] { + t.Fatalf("keys = %v, want %v", got, want) + } + } +} diff --git a/API Server/internal/api/me.go b/API Server/internal/api/me.go index 30cdbf3..d8c186b 100644 --- a/API Server/internal/api/me.go +++ b/API Server/internal/api/me.go @@ -35,6 +35,28 @@ type userRecord struct { Role string `json:"role"` Organization string `json:"organization"` Created string `json:"created"` + + // Garage arrangement. Raw because PocketBase hands back whatever a json field + // holds — null on a record that has never been arranged, and "" on one + // PocketBase stored as an empty value — neither of which is a []string. + CarOrder json.RawMessage `json:"car_order"` +} + +// carOrder decodes the stored garage arrangement, treating anything unexpected +// as "not arranged yet" rather than failing the whole profile read. +func (rec userRecord) carOrder() []string { return decodeStringList(rec.CarOrder) } + +// decodeStringList reads a PocketBase json field that holds a list of strings, +// treating anything unexpected as empty rather than failing the whole read. +func decodeStringList(raw json.RawMessage) []string { + if len(raw) == 0 { + return nil + } + var out []string + if err := json.Unmarshal(raw, &out); err != nil { + return nil + } + return out } func (rec userRecord) toModel() models.User { @@ -54,6 +76,7 @@ func (rec userRecord) toModel() models.User { Created: rec.Created, Organization: rec.Organization, + CarOrder: rec.carOrder(), } if t := parsePBDate(rec.DeletionRequestedAt); !t.IsZero() { u.DeletionRequestedAt = &t @@ -102,13 +125,41 @@ func (s *Server) handleGetMe(w http.ResponseWriter, r *http.Request) { } type updateMeRequest struct { - Name *string `json:"name"` - Bio *string `json:"bio"` - Theme *string `json:"theme"` - Locale *string `json:"locale"` - DateFormat *string `json:"dateFormat"` - Currency *string `json:"currency"` - FontSize *string `json:"fontSize"` + Name *string `json:"name"` + Bio *string `json:"bio"` + Theme *string `json:"theme"` + Locale *string `json:"locale"` + DateFormat *string `json:"dateFormat"` + Currency *string `json:"currency"` + FontSize *string `json:"fontSize"` + CarOrder *[]string `json:"carOrder"` +} + +// maxCarOrder bounds the stored arrangement. listCars fetches at most 200 owned +// plus 200 shared cars, so this leaves room without letting a client park an +// unbounded blob on the record. +const maxCarOrder = 500 + +// normalizeCarOrder cleans a client-supplied garage arrangement: blanks out, +// duplicates dropped (first position wins), length capped. The ids are not +// checked against real cars — that would cost a lookup per entry, and an id for +// a car the user no longer has is harmless: listCars ignores what it can't +// match, and the next drag rewrites the list anyway. +func normalizeCarOrder(in []string) ([]string, error) { + if len(in) > maxCarOrder { + return nil, fmt.Errorf("carOrder is too long (max %d)", maxCarOrder) + } + out := make([]string, 0, len(in)) + seen := make(map[string]bool, len(in)) + for _, id := range in { + id = strings.TrimSpace(id) + if id == "" || seen[id] { + continue + } + seen[id] = true + out = append(out, id) + } + return out, nil } var validThemes = map[string]bool{"light": true, "dark": true, "system": true} @@ -189,6 +240,14 @@ func (s *Server) handleUpdateMe(w http.ResponseWriter, r *http.Request) { } payload["font_size"] = *in.FontSize } + if in.CarOrder != nil { + ids, err := normalizeCarOrder(*in.CarOrder) + if err != nil { + writeError(w, http.StatusBadRequest, err.Error()) + return + } + payload["car_order"] = ids + } var rec userRecord if err := s.pb.Update(r.Context(), s.usersCollection(), claims.ID, payload, &rec); err != nil { diff --git a/API Server/internal/api/records.go b/API Server/internal/api/records.go index ef12e9b..146ee0e 100644 --- a/API Server/internal/api/records.go +++ b/API Server/internal/api/records.go @@ -1,6 +1,7 @@ package api import ( + "encoding/json" "strings" "time" @@ -66,6 +67,12 @@ type carRecord struct { Owner string `json:"owner"` Created string `json:"created"` Updated string `json:"updated"` + + // Switched-off tabs and Information fields. Raw because PocketBase hands back + // whatever a json field holds — null on a car nobody has configured — which + // is not a []string. + HiddenTabs json.RawMessage `json:"hidden_tabs"` + HiddenFields json.RawMessage `json:"hidden_fields"` } func (rec carRecord) toModel() models.Car { @@ -92,6 +99,8 @@ func (rec carRecord) toModel() models.Car { FirstRegistrationDate: rec.FirstRegistrationDate, Provider: rec.Provider, ProviderVehicleID: rec.ProviderVehicleID, + HiddenTabs: decodeStringList(rec.HiddenTabs), + HiddenFields: decodeStringList(rec.HiddenFields), Owner: rec.Owner, Created: rec.Created, Updated: rec.Updated, diff --git a/API Server/internal/api/server.go b/API Server/internal/api/server.go index 144fc49..67e429a 100644 --- a/API Server/internal/api/server.go +++ b/API Server/internal/api/server.go @@ -59,6 +59,7 @@ // # cars, service records, parts, shares // GET /api/cars POST /api/cars // GET /api/cars/{id} PATCH /api/cars/{id} DELETE /api/cars/{id} +// PUT /api/cars/{id}/view // GET /api/cars/{id}/provider POST /api/cars/{id}/provider // POST /api/cars/{id}/provider/sync // GET /api/cars/{id}/service-records @@ -352,6 +353,7 @@ func (s *Server) Handler() http.Handler { mux.HandleFunc("POST /api/cars", s.createCar) mux.HandleFunc("GET /api/cars/{id}", s.getCar) mux.HandleFunc("PATCH /api/cars/{id}", s.updateCar) + mux.HandleFunc("PUT /api/cars/{id}/view", s.updateCarView) mux.HandleFunc("DELETE /api/cars/{id}", s.deleteCar) mux.HandleFunc("GET /api/cars/{id}/service-records", s.listCarServiceRecords) mux.HandleFunc("GET /api/cars/{id}/technical-checks", s.listCarTechnicalChecks) diff --git a/API Server/internal/bootstrap/schema.go b/API Server/internal/bootstrap/schema.go index 0caafc5..39c630e 100644 --- a/API Server/internal/bootstrap/schema.go +++ b/API Server/internal/bootstrap/schema.go @@ -39,6 +39,13 @@ var collectionsSchema = map[string][]fieldDef{ // internal/api/vehicleproviders.go. Blank for a hand-entered car. fText("provider", false), fText("provider_vehicle_id", false), + // What this car's page shows: the tabs switched off (["fuel"] on an EV) + // and the Information fields switched off (["differentialOil"] on a car + // without one). Properties of the car, so everyone it is shared with sees + // the same page. Stored as the hidden sets, so anything added in a later + // release is on by default. Keys are validated in internal/api/cars.go. + fJSON("hidden_tabs", 2000), + fJSON("hidden_fields", 2000), // Owner of this car. Non-cascading: deleting a user must not wipe their cars. fRelation("owner", "users", false, false), }, @@ -172,6 +179,10 @@ var collectionsSchema = map[string][]fieldDef{ fRelation("organization", "organizations", false, false), // Per-user plugin/integration config (bottom layer of the cascade). fJSON("pluginSettings", 100000), + // The garage order: car ids in the order this user arranged them. Per + // user rather than per car, so it also covers cars shared with them and + // never reorders somebody else's garage. + fJSON("car_order", 20000), }, } diff --git a/API Server/internal/models/models.go b/API Server/internal/models/models.go index bc1231b..0185b94 100644 --- a/API Server/internal/models/models.go +++ b/API Server/internal/models/models.go @@ -66,6 +66,15 @@ type Car struct { Provider string `json:"provider,omitempty"` ProviderVehicleID string `json:"providerVehicleId,omitempty"` + // HiddenTabs and HiddenFields are what this car's page does not show: tabs + // (["fuel"] on an EV) and Information fields (["differentialOil"] on a car + // without one). Properties of the car, so everyone it is shared with sees the + // same page. The hidden sets, not the visible ones, so anything added in a + // later release is on by default. Set through the view endpoint only, never by + // an ordinary car edit, so saving the form cannot silently reveal them again. + HiddenTabs []string `json:"hiddenTabs"` + HiddenFields []string `json:"hiddenFields"` + // Owner is the user id that owns this car. Access is the requesting user's // permission on it — "owner", "write", or "read" — computed by the API at // read time and never persisted (omitempty; not part of the write payload). @@ -340,6 +349,11 @@ type User struct { Organization string `json:"organization"` OrganizationName string `json:"organizationName,omitempty"` + // CarOrder is the garage arrangement: car ids in the order this user dragged + // them into. The car list is already returned in this order, so a client only + // needs it to send an updated arrangement back. + CarOrder []string `json:"carOrder"` + // Non-empty while an account-deletion request is pending its cooldown. DeletionRequestedAt *time.Time `json:"deletionRequestedAt,omitempty"` diff --git a/API Server/scripts/setup-pocketbase.mjs b/API Server/scripts/setup-pocketbase.mjs index ac15554..3e4c1e1 100644 --- a/API Server/scripts/setup-pocketbase.mjs +++ b/API Server/scripts/setup-pocketbase.mjs @@ -272,6 +272,13 @@ const DESIRED = { // or linked to a connected account; blank for a hand-entered car. F.text("provider"), F.text("provider_vehicle_id"), + // What this car's page shows: the tabs switched off (["fuel"] on an EV) and + // the Information rows switched off (["differentialOil"]). Properties of the + // car, so everyone it is shared with sees the same page. The hidden sets, + // not the visible ones, so anything added in a later release is on by + // default. Keys are validated in internal/api/cars.go. + F.json("hidden_tabs", 2000), + F.json("hidden_fields", 2000), // Owner of this car. Non-cascading on purpose: deleting a user must not // wipe their cars (account deletion in me.go intentionally leaves cars). // required:false at the DB level — the API always sets owner on create and @@ -444,6 +451,10 @@ const DESIRED = { // { "": { "config": {…}, "enabled": bool } } // The `enabled` flag is the personal opt-in; see internal/api/integrations.go. F.json("pluginSettings"), + // The garage order: car ids as this user dragged them, e.g. ["c2","c1"]. + // Per user rather than per car, so it also covers cars shared with them and + // never reorders somebody else's garage. See internal/api/cars.go. + F.json("car_order", 20000), ], }; diff --git a/Web App/README.md b/Web App/README.md index e8ef6b2..b5003cf 100644 --- a/Web App/README.md +++ b/Web App/README.md @@ -88,7 +88,18 @@ Config (`server/.env`, copy from `.env.example`): car by hand, or **import from service** — pick a vehicle off a connected manufacturer account and have its details filled in (the button appears only once an account is connected). Shared cars are labelled and gated by your access - level. + level. **Drag a card** to rearrange the garage: the order is saved per user (so + it covers shared cars and never reorders anybody else's garage) and applied by + the API on every list. Pointer-only — the native drag events it uses don't fire + on touch. +- **What a car shows** — the gear button in a car's header picks both the + sections that car's page shows (connected service, service history, technical + checks, maintenance, fuel, documents, parts, reminders — Fuel off on an EV, + say) and which of the 14 Information rows it lists (no Differential oil on a + car without one). It belongs to the car, so everyone it is shared with sees + the same page; setting it needs write access. Stored as the *hidden* sets, so + anything added in a later release is on by default, and the Information tab + itself can't be switched off. - **Car detail** — all car spec fields (engine / transmission / differential oil, brake fluid, coolant, VIN, fuel type, …) plus tabbed histories, each with an optional file attachment and add/edit/delete gated by your access level: @@ -96,9 +107,11 @@ Config (`server/.env`, copy from `.env.example`): car linked to a manufacturer account: live readings (odometer, fuel, battery, range, position), the vehicle record, and every section the plugin can fetch with its raw response. Offers the provider's odometer when it is ahead of the - stored one. On an unlinked car the tab instead offers to connect it to a - vehicle on your account. Read under *your* account, so a car shared from - someone else shows data only if that vehicle is on your account too. + stored one. Every card below the live readings — the vehicle record and each + provider section — folds away, and which ones you folded is remembered per + device in localStorage. On an unlinked car the tab instead offers to connect + it to a vehicle on your account. Read under *your* account, so a car shared + from someone else shows data only if that vehicle is on your account too. - **Service history** — date, km, computed next date/km, and changed-parts flags. - **Technical checks** — roadworthiness inspections; result, cost, station and the certificate's valid-until, which drives the next-due date. diff --git a/Web App/web/src/api.js b/Web App/web/src/api.js index c489473..9cd9c0f 100644 --- a/Web App/web/src/api.js +++ b/Web App/web/src/api.js @@ -119,6 +119,12 @@ export const api = { getCar: (id) => request(`/cars/${id}`), createCar: (body) => request("/cars", { method: "POST", body: JSON.stringify(body) }), updateCar: (id, body) => request(`/cars/${id}`, { method: "PATCH", body: JSON.stringify(body) }), + // What this car's page shows — {hiddenTabs?, hiddenFields?}, as hidden sets. + // Its own endpoint so an ordinary car edit — which sends every other field — + // can never reveal something switched off. Needs write access, like editing + // the car. Only the sets passed are written. + updateCarView: (id, patch) => + request(`/cars/${id}/view`, { method: "PUT", body: JSON.stringify(patch) }), deleteCar: (id) => request(`/cars/${id}`, { method: "DELETE" }), // Sharing (owner-only). A share grants another user read or write access. diff --git a/Web App/web/src/components/ProviderPanel.vue b/Web App/web/src/components/ProviderPanel.vue index 8a2bae3..03f2122 100644 --- a/Web App/web/src/components/ProviderPanel.vue +++ b/Web App/web/src/components/ProviderPanel.vue @@ -143,6 +143,42 @@ async function applyOdometer() { } } +// --- Collapsing the cards --- +// +// Every card below the headline readings folds away, so a long provider dump +// (Toyota reports eight sections) can be trimmed to the two or three worth +// watching. Which ones are folded is remembered in localStorage rather than on +// the profile: it is a per-device reading habit, not an account setting, and it +// should survive leaving the tab without a round trip. Keyed by section id, so +// collapsing "Notifications" keeps it collapsed on every car. +const COLLAPSED_KEY = "cc_provider_collapsed"; + +const collapsed = ref(readCollapsed()); + +function readCollapsed() { + try { + const raw = JSON.parse(localStorage.getItem(COLLAPSED_KEY) || "[]"); + return Array.isArray(raw) ? raw.filter((id) => typeof id === "string") : []; + } catch { + return []; // unreadable (hand-edited, or written by an older version) + } +} + +function isOpen(id) { + return !collapsed.value.includes(id); +} + +function toggleCard(id) { + collapsed.value = isOpen(id) + ? [...collapsed.value, id] + : collapsed.value.filter((k) => k !== id); + try { + localStorage.setItem(COLLAPSED_KEY, JSON.stringify(collapsed.value)); + } catch { + // A full or blocked store just means the choice lasts this visit only. + } +} + function metricLabel(key) { return t(`car.provider.metrics.${key}`); } @@ -225,9 +261,22 @@ onMounted(async () => {
+ + +
-

{{ t("car.provider.vehicle") }}

{{ snap.vehicle.name }}

{{ [snap.vehicle.make, snap.vehicle.model, snap.vehicle.year || ''].filter(Boolean).join(' ') }} @@ -252,17 +301,41 @@ onMounted(async () => {

+
-
+
+
+ + + {{ t("car.provider.sectionFailed") }} + + +
+ -

{{ t("car.provider.sectionEmpty") }}

+
+

{{ sec.error }}

+ +

{{ t("car.provider.sectionEmpty") }}

+
diff --git a/Web App/web/src/i18n/da.json b/Web App/web/src/i18n/da.json index c03b1b0..25cd125 100644 --- a/Web App/web/src/i18n/da.json +++ b/Web App/web/src/i18n/da.json @@ -88,6 +88,7 @@ "subtitle": "Serviceoverblik og servicehistorik.", "addCar": "Tilføj bil", "importCar": "Importér fra tjeneste", + "dragHint": "Træk for at ændre rækkefølgen i din garage.", "empty": "Ingen biler endnu. Klik på {action} for at komme i gang.", "shared": "Delt", "sharedReadOnly": "Delt · skrivebeskyttet", @@ -190,6 +191,7 @@ "fontLarge": "stor" }, + "profile": { "title": "Profil", "avatarAlt": "Profilbillede", @@ -273,6 +275,15 @@ "reminders": "Påmindelser" }, + "viewPicker": { + "open": "Hvad denne bils side viser", + "title": "Hvad denne bil viser", + "subtitle": "Vælg hvilke afsnit og oplysninger denne bils side viser. Det gælder alle, bilen er delt med.", + "tabsHeading": "Faner", + "fieldsHeading": "Oplysninger", + "alwaysOn": "{tab} er altid tilgængelig." + }, + "provider": { "subtitle": "Live-data fra din {label}-konto.", "refresh": "Opdater", @@ -285,6 +296,7 @@ "allFields": "Alle oplyste felter", "truncated": "Kun de første {n} felter er vist — resten findes i det rå svar nedenfor.", "sectionEmpty": "Intet oplyst.", + "sectionFailed": "Kunne ikke hentes", "own": "Kun din egen konto bruges, så loginoplysninger deles aldrig sammen med en bil.", "odometerSuggest": "{label} oplyser {km}, altså mere end bilens gemte kilometerstand.", "updateOdometer": "Opdater kilometerstand", @@ -318,6 +330,7 @@ }, "info": { + "allHidden": "Alle felter er slået fra for denne bil.", "oilSpec": "Motorolie-specifikation", "transmissionOil": "Gearolie", "differentialOil": "Differentialeolie", diff --git a/Web App/web/src/i18n/en.json b/Web App/web/src/i18n/en.json index a657b78..c178320 100644 --- a/Web App/web/src/i18n/en.json +++ b/Web App/web/src/i18n/en.json @@ -106,6 +106,7 @@ "subtitle": "Maintenance overview and service history.", "addCar": "Add car", "importCar": "Import from service", + "dragHint": "Drag to rearrange your garage.", "empty": "No cars yet. Click {action} to get started.", "shared": "Shared", "sharedReadOnly": "Shared · read-only", @@ -208,6 +209,7 @@ "fontLarge": "large" }, + "profile": { "title": "Profile", "avatarAlt": "Avatar", @@ -348,6 +350,15 @@ "reminders": "Reminders" }, + "viewPicker": { + "open": "What this car's page shows", + "title": "What this car shows", + "subtitle": "Pick the sections and details this car's page shows. It applies to everyone the car is shared with.", + "tabsHeading": "Tabs", + "fieldsHeading": "Information fields", + "alwaysOn": "{tab} is always available." + }, + "provider": { "subtitle": "Live data from your {label} account.", "refresh": "Refresh", @@ -360,6 +371,7 @@ "allFields": "All reported fields", "truncated": "Only the first {n} fields are listed — the raw response below has the rest.", "sectionEmpty": "Nothing reported.", + "sectionFailed": "Couldn't be fetched", "own": "Only your own account is used, so credentials are never shared with a car.", "odometerSuggest": "{label} reports {km}, ahead of this car's stored reading.", "updateOdometer": "Update odometer", @@ -393,6 +405,7 @@ }, "info": { + "allHidden": "Every field is switched off for this car.", "oilSpec": "Engine oil spec", "transmissionOil": "Transmission oil", "differentialOil": "Differential oil", diff --git a/Web App/web/src/i18n/pl.json b/Web App/web/src/i18n/pl.json index 5605032..bd1785c 100644 --- a/Web App/web/src/i18n/pl.json +++ b/Web App/web/src/i18n/pl.json @@ -90,6 +90,7 @@ "subtitle": "Przegląd serwisowy i historia napraw.", "addCar": "Dodaj samochód", "importCar": "Importuj z serwisu", + "dragHint": "Przeciągnij, aby zmienić kolejność w garażu.", "empty": "Nie masz jeszcze samochodów. Kliknij {action}, aby zacząć.", "shared": "Udostępniony", "sharedReadOnly": "Udostępniony · tylko do odczytu", @@ -194,6 +195,7 @@ "fontLarge": "duża" }, + "profile": { "title": "Profil", "avatarAlt": "Awatar", @@ -277,6 +279,15 @@ "reminders": "Przypomnienia" }, + "viewPicker": { + "open": "Co pokazuje strona tego samochodu", + "title": "Co pokazuje ten samochód", + "subtitle": "Wybierz sekcje i szczegóły widoczne na stronie tego samochodu. Dotyczy wszystkich, którym go udostępniono.", + "tabsHeading": "Zakładki", + "fieldsHeading": "Pola informacji", + "alwaysOn": "Zakładka {tab} jest zawsze dostępna." + }, + "provider": { "subtitle": "Dane na żywo z Twojego konta {label}.", "refresh": "Odśwież", @@ -289,6 +300,7 @@ "allFields": "Wszystkie zgłoszone pola", "truncated": "Wypisano tylko pierwsze {n} pól — pozostałe znajdziesz w surowej odpowiedzi poniżej.", "sectionEmpty": "Brak danych.", + "sectionFailed": "Nie udało się pobrać", "own": "Używane jest wyłącznie Twoje własne konto, więc dane logowania nigdy nie są udostępniane wraz z samochodem.", "odometerSuggest": "{label} podaje {km}, czyli więcej niż zapisany przebieg tego samochodu.", "updateOdometer": "Zaktualizuj przebieg", @@ -322,6 +334,7 @@ }, "info": { + "allHidden": "Wszystkie pola są wyłączone dla tego samochodu.", "oilSpec": "Specyfikacja oleju silnikowego", "transmissionOil": "Olej przekładniowy", "differentialOil": "Olej mostu napędowego", diff --git a/Web App/web/src/views/CarDetail.vue b/Web App/web/src/views/CarDetail.vue index b1442ee..4261f93 100644 --- a/Web App/web/src/views/CarDetail.vue +++ b/Web App/web/src/views/CarDetail.vue @@ -1,5 +1,5 @@