mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 03:26:07 +00:00
Compare commits
207 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 711015d5fd | |||
| 6ebd5cf0c7 | |||
| 8ab7547edf | |||
| f599892a4b | |||
| 1436cec35c | |||
| fe90502955 | |||
| 0431741ad7 | |||
| fa99940945 | |||
| 09316025c3 | |||
| 100313cfa9 | |||
| 411ec4af59 | |||
| ec7f5e0585 | |||
| 8e38749bc3 | |||
| 2c17edd74c | |||
| c5e2afc21b | |||
| 502e6916d9 | |||
| 61674cf918 | |||
| ac01925be7 | |||
| 99465d04de | |||
| 73a7c4843b | |||
| 6e919696bb | |||
| d32cfb3635 | |||
| 31c9f40550 | |||
| 7ae4dcba51 | |||
| daa4e1dfcf | |||
| 9a7bce6fd8 | |||
| 0834d4f8fe | |||
| d8c28c9998 | |||
| 76ff6e15b1 | |||
| 3e0a2ef8ed | |||
| fd35f79c36 | |||
| 294a386d23 | |||
| ee79413653 | |||
| ec08915a16 | |||
| 40f9c020bb | |||
| 684a3bf5f5 | |||
| 26122a4208 | |||
| 9dc80760f7 | |||
| 090db8519d | |||
| efc55ac700 | |||
| 85b773420c | |||
| 771dab7c35 | |||
| ca7cdcebcc | |||
| 6bc27a259b | |||
| a2d9c2416d | |||
| fd1942afab | |||
| 23eabe1499 | |||
| bcc82db7bd | |||
| 26b220470a | |||
| cdc31967b2 | |||
| 4a435df6e4 | |||
| 21f4f7d5de | |||
| e3d195896c | |||
| 911bd825c1 | |||
| 81628d78ee | |||
| 69e791206e | |||
| e66330e226 | |||
| c970245e0d | |||
| cc0fe6ce2b | |||
| 39346ceca7 | |||
| 6dfba51f21 | |||
| 3973741509 | |||
| 3eac508baf | |||
| 7f6f2eb97c | |||
| f2cfbc4041 | |||
| 636fc7d0a6 | |||
| adcda60f7d | |||
| e8f808b67f | |||
| 70108e5694 | |||
| c75fb22289 | |||
| 621b2f17df | |||
| bc6728678b | |||
| 6040b60e86 | |||
| 2edf5f807a | |||
| fd864cc441 | |||
| b004d3b88e | |||
| 9b1bd6e435 | |||
| 73f3aa8309 | |||
| 82195c7418 | |||
| 9fd77b04fa | |||
| f1ea716305 | |||
| da1a02e7a8 | |||
| 9808e113e4 | |||
| 13e81c04ab | |||
| fd42d06d55 | |||
| e6f4f7a5f3 | |||
| 9497b586b7 | |||
| 77d90be4f8 | |||
| a884539a2b | |||
| 633df91bd6 | |||
| dd98469a02 | |||
| 223a7605ed | |||
| 0e04eeaf9a | |||
| aa77e21d4b | |||
| 8c8cfb5d5d | |||
| 9eeb59997e | |||
| 8179d7d707 | |||
| f211a1c614 | |||
| f42ef5246c | |||
| e1a5864406 | |||
| 62c03d71bf | |||
| f4ce2c2bd0 | |||
| d643f8c329 | |||
| 1b270806a1 | |||
| 2d7392c4c0 | |||
| a9cdb2f91c | |||
| 2983971c8b | |||
| e6a0a39a51 | |||
| 87612c0c79 | |||
| ff57883e3d | |||
| cd1a3fd433 | |||
| 377f22972b | |||
| fff7d123f6 | |||
| bedb70c479 | |||
| 3b8270edc3 | |||
| 6137aaf716 | |||
| 97a3389409 | |||
| 95ade9cbb2 | |||
| c4c278d2f3 | |||
| 2cb1964863 | |||
| 876cc5e0f0 | |||
| caae538056 | |||
| 1cebddac0e | |||
| 78bfa8183a | |||
| 43af349391 | |||
| 9c35343d9d | |||
| b0b1986377 | |||
| f11f021e15 | |||
| 6e7336b8d7 | |||
| 927fcab67f | |||
| c51f4f78bb | |||
| 12f4a40d7c | |||
| 3a6e91e26b | |||
| 680ce7324a | |||
| f5fbd60b5e | |||
| 8c1395c8f1 | |||
| 19bfa77ace | |||
| 2fb041a428 | |||
| be1983c9a4 | |||
| 2288487fe1 | |||
| b2384892a8 | |||
| 43e30ca28e | |||
| 42f0705f07 | |||
| e97dbc89c9 | |||
| 76dfbe0a00 | |||
| 424fa538e0 | |||
| 863ff62b6c | |||
| e2b0910e28 | |||
| cf9172f9e7 | |||
| 0e911608af | |||
| 95d067ad6d | |||
| ba043cb1c0 | |||
| 3a4c523509 | |||
| 057748c47a | |||
| e4457ed9eb | |||
| f430cbe59e | |||
| 5316362e9e | |||
| 900f2bfc30 | |||
| b7c8f0629c | |||
| 45fef1077a | |||
| ddb42ecf0a | |||
| 09295781f4 | |||
| 5938609f69 | |||
| d3cd484519 | |||
| 410d2393e0 | |||
| 44b6340be5 | |||
| 2f3dc4ea79 | |||
| af861e5816 | |||
| c1bbe27ac6 | |||
| 11f4373076 | |||
| f57fb7f9de | |||
| 96f2427518 | |||
| 3f51153dcc | |||
| fc37eb95d1 | |||
| 55607ff2f9 | |||
| 1ea08dcf0a | |||
| c6f6dd2d57 | |||
| 579df97bba | |||
| aa2f7ca8b4 | |||
| 17c9c0758f | |||
| 7340087353 | |||
| 910c98b971 | |||
| b144781e9f | |||
| a26db47cb6 | |||
| 9e5379d092 | |||
| 693acd5580 | |||
| c3f6177be1 | |||
| 60642cc18b | |||
| 54b843ae29 | |||
| 633e9bcdc1 | |||
| eab501925f | |||
| 2630d7e8ec | |||
| 116ba52fbb | |||
| e5fb6d9107 | |||
| 98529bc84c | |||
| 4a3ad562a7 | |||
| 518287ff12 | |||
| 0cdfb9eb42 | |||
| 4d0067a455 | |||
| 66d4431d26 | |||
| 293a48c26a | |||
| 80fca10784 | |||
| 830cd6e3b5 | |||
| 0f338d5484 | |||
| a99cd40f4d | |||
| f3ea50b17b | |||
| 2e3762afe1 |
@@ -0,0 +1,156 @@
|
||||
name: Set up Node and the workspaces
|
||||
description: >-
|
||||
Node from .nvmrc, the workspace dependencies from an exact cache or npm ci,
|
||||
and optionally shared/dist from a cache or a build. Runs after checkout.
|
||||
|
||||
# A local action, so it is versioned with the workflow that calls it and needs
|
||||
# no SHA pin. scripts/ci/changed-areas.mjs counts .github/actions/ like
|
||||
# test.yml: a change here runs everything.
|
||||
#
|
||||
# node_modules is restored only on an exact key: the runner image, the scope,
|
||||
# the Node ABI, the lockfile and every workspace package.json. There are no
|
||||
# restore-keys, so a hit is the tree npm ci would build and a miss is a plain
|
||||
# npm ci. The package.json files are in the key because npm ci is also the
|
||||
# check that they agree with the lockfile: an edited range without a fresh
|
||||
# lockfile misses the cache and fails the install, as it did when every job
|
||||
# ran npm ci. Only pushes to dev and main save, the npm download cache
|
||||
# included, so pull requests read what their base left and cannot evict it or
|
||||
# fill the repository's cache quota with entries of their own.
|
||||
|
||||
inputs:
|
||||
scope:
|
||||
description: >-
|
||||
Which workspaces to install: full (npm ci), client (shared and client)
|
||||
or shared (shared alone).
|
||||
required: true
|
||||
build-shared:
|
||||
description: "'true' to restore shared/dist, or build it on a miss."
|
||||
required: false
|
||||
default: 'false'
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version-file: .nvmrc
|
||||
|
||||
# ImageOS and ImageVersion name the runner image, whose system libraries
|
||||
# the native modules were built against. They live in the runner's
|
||||
# environment, not in the env context, so the key is put together here. A
|
||||
# job in a container has neither; the container's OS release stands in,
|
||||
# and that job's tree is kept apart from the runner's.
|
||||
- name: Work out the cache keys
|
||||
id: keys
|
||||
shell: bash
|
||||
env:
|
||||
SCOPE: ${{ inputs.scope }}
|
||||
DEPS: ${{ hashFiles('.nvmrc', 'package-lock.json', 'package.json', 'client/package.json', 'server/package.json', 'shared/package.json') }}
|
||||
SHARED: ${{ hashFiles('shared/src/**', 'shared/package.json', 'shared/tsconfig*.json', 'shared/tsdown.config.ts', 'package-lock.json') }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
case "$SCOPE" in
|
||||
full | client | shared) ;;
|
||||
*) echo "::error::scope must be full, client or shared, not '$SCOPE'"; exit 1 ;;
|
||||
esac
|
||||
if [ -n "${ImageOS:-}" ]; then
|
||||
image="$ImageOS-${ImageVersion:-unknown}"
|
||||
else
|
||||
image="container-$(. /etc/os-release && echo "$ID$VERSION_ID")"
|
||||
fi
|
||||
abi="$(node -p process.versions.modules)"
|
||||
echo "nm=nm-$RUNNER_OS-$image-$SCOPE-node$abi-$DEPS" >> "$GITHUB_OUTPUT"
|
||||
echo "sd=sd-$RUNNER_OS-$SHARED" >> "$GITHUB_OUTPUT"
|
||||
echo "save=${{ github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Restore node_modules
|
||||
id: nm
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: |
|
||||
node_modules
|
||||
server/node_modules
|
||||
client/node_modules
|
||||
shared/node_modules
|
||||
key: ${{ steps.keys.outputs.nm }}
|
||||
|
||||
# The npm download cache only matters when npm ci runs, so it is restored
|
||||
# only then. It may fall back to an older lockfile's cache: npm ci checks
|
||||
# every tarball against the lockfile's integrity hash and fetches what is
|
||||
# missing, so a stale entry only costs downloads.
|
||||
- name: Restore the npm download cache
|
||||
id: npm
|
||||
if: steps.nm.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: ~/.npm
|
||||
key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
|
||||
restore-keys: npm-${{ runner.os }}-
|
||||
|
||||
- name: Install dependencies
|
||||
if: steps.nm.outputs.cache-hit != 'true'
|
||||
shell: bash
|
||||
env:
|
||||
SCOPE: ${{ inputs.scope }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# better-sqlite3 ships no prebuilt binary and compiles on install. The
|
||||
# hosted runners carry a compiler; the Playwright container of the e2e
|
||||
# jobs does not, so on a cache miss there it gets one first. A hit,
|
||||
# the usual case once a push to dev has saved the container's key,
|
||||
# never reaches this step.
|
||||
if ! command -v make >/dev/null || ! command -v g++ >/dev/null; then
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
timeout 300 apt-get update -qq
|
||||
timeout 300 apt-get install -y -qq --no-install-recommends make g++
|
||||
fi
|
||||
case "$SCOPE" in
|
||||
full) npm ci ;;
|
||||
# The scoped install keeps @testing-library/dom (a peer of
|
||||
# @testing-library/react) in the tree.
|
||||
client) npm ci --workspace shared --workspace client ;;
|
||||
shared) npm ci --workspace shared ;;
|
||||
esac
|
||||
|
||||
- name: Save node_modules
|
||||
if: steps.nm.outputs.cache-hit != 'true' && steps.keys.outputs.save == 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: |
|
||||
node_modules
|
||||
server/node_modules
|
||||
client/node_modules
|
||||
shared/node_modules
|
||||
key: ${{ steps.keys.outputs.nm }}
|
||||
|
||||
# Only a full install saves the download cache, so the entry holds every
|
||||
# tarball; a scoped job that finished first would otherwise claim the key
|
||||
# with part of the tree and no later run would fill it.
|
||||
- name: Save the npm download cache
|
||||
if: steps.nm.outputs.cache-hit != 'true' && steps.keys.outputs.save == 'true' && steps.npm.outputs.cache-hit != 'true' && inputs.scope == 'full'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: ~/.npm
|
||||
key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
|
||||
|
||||
# The key holds every input of the build: the sources, the package and
|
||||
# build configs, and the lockfile that pins tsdown and zod.
|
||||
- name: Restore shared/dist
|
||||
id: sd
|
||||
if: inputs.build-shared == 'true'
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: shared/dist
|
||||
key: ${{ steps.keys.outputs.sd }}
|
||||
|
||||
- name: Build shared
|
||||
if: inputs.build-shared == 'true' && steps.sd.outputs.cache-hit != 'true'
|
||||
shell: bash
|
||||
run: npm run build --workspace=shared
|
||||
|
||||
- name: Save shared/dist
|
||||
if: inputs.build-shared == 'true' && steps.sd.outputs.cache-hit != 'true' && steps.keys.outputs.save == 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: shared/dist
|
||||
key: ${{ steps.keys.outputs.sd }}
|
||||
@@ -7,8 +7,11 @@
|
||||
# enforce-target-branch.yml moves those onto dev.
|
||||
#
|
||||
# Every PR runs test.yml like any other, so ci-ok decides whether it can
|
||||
# merge. Dependabot runs get no Actions secrets, so s3-contract and the Sonar
|
||||
# merge. Dependabot runs get no Actions secrets, so server-s3 and the Sonar
|
||||
# scan skip themselves on these PRs and ci-ok counts the skip as passed.
|
||||
# A bump of @playwright/test also needs the Playwright container tag and
|
||||
# digest in test.yml's client-e2e moved by hand; workflow-jobs.test.mjs
|
||||
# fails the PR until they match.
|
||||
version: 2
|
||||
updates:
|
||||
# The root lockfile covers the client, server and shared workspaces.
|
||||
|
||||
@@ -18,9 +18,16 @@ jobs:
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version-file: .nvmrc
|
||||
cache: npm
|
||||
cache-dependency-path: package-lock.json
|
||||
|
||||
# shared's ESLint and Prettier plugins are its own devDependencies, and
|
||||
# the format ratchet in scripts/lib/ resolves prettier from the root, so
|
||||
# shared plus the root is the whole tree these checks read. npm ci
|
||||
# installs exactly what the lockfile says, where npm install could
|
||||
# resolve anew.
|
||||
- name: Install dependencies
|
||||
run: npm install
|
||||
run: npm ci --workspace shared --include-workspace-root
|
||||
|
||||
- name: Run lint & format check
|
||||
# Both are check-only: lint used to run eslint --fix, which rewrote the
|
||||
|
||||
@@ -10,6 +10,13 @@ permissions:
|
||||
#
|
||||
# Unsigned on purpose: signing and store uploads need secrets that fork PRs do
|
||||
# not get, and belong in a release workflow of their own.
|
||||
#
|
||||
# package-lock.json is not a trigger: every dependency bump touches it, and a
|
||||
# Mac build per bump only held the queue. The shells link nothing but the
|
||||
# @capacitor/* packages, all declared in client/package.json, and a Dependabot
|
||||
# bump of one of them raises the range there too, so it still runs. The client
|
||||
# typecheck and the watch and widget snapshot tests run in test.yml on every
|
||||
# change under client/.
|
||||
on:
|
||||
pull_request:
|
||||
paths:
|
||||
@@ -24,7 +31,6 @@ on:
|
||||
- 'client/scripts/check-store-metadata.mjs'
|
||||
- 'client/fastlane/**'
|
||||
- 'client/package.json'
|
||||
- 'package-lock.json'
|
||||
- 'shared/src/i18n/*/native.ts'
|
||||
- '.github/workflows/native.yml'
|
||||
workflow_dispatch:
|
||||
@@ -182,34 +188,6 @@ jobs:
|
||||
path: client/ios/WidgetPreviews/out
|
||||
retention-days: 14
|
||||
|
||||
# The watch's half in the UI (client/src/native/watch.ts): the snapshot it
|
||||
# builds and the ticks it takes back, typechecked and tested here as well,
|
||||
# so a change to the bridge is checked next to the Swift that reads it.
|
||||
watch-bridge:
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version-file: .nvmrc
|
||||
cache: npm
|
||||
|
||||
- name: Install
|
||||
run: npm ci --workspace=shared --workspace=client
|
||||
|
||||
- name: Build shared
|
||||
run: npm run build --workspace=shared
|
||||
|
||||
- name: Typecheck the client
|
||||
working-directory: client
|
||||
run: npm run typecheck
|
||||
|
||||
- name: Test the widget and watch snapshots
|
||||
working-directory: client
|
||||
run: npx vitest run src/native/watch.test.ts src/native/widgets.test.ts src/native/widgetExtras.test.ts
|
||||
|
||||
# The watch app on watchOS simulators in its screenshot mode (DemoMode.swift):
|
||||
# every screen on the largest and the smallest watch, the main ones in every
|
||||
# language, and the complications, as PNGs to look at without a watch.
|
||||
|
||||
@@ -13,7 +13,7 @@ name: Security Scan
|
||||
# - scout scans the built image, base image packages included. It needs
|
||||
# the Docker Hub login, so it runs on PRs and pushes into main only and
|
||||
# skips fork PRs. Whether the image builds at all is test.yml's
|
||||
# docker-image job, which a red scan cannot hide.
|
||||
# docker job, which a red scan cannot hide.
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main, dev]
|
||||
|
||||
+924
-747
File diff suppressed because it is too large
Load Diff
@@ -31,6 +31,7 @@ Tests:
|
||||
npm run test # all workspaces
|
||||
npm run test --workspace=server # vitest run (server); also test:unit / test:integration / test:ws
|
||||
npm run test:e2e # server e2e (boots Nest against a temp SQLite)
|
||||
npm run test:pg --workspace=server # the Postgres lane (vitest.pg.config.ts; needs TREK_TEST_DB_URL, e.g. postgres://postgres:trek@127.0.0.1:55432/postgres)
|
||||
npm run test:cov # coverage (lcov) for all four packages incl. plugin-sdk
|
||||
cd client && npm run test # client vitest run
|
||||
cd client && npm run e2e # Playwright (CI runs the public and app projects; the screenshot and help-media ones are local)
|
||||
@@ -51,7 +52,9 @@ cd client && npm run lint:skips # no .only; skipped tests may
|
||||
cd client && npm run lint:i18n-keys # every key the client names exists in en; unused en keys may only shrink (CI gate)
|
||||
cd server && npm run lint:boundaries # no new import cycles or cross-domain reach-ins (CI gate)
|
||||
cd server && npm run lint:dialect # SQLite-only SQL spellings may only shrink (CI gate; rules in server/CLAUDE.md)
|
||||
cd server && npm run lint:engine-dispatch # engine checks outside src/db/dialect/ and src/db/engine/ may only shrink (CI gate)
|
||||
cd server && npm run probe:pg # dialect helpers + the repository statements it reaches against Postgres (CI job; needs TREK_PG_PROBE_URL)
|
||||
cd server && npm run check:pg-baseline # the Postgres baseline in server/assets/postgres/ matches the entities and the migrations (CI gate)
|
||||
cd server && npm run lint:tx # no new method writing twice outside one transaction (CI gate)
|
||||
cd server && npm run lint:test-sql # raw SQL fixtures in tests/ may only shrink; seed through tests/helpers/factories (CI gate)
|
||||
cd server && npm run lint:test-mocks # vi.mock of config, realtime and db modules in tests/ may only shrink (CI gate)
|
||||
@@ -134,13 +137,18 @@ These principles come out of a full-repo audit and shape all new code:
|
||||
|
||||
## Quality gates in CI
|
||||
|
||||
`.github/workflows/test.yml` runs, per package: typecheck (server also `typecheck:tests`, client also the strict-mode ratchet `lint:strict`), lint (client and server through `lint:warnings`, which also holds the warning count per rule), `lint:pages`, `lint:rtl`, `lint:size` (client and server), the server's `lint:strict`, `lint:boundaries`, `lint:tx`, `lint:dialect`, `lint:test-sql`, `lint:test-mocks`, `lint:test-new-service`, `lint:query-api`, `lint:mcp-zod`, `lint:service-http` and `lint:response-contracts`, the client's and server's `lint:format`, `lint:layers`, `lint:offline`, `lint:dup`, `lint:pairs`, `lint:skips`, `lint:i18n-keys` and `theme:lint`, shared's `contracts:open`, the repo-wide `lint:knip` (in server-lint-checks), `check:plugin-facts`, `i18n:parity:strict` (with the untranslated-strings ratchet), the S3 contract suite, the Postgres probe (`postgres-probe`: every dialect helper on SQLite and Postgres, and the statements every repository method reaches with sample arguments against a Postgres service; the SQL errors per method and the list of methods it cannot measure are held to a baseline that only shrinks and fails while it is still unmeasured; see `server/CLAUDE.md`), the browser end-to-end flows (Chromium and WebKit), a client build with `check:gl-split`, coverage for all four packages, then a SonarCloud scan. It also builds the Docker image and boots it until `/api/health/ready` answers (`docker-image`), and lints and renders the Helm chart against the Kubernetes schemas and runs `docker compose config` on every compose file (`deploy-manifests`). `lint-prettier.yml` additionally runs `lint` + `lint:format` on `shared/`, both check-only. `plugin-sdk` has no lint script and is outside the eslint gates. **Not in CI**: the screenshot and help-media Playwright projects; run them locally. There are no git hooks; nothing runs before a commit except you. Other workflows build Docker images, scan them, and publish `trek-plugin-sdk` on `plugin-sdk-v*` tags.
|
||||
`.github/workflows/test.yml` runs, per package: typecheck (server also `typecheck:tests`, client also the strict-mode ratchet `lint:strict`), lint (client and server through `lint:warnings`, which also holds the warning count per rule), `lint:pages`, `lint:rtl`, `lint:size` (client and server), the server's `lint:strict`, `lint:boundaries`, `lint:tx`, `lint:dialect`, `lint:engine-dispatch`, `lint:test-sql`, `lint:test-mocks`, `lint:test-new-service`, `lint:query-api`, `lint:mcp-zod`, `lint:service-http` and `lint:response-contracts`, the client's and server's `lint:format`, `lint:layers`, `lint:offline`, `lint:dup`, `lint:pairs`, `lint:skips`, `lint:i18n-keys` and `theme:lint`, shared's `contracts:open`, the repo-wide `lint:knip` (in `server-lint`), `check:plugin-facts`, `i18n:parity:strict` (with the untranslated-strings ratchet), the S3 contract suite, TREK on Postgres (`server-postgres`, once per supported major, 14 and 18, each in three slices: first the Postgres probe (in the first slice), every dialect helper on SQLite and Postgres and the statements every repository method reaches with sample arguments, its SQL errors per method and the methods it cannot measure held to a baseline that only shrinks and fails while it is still unmeasured; then the Postgres lane, every suite that boots the app on the real database module, found by `server/tests/postgres/lane.ts` rather than listed, plus PARITY-PG and the write lock; see `server/CLAUDE.md`), the browser end-to-end flows (Chromium and WebKit, in the Playwright container, in two slices), a client build with `check:gl-split`, coverage for all four packages, then a SonarCloud scan. It also builds the Docker image and boots it until `/api/health/ready` answers, on SQLite and on Postgres 18, and lints and renders the Helm chart against the Kubernetes schemas and runs `docker compose config` on every compose file (both in `docker`, each part when its area changed). `lint-prettier.yml` additionally runs `lint` + `lint:format` on `shared/`, both check-only. `plugin-sdk` has no lint script and is outside the eslint gates. **Not in CI**: the screenshot and help-media Playwright projects; run them locally. There are no git hooks; nothing runs before a commit except you. Other workflows build Docker images, scan them, and publish `trek-plugin-sdk` on `plugin-sdk-v*` tags.
|
||||
|
||||
- **Job names read "package: what"** (`Server: Types`, `Client: Tests 3/7`), and the list at the top of `test.yml` says what each job holds. A new job follows the scheme and joins that list, and the job-count note there says when a long job needs a slot freed first.
|
||||
- **Tests run beside the gates, in shards.** The client and server suites run in slices on parallel runners (`client-tests`, `server-tests`, through each package's `vitest.shard.config.ts`), and `client-coverage`/`server-coverage` merge their blob reports and check the thresholds against the whole. A red slice is usually a failing test, a red merge job usually a threshold.
|
||||
- **`ci-ok` is the required check.** The branch ruleset requires `ci-ok` (plus `lint` and `check-target` from their own workflows), and `ci-ok` needs every job above except the scan. It fails if any of them failed or was cancelled and passes if they passed or were skipped. A new gate job counts only once it is listed in `ci-ok`'s `needs:`.
|
||||
- **Job names read "<Area> <what>[ <variant>][ i/n]"** (`Server tests 3/10`, `Server Postgres 14 2/3`, `Docker and Helm`): the area first, one of Changes, Shared, Server, Client, Docker or Sonar, then lower case, with no colon, no parentheses and no middle dot, and a slice only at the end, so the checks list sorts by area. The workflow is named `CI`, so a check reads `CI / Server tests 3/10`. Job ids are the names in kebab-case (`server-tests`), the jobs stand in `test.yml` in area order, and the list at the top of `test.yml` says what each job holds. A new job follows the scheme and joins that list; `scripts/ci/workflow-jobs.test.mjs` fails on a name outside it. `ci-ok`, `lint` and `check-target` keep their names: the ruleset requires them by name.
|
||||
- **What the folded jobs hold.** `Shared tests` is the plugin SDK's typecheck and coverage, run before the root install so the SDK resolves only its own dependencies, then i18n parity and shared's coverage. `Client types` is the typecheck and the strict ratchet; `Client checks` the source ratchets, then the production build with `check:gl-split`. `Docker and Helm` builds and boots the image when the image area changed and checks the chart and compose files when the deploy area changed. Inside a folded job each group of steps runs after a failure in another, so one red check shows every gate that failed; the step names say which.
|
||||
- **Tests run beside the gates, in shards.** The client and server suites run in ten slices each on parallel runners (`client-tests`, `server-tests`, through each package's `vitest.shard.config.ts`), the Postgres lane in three per major, and the end-to-end flows in two, and `client-coverage`/`server-coverage` merge their blob reports and check the thresholds against the whole. A red slice is usually a failing test, a red merge job usually a threshold. A sliced job states its slice count in its matrix's shard axis, the `i/n` in its name and its `--shard=i/n`; `scripts/ci/workflow-jobs.test.mjs` fails until all three agree, and on any job naming `matrix.shard` or `--shard` whose axis is not the one-line `shard: [1, ..., n]` it reads.
|
||||
- **`ci-ok` is the required check.** The branch ruleset requires `ci-ok` (plus `lint` and `check-target` from their own workflows), and `ci-ok` needs every job above except the scan. It fails if any of them failed or was cancelled and passes if they passed or were skipped. A new gate job counts only once it is listed in `ci-ok`'s `needs:`, and `scripts/ci/workflow-jobs.test.mjs` (in `test:ci-scripts`) fails while a job other than the scan is missing there.
|
||||
- **The release pull request mirrors the push run.** On the pull request from `dev` into `main` (head branch in this repository), `changes` sets `mirror` and turns every area off (`scripts/ci/changed-areas.mjs`), so no test, gate or scan job runs, and `ci-ok` runs `scripts/ci/mirror-push-run.mjs`: it waits for the `ci-ok` of the push run of `test.yml` on `dev` for exactly the PR's head commit and passes or fails with it. No such push run, one that ended without a verdict, or a wait past 17 minutes fails with a re-run hint, never passes. A push to `dev` lists its changes against the merge base with `main`, not against the previous push, so the run it mirrors covers every area the pull request brings in, even when an earlier push's run was cancelled or red. Testing that commit twice doubled the jobs past the 60 slots.
|
||||
- **Guides name paths that exist**: the `changes` job runs `scripts/ci/doc-paths.mjs`, which resolves every backtick path in the CLAUDE.md files, `README.md`, `server/src/nest/README.md` and the wiki against the tracked files; the missing ones are listed in `scripts/ci/doc-paths-baseline.json`, which only shrinks (`--update` after a fix).
|
||||
- **What runs is decided by `changes`, not by `on.paths`**: `scripts/ci/changed-areas.mjs` maps the changed files to the `code`, `image` and `deploy` areas (tests: `npm run test:ci-scripts`). A path filter on the workflow would leave `ci-ok` unreported on a docs-only PR and block it. Add a new top-level file the build reads to the right area there.
|
||||
- **What runs is decided by `changes`, not by `on.paths`**: `scripts/ci/changed-areas.mjs` maps the changed files to the `code`, `image` and `deploy` areas (tests: `npm run test:ci-scripts`). A path filter on the workflow would leave `ci-ok` unreported on a docs-only PR and block it. Add a new top-level file the build reads to the right area there. A change to `test.yml`, to `scripts/ci/` or to a local action under `.github/actions/` runs everything.
|
||||
- **Setup goes through one local action.** Every job that installs dependencies uses `.github/actions/setup/action.yml` (`scope` full, client or shared; `build-shared`) instead of its own `npm ci`; `workflow-jobs.test.mjs` fails on a job that installs on its own (plugin-sdk's own install in its directory excepted). The action restores node_modules on an exact key (runner image, scope, Node ABI, `.nvmrc`, the lockfile and every workspace `package.json`, so npm ci still refuses a `package.json` out of step with the lockfile; no restore-keys) and shared/dist on a key over shared's sources and build config, and runs `npm ci` or the shared build on a miss. Only pushes to dev and main save, the npm download cache included; pull requests only read.
|
||||
- **End-to-end runs in the Playwright container**, `mcr.microsoft.com/playwright:v<version>-noble` pinned by digest, so no step installs browsers or system libraries. Dependabot bumps only the lockfile: on every Playwright PR move the tag and its digest in `client-e2e` by hand (`docker buildx imagetools inspect mcr.microsoft.com/playwright:v<version>-noble`); `workflow-jobs.test.mjs` fails until the tag names the lockfile's `@playwright/test` version.
|
||||
- **Budget: `ci-ok` within ten minutes.** One code run starts at most about 35 long jobs (gates, slices, Postgres, e2e, Docker), so two PR runs fit in the organisation's 60 concurrent jobs. Every job sets `timeout-minutes` of at most 20 (15 for the long ones, 10 for the short ones), which `workflow-jobs.test.mjs` holds. A new long job, slice or shard needs a reason that outweighs its slot; the job-count note at the top of `test.yml` has the numbers.
|
||||
- **Runners and Node**: jobs run on `ubuntu-24.04`, not `ubuntu-latest`, and every `setup-node` reads `.nvmrc`. Third-party actions (anything outside `actions/*`) are pinned by commit SHA with the tag in a comment; Dependabot keeps both current.
|
||||
- **Security scans are advisory.** `security.yml` runs `npm audit` (what the image installs, plus `plugin-sdk`) on every PR and push into dev and main, and Docker Scout on the built image for main. Neither is required: a newly published advisory would turn every open PR red at once. Fixes are held as floors in the root `package.json` `overrides`; npm ignores an `overrides` block in a workspace `package.json`, so never put one there.
|
||||
- **Releases** are dispatched by hand and refuse a commit whose `ci-ok` is not green. `docker-dev.yml` (any branch, usually dev) is the canary: it builds the dispatched commit as the next minor or major `-pre.N` and moves only `:latest-pre` and `:<major>-pre`. `docker.yml` (main only) bumps the version, commits and tags it, builds both platforms from exactly that commit and moves `:latest`, `:<major>`, `:<major>.<minor>` and `:<version>`. Its `bump=auto` only finalizes a prerelease in flight; without one it stops and asks for patch, minor or major. Ship a release that migrates or changes a lot as a prerelease first, and as a minor, so installs pinned to `:<major>.<minor>` can wait it out.
|
||||
|
||||
+24
-10
@@ -72,17 +72,30 @@ COPY server/package.json ./server/
|
||||
# package, and a telemetry ping.
|
||||
# The upgrade takes the Debian security fixes the base image was built before
|
||||
# (zlib, 11/2026, failed the image scan until node:24-trixie-slim caught up).
|
||||
RUN apt-get update && \
|
||||
#
|
||||
# postgresql-client-18 brings pg_dump, pg_restore and psql to
|
||||
# /usr/lib/postgresql/18/bin, which back up and restore an install on Postgres
|
||||
# (TREK_DB_URL). A client handles every server up to its own major and refuses
|
||||
# a newer one, so the image carries the newest major TREK supports (14 to 18).
|
||||
# Debian 13 ships 17 only, so it comes from the PostgreSQL project's apt
|
||||
# repository (PGDG): the `18` component lists that major's packages and no
|
||||
# other, and the repository's signing key (fingerprint B97B 0AFC AA1A 47F0 44F2
|
||||
# 44A0 7FCC 7D46 ACCC 4CF8) is kept beside the entrypoint instead of fetched at
|
||||
# build time. Raise both together when TREK supports a newer major.
|
||||
COPY server/scripts/pgdg-apt-key.asc /etc/apt/keyrings/pgdg.asc
|
||||
RUN echo 'deb [signed-by=/etc/apt/keyrings/pgdg.asc] http://apt.postgresql.org/pub/repos/apt trixie-pgdg main 18' \
|
||||
> /etc/apt/sources.list.d/pgdg.list && \
|
||||
apt-get update && \
|
||||
apt-get upgrade -y --no-install-recommends && \
|
||||
apt-get install -y --no-install-recommends tzdata dumb-init wget ca-certificates \
|
||||
libkitinerary-bin libsqlite3-0 && \
|
||||
libkitinerary-bin libsqlite3-0 postgresql-client-18 && \
|
||||
npm ci --workspace=server --omit=dev --ignore-scripts && \
|
||||
{ ln -sf "$(find /usr/lib -name kitinerary-extractor -type f | head -1)" /usr/local/bin/kitinerary-extractor || true; } && \
|
||||
rm -rf /var/lib/apt/lists/* /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx && \
|
||||
chown -R node:node /app
|
||||
|
||||
# gosu rebuilt with a current Go toolchain (stage 0) — the entrypoint script uses
|
||||
# it to drop to node.
|
||||
# gosu rebuilt with a current Go toolchain (stage 0). The entrypoint drops to node
|
||||
# with setpriv since #3135; gosu stays in the image for anyone who calls it by hand.
|
||||
COPY --from=gosu-build /out/gosu /usr/local/bin/gosu
|
||||
|
||||
ENV XDG_CACHE_HOME=/tmp/kf6-cache
|
||||
@@ -94,8 +107,9 @@ ENV KITINERARY_EXTRACTOR_PATH=/usr/local/bin/kitinerary-extractor
|
||||
|
||||
COPY --chown=node:node --from=server-builder /app/server/dist ./server/dist
|
||||
# Runtime data assets read from server/assets at runtime: airports.json (flight
|
||||
# transport search) and atlas/*.geojson.gz + atlas/admin1/*.geojson.gz (Atlas
|
||||
# country/region map). The build
|
||||
# transport search), atlas/*.geojson.gz + atlas/admin1/*.geojson.gz (Atlas
|
||||
# country/region map) and postgres/baseline.* (the schema a fresh Postgres
|
||||
# database starts from). The build
|
||||
# only emits dist, so these must be copied explicitly or the features silently
|
||||
# degrade to empty in the image.
|
||||
COPY --chown=node:node --from=server-builder /app/server/assets ./server/assets
|
||||
@@ -106,9 +120,9 @@ COPY --chown=node:node wiki ./wiki
|
||||
# tsconfig-paths/register reads this at runtime to resolve MCP SDK paths.
|
||||
COPY --chown=node:node server/tsconfig.json ./server/
|
||||
# Encryption-key rotation is run on demand via tsx (a prod dep) straight from the
|
||||
# raw .ts source — it never enters dist, so it must be copied in explicitly or
|
||||
# raw .ts source (the command and its stores module). They never enter dist, so they must be copied in explicitly or
|
||||
# `node --import tsx scripts/migrate-encryption.ts` fails with module-not-found.
|
||||
COPY --chown=node:node server/scripts/migrate-encryption.ts ./server/scripts/migrate-encryption.ts
|
||||
COPY --chown=node:node server/scripts/migrate-encryption.ts server/scripts/migrate-encryption-stores.ts ./server/scripts/
|
||||
# Admin recovery script (node server/reset-admin.js) for locked-out installs.
|
||||
COPY --chown=node:node server/reset-admin.js ./server/reset-admin.js
|
||||
COPY --chown=node:node --from=shared-builder /app/shared/dist ./shared/dist
|
||||
@@ -159,8 +173,8 @@ HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
|
||||
# carrying quotes does not survive that round-trip (the container then dies with
|
||||
# a shell syntax error before Node starts). A CMD of one bare token does.
|
||||
COPY server/scripts/entrypoint.sh /usr/local/bin/trek-entrypoint
|
||||
# Root-owned on purpose — this is what calls gosu, so it runs before the drop to
|
||||
# node. chmod is explicit because a checkout on Windows carries no exec bit.
|
||||
# Root-owned on purpose: it runs as root and drops to node itself, with setpriv.
|
||||
# chmod is explicit because a checkout on Windows carries no exec bit.
|
||||
RUN chmod 0755 /usr/local/bin/trek-entrypoint
|
||||
|
||||
ENTRYPOINT ["dumb-init", "--"]
|
||||
|
||||
@@ -321,6 +321,11 @@ docker compose up -d
|
||||
See [Install with Docker Compose](https://github.com/liketrek/TREK/wiki/Install-Docker-Compose)
|
||||
for the full walkthrough.
|
||||
|
||||
TREK stores its data in SQLite by default. Set `TREK_DB_URL` to run it on a PostgreSQL 14 to 18 database instead. The
|
||||
[`docker-compose.postgres.yml`](docker-compose.postgres.yml) example starts one beside TREK, and the
|
||||
[Postgres guide](https://github.com/liketrek/TREK/wiki/Database-Postgres) covers the requirements, the backups and
|
||||
how to move an existing SQLite install to Postgres with the command TREK ships for it.
|
||||
|
||||
<br />
|
||||
|
||||
<h2 id="helm-kubernetes">Helm (Kubernetes)</h2>
|
||||
|
||||
@@ -46,6 +46,7 @@ See `values.yaml` for more options.
|
||||
- Both PVCs are `ReadWriteOnce`. Set `persistence.data.accessModes` and/or `persistence.uploads.accessModes` to override, for example `[ReadWriteMany]` so a backup pod can mount the volume. On the data volume such a pod may only read: SQLite corrupts `travel.db` when a second process writes it over a network filesystem.
|
||||
- To use your own PVCs, set `persistence.data.existingClaim` and/or `persistence.uploads.existingClaim`. The other values for that volume (size, storageClassName, accessModes, annotations) are then ignored.
|
||||
- With `persistence.enabled: false`, the data and uploads volumes use an `emptyDir` — storage is ephemeral and lost on pod restart. Intended for testing only.
|
||||
- `database.url` runs TREK on a PostgreSQL database instead of the SQLite file. The chart writes it into its Secret as `TREK_DB_URL`; `database.existingSecret` and `database.existingSecretKey` read it from a Secret you manage. Leave both empty for SQLite. Keep `replicas: 1` either way. See the wiki page `Database-Postgres`.
|
||||
- `JWT_SECRET` is managed entirely by the server — auto-generated into the data PVC on first start and rotatable via the admin panel (Settings → Danger Zone). No Helm configuration needed.
|
||||
- `ENCRYPTION_KEY` encrypts stored secrets (API keys, MFA, SMTP, OIDC) at rest. Recommended: set via `secretEnv.ENCRYPTION_KEY` or `existingSecret`. If left empty, the server falls back automatically: existing installs use `data/.jwt_secret` (no action needed on upgrade); fresh installs auto-generate a key persisted to the data PVC.
|
||||
- Liveness and readiness probes are configurable under `probes`. Overrides are merged over the defaults, so `--set probes.liveness.initialDelaySeconds=60` keeps the `httpGet` handler. When switching to `exec` or `tcpSocket`, clear `httpGet` in the same override. Set `probes.liveness: null` to remove a probe.
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
{{- if and .Values.database.url (not .Values.database.existingSecret) .Values.existingSecret }}
|
||||
{{- fail "database.url is written into the chart's own Secret, which existingSecret replaces. Put TREK_DB_URL in your Secret and set database.existingSecret instead." }}
|
||||
{{- end }}
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
@@ -5,11 +8,13 @@ metadata:
|
||||
labels:
|
||||
app: {{ include "trek.name" . }}
|
||||
spec:
|
||||
# One replica. Its rate limits, pending codes, permission cache and WebSocket
|
||||
# connections live in the process's memory, so a second pod would not share them. That
|
||||
# holds with database.url (PostgreSQL) too; see updateStrategy in values.yaml.
|
||||
replicas: 1
|
||||
# TREK is a single-writer SQLite app on a ReadWriteOnce PVC, so the default
|
||||
# RollingUpdate would start a second pod holding the same volume before the old one
|
||||
# exits — a Multi-Attach deadlock, or two processes on one travel.db. Recreate tears
|
||||
# the old pod down first. Keep it, see updateStrategy in values.yaml.
|
||||
# The default RollingUpdate would start a second pod on the same ReadWriteOnce PVC
|
||||
# before the old one exits: a Multi-Attach deadlock, or two processes on one travel.db.
|
||||
# Recreate tears the old pod down first. Keep it, see updateStrategy in values.yaml.
|
||||
strategy:
|
||||
type: {{ .Values.updateStrategy | default "Recreate" }}
|
||||
selector:
|
||||
@@ -61,6 +66,14 @@ spec:
|
||||
name: {{ default (printf "%s-secret" (include "trek.fullname" .)) .Values.existingSecret }}
|
||||
key: {{ .Values.existingSecretKey | default "ENCRYPTION_KEY" }}
|
||||
optional: true
|
||||
{{- if or .Values.database.url .Values.database.existingSecret }}
|
||||
# Required when set: a missing key stops the pod rather than starting it on SQLite.
|
||||
- name: TREK_DB_URL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ default (printf "%s-secret" (include "trek.fullname" .)) .Values.database.existingSecret }}
|
||||
key: {{ if .Values.database.existingSecret }}{{ .Values.database.existingSecretKey | default "TREK_DB_URL" }}{{ else }}TREK_DB_URL{{ end }}
|
||||
{{- end }}
|
||||
- name: ADMIN_EMAIL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
||||
@@ -8,6 +8,9 @@ metadata:
|
||||
type: Opaque
|
||||
data:
|
||||
{{ .Values.existingSecretKey | default "ENCRYPTION_KEY" }}: {{ .Values.secretEnv.ENCRYPTION_KEY | b64enc | quote }}
|
||||
{{- if .Values.database.url }}
|
||||
TREK_DB_URL: {{ .Values.database.url | b64enc | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.secretEnv.ADMIN_EMAIL }}
|
||||
ADMIN_EMAIL: {{ .Values.secretEnv.ADMIN_EMAIL | b64enc | quote }}
|
||||
{{- end }}
|
||||
@@ -65,6 +68,9 @@ stringData:
|
||||
{{- else }}
|
||||
{{ .Values.existingSecretKey | default "ENCRYPTION_KEY" }}: {{ randAlphaNum 32 | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.database.url }}
|
||||
TREK_DB_URL: {{ .Values.database.url | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.secretEnv.ADMIN_EMAIL }}
|
||||
ADMIN_EMAIL: {{ .Values.secretEnv.ADMIN_EMAIL | quote }}
|
||||
{{- end }}
|
||||
|
||||
+23
-4
@@ -4,10 +4,13 @@ image:
|
||||
# tag: latest
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
# Deployment update strategy. Keep Recreate: TREK is a single-writer SQLite app, and
|
||||
# during a RollingUpdate the new pod migrates the database while the old one still
|
||||
# writes to it. A ReadWriteMany volume does not make that safe; SQLite's WAL needs both
|
||||
# processes on one host, which network filesystems do not provide.
|
||||
# Deployment update strategy. Keep Recreate. The new pod migrates the database when it
|
||||
# starts, and during a RollingUpdate it would do that while the old pod still writes to
|
||||
# it. Recreate stops the old pod first. On SQLite two processes on one travel.db are
|
||||
# unsafe, and a ReadWriteOnce volume cannot be attached to both pods at once.
|
||||
# With database.url the database is PostgreSQL, but the reason for one replica stays: TREK
|
||||
# keeps rate limits, pending codes, the permission cache and WebSocket connections in
|
||||
# memory, so a second pod would not share them. Postgres does not make more replicas safe.
|
||||
updateStrategy: Recreate
|
||||
|
||||
# Pod-level security context. fsGroup gives the node user (uid/gid 1000) group access
|
||||
@@ -178,6 +181,22 @@ env:
|
||||
# address is sent unless you set one here.
|
||||
|
||||
|
||||
# Database. Empty (the default) keeps TREK on its SQLite file in the data volume. Set url to
|
||||
# run TREK on a PostgreSQL database instead (see the wiki page Database-Postgres). The URL
|
||||
# carries the password, so it is never a plain env value: with url, the chart writes it into
|
||||
# its own Secret as TREK_DB_URL; with existingSecret, TREK reads TREK_DB_URL from that Secret
|
||||
# under existingSecretKey and the chart writes nothing. existingSecret wins over url. The
|
||||
# variable is required when either is set: a missing Secret key stops the pod instead of
|
||||
# starting it on SQLite. The role in the URL owns TREK's database and must not be a superuser
|
||||
# (nor a member of one, nor hold a right that reaches the server's files or programs): a
|
||||
# restore runs the backup's SQL as that role and refuses one that could reach the database host. The wiki page shows the
|
||||
# SQL that creates such a role. PostgreSQL 14 to 18 is supported.
|
||||
# url: "postgres://trek:<password>@postgres.example.internal:5432/trek?sslmode=require"
|
||||
database:
|
||||
url: ""
|
||||
existingSecret: ""
|
||||
existingSecretKey: TREK_DB_URL
|
||||
|
||||
# Secret environment variables stored in a Kubernetes Secret.
|
||||
# JWT_SECRET is managed entirely by the server (auto-generated into the data PVC,
|
||||
# rotatable via the admin panel) — it is not configured here.
|
||||
|
||||
@@ -82,10 +82,12 @@ abstract class TrekWidget : GlanceAppWidget() {
|
||||
// Read inside the composition: a session outlives one update, and every
|
||||
// write (the dashboard's, then each trip's) must reach it.
|
||||
val version by WidgetStore.version.collectAsState()
|
||||
val snapshot = remember(version) {
|
||||
val stored = remember(version) {
|
||||
val tripId = if (perTrip && appWidgetId >= 0) WidgetStore.tripFor(context, appWidgetId) else WidgetStore.AUTO
|
||||
WidgetStore.load(context, tripId)
|
||||
}
|
||||
// The day of the trip is today's on every update, not the one the app last wrote.
|
||||
val snapshot = stored?.on(LocalDate.now())
|
||||
TrekWidgetTheme.Themed { Content(snapshot) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,28 @@ data class WidgetSnapshot(
|
||||
val labels: Labels,
|
||||
/** The trip's next flight or the one in the air; last and defaulted, so older callers keep compiling. */
|
||||
val flight: Flight? = null,
|
||||
/**
|
||||
* The trip's days from the day the app wrote this on, each with its date, so
|
||||
* the widget turns to the next day itself (see [on]); empty from an app
|
||||
* that predates them.
|
||||
*/
|
||||
val days: List<Today> = emptyList(),
|
||||
) {
|
||||
/**
|
||||
* The snapshot as it reads on [date]: that date's trip day out of [days],
|
||||
* none before or after the trip, and only the bookings from that date on.
|
||||
* The app writes its snapshot only while it runs, so without this a widget
|
||||
* showed the day it last ran. A snapshot without [days] reads as written.
|
||||
*/
|
||||
fun on(date: LocalDate): WidgetSnapshot {
|
||||
if (days.isEmpty()) return this
|
||||
val key = date.toString()
|
||||
return copy(
|
||||
today = days.firstOrNull { it.date == key },
|
||||
bookings = bookings.filter { (it.date ?: key) >= key },
|
||||
)
|
||||
}
|
||||
|
||||
data class Trip(
|
||||
val title: String,
|
||||
val start: String,
|
||||
@@ -52,7 +73,8 @@ data class WidgetSnapshot(
|
||||
val symbol: String?,
|
||||
)
|
||||
|
||||
data class Today(val dayLabel: String, val stops: List<Stop>, val index: Int?, val total: Int?)
|
||||
/** A trip day; [date] (yyyy-MM-dd) is absent from an app that predates the days ahead. */
|
||||
data class Today(val dayLabel: String, val stops: List<Stop>, val index: Int?, val total: Int?, val date: String? = null)
|
||||
|
||||
data class Weather(
|
||||
val temp: Int,
|
||||
@@ -212,6 +234,16 @@ data class WidgetSnapshot(
|
||||
null
|
||||
}
|
||||
|
||||
private fun dayOf(t: JSONObject): Today = Today(
|
||||
dayLabel = t.optString("dayLabel"),
|
||||
stops = t.optJSONArray("stops").objects().map {
|
||||
Stop(it.str("time"), it.optString("name"), it.int("minutes"), it.str("color"), it.str("symbol"))
|
||||
},
|
||||
index = t.int("index"),
|
||||
total = t.int("total"),
|
||||
date = t.str("date"),
|
||||
)
|
||||
|
||||
fun fromJson(o: JSONObject): WidgetSnapshot = WidgetSnapshot(
|
||||
trip = o.optJSONObject("trip")?.let {
|
||||
Trip(
|
||||
@@ -226,16 +258,8 @@ data class WidgetSnapshot(
|
||||
memberCount = it.int("memberCount"),
|
||||
)
|
||||
},
|
||||
today = o.optJSONObject("today")?.let { t ->
|
||||
Today(
|
||||
dayLabel = t.optString("dayLabel"),
|
||||
stops = t.optJSONArray("stops").objects().map {
|
||||
Stop(it.str("time"), it.optString("name"), it.int("minutes"), it.str("color"), it.str("symbol"))
|
||||
},
|
||||
index = t.int("index"),
|
||||
total = t.int("total"),
|
||||
)
|
||||
},
|
||||
today = o.optJSONObject("today")?.let(::dayOf),
|
||||
days = o.optJSONArray("days").objects().map(::dayOf),
|
||||
weather = o.optJSONObject("weather")?.let {
|
||||
Weather(it.optInt("temp"), it.int("high"), it.int("low"), it.optString("main"), it.optString("label"), it.str("place"), it.int("rain"))
|
||||
},
|
||||
|
||||
@@ -99,4 +99,34 @@ class WidgetSnapshotTest {
|
||||
assertEquals("ferry.fill", TrekIcons.booking("cruise").first)
|
||||
assertEquals("bookmark.fill", TrekIcons.booking("something").first)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun turnsToTheDayOfTheDateItIsReadOn() {
|
||||
val json = """{"trip":{"title":"T","start":"2026-11-06","end":"2026-11-08","path":"/trips/1"},
|
||||
"today":{"date":"2026-11-06","dayLabel":"Day 1 of 3","stops":[{"time":"09:00","name":"Museum","minutes":540}]},
|
||||
"days":[
|
||||
{"date":"2026-11-06","dayLabel":"Day 1 of 3","stops":[{"time":"09:00","name":"Museum","minutes":540}]},
|
||||
{"date":"2026-11-07","dayLabel":"Day 2 of 3","stops":[{"time":"10:00","name":"Harbour","minutes":600}]}
|
||||
],
|
||||
"bookings":[
|
||||
{"title":"Hotel","kind":"hotel","date":"2026-11-06","confirmed":true,"path":"/trips/1"},
|
||||
{"title":"Train","kind":"train","date":"2026-11-07","confirmed":true,"path":"/trips/1"}
|
||||
],
|
||||
"labels":{}}"""
|
||||
val snapshot = WidgetSnapshot.parse(json)!!
|
||||
assertEquals("Day 1 of 3", snapshot.on(LocalDate.of(2026, 11, 6)).today!!.dayLabel)
|
||||
val second = snapshot.on(LocalDate.of(2026, 11, 7))
|
||||
assertEquals("Day 2 of 3", second.today!!.dayLabel)
|
||||
assertEquals("Harbour", second.today!!.stops.single().name)
|
||||
assertEquals(listOf("Train"), second.bookings.map { it.title })
|
||||
// A day the app wrote nothing for (the trip is over) shows no day.
|
||||
assertNull(snapshot.on(LocalDate.of(2026, 11, 9)).today)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun aSnapshotWithoutDaysReadsAsWritten() {
|
||||
val snapshot = WidgetSnapshot.parse(WidgetSamples.json(running = true, now = today))!!
|
||||
assertTrue(snapshot.days.isEmpty())
|
||||
assertEquals(snapshot, snapshot.on(today.plusDays(3)))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -686,9 +686,8 @@ extension TrekShellPlugin {
|
||||
/// know are left out, so the shell offers only what can really be bought.
|
||||
@objc func storeProducts(_ call: CAPPluginCall) {
|
||||
let ids = call.getArray("ids", String.self) ?? []
|
||||
// TestFlight, App Review and Xcode builds buy in the sandbox; their receipt says so.
|
||||
let sandbox = Bundle.main.appStoreReceiptURL?.lastPathComponent == "sandboxReceipt"
|
||||
Task {
|
||||
let sandbox = await Self.buysInSandbox()
|
||||
guard AppStore.canMakePayments, let products = try? await Product.products(for: ids) else {
|
||||
call.resolve(["products": [], "sandbox": sandbox])
|
||||
return
|
||||
@@ -697,6 +696,26 @@ extension TrekShellPlugin {
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether this build buys in the App Store sandbox: TestFlight, App Review and
|
||||
/// Xcode builds do, and while TREK Cloud's orders are closed only they may buy.
|
||||
/// The signed app transaction names its environment; the receipt's file name,
|
||||
/// which App Review builds do not always carry, is only the fallback where the
|
||||
/// app transaction is missing (iOS 15) or cannot be read.
|
||||
static func buysInSandbox() async -> Bool {
|
||||
let receiptSaysSandbox = Bundle.main.appStoreReceiptURL?.lastPathComponent == "sandboxReceipt"
|
||||
guard #available(iOS 16.0, *), let result = try? await AppTransaction.shared else {
|
||||
return receiptSaysSandbox
|
||||
}
|
||||
// An unverified transaction still names the environment it was signed in;
|
||||
// it only decides whether the button shows, the cloud checks every purchase itself.
|
||||
let transaction: AppTransaction
|
||||
switch result {
|
||||
case .verified(let signed), .unverified(let signed, _):
|
||||
transaction = signed
|
||||
}
|
||||
return transaction.environment != .production || receiptSaysSandbox
|
||||
}
|
||||
|
||||
/// Feature storeKit: runs the App Store purchase sheet. Resolves with `kind`
|
||||
/// bought (with the signed transaction the control plane verifies), cancelled,
|
||||
/// pending (Ask to Buy, a payment the bank still has to approve) or failed.
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 49 KiB |
@@ -21,12 +21,14 @@ struct TrekProvider: TimelineProvider {
|
||||
func getSnapshot(in context: Context, completion: @escaping (TrekEntry) -> Void) {
|
||||
let stored = WidgetSnapshot.load()
|
||||
let snapshot: WidgetSnapshot? = (stored?.trip != nil || !context.isPreview) ? stored : WidgetSnapshot.sample(running: false)
|
||||
completion(TrekEntry(date: Date(), snapshot: snapshot))
|
||||
let now = Date()
|
||||
completion(TrekEntry(date: now, snapshot: snapshot?.on(now)))
|
||||
}
|
||||
|
||||
/// An entry every quarter hour for the next six hours, so the now line and
|
||||
/// the next stop move on without the app; the app reloads the timeline
|
||||
/// whenever it writes a new snapshot.
|
||||
/// the next stop move on without the app, each with the trip day of its own
|
||||
/// date: the one at midnight turns to the next day. The app reloads the
|
||||
/// timeline whenever it writes a new snapshot, WidgetKit when it runs out.
|
||||
func getTimeline(in context: Context, completion: @escaping (Timeline<TrekEntry>) -> Void) {
|
||||
completion(TrekProvider.timeline(WidgetSnapshot.load()))
|
||||
}
|
||||
@@ -36,10 +38,11 @@ struct TrekProvider: TimelineProvider {
|
||||
let calendar = Calendar.current
|
||||
let minute = calendar.component(.minute, from: now)
|
||||
let firstStep = calendar.date(byAdding: .minute, value: 15 - minute % 15, to: now) ?? now
|
||||
var entries = [TrekEntry(date: now, snapshot: snapshot)]
|
||||
var entries = [TrekEntry(date: now, snapshot: snapshot?.on(now))]
|
||||
for step in 0..<24 {
|
||||
if let date = calendar.date(byAdding: .minute, value: step * 15, to: firstStep) {
|
||||
entries.append(TrekEntry(date: calendar.date(bySetting: .second, value: 0, of: date) ?? date, snapshot: snapshot))
|
||||
let at = calendar.date(bySetting: .second, value: 0, of: date) ?? date
|
||||
entries.append(TrekEntry(date: at, snapshot: snapshot?.on(at)))
|
||||
}
|
||||
}
|
||||
return Timeline(entries: entries, policy: .atEnd)
|
||||
|
||||
@@ -512,8 +512,8 @@ struct StopList: View {
|
||||
ForEach(Array(window.enumerated()), id: \.offset) { offset, stop in
|
||||
let past = (stop.minutes ?? Int.max) < nowMinutes
|
||||
let isNext = !past && (offset == 0 || (window[offset - 1].minutes ?? Int.max) < nowMinutes)
|
||||
if isNext && offset > 0, let nowLabel { nowLine(nowLabel) }
|
||||
row(stop, past: past, isNext: isNext, last: offset == window.count - 1)
|
||||
if isNext && offset > 0, let nowLabel { nowLine(nowLabel, in: window) }
|
||||
row(stop, in: window, past: past, isNext: isNext, last: offset == window.count - 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -528,13 +528,33 @@ struct StopList: View {
|
||||
|
||||
private var ink: Color { onPhoto ? .white : Trek.ink(scheme) }
|
||||
|
||||
private func row(_ stop: WidgetSnapshot.Stop, past: Bool, isNext: Bool, last: Bool) -> some View {
|
||||
/// The time column, as wide as the longest time in the window (and the now
|
||||
/// marker's label): every row lays all of them over each other, hidden, so
|
||||
/// "5:45 AM" fits as well as "09:30" and the dots still stand in one line.
|
||||
private func timeColumn<Label: View>(_ window: [WidgetSnapshot.Stop], @ViewBuilder label: () -> Label) -> some View {
|
||||
ZStack(alignment: .leading) {
|
||||
ForEach(Array(window.enumerated()), id: \.offset) { _, stop in
|
||||
Text(stop.time ?? "–").font(Trek.number(11.5, .heavy)).hidden()
|
||||
}
|
||||
if let nowLabel { nowText(nowLabel).hidden() }
|
||||
label()
|
||||
}
|
||||
.lineLimit(1)
|
||||
.fixedSize(horizontal: true, vertical: false)
|
||||
.frame(minWidth: 38, alignment: .leading)
|
||||
}
|
||||
|
||||
private func nowText(_ label: String) -> some View {
|
||||
Text(label.uppercased()).font(.system(size: 8.5, weight: .heavy)).tracking(0.5).foregroundStyle(Trek.danger)
|
||||
}
|
||||
|
||||
private func row(_ stop: WidgetSnapshot.Stop, in window: [WidgetSnapshot.Stop], past: Bool, isNext: Bool, last: Bool) -> some View {
|
||||
let color = Color(css: stop.color) ?? (onPhoto ? .white : Trek.info)
|
||||
return HStack(alignment: .top, spacing: 8) {
|
||||
Text(stop.time ?? "–")
|
||||
.font(Trek.number(11.5, isNext ? .heavy : .semibold))
|
||||
.frame(width: 38, alignment: .leading)
|
||||
.padding(.top, 1)
|
||||
timeColumn(window) {
|
||||
Text(stop.time ?? "–").font(Trek.number(11.5, isNext ? .heavy : .semibold))
|
||||
}
|
||||
.padding(.top, 1)
|
||||
VStack(spacing: 0) {
|
||||
ZStack {
|
||||
Circle().fill(color).frame(width: isNext ? 11 : 8, height: isNext ? 11 : 8)
|
||||
@@ -562,10 +582,9 @@ struct StopList: View {
|
||||
.frame(height: 24, alignment: .top)
|
||||
}
|
||||
|
||||
private func nowLine(_ label: String) -> some View {
|
||||
private func nowLine(_ label: String, in window: [WidgetSnapshot.Stop]) -> some View {
|
||||
HStack(spacing: 5) {
|
||||
Text(label.uppercased()).font(.system(size: 8.5, weight: .heavy)).tracking(0.5).foregroundStyle(Trek.danger)
|
||||
.frame(width: 38, alignment: .leading)
|
||||
timeColumn(window) { nowText(label) }
|
||||
Circle().fill(Trek.danger).frame(width: 5, height: 5).frame(width: 15)
|
||||
Rectangle().fill(Trek.danger).frame(height: 1.2)
|
||||
}
|
||||
|
||||
@@ -63,7 +63,8 @@ struct TrekTripProvider: AppIntentTimelineProvider {
|
||||
func snapshot(for configuration: SelectTripIntent, in context: Context) async -> TrekEntry {
|
||||
let stored = WidgetSnapshot.load(trip: configuration.trip?.id)
|
||||
let snapshot: WidgetSnapshot? = (stored?.trip != nil || !context.isPreview) ? stored : WidgetSnapshot.sample(running: false)
|
||||
return TrekEntry(date: Date(), snapshot: snapshot)
|
||||
let now = Date()
|
||||
return TrekEntry(date: now, snapshot: snapshot?.on(now))
|
||||
}
|
||||
|
||||
func timeline(for configuration: SelectTripIntent, in context: Context) async -> Timeline<TrekEntry> {
|
||||
|
||||
@@ -35,6 +35,8 @@ struct WidgetSnapshot: Codable {
|
||||
}
|
||||
|
||||
struct Today: Codable {
|
||||
/// The calendar day it is, yyyy-MM-dd (absent from an app that predates `days`).
|
||||
var date: String?
|
||||
var dayLabel: String
|
||||
var stops: [Stop]
|
||||
/// 1-based position of today in the trip.
|
||||
@@ -245,6 +247,9 @@ struct WidgetSnapshot: Codable {
|
||||
|
||||
var trip: Trip?
|
||||
var today: Today?
|
||||
/// The trip's days from the day the app wrote this on, each with its date,
|
||||
/// so the widget turns to the next day itself (see `on(_:)`).
|
||||
var days: [Today]?
|
||||
var weather: Weather?
|
||||
var bookings: [Booking]?
|
||||
var todos: Todos?
|
||||
@@ -306,6 +311,26 @@ struct WidgetSnapshot: Codable {
|
||||
return days + 1
|
||||
}
|
||||
|
||||
/// The snapshot as it reads on `date`: that date's trip day out of `days`,
|
||||
/// none before or after the trip, and only the bookings from that date on.
|
||||
/// The app writes its snapshot only while it runs, so without this a widget
|
||||
/// showed the day it last ran (TestFlight feedback: "stuck on day 1"). A
|
||||
/// snapshot from an app without `days` reads as it was written.
|
||||
func on(_ date: Date) -> WidgetSnapshot {
|
||||
guard let days, !days.isEmpty else { return self }
|
||||
let key = WidgetSnapshot.key(date)
|
||||
var snapshot = self
|
||||
snapshot.today = days.first { $0.date == key }
|
||||
snapshot.bookings = bookings?.filter { ($0.date ?? key) >= key }
|
||||
return snapshot
|
||||
}
|
||||
|
||||
/// A date as the app writes one, yyyy-MM-dd in the device's calendar day.
|
||||
static func key(_ date: Date) -> String {
|
||||
let parts = Calendar.current.dateComponents([.year, .month, .day], from: date)
|
||||
return String(format: "%04d-%02d-%02d", parts.year ?? 0, parts.month ?? 0, parts.day ?? 0)
|
||||
}
|
||||
|
||||
static func daysBetween(_ from: Date, _ to: Date) -> Int? {
|
||||
let calendar = Calendar.current
|
||||
return calendar.dateComponents([.day], from: calendar.startOfDay(for: from), to: calendar.startOfDay(for: to)).day
|
||||
|
||||
@@ -190,7 +190,7 @@
|
||||
{
|
||||
"feature": "Booking mail import: admin card",
|
||||
"hooks": ["src/components/Admin/mailIngest/useMailIngestAdmin.ts", "src/components/Admin/mailIngest/mailIngestAdminModel.ts"],
|
||||
"desktop": ["src/components/Admin/mailIngest/MailIngestAdminCard.tsx"],
|
||||
"desktop": ["src/components/Admin/mailIngest/MailIngestAddonTile.tsx"],
|
||||
"mobile": ["src/mobile/screens/admin/MMailIngestAdminCard.tsx"]
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1542,7 +1542,6 @@
|
||||
"src/pages/journeyDetail/useJourneyDetail.ts",
|
||||
"src/pages/journeyDetail/useProviderPhotoAdds.test.tsx",
|
||||
"src/pages/journeyDetail/useProviderPhotoAdds.ts",
|
||||
"src/pages/journeyPublic/journeyPublicModel.ts",
|
||||
"src/pages/journeyPublic/useJourneyPublic.ts",
|
||||
"src/pages/journeyStudio/useJourneyStudio.test.tsx",
|
||||
"src/pages/journeyStudio/useJourneyStudio.ts",
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
"pdf.ts": 1,
|
||||
"perm.ts": 4,
|
||||
"places.ts": 9,
|
||||
"planner.ts": 53,
|
||||
"planner.ts": 52,
|
||||
"reservations.ts": 21,
|
||||
"roadtrip.ts": 36,
|
||||
"settings.ts": 37,
|
||||
|
||||
@@ -113,7 +113,6 @@
|
||||
"src/pages/AtlasPage.tsx": 6,
|
||||
"src/pages/FilesPage.tsx": 1,
|
||||
"src/pages/JourneyDetailPage.tsx": 1,
|
||||
"src/pages/JourneyPublicPage.test.tsx": 1,
|
||||
"src/pages/LoginPage.tsx": 1,
|
||||
"src/pages/VacayPage.tsx": 1,
|
||||
"src/pages/admin/useAdmin.ts": 4,
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
"mobile/components/MToastHost.tsx": 2,
|
||||
"mobile/components/MUserPickerList.tsx": 1,
|
||||
"mobile/screens/admin/MAdmin.tsx": 8,
|
||||
"mobile/screens/admin/MAdminAddonManager.tsx": 4,
|
||||
"mobile/screens/admin/MAdminAddonManager.tsx": 3,
|
||||
"mobile/screens/admin/MAdminAuditLogPanel.tsx": 15,
|
||||
"mobile/screens/admin/MAdminBackupPanel.tsx": 7,
|
||||
"mobile/screens/admin/MAdminCategoryManager.tsx": 8,
|
||||
|
||||
@@ -7,6 +7,7 @@ import { useAuthStore } from '../../store/authStore';
|
||||
import { useSettingsStore } from '../../store/settingsStore';
|
||||
import { useAddonStore } from '../../store/addonStore';
|
||||
import { ToastContainer } from '../shared/Toast';
|
||||
import { mailIngestRepo } from '../../repo/mailIngestRepo';
|
||||
import AddonManager from './AddonManager';
|
||||
|
||||
function buildAddon(overrides = {}) {
|
||||
@@ -691,4 +692,40 @@ describe('AddonManager', () => {
|
||||
expect(roadtrip.querySelector('svg.lucide-car-front')).toBeInTheDocument();
|
||||
expect(tours.querySelector('svg.lucide-puzzle')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('FE-ADMIN-ADDON-045: live flight status is a row of the trip card, switched there and locked by the environment', async () => {
|
||||
server.use(addonsRoute([buildAddon({ id: 'packing', name: 'Lists', icon: 'ListChecks', type: 'trip', enabled: true })]));
|
||||
const onToggle = vi.fn();
|
||||
const { unmount } = render(<AddonManager flightLive={{ on: false, locked: false, managed: false, onToggle }} />);
|
||||
const trip = (await screen.findByRole('heading', { name: 'Trip' })).closest('section')!;
|
||||
await userEvent.click(within(trip).getByRole('button', { name: 'Follow booked flights live' }));
|
||||
expect(onToggle).toHaveBeenCalledTimes(1);
|
||||
// The count stays the addons': the flight row is an instance option beside them.
|
||||
expect(within(trip).getByText('1/1')).toBeInTheDocument();
|
||||
unmount();
|
||||
|
||||
render(<AddonManager flightLive={{ on: true, locked: true, managed: false, onToggle }} />);
|
||||
expect(await screen.findByRole('button', { name: 'Follow booked flights live' })).toBeDisabled();
|
||||
});
|
||||
|
||||
it('FE-ADMIN-ADDON-046: the booking mail import is a row of the integration card whose setup opens in a dialog', async () => {
|
||||
server.use(addonsRoute([buildAddon({ id: 'mcp', name: 'MCP', icon: 'Terminal', type: 'integration', enabled: false })]));
|
||||
vi.spyOn(mailIngestRepo, 'adminSettings').mockResolvedValue({ mail_ingest_enabled: 'true' });
|
||||
vi.spyOn(mailIngestRepo, 'adminStatus').mockRejectedValue(new Error('no status'));
|
||||
render(<AddonManager mailImport />);
|
||||
const integration = (await screen.findByRole('heading', { name: 'Integration' })).closest('section')!;
|
||||
expect(within(integration).getByText('Booking mail import')).toBeInTheDocument();
|
||||
await userEvent.click(await within(integration).findByRole('button', { name: 'Set up mail import' }));
|
||||
const dialog = await screen.findByRole('dialog');
|
||||
expect(within(dialog).getByText('How mail arrives')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('FE-ADMIN-ADDON-047: without the mail option the integration card has no mail row and nothing is loaded', async () => {
|
||||
server.use(addonsRoute([buildAddon({ id: 'mcp', name: 'MCP', icon: 'Terminal', type: 'integration', enabled: false })]));
|
||||
const load = vi.spyOn(mailIngestRepo, 'adminSettings');
|
||||
render(<AddonManager />);
|
||||
await screen.findByRole('heading', { name: 'Integration' });
|
||||
expect(screen.queryByText('Booking mail import')).not.toBeInTheDocument();
|
||||
expect(load).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { ComponentType, ReactNode } from 'react'
|
||||
import type { ComponentType } from 'react'
|
||||
import { useTranslation } from '../../i18n'
|
||||
import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen, Sparkles, Luggage, Plane, Bookmark, Users, Loader2, Mountain, CarFront } from 'lucide-react'
|
||||
import { Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen, Sparkles, Luggage, Plane, Bookmark, Users, Loader2, Mountain, CarFront, Radar } from 'lucide-react'
|
||||
import EmptyState from '../shared/EmptyState'
|
||||
import DawarichIcon from '../shared/DawarichIcon'
|
||||
import AirTrailIcon from '../shared/AirTrailIcon'
|
||||
@@ -12,6 +12,9 @@ import { SettingsCard, SettingsColumns, StatusPill } from '../Settings/settingsK
|
||||
import { type Addon, type CollabFeatures, COLLAB_SUB_FEATURES, getAddonLabel } from './addons/addonModel'
|
||||
import { useAddonManager } from './addons/useAddonManager'
|
||||
import AiAddonTile from './addons/AiAddonTile'
|
||||
import MailIngestAddonTile from './mailIngest/MailIngestAddonTile'
|
||||
import PaddleRegionsPanel from './paddle/PaddleRegionsPanel'
|
||||
import ToggleSwitch from '../Settings/ToggleSwitch'
|
||||
import { ImmichIcon, SynologyIcon } from './addons/PhotoProviderIcons'
|
||||
import WandererMark from '../Tours/wanderer/WandererMark'
|
||||
|
||||
@@ -65,13 +68,24 @@ const TYPE_META: Record<string, { icon: ComponentType<{ size?: number }>; labelK
|
||||
integration: { icon: Link2, labelKey: 'admin.addons.type.integration', hintKey: 'admin.addons.integrationHint' },
|
||||
}
|
||||
|
||||
export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking, collabFeatures, onToggleCollabFeature, aside }: {
|
||||
/** The live flight status switch, an instance setting that sits with the trip addons. */
|
||||
export interface FlightLiveOption {
|
||||
on: boolean
|
||||
/** The server environment (FLIGHT_LIVE_ENABLED) holds it; the switch shows the state and says why. */
|
||||
locked: boolean
|
||||
managed: boolean
|
||||
onToggle: () => void
|
||||
}
|
||||
|
||||
export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking, collabFeatures, onToggleCollabFeature, flightLive, mailImport = false }: {
|
||||
bagTrackingEnabled?: boolean
|
||||
onToggleBagTracking?: () => void
|
||||
collabFeatures?: CollabFeatures
|
||||
onToggleCollabFeature?: (key: string) => void
|
||||
/** Cards that set up what the integrations reach (flight status, booking mails), under them in the right column. */
|
||||
aside?: ReactNode
|
||||
/** Live flight status, a row of the trip card: it follows the trips' booked flights. */
|
||||
flightLive?: FlightLiveOption
|
||||
/** Booking mail import, a row of the integration card with its setup dialog; off on a managed install. */
|
||||
mailImport?: boolean
|
||||
}) {
|
||||
const { t } = useTranslation()
|
||||
const {
|
||||
@@ -181,6 +195,8 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
|
||||
onToggle={() => void toggle()}
|
||||
/>
|
||||
)),
|
||||
// The paddle water data the tour planner reads, set up in a dialog of its own.
|
||||
<PaddleRegionsPanel key="paddle-regions" />,
|
||||
]
|
||||
}
|
||||
return null
|
||||
@@ -202,6 +218,9 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
|
||||
)
|
||||
}
|
||||
|
||||
/** Whether a card holds rows beside its own addons: the AI tile, an instance option. */
|
||||
const extraRows = (key: string) =>
|
||||
(key === 'trip' && !!flightLive) || (key === 'integration' && (aiAddons.length > 0 || mailImport))
|
||||
/* A card per type, the way every other admin tab sets its cards: Trip in the
|
||||
left column, Global and Integration in the right one, each card with the
|
||||
dialogs' head band carrying the type, its count and what it means. */
|
||||
@@ -209,14 +228,14 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
|
||||
{ key: 'trip', addons: tripAddons },
|
||||
{ key: 'global', addons: globalAddons },
|
||||
{ key: 'integration', addons: integrationAddons },
|
||||
].filter(g => g.addons.length > 0 || (g.key === 'integration' && aiAddons.length > 0))
|
||||
].filter(g => g.addons.length > 0 || extraRows(g.key))
|
||||
|
||||
const card = (g: (typeof groups)[number]) => {
|
||||
const meta = TYPE_META[g.key]
|
||||
const all = g.key === 'integration' ? [...aiAddons, ...g.addons] : g.addons
|
||||
const visible = g.addons
|
||||
const ai = g.key === 'integration' && aiAddons.length > 0
|
||||
if (!visible.length && !ai) return null
|
||||
if (!visible.length && !ai && !extraRows(g.key)) return null
|
||||
const on = all.filter(a => a.enabled).length
|
||||
return (
|
||||
<SettingsCard
|
||||
@@ -235,6 +254,10 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
|
||||
{/* The AI addons share a connection and a settings dialog, so they head the card as one tile. */}
|
||||
{ai && <AiAddonTile addons={aiAddons} onToggle={handleToggle} />}
|
||||
{visible.map(tile)}
|
||||
{/* Not addons but instance options of the same kind, as rows of the same card;
|
||||
the count above stays the addons'. */}
|
||||
{g.key === 'trip' && flightLive && <FlightLiveTile option={flightLive} />}
|
||||
{g.key === 'integration' && mailImport && <MailIngestAddonTile />}
|
||||
</div>
|
||||
</SettingsCard>
|
||||
)
|
||||
@@ -251,5 +274,21 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
|
||||
)
|
||||
}
|
||||
|
||||
return <SettingsColumns start={cards.start} end={<>{cards.end}{aside}</>} />
|
||||
return <SettingsColumns start={cards.start} end={cards.end} />
|
||||
}
|
||||
|
||||
/** Live flight status as a trip row: on, it follows every booked flight on its day. */
|
||||
function FlightLiveTile({ option }: { option: FlightLiveOption }) {
|
||||
const { t } = useTranslation()
|
||||
const name = t('flightLive.adminTitle')
|
||||
const hint = option.managed ? t('flightLive.adminHintManaged') : t('flightLive.adminHint')
|
||||
return (
|
||||
<AddonTile
|
||||
icon={<Radar size={18} />}
|
||||
name={name}
|
||||
description={option.locked ? `${hint} ${t('flightLive.envLocked')}` : hint}
|
||||
enabled={option.on}
|
||||
trailing={<ToggleSwitch on={option.on} label={t('flightLive.adminToggle')} disabled={option.locked} onToggle={option.onToggle} />}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
import React, { useId, type ReactNode } from 'react';
|
||||
import { useTranslation } from '../../i18n';
|
||||
import {
|
||||
DialogButton,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogShell,
|
||||
DialogTile,
|
||||
FooterSpacer,
|
||||
NEUTRAL_TINT,
|
||||
} from '../shared/DialogShell';
|
||||
|
||||
/**
|
||||
* The dialog an addon's setup row opens: the icon tile, the addon it belongs
|
||||
* to above the title, what it sets up below, and one Close, since everything
|
||||
* inside saves on its own (booking mails, paddle water data).
|
||||
*/
|
||||
export default function AddonSetupDialog({
|
||||
icon,
|
||||
eyebrow,
|
||||
title,
|
||||
sub,
|
||||
onClose,
|
||||
blocked = false,
|
||||
children,
|
||||
}: {
|
||||
icon: ReactNode;
|
||||
eyebrow: string;
|
||||
title: string;
|
||||
sub: string;
|
||||
onClose: () => void;
|
||||
/** A confirmation stacked on top holds the dialog while it is open. */
|
||||
blocked?: boolean;
|
||||
children: ReactNode;
|
||||
}): React.ReactElement {
|
||||
const { t } = useTranslation();
|
||||
const labelId = useId();
|
||||
return (
|
||||
<DialogShell
|
||||
onClose={onClose}
|
||||
labelledBy={labelId}
|
||||
width="detail"
|
||||
blocked={blocked}
|
||||
header={
|
||||
<DialogHeader
|
||||
tile={<DialogTile>{icon}</DialogTile>}
|
||||
tint={NEUTRAL_TINT}
|
||||
labelId={labelId}
|
||||
eyebrow={eyebrow}
|
||||
title={title}
|
||||
sub={sub}
|
||||
subWraps
|
||||
onClose={onClose}
|
||||
/>
|
||||
}
|
||||
footer={
|
||||
<DialogFooter>
|
||||
<FooterSpacer />
|
||||
<DialogButton variant="primary" onClick={onClose}>
|
||||
{t('common.close')}
|
||||
</DialogButton>
|
||||
</DialogFooter>
|
||||
}
|
||||
>
|
||||
{children}
|
||||
</DialogShell>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
import { ChevronRight, Settings2 } from 'lucide-react';
|
||||
import React, { type ReactNode } from 'react';
|
||||
import { fs } from '../shared/DialogShell';
|
||||
|
||||
/**
|
||||
* The last row of an addon's shelf that opens its settings dialog: a gear, what
|
||||
* the dialog sets up, and a chevron. It keeps a card of addons as short as its
|
||||
* switches and puts the long forms behind one tap (AI, booking mails, paddle
|
||||
* water data). A badge says what waits inside, such as requests to look at.
|
||||
*/
|
||||
export default function AddonSetupRow({
|
||||
label,
|
||||
onOpen,
|
||||
badge,
|
||||
}: {
|
||||
label: string;
|
||||
onOpen: () => void;
|
||||
badge?: ReactNode;
|
||||
}): React.ReactElement {
|
||||
return (
|
||||
<li>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onOpen}
|
||||
className="flex min-h-[44px] w-full items-center gap-2.5 border-0 bg-transparent py-1.5 pe-4 ps-[60px] text-start transition-colors hover:bg-surface-hover focus-visible:bg-surface-hover focus-visible:outline-none"
|
||||
>
|
||||
<span className="grid h-6 w-6 flex-none place-items-center text-content-muted">
|
||||
<Settings2 size={14} />
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate font-medium text-content" style={fs(12.5, 'body')}>
|
||||
{label}
|
||||
</span>
|
||||
{badge}
|
||||
<ChevronRight size={15} strokeWidth={2.2} className="flex-none text-content-faint rtl:rotate-180" />
|
||||
</button>
|
||||
</li>
|
||||
);
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
import { ChevronRight, Settings2, Sparkles } from 'lucide-react';
|
||||
import { Sparkles } from 'lucide-react';
|
||||
import React from 'react';
|
||||
import { useTranslation } from '../../../i18n';
|
||||
import { StatusPill } from '../../Settings/settingsKit';
|
||||
import { fs } from '../../shared/DialogShell';
|
||||
import AddonSetupRow from '../AddonSetupRow';
|
||||
import AddonSubRow from '../AddonSubRow';
|
||||
import AddonTile from '../AddonTile';
|
||||
import { type Addon, getAddonLabel } from './addonModel';
|
||||
@@ -54,23 +55,7 @@ export default function AiAddonTile({
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{tile.canSetUp && (
|
||||
<li>
|
||||
<button
|
||||
type="button"
|
||||
onClick={tile.openDialog}
|
||||
className="flex min-h-[44px] w-full items-center gap-2.5 border-0 bg-transparent py-1.5 pe-4 ps-[60px] text-start transition-colors hover:bg-surface-hover focus-visible:bg-surface-hover focus-visible:outline-none"
|
||||
>
|
||||
<span className="grid h-6 w-6 flex-none place-items-center text-content-muted">
|
||||
<Settings2 size={14} />
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate font-medium text-content" style={fs(12.5, 'body')}>
|
||||
{t('admin.addons.ai.setup')}
|
||||
</span>
|
||||
<ChevronRight size={15} strokeWidth={2.2} className="flex-none text-content-faint rtl:rotate-180" />
|
||||
</button>
|
||||
</li>
|
||||
)}
|
||||
{tile.canSetUp && <AddonSetupRow label={t('admin.addons.ai.setup')} onOpen={tile.openDialog} />}
|
||||
</AddonTile>
|
||||
{tile.dialogOpen && <AiSettingsDialog addons={addons} onClose={tile.closeDialog} />}
|
||||
</>
|
||||
|
||||
+42
-33
@@ -1,22 +1,17 @@
|
||||
import { AlertTriangle, CheckCircle, Copy, Loader2, Mail, PlugZap, Save, XCircle } from 'lucide-react';
|
||||
import type { ReactNode } from 'react';
|
||||
import { useState, type ReactNode } from 'react';
|
||||
import { useTranslation } from '../../../i18n';
|
||||
import type { TranslationFn } from '../../../types';
|
||||
import { copyText } from '../../../utils/clipboard';
|
||||
import { relativeTime } from '../../../utils/relativeTime';
|
||||
import {
|
||||
HintMark,
|
||||
SETTINGS_BUTTON,
|
||||
SETTINGS_BUTTON_PRIMARY,
|
||||
SettingRow,
|
||||
SettingRows,
|
||||
SettingsCard,
|
||||
StatusPill,
|
||||
} from '../../Settings/settingsKit';
|
||||
import { HintMark, SETTINGS_BUTTON, SETTINGS_BUTTON_PRIMARY, StatusPill } from '../../Settings/settingsKit';
|
||||
import ToggleSwitch from '../../Settings/ToggleSwitch';
|
||||
import CustomSelect from '../../shared/CustomSelect';
|
||||
import { EditorField, GRID_2, INPUT, READONLY_BOX } from '../../shared/dialogParts';
|
||||
import { useToast } from '../../shared/Toast';
|
||||
import AddonSetupDialog from '../AddonSetupDialog';
|
||||
import AddonSetupRow from '../AddonSetupRow';
|
||||
import AddonTile from '../AddonTile';
|
||||
import {
|
||||
TRANSPORTS,
|
||||
problemText,
|
||||
@@ -306,32 +301,46 @@ function Setup({ admin, form, t, locale }: { admin: MailIngestAdmin; form: MailA
|
||||
}
|
||||
|
||||
/**
|
||||
* The booking mail import in the admin settings of a self-hosted install: the
|
||||
* instance switch, how mail arrives (IMAP or a signed webhook), the forwarding
|
||||
* address template, the AI allowance per person and day, a connection test and
|
||||
* the status in counts. Not shown on a managed install, where the operator
|
||||
* runs the TREK Cloud relay.
|
||||
* The booking mail import as a row of the integration card: its switch, and
|
||||
* while it is on one row to the dialog that sets it up (how mail arrives, the
|
||||
* forwarding address template, the AI allowance per person and day, a
|
||||
* connection test and the status in counts). Not shown on a managed install,
|
||||
* where the operator runs the TREK Cloud relay.
|
||||
*/
|
||||
export default function MailIngestAdminCard() {
|
||||
export default function MailIngestAddonTile() {
|
||||
const { t, locale } = useTranslation();
|
||||
const admin = useMailIngestAdmin(true);
|
||||
const [open, setOpen] = useState(false);
|
||||
const name = t('mailAdmin.title');
|
||||
return (
|
||||
<SettingsCard icon={Mail} title={t('mailAdmin.title')} hint={t('mailAdmin.hint')}>
|
||||
<SettingRows>
|
||||
<SettingRow
|
||||
label={t('mailAdmin.enabled')}
|
||||
hint={t('mailAdmin.enabledHint')}
|
||||
control={
|
||||
<ToggleSwitch
|
||||
on={admin.enabled}
|
||||
label={t('mailAdmin.enabled')}
|
||||
disabled={!admin.loaded}
|
||||
onToggle={() => admin.toggle(!admin.enabled)}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
</SettingRows>
|
||||
{admin.enabled && admin.form && <Setup admin={admin} form={admin.form} t={t} locale={locale} />}
|
||||
</SettingsCard>
|
||||
<>
|
||||
<AddonTile
|
||||
icon={<Mail size={15} />}
|
||||
name={name}
|
||||
description={`${t('mailAdmin.hint')} ${t('mailAdmin.enabledHint')}`}
|
||||
enabled={admin.enabled}
|
||||
trailing={
|
||||
<ToggleSwitch
|
||||
on={admin.enabled}
|
||||
label={t('mailAdmin.enabled')}
|
||||
disabled={!admin.loaded}
|
||||
onToggle={() => admin.toggle(!admin.enabled)}
|
||||
/>
|
||||
}
|
||||
>
|
||||
{admin.enabled && admin.form && <AddonSetupRow label={t('mailAdmin.setup')} onOpen={() => setOpen(true)} />}
|
||||
</AddonTile>
|
||||
{open && admin.enabled && admin.form && (
|
||||
<AddonSetupDialog
|
||||
icon={<Mail size={20} strokeWidth={2} />}
|
||||
eyebrow={name}
|
||||
title={t('mailAdmin.setup')}
|
||||
sub={t('mailAdmin.hint')}
|
||||
onClose={() => setOpen(false)}
|
||||
>
|
||||
<Setup admin={admin} form={admin.form} t={t} locale={locale} />
|
||||
</AddonSetupDialog>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -78,17 +78,22 @@ function adminState(overrides: Partial<Admin> = {}, search: Partial<Admin['searc
|
||||
};
|
||||
}
|
||||
|
||||
function show(overrides: Partial<Admin> = {}, search: Partial<Admin['search']> = {}) {
|
||||
/** The panel as the Tours shelf shows it: a setup row, opened into its dialog unless asked not to. */
|
||||
function show(overrides: Partial<Admin> = {}, search: Partial<Admin['search']> = {}, { open = true } = {}) {
|
||||
const state = adminState(overrides, search);
|
||||
hook.usePaddleRegionsAdmin.mockReturnValue(state);
|
||||
return { state, ...render(<PaddleRegionsPanel />) };
|
||||
const view = render(
|
||||
<ul>
|
||||
<PaddleRegionsPanel />
|
||||
</ul>
|
||||
);
|
||||
if (open && state.toursOn) fireEvent.click(setupRow());
|
||||
return { state, ...view };
|
||||
}
|
||||
|
||||
/** The card's title row, where the number of regions sits beside the title. */
|
||||
function titleRow(): HTMLElement {
|
||||
const row = screen.getByRole('heading', { name: 'Paddle water data' }).parentElement;
|
||||
if (!row) throw new Error('no title row');
|
||||
return row;
|
||||
/** The shelf row that opens the dialog, where the count of requests or regions sits beside the title. */
|
||||
function setupRow(): HTMLElement {
|
||||
return screen.getAllByRole('button', { name: /^Paddle water data/ })[0];
|
||||
}
|
||||
|
||||
function rowOf(name: string): HTMLElement {
|
||||
@@ -100,7 +105,7 @@ function rowOf(name: string): HTMLElement {
|
||||
describe('PaddleRegionsPanel', () => {
|
||||
it('FE-ADMIN-PADDLEREG-001: renders nothing while the Tours addon is off', () => {
|
||||
const { container } = show({ toursOn: false, regions: [READY] });
|
||||
expect(container).toBeEmptyDOMElement();
|
||||
expect(container.querySelector('ul')).toBeEmptyDOMElement();
|
||||
});
|
||||
|
||||
it('FE-ADMIN-PADDLEREG-002: shows the card with its hint, the attribution and the empty state', () => {
|
||||
@@ -110,7 +115,7 @@ describe('PaddleRegionsPanel', () => {
|
||||
expect(screen.getByText(EMPTY)).toBeInTheDocument();
|
||||
expect(screen.getByText(ATTRIBUTION)).toBeInTheDocument();
|
||||
// No count beside the title while there is no region.
|
||||
expect(titleRow()).toHaveTextContent(/^Paddle water data$/);
|
||||
expect(setupRow()).toHaveTextContent(/^Paddle water data$/);
|
||||
const search = screen.getByRole('searchbox', { name: 'Add a region' });
|
||||
expect(search).toBeEnabled();
|
||||
expect(search).toHaveAttribute('placeholder', 'Search Geofabrik, for example Oberpfalz');
|
||||
@@ -277,12 +282,31 @@ describe('PaddleRegionsPanel', () => {
|
||||
}
|
||||
});
|
||||
|
||||
it('FE-ADMIN-PADDLEREG-019: the title carries the number of regions', () => {
|
||||
it('FE-ADMIN-PADDLEREG-019: the setup row carries the open requests, else the number of regions', () => {
|
||||
show({ regions: [READY, WAITING, FAILED_FIRST] });
|
||||
expect(within(titleRow()).getByText('3')).toBeInTheDocument();
|
||||
expect(within(setupRow()).getByText('3')).toBeInTheDocument();
|
||||
expect(screen.getAllByTestId('paddle-region-row')).toHaveLength(3);
|
||||
});
|
||||
|
||||
it('FE-ADMIN-PADDLEREG-019b: an open request outranks the region count, a declined one does not count', () => {
|
||||
const base = { bytes: 1, requested_by: 'elmo', requested_at: '2026-10-18T09:00:00Z' };
|
||||
show(
|
||||
{
|
||||
regions: [READY, WAITING],
|
||||
requests: [
|
||||
{ ...base, id: 'norway', name: 'Norway', reason: 'too_large', declined: true },
|
||||
{ ...base, id: 'saale', name: 'Saale', reason: 'limit', declined: false },
|
||||
],
|
||||
},
|
||||
{},
|
||||
{ open: false }
|
||||
);
|
||||
expect(within(setupRow()).getByText('1')).toBeInTheDocument();
|
||||
expect(within(setupRow()).queryByText('2')).toBeNull();
|
||||
// Closed until the row is opened.
|
||||
expect(screen.queryByRole('dialog')).toBeNull();
|
||||
});
|
||||
|
||||
it('FE-ADMIN-PADDLEREG-020: removing asks first, naming the region, and confirming hands it to the hook', () => {
|
||||
const { state } = show({ regions: [READY], removing: READY });
|
||||
const message = 'Oberpfalz and its obstacle data are removed. Paddle tours there then show no data.';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { PaddleRegion, PaddleRegionCatalogEntry } from '@trek/shared';
|
||||
import { Check, ChevronRight, Loader2, Plus, RefreshCw, Search, Trash2, Waves, WifiOff } from 'lucide-react';
|
||||
import { useId } from 'react';
|
||||
import { useId, useState } from 'react';
|
||||
import { useDateFormat } from '../../../hooks/useDateFormat';
|
||||
import { useTranslation } from '../../../i18n';
|
||||
import { formatDisplayDate } from '../../../utils/dateFormat';
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
SettingRows,
|
||||
SETTINGS_BUTTON,
|
||||
SETTINGS_ICON_BUTTON,
|
||||
SettingsCard,
|
||||
SettingsHint,
|
||||
StatusPill,
|
||||
} from '../../Settings/settingsKit';
|
||||
@@ -17,6 +16,8 @@ import { EditorField, INPUT } from '../../shared/dialogParts';
|
||||
import { fs } from '../../shared/DialogShell';
|
||||
import ErrorBoundary from '../../shared/ErrorBoundary';
|
||||
import { Tooltip } from '../../shared/Tooltip';
|
||||
import AddonSetupDialog from '../AddonSetupDialog';
|
||||
import AddonSetupRow from '../AddonSetupRow';
|
||||
import { AutoLoadSettings, AutoOriginPill, RequestList } from './PaddleAutoLoadParts';
|
||||
import { progressPercent, regionStatusTone } from './paddleRegionsModel';
|
||||
import { usePaddleRegionsAdmin } from './usePaddleRegionsAdmin';
|
||||
@@ -27,8 +28,10 @@ type Admin = ReturnType<typeof usePaddleRegionsAdmin>;
|
||||
* PAD-05A in the admin area: the regions TREK reads paddle obstacles for,
|
||||
* picked from Geofabrik's list, and (PAD-11C) how TREK loads the region of a
|
||||
* place a paddler plans in by itself, with the regions that wait for an admin.
|
||||
* The desktop admin shows this card under the addons while the Tours addon
|
||||
* is on; the phone has MAdminPaddleRegionsPanel on the same hook.
|
||||
* The desktop admin shows it as a row of the Tours addon that opens it as a
|
||||
* dialog while the addon is on; the row counts what waits for the admin (the
|
||||
* requests) or else the regions. The phone has MAdminPaddleRegionsPanel on
|
||||
* the same hook.
|
||||
*/
|
||||
export default function PaddleRegionsPanel() {
|
||||
return (
|
||||
@@ -41,14 +44,42 @@ export default function PaddleRegionsPanel() {
|
||||
function Panel() {
|
||||
const { t } = useTranslation();
|
||||
const admin = usePaddleRegionsAdmin();
|
||||
const [open, setOpen] = useState(false);
|
||||
if (!admin.toursOn) return null;
|
||||
const title = t('admin.paddleRegions.title');
|
||||
// A declined request no longer waits for anyone; only the open ones ask for a look.
|
||||
const waiting = admin.requests.filter((r) => !r.declined).length;
|
||||
const badge =
|
||||
waiting > 0 ? (
|
||||
<StatusPill tone="warning">{waiting}</StatusPill>
|
||||
) : admin.regions.length > 0 ? (
|
||||
<StatusPill>{admin.regions.length}</StatusPill>
|
||||
) : undefined;
|
||||
const close = () => setOpen(false);
|
||||
return (
|
||||
<SettingsCard
|
||||
icon={Waves}
|
||||
title={t('admin.paddleRegions.title')}
|
||||
hint={t('admin.paddleRegions.hint')}
|
||||
badge={admin.regions.length > 0 ? <StatusPill>{admin.regions.length}</StatusPill> : undefined}
|
||||
>
|
||||
<>
|
||||
<AddonSetupRow label={title} onOpen={() => setOpen(true)} badge={badge} />
|
||||
{open && (
|
||||
<AddonSetupDialog
|
||||
icon={<Waves size={20} strokeWidth={2} />}
|
||||
eyebrow={t('admin.addons.catalog.tours.name')}
|
||||
title={title}
|
||||
sub={t('admin.paddleRegions.hint')}
|
||||
onClose={close}
|
||||
blocked={admin.removing !== null}
|
||||
>
|
||||
<PanelBody admin={admin} />
|
||||
</AddonSetupDialog>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/** What the dialog holds: the state of the list, the settings, the requests, the search and the regions. */
|
||||
function PanelBody({ admin }: { admin: Admin }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<div className="flex flex-col gap-4">
|
||||
{admin.offline && (
|
||||
<p
|
||||
role="status"
|
||||
@@ -86,7 +117,7 @@ function Panel() {
|
||||
message={t('admin.paddleRegions.removeMessage', { name: admin.removing?.name ?? '' })}
|
||||
confirmLabel={t('common.remove')}
|
||||
/>
|
||||
</SettingsCard>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,6 @@ function look(over: Partial<JourneyEntryLook> = {}): JourneyEntryLook {
|
||||
photoId: 7,
|
||||
video: false,
|
||||
photoCount: 1,
|
||||
visibility: 'private',
|
||||
draft: false,
|
||||
fromTripPlace: false,
|
||||
dayIndex: 0,
|
||||
@@ -86,13 +85,15 @@ afterEach(() => {
|
||||
|
||||
describe('the journal entries card', () => {
|
||||
it('FE-AI-JOURNEY-001: one entry reads as a row with its photo, facts, marks and text under the journal', () => {
|
||||
const { container } = block([card([look({ visibility: 'public', draft: true, photoCount: 4, video: true })])]);
|
||||
// A card stored while entries carried a visibility: it reads, and says nothing of it.
|
||||
const stored = { ...look({ draft: true, photoCount: 4, video: true }), visibility: 'public' };
|
||||
const { container } = block([card([stored])]);
|
||||
expect(screen.getByRole('region', { name: 'Journal entries' })).toBeInTheDocument();
|
||||
expect(screen.getByText('Sunset at the Spree')).toBeInTheDocument();
|
||||
expect(screen.getByText('14:30')).toBeInTheDocument();
|
||||
expect(screen.getByText('Berlin')).toBeInTheDocument();
|
||||
expect(screen.getByText('The light over the river was unreal.')).toBeInTheDocument();
|
||||
expect(screen.getByText('Public')).toBeInTheDocument();
|
||||
expect(screen.queryByText('Public')).toBeNull();
|
||||
expect(screen.getByText('Draft')).toBeInTheDocument();
|
||||
expect(screen.getByText('4 photos')).toBeInTheDocument();
|
||||
expect(screen.getByText('Opens with a video')).toBeInTheDocument();
|
||||
@@ -225,13 +226,12 @@ describe('a change row of a journal entry', () => {
|
||||
}
|
||||
|
||||
it('FE-AI-JOURNEY-008: a waiting delete shows the photo, the text and that it goes back to a suggestion; a receipt opens it', () => {
|
||||
const entry = look({ fromTripPlace: true, visibility: 'shared' });
|
||||
const entry = look({ fromTripPlace: true });
|
||||
const held = card([entry], { change: 'willDelete', tripJournal: true });
|
||||
const onOpen = vi.fn();
|
||||
const first = inView(<AssistantChangeCard items={[item('pending', held)]} />, { onOpen });
|
||||
expect(screen.getByText('Delete the journal entry')).toBeInTheDocument();
|
||||
expect(screen.getByText('The light over the river was unreal.')).toBeInTheDocument();
|
||||
expect(screen.getByText('Shared')).toBeInTheDocument();
|
||||
expect(screen.getByText('Goes back to a suggestion')).toBeInTheDocument();
|
||||
expect(screen.getByText('Tue, Oct 21')).toBeInTheDocument();
|
||||
expect(screen.getByText('Museum Island')).toBeInTheDocument();
|
||||
@@ -255,7 +255,6 @@ describe('a change row of a journal entry', () => {
|
||||
{ op: 'change', labelKey: 'name', before: 'Sunset', after: 'Sunset at the Spree' },
|
||||
{ op: 'change', labelKey: 'time', before: '14:30', after: '' },
|
||||
{ op: 'change', labelKey: 'text', before: 'Old story', after: 'New story' },
|
||||
{ op: 'change', labelKey: 'field', field: 'visibility', before: 'private', after: 'public' },
|
||||
{ op: 'change', labelKey: 'field', field: 'mood', before: 'good', after: '' },
|
||||
{ op: 'change', labelKey: 'field', field: 'weather', before: 'sunny', after: 'Drizzle' },
|
||||
{ op: 'change', labelKey: 'field', field: 'is_draft', before: '✓', after: '✗' },
|
||||
@@ -267,8 +266,6 @@ describe('a change row of a journal entry', () => {
|
||||
expect(screen.getByText('14:30')).toHaveClass('line-through');
|
||||
expect(screen.getByText('Old story')).toHaveClass('line-through');
|
||||
expect(screen.getByText('New story')).toBeInTheDocument();
|
||||
expect(screen.getByText('Private')).toHaveClass('line-through');
|
||||
expect(screen.getByText('Public')).toBeInTheDocument();
|
||||
expect(screen.getByText('Good')).toHaveClass('line-through');
|
||||
expect(screen.getByText('Sunny')).toHaveClass('line-through');
|
||||
expect(screen.getByText('Drizzle')).toBeInTheDocument();
|
||||
|
||||
@@ -28,7 +28,6 @@ const ENTRY: JourneyEntryLook = {
|
||||
photoId: null,
|
||||
video: false,
|
||||
photoCount: 0,
|
||||
visibility: 'private',
|
||||
draft: false,
|
||||
fromTripPlace: false,
|
||||
dayIndex: null,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { JourneyEntryLook } from '@trek/shared';
|
||||
import { CalendarDays, Globe, Images, MapPin, Play, Tag, ThumbsDown, ThumbsUp, Users } from 'lucide-react';
|
||||
import { CalendarDays, Images, MapPin, Play, Tag, ThumbsDown, ThumbsUp } from 'lucide-react';
|
||||
|
||||
import { useTranslation } from '../../../../i18n';
|
||||
import { cardDateLabel, cardPlace } from '../../../Journey/journeyCard';
|
||||
@@ -12,8 +12,8 @@ import { moodOf, weatherOf } from './journeyTones';
|
||||
/**
|
||||
* The pieces a journal entry is drawn from in the chat, the same in an
|
||||
* answer, a change row and a receipt: its photo, the facts of when and where
|
||||
* as the planner's badges, the marks of how it reads (shared, draft, mood,
|
||||
* weather, more photos) and the start of its text. Every fact wraps, none is
|
||||
* as the planner's badges, the marks of how it reads (draft, mood, weather,
|
||||
* more photos) and the start of its text. Every fact wraps, none is
|
||||
* cut.
|
||||
*/
|
||||
|
||||
@@ -63,19 +63,6 @@ export function EntryWhen({ look }: { look: JourneyEntryLook }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** Shared or public; nothing for a private entry. */
|
||||
function VisibilityMark({ visibility }: { visibility: JourneyEntryLook['visibility'] }) {
|
||||
const { t } = useTranslation();
|
||||
if (visibility === 'private') return null;
|
||||
const shared = visibility === 'shared';
|
||||
const Icon = shared ? Users : Globe;
|
||||
return (
|
||||
<SoftPill tone="info" icon={<Icon size={10} strokeWidth={2.2} aria-hidden="true" />}>
|
||||
{shared ? t('journey.visibility.shared') : t('journey.visibility.public')}
|
||||
</SoftPill>
|
||||
);
|
||||
}
|
||||
|
||||
/** A mood the journal knows, in its own colour; nothing for any other. */
|
||||
function MoodMark({ id }: { id: string | null }) {
|
||||
const { t } = useTranslation();
|
||||
@@ -129,17 +116,16 @@ function ListMarks({ look }: { look: JourneyEntryLook }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** How the entry reads: shared or public, a draft, its mood and weather, its photos past the first, its tags and verdict. */
|
||||
/** How the entry reads: a draft, its mood and weather, its photos past the first, its tags and verdict. */
|
||||
export function EntryMarks({ look }: { look: JourneyEntryLook }) {
|
||||
const { t } = useTranslation();
|
||||
const mood = moodOf(look.mood) !== null;
|
||||
const lists = (look.tags?.length ?? 0) > 0 || !!look.verdict;
|
||||
if (look.visibility === 'private' && !look.draft && !mood && !look.weather && look.photoCount < 2 && !lists) {
|
||||
if (!look.draft && !mood && !look.weather && look.photoCount < 2 && !lists) {
|
||||
return null;
|
||||
}
|
||||
return (
|
||||
<CardFacts>
|
||||
<VisibilityMark visibility={look.visibility} />
|
||||
{look.draft && <SoftPill tone="warning">{t('journey.entry.draft')}</SoftPill>}
|
||||
<MoodMark id={look.mood} />
|
||||
<WeatherMark weather={look.weather} />
|
||||
|
||||
@@ -31,7 +31,6 @@ function look(over: Partial<JourneyEntryLook> = {}): JourneyEntryLook {
|
||||
photoId: null,
|
||||
video: false,
|
||||
photoCount: 0,
|
||||
visibility: 'private',
|
||||
draft: false,
|
||||
fromTripPlace: false,
|
||||
dayIndex: null,
|
||||
@@ -97,12 +96,13 @@ describe('journeyCardModel', () => {
|
||||
});
|
||||
|
||||
it('FE-AI-JOURNEY-MODEL-009: the states an update sets are named by field, flags by on and off', () => {
|
||||
expect(stateOf('visibility', 'public')?.labelKey).toBe('journey.visibility.public');
|
||||
// The stored visibility keeps nothing off the share link, so it has no name to show.
|
||||
expect(stateOf('visibility', 'private')).toBeNull();
|
||||
expect(stateOf('type', 'skeleton')?.labelKey).toBe('journey.entry.suggestion');
|
||||
expect(stateOf('mood', 'good')?.labelKey).toBe('journey.mood.good');
|
||||
expect(stateOf('weather', 'cold')?.labelKey).toBe('journey.weather.cold');
|
||||
expect(stateOf('weather', 'Drizzle')).toBeNull();
|
||||
expect(stateOf('visibility', 'toString')).toBeNull();
|
||||
expect(stateOf('type', 'toString')).toBeNull();
|
||||
expect(stateOf(undefined, 'public')).toBeNull();
|
||||
expect(flagOf('is_draft', '✓')?.labelKey).toBe('journey.entry.draft');
|
||||
expect(flagOf('is_draft', '✗')?.labelKey).toBe('assistant.card.journey.notDraft');
|
||||
|
||||
@@ -7,8 +7,6 @@ import {
|
||||
Eye,
|
||||
EyeOff,
|
||||
Frown,
|
||||
Globe,
|
||||
Lock,
|
||||
type LucideIcon,
|
||||
MapPinCheck,
|
||||
Meh,
|
||||
@@ -19,14 +17,13 @@ import {
|
||||
Snowflake,
|
||||
Sparkles,
|
||||
Sun,
|
||||
Users,
|
||||
} from 'lucide-react';
|
||||
|
||||
/**
|
||||
* How the states of a journal entry read in the chat, the way the journal
|
||||
* draws them: its moods with the glyphs of its tiles, its weathers, and the
|
||||
* words for what an update sets beyond the text (who sees the entry, its
|
||||
* kind, a draft, the route, a waved-away suggestion).
|
||||
* words for what an update sets beyond the text (its kind, a draft, the
|
||||
* route, a waved-away suggestion).
|
||||
*/
|
||||
|
||||
/** How a state is drawn: its glyph and the key of its name. */
|
||||
@@ -57,12 +54,6 @@ const WEATHERS: Readonly<Record<string, EntryTone>> = {
|
||||
cold: { Icon: Snowflake, labelKey: 'journey.weather.cold' },
|
||||
};
|
||||
|
||||
const VISIBILITIES: Readonly<Record<string, EntryTone>> = {
|
||||
private: { Icon: Lock, labelKey: 'journey.visibility.private' },
|
||||
shared: { Icon: Users, labelKey: 'journey.visibility.shared' },
|
||||
public: { Icon: Globe, labelKey: 'journey.visibility.public' },
|
||||
};
|
||||
|
||||
const TYPES: Readonly<Record<string, EntryTone>> = {
|
||||
entry: { Icon: BookOpenText, labelKey: 'assistant.card.journey.typeEntry' },
|
||||
checkin: { Icon: MapPinCheck, labelKey: 'assistant.card.journey.typeCheckin' },
|
||||
@@ -119,7 +110,6 @@ export function flagOf(field: string | undefined, value: string): EntryTone | nu
|
||||
export function stateOf(field: string | undefined, value: string | null): EntryTone | null {
|
||||
if (field === 'mood') return moodOf(value);
|
||||
if (field === 'weather') return weatherOf(value);
|
||||
if (field === 'visibility') return own(VISIBILITIES, value);
|
||||
if (field === 'type') return own(TYPES, value);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { render, waitFor } from '../../../tests/helpers/render';
|
||||
import { offlineDb } from '../../db/offlineDb';
|
||||
import type { Day, Trip } from '../../types';
|
||||
|
||||
const published = vi.hoisted(() => ({ calls: [] as unknown[][] }));
|
||||
|
||||
vi.mock('@capacitor/app', () => ({ App: { addListener: vi.fn(async () => ({ remove: vi.fn() })) } }));
|
||||
vi.mock('../../native/capabilities', () => ({ useNativeCapabilities: () => ({ caps: {} }) }));
|
||||
vi.mock('../../native/watch', () => ({
|
||||
applyWatchActions: vi.fn(async () => []),
|
||||
buildWatchSnapshot: vi.fn(),
|
||||
publishWatch: vi.fn(async () => {}),
|
||||
takeWatchActions: vi.fn(async () => []),
|
||||
watchActive: () => false,
|
||||
}));
|
||||
vi.mock('../../native/widgetMedia', () => ({
|
||||
widgetCover: vi.fn(async () => null),
|
||||
widgetWeather: vi.fn(async () => null),
|
||||
}));
|
||||
vi.mock('../../native/widgetOnline', () => ({
|
||||
atlasSummary: vi.fn(async () => null),
|
||||
collabSummary: vi.fn(async () => null),
|
||||
packingDetail: vi.fn(async () => null),
|
||||
}));
|
||||
vi.mock('../../native/widgets', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('../../native/widgets')>();
|
||||
return {
|
||||
...actual,
|
||||
widgetsActive: () => true,
|
||||
publishWidgets: vi.fn(async (...args: unknown[]) => {
|
||||
published.calls.push(args);
|
||||
}),
|
||||
};
|
||||
});
|
||||
|
||||
import NativeWidgetsSync from './NativeWidgetsSync';
|
||||
|
||||
const trip = {
|
||||
id: 7,
|
||||
title: 'Lisbon',
|
||||
start_date: '2026-11-06',
|
||||
end_date: '2026-11-08',
|
||||
is_archived: 0,
|
||||
} as unknown as Trip;
|
||||
const day = (id: number, n: number, date: string, name: string) =>
|
||||
({
|
||||
id,
|
||||
trip_id: 7,
|
||||
day_number: n,
|
||||
date,
|
||||
assignments: [{ id: id * 10, order_index: 0, place: { name, place_time: '10:00' } }],
|
||||
}) as unknown as Day;
|
||||
|
||||
describe('NativeWidgetsSync', () => {
|
||||
beforeEach(async () => {
|
||||
vi.useFakeTimers({ toFake: ['Date'] });
|
||||
vi.setSystemTime(new Date(2026, 10, 7, 9, 0));
|
||||
published.calls = [];
|
||||
await offlineDb.trips.put(trip as never);
|
||||
await offlineDb.days.bulkPut([
|
||||
day(1, 1, '2026-11-06', 'Castle'),
|
||||
day(2, 2, '2026-11-07', 'Harbour'),
|
||||
day(3, 3, '2026-11-08', 'Market'),
|
||||
] as never);
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
vi.useRealTimers();
|
||||
await offlineDb.trips.clear();
|
||||
await offlineDb.days.clear();
|
||||
});
|
||||
|
||||
it('FE-NATIVE-WSYNC-001: writes today and every day ahead, so the widgets turn the day without the app', async () => {
|
||||
render(<NativeWidgetsSync />);
|
||||
await waitFor(() => expect(published.calls.length).toBeGreaterThan(0));
|
||||
const snapshot = published.calls[0][0] as {
|
||||
today: { date: string; stops: { name: string }[] } | null;
|
||||
days: { date: string; stops: { name: string }[] }[];
|
||||
};
|
||||
expect(snapshot.today).toMatchObject({ date: '2026-11-07', stops: [{ name: 'Harbour' }] });
|
||||
expect(snapshot.days.map((d) => [d.date, d.stops[0]?.name])).toEqual([
|
||||
['2026-11-07', 'Harbour'],
|
||||
['2026-11-08', 'Market'],
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -25,11 +25,10 @@ import {
|
||||
liveFlightOf,
|
||||
pickTrip,
|
||||
publishWidgets,
|
||||
todayOf,
|
||||
snapshotDays,
|
||||
tripDayState,
|
||||
widgetTripChoices,
|
||||
widgetsActive,
|
||||
withBookings,
|
||||
type TripWidgetSnapshot,
|
||||
type WidgetLabels,
|
||||
} from '../../native/widgets';
|
||||
@@ -191,11 +190,15 @@ export default function NativeWidgetsSync(): null {
|
||||
const tripSnapshot = async (trip: Trip | null, context: SyncContext, atlas: WidgetAtlas | null) => {
|
||||
const days = trip ? await offlineDb.days.where('trip_id').equals(trip.id).toArray() : [];
|
||||
const extra = trip ? await tripExtras(trip, days, context) : null;
|
||||
const plain = trip
|
||||
? todayOf(trip, days, context.today, (n, m) => t('native.widget.dayOf', { n, m }), context.time)
|
||||
: null;
|
||||
const day = plain ? withBookings(plain, extra?.reservations ?? [], context.today, context.time) : null;
|
||||
return { day, days, extra, snapshot: buildSnapshot(trip, day, labels(t), { ...extra?.extras, atlas }) };
|
||||
// Today and the days after it: the widgets turn to the next day at midnight by themselves.
|
||||
const { today: day, ahead } = snapshotDays(trip, days, {
|
||||
reservations: extra?.reservations ?? [],
|
||||
from: context.today,
|
||||
dayLabel: (n, m) => t('native.widget.dayOf', { n, m }),
|
||||
formatTime: context.time,
|
||||
});
|
||||
const snapshot = buildSnapshot(trip, day, labels(t), { ...extra?.extras, atlas, days: ahead });
|
||||
return { day, days, extra, snapshot };
|
||||
};
|
||||
|
||||
/** The hero trip in full for the watch, with the ticks from it applied so far. */
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// FE-PLANNER-DPTRANSPORT-001 to FE-PLANNER-DPTRANSPORT-021
|
||||
// FE-PLANNER-DPTRANSPORT-001 to FE-PLANNER-DPTRANSPORT-024
|
||||
import { render, screen, fireEvent, within } from '../../../tests/helpers/render'
|
||||
import userEvent from '@testing-library/user-event'
|
||||
import { resetAllStores, seedStore } from '../../../tests/helpers/store'
|
||||
@@ -329,4 +329,29 @@ describe('DayPlanSidebarTransportDetailModal', () => {
|
||||
await user.click(screen.getByRole('button', { name: 'Close' }))
|
||||
expect(setTransportDetail).toHaveBeenCalledWith(null)
|
||||
})
|
||||
|
||||
// #3122: a transport holding only times showed them without the day they fall on.
|
||||
it('FE-PLANNER-DPTRANSPORT-022: a booking holding only times names the date of its linked day', () => {
|
||||
seedStore(useTripStore, { days: [{ id: 4, trip_id: 1, day_number: 2, date: '2025-06-16' }] as never })
|
||||
const res = { ...flight(), day_id: 4, reservation_time: '09:15', reservation_end_time: '11:00', endpoints: [] } as Reservation
|
||||
render(<DayPlanSidebarTransportDetailModal {...makeProps({ transportDetail: res })} />)
|
||||
expect(screen.getByText('09:15 → 11:00').parentElement).toHaveTextContent(/Mon, Jun 16/)
|
||||
})
|
||||
|
||||
it('FE-PLANNER-DPTRANSPORT-023: an overnight booking names the arrival date too', () => {
|
||||
const res = { ...flight(), reservation_time: '2025-06-15T22:30:00', reservation_end_time: '2025-06-16T06:05:00' } as Reservation
|
||||
render(<DayPlanSidebarTransportDetailModal {...makeProps({ transportDetail: res })} />)
|
||||
expect(screen.getByText('22:30 → 06:05').parentElement).toHaveTextContent(/Sun, Jun 15 → Mon, Jun 16/)
|
||||
})
|
||||
|
||||
it('FE-PLANNER-DPTRANSPORT-024: in a right-to-left UI the overnight days read in order', () => {
|
||||
document.documentElement.dir = 'rtl'
|
||||
try {
|
||||
const res = { ...flight(), reservation_time: '2025-06-15T22:30:00', reservation_end_time: '2025-06-16T06:05:00' } as Reservation
|
||||
render(<DayPlanSidebarTransportDetailModal {...makeProps({ transportDetail: res })} />)
|
||||
expect(screen.getByText('22:30 → 06:05').parentElement).toHaveTextContent('Sun, Jun 15 ← Mon, Jun 16')
|
||||
} finally {
|
||||
document.documentElement.dir = ''
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -14,7 +14,9 @@ import { BOX, Eyebrow, Field, fs, toneColor, toneOf } from './bookings/bookingPa
|
||||
import { filesFor } from '../../utils/reservationFiles'
|
||||
import { bookingDayLabel, segmentCodeLabel } from './transportDetailModel'
|
||||
import { TransitLegs, transitSummary } from './bookings/transitParts'
|
||||
import type { Reservation } from '../../types'
|
||||
import { bookingDates } from './bookings/bookingsModel'
|
||||
import { flowText } from '../../utils/flowText'
|
||||
import type { Day, Reservation } from '../../types'
|
||||
|
||||
type Translate = (key: string, params?: Record<string, string | number>) => string
|
||||
|
||||
@@ -50,11 +52,12 @@ export function DayPlanSidebarTransportDetailModal({ transportDetail, ...rest }:
|
||||
function TransportDetailDialog({ res, setTransportDetail, onNavigateToFiles, onEdit, t, locale, timeFormat }: Omit<DayPlanSidebarTransportDetailModalProps, 'transportDetail'> & { res: Reservation }) {
|
||||
const titleId = useId()
|
||||
const allFiles = useTripStore(s => s.files)
|
||||
const days = useTripStore(s => s.days)
|
||||
const close = () => setTransportDetail(null)
|
||||
const meta = parseReservationMetadata(res)
|
||||
const transit = transitSummary(meta)
|
||||
const files = filesFor(res, allFiles || [])
|
||||
const when = whenOf(res, locale, timeFormat)
|
||||
const when = whenOf(res, days, locale, timeFormat)
|
||||
const cells = detailCells(res, meta, t)
|
||||
const confirmed = res.status === 'confirmed'
|
||||
|
||||
@@ -192,11 +195,18 @@ function detailCells(res: Reservation, meta: Record<string, unknown>, t: Transla
|
||||
return cells
|
||||
}
|
||||
|
||||
/** The booking's day and its time or time range, each empty when the booking has none. */
|
||||
function whenOf(res: Reservation, locale: string, timeFormat: string): { day: string; time: string } {
|
||||
const { date, time } = splitReservationDateTime(res.reservation_time)
|
||||
/**
|
||||
* The booking's calendar day (both, when it arrives on a later one) and its time or
|
||||
* time range, each empty when the booking has none. A booking holding only times
|
||||
* takes the date of the day it is linked to (#3122).
|
||||
*/
|
||||
function whenOf(res: Reservation, days: Day[], locale: string, timeFormat: string): { day: string; time: string } {
|
||||
const { time } = splitReservationDateTime(res.reservation_time)
|
||||
const { time: endTime } = splitReservationDateTime(res.reservation_end_time)
|
||||
const day = date ? bookingDayLabel(date, locale) : ''
|
||||
const dates = bookingDates(res, days || [])
|
||||
// An arrival date alone would read as the departure, so it only joins a start date.
|
||||
const span = dates.start ? [dates.start, dates.end !== dates.start ? dates.end : null].filter((d): d is string => !!d) : []
|
||||
const day = span.length > 0 ? flowText(span.map(d => bookingDayLabel(d, locale))) : ''
|
||||
const start = time ? formatTime(time, locale, timeFormat) : ''
|
||||
const end = endTime ? formatTime(endTime, locale, timeFormat) : ''
|
||||
return { day, time: start && end ? `${start} → ${end}` : start }
|
||||
|
||||
@@ -357,7 +357,7 @@ describe('TransitSearchPanel', () => {
|
||||
await user.click(fromInput)
|
||||
const picks = (await screen.findAllByRole('button', { name: /Hotel Adlon|Stop \d|Hostel/ })).map(b => b.textContent)
|
||||
expect(picks[0]).toBe('Hotel Adlon')
|
||||
expect(picks.slice(1)).toEqual(['Stop 1', 'Stop 2', 'Stop 3', 'Stop 4', 'Stop 5', 'Stop 6', 'Stop 7', 'Stop 8'])
|
||||
expect(picks.slice(1)).toEqual([...places.map(p => p.name), 'Later Hostel'])
|
||||
|
||||
await user.click(screen.getByRole('button', { name: 'Hotel Adlon' }))
|
||||
expect(fromInput).toHaveValue('Hotel Adlon')
|
||||
@@ -744,7 +744,7 @@ describe('quick picks from the bookings of the day (#1506)', () => {
|
||||
const places = Array.from({ length: 12 }, (_, i) => buildPlace({ id: 100 + i, name: `P${i}`, lat: 52 + i / 100, lng: 13 }))
|
||||
const picks = buildQuickPicks(day, [day], places as any, [], dayBookingStops(day, [flight] as any))
|
||||
expect(picks.slice(0, 2).map(p => p.name)).toEqual(['FRA', 'BER Airport'])
|
||||
expect(picks).toHaveLength(2 + 8)
|
||||
expect(picks).toHaveLength(2 + places.length)
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -8,7 +8,8 @@ import { transitApi } from '../../api/client'
|
||||
import { useSettingsStore } from '../../store/settingsStore'
|
||||
import { useToast } from '../shared/Toast'
|
||||
import { useTranslation } from '../../i18n'
|
||||
import { getDayBookendHotels } from '../../utils/dayOrder'
|
||||
import { getDayBookendHotels, isDayInAccommodationRange } from '../../utils/dayOrder'
|
||||
import { orderTransitStaysByDate } from './transitStayOrder'
|
||||
import type { Day, Place, Accommodation, Reservation } from '../../types'
|
||||
import { useTripStore } from '../../store/tripStore'
|
||||
import { isCarrierTransport } from '../../utils/dayMerge'
|
||||
@@ -110,7 +111,11 @@ function fmtDuration(seconds: number, t: (k: string, p?: Record<string, string |
|
||||
|
||||
// ── quick picks ──────────────────────────────────────────────────────────────
|
||||
|
||||
const MAX_QUICK_PICKS = 8
|
||||
const MAX_OTHER_DAY_STAYS = 8
|
||||
|
||||
function pickedPlaceKey(p: PickedPlace): string {
|
||||
return JSON.stringify([p.name.trim().toLowerCase(), p.lat, p.lng])
|
||||
}
|
||||
|
||||
function stayPick(a: Accommodation): PickedPlace | null {
|
||||
return a.place_lat != null && a.place_lng != null && a.place_name ? { name: a.place_name, lat: a.place_lat, lng: a.place_lng } : null
|
||||
@@ -143,28 +148,30 @@ export function dayBookingStops(day: Pick<Day, 'id' | 'date'>, reservations: Res
|
||||
* starts in and the one it ends in come first and are never cut, since most
|
||||
* connections of a day begin or end there (#2538); the day's airports and
|
||||
* stations follow and are not cut either (#1506); then the day's own located
|
||||
* places and the trip's other stays, up to MAX_QUICK_PICKS.
|
||||
* places and remaining stays covering the day, without a limit. Only stays
|
||||
* outside the selected day's range are capped, nearest in nights first.
|
||||
*/
|
||||
export function buildQuickPicks(day: Day, days: Day[], places: Place[], accommodations: Accommodation[], bookingStops: PickedPlace[] = []): PickedPlace[] {
|
||||
const { morning, evening } = getDayBookendHotels(day, days, accommodations)
|
||||
const dayStays = [morning, evening].filter((a): a is Accommodation => a != null)
|
||||
const bookendStays = [morning, evening].filter((a): a is Accommodation => a != null)
|
||||
const dayStays = accommodations.filter(a => isDayInAccommodationRange(day, a.start_day_id, a.end_day_id, days))
|
||||
|
||||
const seen = new Set<string>()
|
||||
const unique = (p: PickedPlace | null): p is PickedPlace => {
|
||||
if (!p) return false
|
||||
const k = `${p.name}:${p.lat}`
|
||||
const k = pickedPlaceKey(p)
|
||||
if (seen.has(k)) return false
|
||||
seen.add(k)
|
||||
return true
|
||||
}
|
||||
|
||||
const stays = dayStays.map(stayPick).filter(unique)
|
||||
const stays = bookendStays.map(stayPick).filter(unique)
|
||||
const stations = bookingStops.filter(unique)
|
||||
const rest = [
|
||||
...places.map(p => (p.lat != null && p.lng != null ? { name: p.name, lat: p.lat, lng: p.lng } : null)),
|
||||
...accommodations.filter(a => !dayStays.includes(a)).map(stayPick),
|
||||
].filter(unique)
|
||||
return [...stays, ...stations, ...rest.slice(0, MAX_QUICK_PICKS)]
|
||||
const dayPlaces = places.map(p => (p.lat != null && p.lng != null ? { name: p.name, lat: p.lat, lng: p.lng } : null)).filter(unique)
|
||||
const remainingDayStays = dayStays.map(stayPick).filter(unique)
|
||||
const otherStays = orderTransitStaysByDate(day, days, accommodations.filter(a => !dayStays.includes(a)))
|
||||
.map(stayPick).filter(unique).slice(0, MAX_OTHER_DAY_STAYS)
|
||||
return [...stays, ...stations, ...dayPlaces, ...remainingDayStays, ...otherStays]
|
||||
}
|
||||
|
||||
// ── from/to stop picker ──────────────────────────────────────────────────────
|
||||
@@ -221,6 +228,8 @@ function StopPicker({ label, value, onPick, quickPicks, near, placeholder }: {
|
||||
const [results, setResults] = useState<TransitPlaceResult[]>([])
|
||||
const [open, setOpen] = useState(false)
|
||||
const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
// Ignore lookups superseded by another query, a saved pick, or leaving this day.
|
||||
const requestId = useRef(0)
|
||||
const rootRef = useRef<HTMLDivElement>(null)
|
||||
const fieldRef = useRef<HTMLDivElement>(null)
|
||||
const listRef = useRef<HTMLDivElement>(null)
|
||||
@@ -235,21 +244,45 @@ function StopPicker({ label, value, onPick, quickPicks, near, placeholder }: {
|
||||
return () => document.removeEventListener('mousedown', close)
|
||||
}, [])
|
||||
|
||||
useEffect(() => () => { if (debounceRef.current) clearTimeout(debounceRef.current) }, [])
|
||||
useEffect(() => () => {
|
||||
requestId.current += 1
|
||||
if (debounceRef.current) clearTimeout(debounceRef.current)
|
||||
}, [])
|
||||
|
||||
const search = (q: string) => {
|
||||
const id = ++requestId.current
|
||||
setText(q)
|
||||
setResults([])
|
||||
onPick(null)
|
||||
if (debounceRef.current) clearTimeout(debounceRef.current)
|
||||
if (q.trim().length < 2) { setResults([]); return }
|
||||
if (q.trim().length < 2) return
|
||||
debounceRef.current = setTimeout(() => {
|
||||
transitApi.geocode(q, { lang: language, near: near || undefined })
|
||||
.then((d: { results: TransitPlaceResult[] }) => setResults(d.results || []))
|
||||
.catch(() => setResults([]))
|
||||
.then((d: { results: TransitPlaceResult[] }) => { if (id === requestId.current) setResults(d.results || []) })
|
||||
.catch(() => { if (id === requestId.current) setResults([]) })
|
||||
}, 300)
|
||||
}
|
||||
|
||||
const display = value ? value.name : text
|
||||
const query = text.trim().toLowerCase()
|
||||
const saved = quickPicks.filter(p => p.name.toLowerCase().includes(query))
|
||||
const seen = new Set(saved.map(pickedPlaceKey))
|
||||
const external = results.filter(p => {
|
||||
const key = pickedPlaceKey(p)
|
||||
if (seen.has(key)) return false
|
||||
seen.add(key)
|
||||
return true
|
||||
})
|
||||
const suggestions: (PickedPlace & { area?: string | null })[] = value ? [] : [...saved, ...external]
|
||||
|
||||
const pick = (p: PickedPlace) => {
|
||||
requestId.current += 1
|
||||
if (debounceRef.current) clearTimeout(debounceRef.current)
|
||||
onPick({ name: p.name, lat: p.lat, lng: p.lng })
|
||||
setText('')
|
||||
setResults([])
|
||||
setOpen(false)
|
||||
}
|
||||
|
||||
return (
|
||||
<div ref={rootRef} style={{ position: 'relative', flex: 1, minWidth: 0 }}>
|
||||
@@ -267,34 +300,23 @@ function StopPicker({ label, value, onPick, quickPicks, near, placeholder }: {
|
||||
style={{ border: 0, background: 'none', outline: 'none', fontSize: 'calc(13px * var(--fs-scale-body, 1))', width: '100%', fontFamily: 'inherit' }}
|
||||
/>
|
||||
</div>
|
||||
{open && listPos && (results.length > 0 || (!value && text.trim().length < 2 && quickPicks.length > 0)) && createPortal(
|
||||
{open && listPos && suggestions.length > 0 && createPortal(
|
||||
// On the page rather than inside the dialog, so a dialog that scrolls or clips
|
||||
// its content cannot cut the list off before anything is typed.
|
||||
<div ref={listRef} className="bg-surface-card border border-edge z-[var(--z-toast)]" style={{ position: 'fixed', left: listPos.left, width: listPos.width, ...(listPos.above ? { bottom: listPos.bottom } : { top: listPos.top }), borderRadius: 10, boxShadow: 'var(--shadow-dropdown)', overflow: 'hidden', maxHeight: listPos.maxHeight, overflowY: 'auto' }}>
|
||||
{results.length > 0
|
||||
? results.map((r, i) => (
|
||||
<button type="button" key={i} onClick={() => { onPick({ name: r.name, lat: r.lat, lng: r.lng }); setText(''); setResults([]); setOpen(false) }}
|
||||
className="text-content"
|
||||
style={{ display: 'flex', alignItems: 'center', gap: 8, width: '100%', textAlign: 'start', padding: '8px 10px', border: 'none', background: 'none', cursor: 'pointer', fontFamily: 'inherit', fontSize: 'calc(13px * var(--fs-scale-body, 1))' }}
|
||||
onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
|
||||
onMouseLeave={e => e.currentTarget.style.background = 'none'}>
|
||||
<MapPin size={13} className="text-content-faint" style={{ flexShrink: 0 }} />
|
||||
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
|
||||
{r.name}
|
||||
{r.area && <span className="ms-1.5 text-content-faint">{r.area}</span>}
|
||||
</span>
|
||||
</button>
|
||||
))
|
||||
: quickPicks.map((p, i) => (
|
||||
<button type="button" key={i} onClick={() => { onPick(p); setText(''); setOpen(false) }}
|
||||
className="text-content"
|
||||
style={{ display: 'flex', alignItems: 'center', gap: 8, width: '100%', textAlign: 'start', padding: '8px 10px', border: 'none', background: 'none', cursor: 'pointer', fontFamily: 'inherit', fontSize: 'calc(13px * var(--fs-scale-body, 1))' }}
|
||||
onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
|
||||
onMouseLeave={e => e.currentTarget.style.background = 'none'}>
|
||||
<MapPin size={13} className="text-content-faint" style={{ flexShrink: 0 }} />
|
||||
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{p.name}</span>
|
||||
</button>
|
||||
))}
|
||||
{suggestions.map(r => (
|
||||
<button type="button" key={pickedPlaceKey(r)} onClick={() => pick(r)}
|
||||
className="text-content"
|
||||
style={{ display: 'flex', alignItems: 'center', gap: 8, width: '100%', textAlign: 'start', padding: '8px 10px', border: 'none', background: 'none', cursor: 'pointer', fontFamily: 'inherit', fontSize: 'calc(13px * var(--fs-scale-body, 1))' }}
|
||||
onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
|
||||
onMouseLeave={e => e.currentTarget.style.background = 'none'}>
|
||||
<MapPin size={13} className="text-content-faint" style={{ flexShrink: 0 }} />
|
||||
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
|
||||
{r.name}
|
||||
{r.area && <span className="ms-1.5 text-content-faint">{r.area}</span>}
|
||||
</span>
|
||||
</button>
|
||||
))}
|
||||
</div>,
|
||||
document.body,
|
||||
)}
|
||||
|
||||
@@ -0,0 +1,684 @@
|
||||
import userEvent from '@testing-library/user-event';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { buildAssignment, buildDay, buildPlace, buildTrip, buildUser } from '../../../tests/helpers/factories';
|
||||
import { buildPlanner } from '../../../tests/helpers/mobileTrip';
|
||||
import { act, fireEvent, render, screen, waitFor } from '../../../tests/helpers/render';
|
||||
import { resetAllStores, seedStore } from '../../../tests/helpers/store';
|
||||
import { useTranslation } from '../../i18n';
|
||||
import MTransportFormSheet from '../../mobile/screens/trip/sheets/MTransportFormSheet';
|
||||
import { useAuthStore } from '../../store/authStore';
|
||||
import { useTripStore } from '../../store/tripStore';
|
||||
import type { Accommodation, AssignmentsMap, Day, Place } from '../../types';
|
||||
import type { TransitPrefill } from './transitLeg';
|
||||
import { TransportModal } from './TransportModal';
|
||||
|
||||
// Keep the real day selectors, wrappers and shared stop picker. Only the external
|
||||
// geocoder is controlled: a saved private place need not exist in that service.
|
||||
const { geocode, plan } = vi.hoisted(() => ({ geocode: vi.fn(), plan: vi.fn() }));
|
||||
vi.mock('../../api/client', async (importOriginal) => ({
|
||||
...(await importOriginal<typeof import('../../api/client')>()),
|
||||
transitApi: { geocode, plan },
|
||||
}));
|
||||
|
||||
type Surface = 'desktop' | 'phone';
|
||||
interface Fixture {
|
||||
days: Day[];
|
||||
places: Place[];
|
||||
assignments: AssignmentsMap;
|
||||
accommodations: Accommodation[];
|
||||
transitPrefill?: TransitPrefill;
|
||||
selectedDayId?: number;
|
||||
}
|
||||
|
||||
function fixture(): Fixture {
|
||||
const days = [
|
||||
buildDay({ id: 101, trip_id: 1, day_number: 1, date: '2027-06-01', title: 'First day' }),
|
||||
buildDay({ id: 205, trip_id: 1, day_number: 2, date: '2027-06-02', title: 'Second day' }),
|
||||
buildDay({ id: 309, trip_id: 1, day_number: 3, date: '2027-06-03', title: 'Empty day' }),
|
||||
];
|
||||
const places = ['First private stop', 'Second private stop', 'Shared private stop'].map((name, i) =>
|
||||
buildPlace({ id: 11 + i, trip_id: 1, name, lat: 52.5 + i / 100, lng: 13.4 })
|
||||
);
|
||||
const visit = (dayId: number, p: Place, order: number) =>
|
||||
buildAssignment({ day_id: dayId, place_id: p.id, place: p, order_index: order });
|
||||
return {
|
||||
days,
|
||||
places,
|
||||
assignments: {
|
||||
'101': [visit(101, places[0], 0), visit(101, places[2], 1)],
|
||||
'205': [visit(205, places[1], 0), visit(205, places[2], 1)],
|
||||
'309': [],
|
||||
},
|
||||
accommodations: [],
|
||||
};
|
||||
}
|
||||
|
||||
function buildStay(id: number, name: string, start: number, end: number): Accommodation {
|
||||
return {
|
||||
id,
|
||||
trip_id: 1,
|
||||
place_id: 1000 + id,
|
||||
start_day_id: start,
|
||||
end_day_id: end,
|
||||
place_name: name,
|
||||
place_lat: 52 + id / 1000,
|
||||
place_lng: 13,
|
||||
} as Accommodation;
|
||||
}
|
||||
|
||||
function longTripFixture(): Fixture {
|
||||
const days = Array.from({ length: 30 }, (_, i) =>
|
||||
buildDay({
|
||||
id: 5000 - i * 97,
|
||||
trip_id: 1,
|
||||
day_number: i + 1,
|
||||
date: new Date(Date.UTC(2027, 2, i + 1)).toISOString().slice(0, 10),
|
||||
title: `Day ${i + 1}`,
|
||||
})
|
||||
);
|
||||
days[28] = { ...days[28], date: null };
|
||||
const stay = (id: number, name: string, start: number, end: number) =>
|
||||
buildStay(id, name, days[start - 1].id, days[end - 1].id);
|
||||
const nearby = Array.from({ length: 4 }, (_, i) => [
|
||||
stay(10 + i * 2, `Nearby before ${i + 1}`, 18 - i, 20 - i),
|
||||
stay(11 + i * 2, `Nearby after ${i + 1}`, 22 + i, 24 + i),
|
||||
]).flat();
|
||||
return {
|
||||
days,
|
||||
places: [],
|
||||
assignments: {},
|
||||
selectedDayId: days[20].id,
|
||||
accommodations: [
|
||||
stay(1, 'First-week hotel created first', 1, 7),
|
||||
stay(2, 'Undated hotel', 29, 30),
|
||||
...nearby.slice().reverse(),
|
||||
{ ...nearby[0], id: 99 },
|
||||
stay(100, 'Morning hotel', 20, 21),
|
||||
stay(101, 'Evening hotel', 21, 22),
|
||||
...Array.from({ length: 10 }, (_, i) => stay(200 + i, `Current stay ${i + 1}`, 19, 23)),
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
function Harness({ surface, data }: { surface: Surface; data: Fixture }) {
|
||||
const { t } = useTranslation();
|
||||
if (surface === 'phone') {
|
||||
const planner = buildPlanner({
|
||||
t,
|
||||
trip: buildTrip({ id: 1 }),
|
||||
days: data.days,
|
||||
places: data.places,
|
||||
assignments: data.assignments,
|
||||
storedAssignments: data.assignments,
|
||||
tripAccommodations: data.accommodations,
|
||||
showTransportModal: true,
|
||||
transportModalDayId: data.selectedDayId ?? 101,
|
||||
transportModalAutomated: true,
|
||||
transitPrefill: data.transitPrefill ?? null,
|
||||
});
|
||||
return <MTransportFormSheet planner={planner} onOpenExpense={vi.fn()} />;
|
||||
}
|
||||
return (
|
||||
<TransportModal
|
||||
isOpen
|
||||
onClose={vi.fn()}
|
||||
onSave={vi.fn()}
|
||||
reservation={null}
|
||||
days={data.days}
|
||||
selectedDayId={data.selectedDayId ?? 101}
|
||||
initialAutomated
|
||||
places={data.places}
|
||||
assignments={data.assignments}
|
||||
accommodations={data.accommodations}
|
||||
transitPrefill={data.transitPrefill}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
const inputs = () => screen.getAllByPlaceholderText('Search stop or station…');
|
||||
async function switchDay(user: ReturnType<typeof userEvent.setup>, current: string, next: string) {
|
||||
await user.click(screen.getByText(current));
|
||||
await user.click(screen.getByRole('button', { name: new RegExp(`^${next}`) }));
|
||||
}
|
||||
const pickNames = () => screen.queryAllByRole('button', { name: /private stop/ }).map((b) => b.textContent);
|
||||
|
||||
beforeEach(() => {
|
||||
resetAllStores();
|
||||
geocode.mockReset().mockResolvedValue({ results: [] });
|
||||
plan.mockReset();
|
||||
seedStore(useAuthStore, { user: buildUser(), isAuthenticated: true });
|
||||
seedStore(useTripStore, { trip: buildTrip({ id: 1 }), reservations: [] });
|
||||
});
|
||||
|
||||
describe.each<Surface>(['desktop', 'phone'])('Automated transport day selection: %s', (surface) => {
|
||||
beforeEach(() => {
|
||||
Object.defineProperty(window, 'innerWidth', { configurable: true, value: surface === 'phone' ? 390 : 1440 });
|
||||
fireEvent(window, new Event('resize'));
|
||||
});
|
||||
|
||||
it('scopes both pickers by day id and keeps a shared place when switching back and forth', async () => {
|
||||
const user = userEvent.setup();
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
await user.click(inputs()[0]);
|
||||
expect(pickNames()).toEqual(['First private stop', 'Shared private stop']);
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
await user.click(inputs()[1]);
|
||||
expect(pickNames()).toEqual(['Second private stop', 'Shared private stop']);
|
||||
await switchDay(user, 'Second day', 'First day');
|
||||
await user.click(inputs()[0]);
|
||||
expect(pickNames()).toEqual(['First private stop', 'Shared private stop']);
|
||||
});
|
||||
|
||||
it('keeps all nine eligible day places available in the dropdown', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const stops = Array.from({ length: 9 }, (_, i) => buildPlace({ id: 50 + i, name: `Day stop ${i + 1}` }));
|
||||
data.places.push(...stops);
|
||||
data.assignments['101'] = stops.map((p, i) =>
|
||||
buildAssignment({ day_id: 101, place_id: p.id, place: p, order_index: i })
|
||||
);
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
expect(screen.queryAllByRole('button', { name: /^Day stop/ }).map((b) => b.textContent)).toEqual(
|
||||
stops.map((p) => p.name)
|
||||
);
|
||||
expect(screen.queryByRole('button', { name: 'Second private stop' })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('finds an assigned private place when the geocoder has no result', async () => {
|
||||
const user = userEvent.setup();
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
await user.click(inputs()[0]);
|
||||
await user.type(inputs()[0], 'First private');
|
||||
await waitFor(() => expect(geocode).toHaveBeenCalled());
|
||||
await act(async () => {
|
||||
await Promise.resolve();
|
||||
});
|
||||
expect(screen.queryByRole('button', { name: 'First private stop' })).toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Second private stop' })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('ranks matching saved places before external matches and deduplicates by name and both coordinates', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const saved = data.places[0];
|
||||
const other = { name: 'External private stop', lat: 52.8, lng: 13.8, area: 'Berlin' };
|
||||
geocode.mockResolvedValue({
|
||||
results: [
|
||||
other,
|
||||
{ name: saved.name.toUpperCase(), lat: saved.lat, lng: saved.lng, area: 'Duplicate' },
|
||||
{ ...other },
|
||||
{ name: saved.name, lat: saved.lat, lng: 13.9, area: 'Other longitude' },
|
||||
],
|
||||
});
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await user.type(inputs()[0], 'private');
|
||||
await screen.findByRole('button', { name: /External private stop/ });
|
||||
const rows = screen.getAllByRole('button', { name: /private stop/i });
|
||||
expect(rows.map((row) => row.textContent)).toEqual([
|
||||
'First private stop',
|
||||
'Shared private stop',
|
||||
'External private stopBerlin',
|
||||
'First private stopOther longitude',
|
||||
]);
|
||||
expect(geocode).toHaveBeenCalledTimes(1);
|
||||
await user.click(rows[0]);
|
||||
expect(inputs()[0]).toHaveValue(saved.name);
|
||||
});
|
||||
|
||||
it('limits only other-day stays, keeping current hotels, terminals and every selected-day place first', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const stops = Array.from({ length: 12 }, (_, i) => buildPlace({ id: 50 + i, name: `Day stop ${i + 1}` }));
|
||||
// A same-name stop at a different longitude must not be dropped as a duplicate.
|
||||
stops.push(buildPlace({ id: 62, name: stops[0].name, lat: stops[0].lat, lng: 10 }));
|
||||
data.places.push(...stops);
|
||||
data.assignments['101'] = stops.map((p, i) =>
|
||||
buildAssignment({ day_id: 101, place_id: p.id, place: p, order_index: i })
|
||||
);
|
||||
data.accommodations = Array.from(
|
||||
{ length: 12 },
|
||||
(_, i) =>
|
||||
({
|
||||
id: 70 + i,
|
||||
trip_id: 1,
|
||||
place_id: 70 + i,
|
||||
start_day_id: i === 0 ? 101 : 205,
|
||||
end_day_id: i === 0 ? 101 : 205,
|
||||
place_name: i === 0 ? 'Current hotel' : `Other hotel ${i}`,
|
||||
place_lat: 52 + i / 100,
|
||||
place_lng: 13,
|
||||
}) as Accommodation
|
||||
);
|
||||
// Duplicate stays must not consume another slot of the other-day allowance.
|
||||
data.accommodations.splice(2, 0, { ...data.accommodations[1], id: 90 });
|
||||
seedStore(useTripStore, {
|
||||
reservations: [
|
||||
{
|
||||
id: 81,
|
||||
trip_id: 1,
|
||||
type: 'train',
|
||||
day_id: 101,
|
||||
end_day_id: 101,
|
||||
endpoints: [{ role: 'from', name: 'Current terminal', lat: 52, lng: 13, local_date: '2027-06-01' }],
|
||||
},
|
||||
] as ReturnType<typeof useTripStore.getState>['reservations'],
|
||||
});
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
for (const input of inputs()) {
|
||||
await user.click(input);
|
||||
const rows = screen.getAllByRole('button', { name: /Current hotel|Current terminal|Day stop|Other hotel/ });
|
||||
expect(rows.map((row) => row.textContent)).toEqual([
|
||||
'Current hotel',
|
||||
'Current terminal',
|
||||
...stops.map((p) => p.name),
|
||||
...Array.from({ length: 8 }, (_, i) => `Other hotel ${i + 1}`),
|
||||
]);
|
||||
expect(screen.queryByRole('button', { name: 'Second private stop' })).not.toBeInTheDocument();
|
||||
}
|
||||
});
|
||||
|
||||
it('keeps more than eight current-day hotels selectable and searchable despite earlier other-day stays', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const current = Array.from({ length: 12 }, (_, i) => buildStay(200 + i, `Current day hotel ${i + 1}`, 101, 101));
|
||||
const other = Array.from({ length: 9 }, (_, i) => buildStay(100 + i, `Other day hotel ${i + 1}`, 205, 205));
|
||||
data.accommodations = [
|
||||
...other,
|
||||
...current,
|
||||
{ ...current[8], id: 999 },
|
||||
{ ...buildStay(300, 'Unlocated current hotel', 101, 101), place_lat: null },
|
||||
];
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
for (const input of inputs()) {
|
||||
await user.click(input);
|
||||
expect(screen.getAllByRole('button', { name: /^Current day hotel/ }).map((b) => b.textContent)).toEqual(
|
||||
current.map((a) => a.place_name)
|
||||
);
|
||||
expect(screen.getAllByRole('button', { name: /^Other day hotel/ }).map((b) => b.textContent)).toEqual(
|
||||
other.slice(0, 8).map((a) => a.place_name)
|
||||
);
|
||||
expect(screen.queryByRole('button', { name: 'Unlocated current hotel' })).not.toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'First private stop' })).toBeInTheDocument();
|
||||
}
|
||||
await user.type(inputs()[1], 'current day hotel 12');
|
||||
await user.click(screen.getByRole('button', { name: 'Current day hotel 12' }));
|
||||
expect(inputs()[1]).toHaveValue('Current day hotel 12');
|
||||
});
|
||||
|
||||
it('offers Hotel 09 on Day 3 for the manual-review booking pattern without using mirrored day places', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const a = buildStay(1, 'Hotel A — first night', 101, 205);
|
||||
const b = buildStay(2, 'Hotel B — second night', 205, 309);
|
||||
const sameDay = Array.from({ length: 9 }, (_, i) =>
|
||||
buildStay(3 + i, `Other night hotel ${String(i + 1).padStart(2, '0')}`, 309, 309)
|
||||
);
|
||||
data.accommodations = [a, b, ...sameDay];
|
||||
// Days hides accommodation-owned mirror assignments: hotels must come from the stays themselves.
|
||||
data.assignments['309'] = [];
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await switchDay(user, 'First day', 'Empty day');
|
||||
for (const input of inputs()) {
|
||||
await user.click(input);
|
||||
expect(
|
||||
screen.getAllByRole('button', { name: /Hotel A|Hotel B|Other night hotel/ }).map((row) => row.textContent)
|
||||
).toEqual([b.place_name, ...sameDay.map((stay) => stay.place_name), a.place_name]);
|
||||
}
|
||||
await user.click(screen.getByRole('button', { name: 'Other night hotel 09' }));
|
||||
expect(inputs()[1]).toHaveValue('Other night hotel 09');
|
||||
});
|
||||
|
||||
it('keeps multi-night stays and checkout-day stays uncapped, with bookends before the other current stays', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const other = Array.from({ length: 9 }, (_, i) => buildStay(100 + i, `Future hotel ${i + 1}`, 309, 309));
|
||||
const spanning = Array.from({ length: 10 }, (_, i) => buildStay(200 + i, `Multi-night hotel ${i + 1}`, 101, 309));
|
||||
const checkout = buildStay(300, 'Checks out today', 101, 205);
|
||||
const checkin = buildStay(301, 'Checks in today', 205, 309);
|
||||
data.accommodations = [...other, ...spanning, checkout, checkin];
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
await user.click(inputs()[0]);
|
||||
expect(
|
||||
screen
|
||||
.getAllByRole('button', { name: /Multi-night hotel|Checks (in|out) today|Future hotel/ })
|
||||
.map((row) => row.textContent)
|
||||
).toEqual([
|
||||
spanning[0].place_name,
|
||||
checkin.place_name,
|
||||
...spanning.slice(1).map((stay) => stay.place_name),
|
||||
checkout.place_name,
|
||||
...other.slice(0, 8).map((stay) => stay.place_name),
|
||||
]);
|
||||
expect(screen.queryByRole('button', { name: 'Future hotel 9' })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('does not let a first-week hotel take a Day 21 slot from eight closer stays on a 30-day trip', async () => {
|
||||
const user = userEvent.setup();
|
||||
render(<Harness surface={surface} data={longTripFixture()} />);
|
||||
for (const input of inputs()) {
|
||||
await user.click(input);
|
||||
expect(screen.queryByRole('button', { name: 'First-week hotel created first' })).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Undated hotel' })).not.toBeInTheDocument();
|
||||
expect(
|
||||
screen
|
||||
.getAllByRole('button', { name: /Morning hotel|Evening hotel|Current stay|Nearby/ })
|
||||
.map((row) => row.textContent)
|
||||
).toEqual([
|
||||
'Morning hotel',
|
||||
'Evening hotel',
|
||||
...Array.from({ length: 10 }, (_, i) => `Current stay ${i + 1}`),
|
||||
...Array.from({ length: 4 }, (_, i) => [`Nearby before ${i + 1}`, `Nearby after ${i + 1}`]).flat(),
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
it('puts undated stays last and orders identical dated intervals by stay id independently of input order', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = longTripFixture();
|
||||
const dated = data.accommodations.find((stay) => stay.place_name === 'Nearby after 1');
|
||||
if (!dated) throw new Error('Missing dated fixture');
|
||||
const undated = data.accommodations.find((stay) => stay.place_name === 'Undated hotel');
|
||||
if (!undated) throw new Error('Missing undated fixture');
|
||||
data.accommodations = [
|
||||
undated,
|
||||
{ ...dated, id: 90, place_name: 'Same dates higher id', place_lng: 14 },
|
||||
{ ...dated, id: 80, place_name: 'Same dates lower id', place_lng: 15 },
|
||||
];
|
||||
const view = render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
const names = () =>
|
||||
screen.getAllByRole('button', { name: /Same dates|Undated hotel/ }).map((row) => row.textContent);
|
||||
expect(names()).toEqual(['Same dates lower id', 'Same dates higher id', 'Undated hotel']);
|
||||
view.rerender(
|
||||
<Harness surface={surface} data={{ ...data, accommodations: data.accommodations.slice().reverse() }} />
|
||||
);
|
||||
expect(names()).toEqual(['Same dates lower id', 'Same dates higher id', 'Undated hotel']);
|
||||
});
|
||||
|
||||
it('refreshes an open dropdown after places are added, removed and reordered', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const view = render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
expect(pickNames()).toEqual(['First private stop', 'Shared private stop']);
|
||||
const added = buildPlace({ id: 99, name: 'Added private stop' });
|
||||
const next = {
|
||||
...data,
|
||||
places: [...data.places, added],
|
||||
assignments: {
|
||||
...data.assignments,
|
||||
'101': [
|
||||
{ ...data.assignments['101'][1], order_index: 2 },
|
||||
buildAssignment({ day_id: 101, place_id: added.id, place: added, order_index: 0 }),
|
||||
],
|
||||
},
|
||||
};
|
||||
view.rerender(<Harness surface={surface} data={next} />);
|
||||
expect(pickNames()).toEqual(['Added private stop', 'Shared private stop']);
|
||||
});
|
||||
|
||||
it('keeps place membership tied to ids when days and their dates are reordered', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const view = render(<Harness surface={surface} data={data} />);
|
||||
const reordered = {
|
||||
...data,
|
||||
days: [
|
||||
{ ...data.days[1], day_number: 1, date: data.days[0].date },
|
||||
{ ...data.days[0], day_number: 2, date: data.days[1].date },
|
||||
data.days[2],
|
||||
],
|
||||
};
|
||||
view.rerender(<Harness surface={surface} data={reordered} />);
|
||||
await user.click(inputs()[0]);
|
||||
expect(pickNames()).toEqual(['First private stop', 'Shared private stop']);
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
await user.click(inputs()[0]);
|
||||
expect(pickNames()).toEqual(['Second private stop', 'Shared private stop']);
|
||||
});
|
||||
|
||||
it('does not retain endpoints from an unrelated day after selecting from and to', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
// Make the first day's two endpoints exclusive to that day.
|
||||
data.assignments['205'] = [data.assignments['205'][0]];
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
await user.click(screen.getByRole('button', { name: 'First private stop' }));
|
||||
await user.click(inputs()[1]);
|
||||
await user.click(screen.getByRole('button', { name: 'Shared private stop' }));
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
expect(inputs().map((i) => (i as HTMLInputElement).value)).toEqual(['', '']);
|
||||
});
|
||||
|
||||
it('clears search state when changing days so the next day offers its own places', async () => {
|
||||
const user = userEvent.setup();
|
||||
geocode.mockResolvedValue({ results: [{ name: 'Old external station', lat: 52, lng: 13, area: null }] });
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
await user.type(inputs()[0], 'Old station');
|
||||
await screen.findByRole('button', { name: 'Old external station' });
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
await user.click(inputs()[0]);
|
||||
expect(screen.queryByRole('button', { name: 'Old external station' })).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Second private stop' })).toBeInTheDocument();
|
||||
expect(inputs().map((i) => (i as HTMLInputElement).value)).toEqual(['', '']);
|
||||
});
|
||||
|
||||
it('scopes day-plan endpoint, time and walk prefills to the opening day', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
data.transitPrefill = {
|
||||
from: { name: 'Walk end', lat: 52.5, lng: 13.4 },
|
||||
to: { name: 'Next walk start', lat: 52.6, lng: 13.5 },
|
||||
time: '12:15',
|
||||
walk: {
|
||||
dayId: 101,
|
||||
fromWalk: 'Old town',
|
||||
toWalk: 'Harbour',
|
||||
ends: '12:15',
|
||||
endsNextDay: false,
|
||||
endsAtLeast: false,
|
||||
nextStarts: '13:00',
|
||||
},
|
||||
};
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
expect(inputs().map((i) => (i as HTMLInputElement).value)).toEqual(['Walk end', 'Next walk start']);
|
||||
expect(screen.getByTestId('transit-walk-end')).toHaveTextContent('Old town');
|
||||
expect(screen.getByDisplayValue('12:15')).toBeInTheDocument();
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
expect(inputs().map((i) => (i as HTMLInputElement).value)).toEqual(['', '']);
|
||||
expect(screen.queryByTestId('transit-walk-end')).not.toBeInTheDocument();
|
||||
expect(screen.queryByDisplayValue('12:15')).not.toBeInTheDocument();
|
||||
await switchDay(user, 'Second day', 'First day');
|
||||
expect(inputs().map((i) => (i as HTMLInputElement).value)).toEqual(['Walk end', 'Next walk start']);
|
||||
expect(screen.getByTestId('transit-walk-end')).toHaveTextContent('Old town');
|
||||
});
|
||||
|
||||
it('drops old itineraries when changing the day', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
const stop = (name: string, time: string) => ({
|
||||
name,
|
||||
lat: 52.5,
|
||||
lng: 13.4,
|
||||
time,
|
||||
scheduledTime: null,
|
||||
track: null,
|
||||
});
|
||||
plan.mockResolvedValue({
|
||||
itineraries: [
|
||||
{
|
||||
startTime: '2027-06-01T07:00:00Z',
|
||||
endTime: '2027-06-01T07:30:00Z',
|
||||
duration: 1800,
|
||||
transfers: 0,
|
||||
walkSeconds: 0,
|
||||
legs: [
|
||||
{
|
||||
mode: 'SUBWAY',
|
||||
from: stop('A', '2027-06-01T07:00:00Z'),
|
||||
to: stop('B', '2027-06-01T07:30:00Z'),
|
||||
duration: 1800,
|
||||
distance: null,
|
||||
headsign: null,
|
||||
line: 'U88',
|
||||
lineColor: null,
|
||||
lineTextColor: null,
|
||||
agency: null,
|
||||
intermediateStops: 0,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
await user.click(screen.getByRole('button', { name: 'First private stop' }));
|
||||
await user.click(inputs()[1]);
|
||||
await user.click(screen.getByRole('button', { name: 'Shared private stop' }));
|
||||
await user.click(screen.getByRole('button', { name: /^Search$/ }));
|
||||
await screen.findByText('U88');
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
expect(screen.queryByText('U88')).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Add to day' })).not.toBeInTheDocument();
|
||||
expect(inputs().map((i) => (i as HTMLInputElement).value)).toEqual(['', '']);
|
||||
});
|
||||
|
||||
it('ignores an old geocoder response after the day changes', async () => {
|
||||
const user = userEvent.setup();
|
||||
let finish: (value: { results: { name: string; lat: number; lng: number; area: null }[] }) => void = () => {
|
||||
throw new Error('lookup not started');
|
||||
};
|
||||
geocode.mockReturnValueOnce(
|
||||
new Promise((resolve) => {
|
||||
finish = resolve;
|
||||
})
|
||||
);
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
await user.type(inputs()[0], 'Old station');
|
||||
await waitFor(() => expect(geocode).toHaveBeenCalledTimes(1));
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
await user.click(inputs()[0]);
|
||||
await act(async () => {
|
||||
finish({ results: [{ name: 'Late old station', lat: 52, lng: 13, area: null }] });
|
||||
});
|
||||
expect(screen.queryByRole('button', { name: 'Late old station' })).not.toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'Second private stop' })).toBeInTheDocument();
|
||||
expect(inputs()[0]).toHaveValue('');
|
||||
});
|
||||
|
||||
it('keeps the newest search results when an older lookup answers last', async () => {
|
||||
type Answer = { results: { name: string; lat: number; lng: number; area: null }[] };
|
||||
const pending: ((value: Answer) => void)[] = [];
|
||||
geocode.mockImplementation(() => new Promise<Answer>((resolve) => pending.push(resolve)));
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
fireEvent.focus(inputs()[0]);
|
||||
fireEvent.change(inputs()[0], { target: { value: 'Old' } });
|
||||
await waitFor(() => expect(geocode).toHaveBeenCalledTimes(1));
|
||||
fireEvent.change(inputs()[0], { target: { value: 'New' } });
|
||||
await waitFor(() => expect(geocode).toHaveBeenCalledTimes(2));
|
||||
await act(async () => {
|
||||
pending[1]({ results: [{ name: 'New station', lat: 52.5, lng: 13.4, area: null }] });
|
||||
});
|
||||
await act(async () => {
|
||||
pending[0]({ results: [{ name: 'Old station', lat: 52.6, lng: 13.5, area: null }] });
|
||||
});
|
||||
expect(screen.getByRole('button', { name: 'New station' })).toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Old station' })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('ignores a superseded geocoder response after a saved place is picked', async () => {
|
||||
const user = userEvent.setup();
|
||||
let finish: (value: { results: { name: string; lat: number; lng: number; area: null }[] }) => void = () => {
|
||||
throw new Error('lookup not started');
|
||||
};
|
||||
geocode.mockReturnValueOnce(
|
||||
new Promise((resolve) => {
|
||||
finish = resolve;
|
||||
})
|
||||
);
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
fireEvent.change(inputs()[0], { target: { value: 'Old' } });
|
||||
await waitFor(() => expect(geocode).toHaveBeenCalledTimes(1));
|
||||
fireEvent.change(inputs()[0], { target: { value: 'First private' } });
|
||||
fireEvent.focus(inputs()[0]);
|
||||
fireEvent.click(screen.getByRole('button', { name: 'First private stop' }));
|
||||
await act(async () => {
|
||||
finish({ results: [{ name: 'Superseded station', lat: 52, lng: 13, area: null }] });
|
||||
});
|
||||
await user.clear(inputs()[0]);
|
||||
expect(screen.queryByRole('button', { name: 'Superseded station' })).not.toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'First private stop' })).toBeInTheDocument();
|
||||
expect(geocode).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('offers no unrelated regular places on an empty day', async () => {
|
||||
const user = userEvent.setup();
|
||||
render(<Harness surface={surface} data={fixture()} />);
|
||||
await switchDay(user, 'First day', 'Empty day');
|
||||
await user.click(inputs()[0]);
|
||||
expect(pickNames()).toEqual([]);
|
||||
});
|
||||
|
||||
it('offers the active stay and other trip stays intentionally, even on a booking-only day', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
data.assignments['101'] = [];
|
||||
const stay = (id: number, name: string, dayId: number): Accommodation =>
|
||||
({
|
||||
id,
|
||||
trip_id: 1,
|
||||
place_id: id,
|
||||
start_day_id: dayId,
|
||||
end_day_id: dayId,
|
||||
place_name: name,
|
||||
place_lat: 52 + id / 100,
|
||||
place_lng: 13,
|
||||
}) as Accommodation;
|
||||
data.accommodations = [stay(70, 'Current hotel', 101), stay(71, 'Later hotel', 205)];
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
expect(screen.getByRole('button', { name: 'Current hotel' })).toBeInTheDocument();
|
||||
expect(screen.getByRole('button', { name: 'Later hotel' })).toBeInTheDocument();
|
||||
expect(pickNames()).toEqual([]);
|
||||
});
|
||||
|
||||
it('offers only the selected day transport terminals on a transport-only day', async () => {
|
||||
const user = userEvent.setup();
|
||||
const data = fixture();
|
||||
data.assignments['101'] = [];
|
||||
const endpoint = (role: 'from' | 'to', name: string, date: string) => ({
|
||||
role,
|
||||
name,
|
||||
lat: 52,
|
||||
lng: 13,
|
||||
local_date: date,
|
||||
});
|
||||
seedStore(useTripStore, {
|
||||
reservations: [
|
||||
{
|
||||
id: 81,
|
||||
trip_id: 1,
|
||||
type: 'train',
|
||||
day_id: 101,
|
||||
end_day_id: 205,
|
||||
endpoints: [
|
||||
endpoint('from', 'First terminal', '2027-06-01'),
|
||||
endpoint('to', 'Second terminal', '2027-06-02'),
|
||||
],
|
||||
},
|
||||
] as ReturnType<typeof useTripStore.getState>['reservations'],
|
||||
});
|
||||
render(<Harness surface={surface} data={data} />);
|
||||
await user.click(inputs()[0]);
|
||||
expect(screen.getByRole('button', { name: 'First terminal' })).toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'Second terminal' })).not.toBeInTheDocument();
|
||||
await switchDay(user, 'First day', 'Second day');
|
||||
await user.click(inputs()[0]);
|
||||
expect(screen.getByRole('button', { name: 'Second terminal' })).toBeInTheDocument();
|
||||
expect(screen.queryByRole('button', { name: 'First terminal' })).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
@@ -20,6 +20,7 @@ import type { TripMember } from '../Budget/BudgetPanelMemberChips'
|
||||
import type { BookingExpenseRequest } from './BookingCostsSection.types'
|
||||
import type { BookingReviewDraft } from './parsedItemToDraft'
|
||||
import TransitSearchPanel from './TransitSearchPanel'
|
||||
import { getTransitDayPlaces } from './transitDayPlaces'
|
||||
import type { TransitPrefill } from './transitLeg'
|
||||
import { BookingDialogHeader, StatusPill } from './bookings/BookingDialogShell'
|
||||
import { DialogShell, DialogSection, DialogFooter, FooterSpacer, DialogButton, DeleteButton } from '../shared/DialogShell'
|
||||
@@ -287,22 +288,20 @@ export function TransportModal({ isOpen, onClose, onSave, reservation, days, sel
|
||||
const transitSearch = () => {
|
||||
const transitDay = days.find(d => d.id === Number(form.start_day_id))
|
||||
if (!transitDay) return <p className="m-0 text-content-faint" style={fs(13, 'body')}>{t('transit.pickDay')}</p>
|
||||
// Quick picks offer the chosen day's itinerary, not the whole trip (#1460).
|
||||
const dayPlaces = (assignments[String(transitDay.id)] || [])
|
||||
.slice().sort((a, b) => a.order_index - b.order_index)
|
||||
.map(a => places.find(p => p.id === a.place_id))
|
||||
.filter((p): p is Place => p != null)
|
||||
const dayPlaces = getTransitDayPlaces(transitDay.id, assignments, places)
|
||||
const dayPrefill = transitDay.id === selectedDayId ? transitPrefill : null
|
||||
return (
|
||||
<TransitSearchPanel
|
||||
key={transitDay.id}
|
||||
day={transitDay}
|
||||
days={days}
|
||||
places={dayPlaces}
|
||||
accommodations={accommodations}
|
||||
onAdd={(payload) => onSave(payload as Record<string, any> & { title: string })}
|
||||
initialFrom={transitPrefill?.from ?? null}
|
||||
initialTo={transitPrefill?.to ?? null}
|
||||
initialTime={transitPrefill?.time ?? null}
|
||||
walk={transitPrefill?.walk ?? null}
|
||||
initialFrom={dayPrefill?.from ?? null}
|
||||
initialTo={dayPrefill?.to ?? null}
|
||||
initialTime={dayPrefill?.time ?? null}
|
||||
walk={dayPrefill?.walk ?? null}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { Day, Reservation, ReservationEndpoint } from '../../../types'
|
||||
import { formatPriceText, formatTime, splitReservationDateTime } from '../../../utils/formatters'
|
||||
import { getFlightLegs, getTrainLegs, usesStationRoute } from '../../../utils/flightLegs'
|
||||
import { safeExternalHref } from '../../../utils/safeUrl'
|
||||
import { daySpan, hotelStayTimes, parseMeta, type AssignmentLookupEntry } from './bookingsModel'
|
||||
import { bookingDates, daySpan, hotelStayTimes, parseMeta, type AssignmentLookupEntry } from './bookingsModel'
|
||||
|
||||
export interface FactsContext {
|
||||
t: (key: string, params?: Record<string, string | number>) => string
|
||||
@@ -84,6 +84,7 @@ export function bookingFacts(r: Reservation, c: FactsContext): BookingFacts {
|
||||
const eps = (r.endpoints || []).slice().sort((a, b) => (a.sequence ?? 0) - (b.sequence ?? 0))
|
||||
const from = eps.find(e => e.role === 'from')
|
||||
const to = eps.find(e => e.role === 'to')
|
||||
const dates = bookingDates(r, c.days)
|
||||
const startTime = startDt.time || from?.local_time || null
|
||||
const endTime = endDt.time || to?.local_time || null
|
||||
// A stay backed by an accommodation says its times as check-in and check-out;
|
||||
@@ -124,8 +125,8 @@ export function bookingFacts(r: Reservation, c: FactsContext): BookingFacts {
|
||||
|
||||
return {
|
||||
day, time, startTime, endTime,
|
||||
startDate: startDt.date || from?.local_date || span.start?.date || null,
|
||||
endDate: endDt.date || to?.local_date || span.end?.date || null,
|
||||
startDate: dates.start,
|
||||
endDate: dates.end,
|
||||
cells, endpoints: eps.length >= 2 ? eps : [], legCodes,
|
||||
place: r.location || r.place_name || null,
|
||||
accommodation: r.accommodation_name || null,
|
||||
|
||||
@@ -132,6 +132,23 @@ export function daySpan(r: Reservation, days: Day[]): DaySpan {
|
||||
return { start: byId(r.day_id), end: byId(r.end_day_id) }
|
||||
}
|
||||
|
||||
/**
|
||||
* The calendar dates a booking starts and ends on, as "YYYY-MM-DD", or null where it
|
||||
* knows none: its own date first, then the local date of its first or last stop,
|
||||
* then the date of the day it is linked to. A day-linked transport often carries
|
||||
* only times, so its day stands in.
|
||||
*/
|
||||
export function bookingDates(r: Reservation, days: Day[]): { start: string | null; end: string | null } {
|
||||
const span = daySpan(r, days)
|
||||
const eps = (r.endpoints || []).slice().sort((a, b) => (a.sequence ?? 0) - (b.sequence ?? 0))
|
||||
const from = eps.find(e => e.role === 'from')
|
||||
const to = eps.find(e => e.role === 'to')
|
||||
return {
|
||||
start: splitReservationDateTime(r.reservation_time).date || from?.local_date || span.start?.date || null,
|
||||
end: splitReservationDateTime(r.reservation_end_time).date || to?.local_date || span.end?.date || null,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The moment a booking starts, as "YYYY-MM-DDTHH:MM" in its own local time, or null
|
||||
* without any date. A day-linked transport often carries no date in reservation_time,
|
||||
|
||||
@@ -54,6 +54,14 @@ describe('TransitLegs', () => {
|
||||
expect(screen.getByText('BVG')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('FE-PLANNER-BKTRANSIT-009: stop names and a walk target wrap instead of being cut off (#3139)', () => {
|
||||
render(<TransitLegs legs={[ride, walk]} compact />);
|
||||
for (const text of ['Alexanderplatz', 'Eberswalder Str.', 'Walk to Mauerpark']) {
|
||||
expect(screen.getByText(text)).not.toHaveClass('truncate');
|
||||
expect(screen.getByText(text)).toHaveClass('break-words');
|
||||
}
|
||||
});
|
||||
|
||||
it('FE-PLANNER-BKTRANSIT-006: a walk reads as one and leaves out the ride facts', () => {
|
||||
render(<TransitLegs legs={[walk]} compact />);
|
||||
expect(screen.getByText('Walk to Mauerpark')).toBeInTheDocument();
|
||||
|
||||
@@ -48,9 +48,11 @@ export function TransitLegs({ legs, compact = false }: { legs: TransitLegDisplay
|
||||
}}>{leg.line || leg.mode}</span>
|
||||
)}
|
||||
<div className={`flex min-w-0 flex-1 flex-col ${compact ? 'gap-1' : 'gap-1.5'}`}>
|
||||
<div className="flex min-w-0 items-center gap-1 font-medium text-content" style={fs(compact ? 12 : 13, 'body')}>
|
||||
{walk ? <span className="truncate text-content-muted">{t('transit.walkTo', { name: leg.to?.name || '' })}</span> : (
|
||||
<><span className="truncate">{leg.from?.name}</span><ArrowRight size={compact ? 11 : 12} strokeWidth={2} className="flex-none text-content-faint" /><span className="truncate">{leg.to?.name}</span></>
|
||||
{/* Detail views show a stop name whole: the names wrap and the
|
||||
arrow moves to the next line with them when it has to (#3139). */}
|
||||
<div className="flex min-w-0 flex-wrap items-center gap-1 font-medium text-content" style={fs(compact ? 12 : 13, 'body')}>
|
||||
{walk ? <span className="min-w-0 break-words text-content-muted [overflow-wrap:anywhere]">{t('transit.walkTo', { name: leg.to?.name || '' })}</span> : (
|
||||
<><span dir="auto" className="min-w-0 break-words [overflow-wrap:anywhere]">{leg.from?.name}</span><ArrowRight size={compact ? 11 : 12} strokeWidth={2} className="flex-none text-content-faint" /><span dir="auto" className="min-w-0 break-words [overflow-wrap:anywhere]">{leg.to?.name}</span></>
|
||||
)}
|
||||
</div>
|
||||
<TransitMetaBadges size={compact ? 'sm' : 'md'} items={[
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
import type { AssignmentsMap, Place } from '../../types';
|
||||
|
||||
/** Resolve the chosen day's places by day id, in itinerary order (#1460). */
|
||||
export function getTransitDayPlaces(dayId: number, assignments: AssignmentsMap, places: Place[]): Place[] {
|
||||
return (assignments[String(dayId)] ?? [])
|
||||
.slice()
|
||||
.sort((a, b) => a.order_index - b.order_index)
|
||||
.map((a) => places.find((p) => p.id === a.place_id))
|
||||
.filter((p): p is Place => p != null);
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
// FE-PLANNER-TRANSITDISPLAY-001 to FE-PLANNER-TRANSITDISPLAY-003
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { render, screen } from '../../../tests/helpers/render';
|
||||
import type { TransitLegDisplay } from './transitDisplay';
|
||||
import { TransitItineraryInline, TransitWalkDivider } from './transitDisplay';
|
||||
|
||||
const t = (key: string, params?: Record<string, string | number>) =>
|
||||
params ? `${key}:${Object.values(params).join(',')}` : key;
|
||||
|
||||
const ride: TransitLegDisplay = {
|
||||
mode: 'RAIL',
|
||||
line: 'XC',
|
||||
duration: 1260,
|
||||
from: { name: 'Basingstoke', time: '12:48' },
|
||||
to: { name: 'Reading', time: '13:09' },
|
||||
};
|
||||
const walk: TransitLegDisplay = { mode: 'WALK', duration: 240, to: { name: 'Reading station, Station Approach' } };
|
||||
|
||||
/** Whether a rendered element clips its text to one line. */
|
||||
function clipsToOneLine(el: HTMLElement): boolean {
|
||||
return el.style.whiteSpace === 'nowrap' || el.style.textOverflow === 'ellipsis';
|
||||
}
|
||||
|
||||
describe('TransitItineraryInline (#3139)', () => {
|
||||
it('FE-PLANNER-TRANSITDISPLAY-001: a ride shows both stop names in full', () => {
|
||||
render(<TransitItineraryInline legs={[ride]} t={t} />);
|
||||
for (const name of ['Basingstoke', 'Reading']) {
|
||||
const el = screen.getByText(name);
|
||||
expect(clipsToOneLine(el)).toBe(false);
|
||||
expect(el.style.overflowWrap).toBe('anywhere');
|
||||
}
|
||||
});
|
||||
|
||||
it('FE-PLANNER-TRANSITDISPLAY-002: a ride shows its arrival time under its departure', () => {
|
||||
render(<TransitItineraryInline legs={[ride, { ...ride, to: { name: 'Oxford' } }]} t={t} />);
|
||||
expect(screen.getByText('13:09')).toBeInTheDocument();
|
||||
expect(screen.getAllByText('12:48')).toHaveLength(2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('TransitWalkDivider (#3139)', () => {
|
||||
it('FE-PLANNER-TRANSITDISPLAY-003: the walk target wraps instead of being cut off', () => {
|
||||
render(<TransitWalkDivider leg={walk} t={t} size="sm" />);
|
||||
const text = screen.getByText(/transit\.walkTo:Reading station, Station Approach/);
|
||||
expect(clipsToOneLine(text)).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -41,14 +41,14 @@ export function TransitWalkDivider({ leg, t, size = 'md' }: {
|
||||
background: `linear-gradient(to ${dir}, var(--text-faint), transparent)`,
|
||||
opacity: 0.55,
|
||||
})
|
||||
// On phones the minutes lead so a long stop name only ever clips the name.
|
||||
// On phones the minutes lead, so they stay on the first line when a long stop name wraps.
|
||||
const text = isMobile
|
||||
? `${mins ? `${t('transit.min', { count: mins })} · ` : ''}${t('transit.walkTo', { name: leg.to?.name || '' })}`
|
||||
: `${t('transit.walkTo', { name: leg.to?.name || '' })}${mins ? ` · ${t('transit.min', { count: mins })}` : ''}`
|
||||
return (
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 10, padding: size === 'sm' ? '1px 0' : '2px 0' }}>
|
||||
<span style={rule('left')} />
|
||||
<span className="text-content-faint" style={{ display: 'inline-flex', alignItems: 'center', gap: 5, fontSize: size === 'sm' ? 'calc(10px * var(--fs-scale-caption, 1))' : 'calc(11.5px * var(--fs-scale-caption, 1))', fontWeight: 500, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', maxWidth: isMobile ? '85%' : '75%' }}>
|
||||
<span className="text-content-faint" style={{ display: 'inline-flex', alignItems: 'center', gap: 5, fontSize: size === 'sm' ? 'calc(10px * var(--fs-scale-caption, 1))' : 'calc(11.5px * var(--fs-scale-caption, 1))', fontWeight: 500, textAlign: 'center', overflowWrap: 'anywhere', maxWidth: isMobile ? '85%' : '75%' }}>
|
||||
<Footprints size={size === 'sm' ? 11 : 12} style={{ flexShrink: 0 }} />
|
||||
{text}
|
||||
</span>
|
||||
@@ -72,8 +72,10 @@ export function TransitItineraryInline({ legs, t }: {
|
||||
const mins = leg.duration ? Math.round(leg.duration / 60) : null
|
||||
return (
|
||||
<div key={i} style={{ display: 'flex', alignItems: 'flex-start', gap: 7 }}>
|
||||
<span className="text-content-muted" style={{ width: 34, flexShrink: 0, textAlign: 'end', fontSize: 'calc(10px * var(--fs-scale-caption, 1))', fontWeight: 600, paddingTop: 1 }}>
|
||||
{leg.from?.time || ''}
|
||||
{/* Departure beside the stops, arrival under it (#3139). */}
|
||||
<span className="text-content-muted" style={{ width: 34, flexShrink: 0, alignSelf: 'stretch', display: 'flex', flexDirection: 'column', justifyContent: 'space-between', textAlign: 'end', fontSize: 'calc(10px * var(--fs-scale-caption, 1))', fontWeight: 600, paddingTop: 1 }}>
|
||||
<span>{leg.from?.time || ''}</span>
|
||||
{leg.to?.time && <span className="text-content-faint">{leg.to.time}</span>}
|
||||
</span>
|
||||
<span style={{
|
||||
display: 'inline-flex', alignItems: 'center', borderRadius: 4, padding: '0 5px',
|
||||
@@ -84,10 +86,11 @@ export function TransitItineraryInline({ legs, t }: {
|
||||
{leg.line || leg.mode}
|
||||
</span>
|
||||
<div style={{ flex: 1, minWidth: 0 }}>
|
||||
<div className="text-content" style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', fontWeight: 500, display: 'flex', alignItems: 'center', gap: 4, minWidth: 0 }}>
|
||||
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{leg.from?.name}</span>
|
||||
{/* The folded-out itinerary is where a journey is read in full: stop names wrap (#3139). */}
|
||||
<div className="text-content" style={{ fontSize: 'calc(11px * var(--fs-scale-caption, 1))', fontWeight: 500, display: 'flex', flexWrap: 'wrap', alignItems: 'center', columnGap: 4, minWidth: 0 }}>
|
||||
<span dir="auto" style={{ minWidth: 0, overflowWrap: 'anywhere' }}>{leg.from?.name}</span>
|
||||
<MoveRight size={10} className="text-content-faint" style={{ flexShrink: 0 }} />
|
||||
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{leg.to?.name}</span>
|
||||
<span dir="auto" style={{ minWidth: 0, overflowWrap: 'anywhere' }}>{leg.to?.name}</span>
|
||||
</div>
|
||||
<div className="text-content-faint" style={{ fontSize: 'calc(9.5px * var(--fs-scale-caption, 1))', marginTop: 1 }}>
|
||||
{[
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { buildDay } from '../../../tests/helpers/factories';
|
||||
import type { Accommodation } from '../../types';
|
||||
import { orderTransitStaysByDate } from './transitStayOrder';
|
||||
|
||||
const day = buildDay({ id: 500, date: '2027-03-21', day_number: 21 });
|
||||
const stay = (id: number, start: number, end = start) =>
|
||||
({ id, start_day_id: start, end_day_id: end }) as Accommodation;
|
||||
const refs = [
|
||||
buildDay({ id: 900, date: '2027-03-01', day_number: 1 }),
|
||||
buildDay({ id: 700, date: '2027-03-19', day_number: 19 }),
|
||||
buildDay({ id: 600, date: '2027-03-20', day_number: 20 }),
|
||||
day,
|
||||
buildDay({ id: 400, date: '2027-03-22', day_number: 22 }),
|
||||
buildDay({ id: 300, date: '2027-03-23', day_number: 23 }),
|
||||
];
|
||||
const ids = (stays: Accommodation[]) => stays.map((a) => a.id);
|
||||
|
||||
describe('orderTransitStaysByDate', () => {
|
||||
it('uses the whole interval: an early check-in with a nearby checkout is close', () => {
|
||||
const spanning = stay(1, 900, 600);
|
||||
const future = stay(2, 400, 300);
|
||||
const farther = stay(3, 700);
|
||||
expect(ids(orderTransitStaysByDate(day, refs, [farther, future, spanning]))).toEqual([1, 2, 3]);
|
||||
});
|
||||
|
||||
it('puts the earlier interval first at equal distance, then earlier checkout and stable stay id', () => {
|
||||
const list = [stay(90, 400, 300), stay(2, 600), stay(80, 400, 300), stay(100, 400)];
|
||||
expect(ids(orderTransitStaysByDate(day, refs, list))).toEqual([2, 100, 80, 90]);
|
||||
expect(ids(orderTransitStaysByDate(day, refs, list.slice().reverse()))).toEqual([2, 100, 80, 90]);
|
||||
});
|
||||
|
||||
it('places missing, incomplete and invalid calendar dates after dated stays', () => {
|
||||
const dates = [
|
||||
...refs,
|
||||
buildDay({ id: 10, date: null }),
|
||||
buildDay({ id: 11, date: '2027-02-30' }),
|
||||
buildDay({ id: 12, date: 'not-a-date' }),
|
||||
];
|
||||
const list = [stay(4, 10), stay(3, 11), stay(2, 12), stay(5, 600, 10), stay(6, 99999), stay(9, 900)];
|
||||
expect(ids(orderTransitStaysByDate(day, dates, list))).toEqual([9, 2, 3, 4, 5, 6]);
|
||||
});
|
||||
|
||||
it('handles leap days without accepting a normalized invalid date', () => {
|
||||
const selected = buildDay({ id: 1, date: '2028-03-01' });
|
||||
const dates = [selected, buildDay({ id: 2, date: '2028-02-29' }), buildDay({ id: 3, date: '2027-02-29' })];
|
||||
expect(ids(orderTransitStaysByDate(selected, dates, [stay(1, 3), stay(2, 2)]))).toEqual([2, 1]);
|
||||
});
|
||||
|
||||
it('uses updated calendar dates after days are reordered, regardless of array order or numeric ids', () => {
|
||||
const before = stay(1, 600);
|
||||
const after = stay(2, 400);
|
||||
const reordered = refs
|
||||
.map((d) =>
|
||||
d.id === 600
|
||||
? { ...d, date: '2027-03-22', day_number: 22 }
|
||||
: d.id === 400
|
||||
? { ...d, date: '2027-03-20', day_number: 20 }
|
||||
: d
|
||||
)
|
||||
.reverse();
|
||||
expect(ids(orderTransitStaysByDate(day, refs, [after, before]))).toEqual([1, 2]);
|
||||
expect(ids(orderTransitStaysByDate(day, reordered, [before, after]))).toEqual([2, 1]);
|
||||
});
|
||||
|
||||
it('counts calendar nights equally across the spring DST boundary', () => {
|
||||
const selected = buildDay({ id: 1, date: '2027-03-29' });
|
||||
const dates = [selected, buildDay({ id: 2, date: '2027-03-28' }), buildDay({ id: 3, date: '2027-03-30' })];
|
||||
expect(ids(orderTransitStaysByDate(selected, dates, [stay(1, 3), stay(2, 2)]))).toEqual([2, 1]);
|
||||
});
|
||||
|
||||
it('normalizes reversed interval endpoints consistently with day-range membership', () => {
|
||||
expect(ids(orderTransitStaysByDate(day, refs, [stay(1, 700), stay(2, 300, 600)]))).toEqual([2, 1]);
|
||||
});
|
||||
|
||||
it('keeps dated stays ahead of undated ones when the selected day has no usable date', () => {
|
||||
const selected = { ...day, date: null };
|
||||
expect(ids(orderTransitStaysByDate(selected, refs, [stay(1, 99999), stay(3, 300), stay(2, 900)]))).toEqual([
|
||||
2, 3, 1,
|
||||
]);
|
||||
});
|
||||
|
||||
it('does not mutate the caller list', () => {
|
||||
const list = Object.freeze([stay(1, 300), stay(2, 600)]);
|
||||
expect(ids(orderTransitStaysByDate(day, refs, list))).toEqual([2, 1]);
|
||||
expect(ids([...list])).toEqual([1, 2]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,37 @@
|
||||
import type { Accommodation, Day } from '../../types';
|
||||
|
||||
/** A strict calendar date as a UTC day number, so DST never changes the number of nights. */
|
||||
function nightNumber(value: string | null | undefined): number | null {
|
||||
if (!value || !/^\d{4}-\d{2}-\d{2}$/.test(value)) return null;
|
||||
const time = Date.parse(`${value}T00:00:00Z`);
|
||||
if (!Number.isFinite(time) || new Date(time).toISOString().slice(0, 10) !== value) return null;
|
||||
return time / 86_400_000;
|
||||
}
|
||||
|
||||
/** Rank other-day stays by the closest boundary of their complete booking interval. */
|
||||
export function orderTransitStaysByDate(
|
||||
day: Pick<Day, 'date'>,
|
||||
days: readonly Pick<Day, 'id' | 'date'>[],
|
||||
stays: readonly Accommodation[]
|
||||
): Accommodation[] {
|
||||
const selected = nightNumber(day.date);
|
||||
const dates = new Map(days.map((d) => [d.id, nightNumber(d.date)]));
|
||||
return stays
|
||||
.map((stay) => {
|
||||
const start = dates.get(stay.start_day_id);
|
||||
const end = dates.get(stay.end_day_id);
|
||||
// A partial or invalid interval has no usable proximity and follows every dated stay.
|
||||
const lo = start != null && end != null ? Math.min(start, end) : Infinity;
|
||||
const hi = start != null && end != null ? Math.max(start, end) : Infinity;
|
||||
const distance = selected != null && lo !== Infinity ? Math.max(lo - selected, selected - hi, 0) : Infinity;
|
||||
// Earlier check-in, then earlier check-out, then stable booking identity break ties.
|
||||
return { stay, rank: [distance, lo, hi, stay.id] };
|
||||
})
|
||||
.sort((a, b) => {
|
||||
for (let i = 0; i < a.rank.length; i++) {
|
||||
if (a.rank[i] !== b.rank[i]) return a.rank[i] < b.rank[i] ? -1 : 1;
|
||||
}
|
||||
return 0;
|
||||
})
|
||||
.map((row) => row.stay);
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { dayColor } from './dayColors'
|
||||
import { stageMapData, stagePlaceIds, stagePoints } from './stageMap'
|
||||
import { stageConnectionIds, stageMapData, stagePlaceIds, stagePoints } from './stageMap'
|
||||
import type { AccessSpur, RoadtripDay, RoadtripRoutes, RoadtripStop } from '@trek/shared/roadtrip'
|
||||
|
||||
// FE-RTSTAGE-001 to FE-RTSTAGE-021
|
||||
// FE-RTSTAGE-001 to FE-RTSTAGE-023
|
||||
|
||||
function stop(name: string, over: Partial<RoadtripStop> = {}): RoadtripStop {
|
||||
return {
|
||||
@@ -125,14 +125,15 @@ describe('stageMapData with a stage', () => {
|
||||
expect(stageMapData(routes(), stage, true).lines).toEqual([LINES[1], LINES[2]])
|
||||
})
|
||||
|
||||
it('FE-RTSTAGE-016: the drive into the next day is left off the stage', () => {
|
||||
// With "connect the days" on, that leg is drawn in the colour of the day it leaves, so
|
||||
it('FE-RTSTAGE-016: the drive in from the day before is left off the stage', () => {
|
||||
// With "connect the days" on, that leg is drawn as the day it arrives on (#3123), so
|
||||
// filtering by day number alone handed the stage a line running off it to a place the
|
||||
// day never visits. On a phone, where the stage IS the map, it was the longest thing
|
||||
// on screen and read as the day's own route.
|
||||
const withJoin = routes({ lineJoins: [false, false, true, false] })
|
||||
// on screen and read as the day's own route. The assembler emits it first among the
|
||||
// lines of the day it reaches, ahead of that day's own legs.
|
||||
const withJoin = routes({ lineJoins: [false, true, false, false] })
|
||||
|
||||
expect(stageMapData(withJoin, stage, true).lines).toEqual([LINES[1]])
|
||||
expect(stageMapData(withJoin, stage, true).lines).toEqual([LINES[2]])
|
||||
})
|
||||
|
||||
it('FE-RTSTAGE-020: a day that is nothing but driving keeps its connection rather than going blank', () => {
|
||||
@@ -144,7 +145,7 @@ describe('stageMapData with a stage', () => {
|
||||
})
|
||||
|
||||
it('FE-RTSTAGE-017: the colours still line up once a join has been dropped', () => {
|
||||
const data = stageMapData(routes({ lineJoins: [false, false, true, false] }), stage, true)
|
||||
const data = stageMapData(routes({ lineJoins: [false, true, false, false] }), stage, true)
|
||||
|
||||
expect(data.lineColors).toHaveLength(data.lines.length)
|
||||
expect(data.lineColors).toEqual([dayColor(2)])
|
||||
@@ -153,7 +154,7 @@ describe('stageMapData with a stage', () => {
|
||||
it('FE-RTSTAGE-018: the all-days view keeps the joins, which is the view they are for', () => {
|
||||
// The setting draws the whole drive as one connected line; that is what it is for, and
|
||||
// on this map the connection has the other days beside it.
|
||||
expect(stageMapData(routes({ lineJoins: [false, false, true, false] }), null, true).lines).toEqual(LINES)
|
||||
expect(stageMapData(routes({ lineJoins: [false, true, false, false] }), null, true).lines).toEqual(LINES)
|
||||
})
|
||||
|
||||
it('FE-RTSTAGE-019: routes from before the flag existed are drawn as they were', () => {
|
||||
@@ -267,3 +268,23 @@ describe('a stage that starts or ends at a booked night', () => {
|
||||
expect(data.accessLines).toEqual([walk])
|
||||
})
|
||||
})
|
||||
|
||||
describe('stageConnectionIds', () => {
|
||||
const flight = (reservationId: number, role: 'arrival' | 'departure') =>
|
||||
stop('Airport', { carrier: { reservationId, type: 'flight', role, title: 'Flight', code: null, at: null } })
|
||||
|
||||
it("FE-RTSTAGE-022: a stage draws its own rides, not the drive's ride home from a later day", () => {
|
||||
// The flight in (31) seams this stage; the flight home (32) belongs to a stage days later
|
||||
// and is not on this one at all.
|
||||
const stage = day([flight(31, 'arrival'), stop('Ubud')])
|
||||
expect(stageConnectionIds(stage, [], () => true)).toEqual([31])
|
||||
})
|
||||
|
||||
it('FE-RTSTAGE-023: of the bookings switched on by hand only those running on the stage day stay', () => {
|
||||
const stage = day([stop('Ubud')])
|
||||
const onThisDay = new Set([40])
|
||||
expect(stageConnectionIds(stage, [40, 41], id => onThisDay.has(id))).toEqual([40])
|
||||
// A ride that seams the stage stays even when it was booked on another day.
|
||||
expect(stageConnectionIds(day([flight(31, 'arrival')]), [31], () => false)).toEqual([31])
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { dayColor } from './dayColors'
|
||||
import { carrierReservationIds } from '@trek/shared/roadtrip'
|
||||
import type { AccessSpur, RoadtripDay, RoadtripRoutes } from '@trek/shared/roadtrip'
|
||||
|
||||
/**
|
||||
@@ -50,15 +51,15 @@ export function stageMapData(
|
||||
}
|
||||
if (!routes.lines.length) return { ...EMPTY, placeIds: stagePlaceIds(stage), focusPoints: stagePoints(stage) }
|
||||
|
||||
// A stage is ONE day, so the drive into the next day is left off it.
|
||||
// A stage is ONE day, so the drive in from the day before is left off it.
|
||||
//
|
||||
// With "connect the days" on, that leg is drawn in the colour of the day it leaves, so
|
||||
// on the whole-drive map it reads as that day carrying on. Filtering by day number
|
||||
// alone therefore handed a stage a line that runs off it to a place the day never
|
||||
// visits: on a phone, where the stage IS the map, that read as the day's own route and
|
||||
// was the longest thing on screen. The desktop has the same connection, but it has it
|
||||
// beside every other day, which is the view the setting exists for; here that view is
|
||||
// the "all days" one, a tap away on the same map.
|
||||
// With "connect the days" on, that leg is drawn as the day it arrives on, the day whose
|
||||
// distance counts it. Filtering by day number alone therefore handed a stage a line
|
||||
// that runs off it to a place the day never visits: on a phone, where the stage IS the
|
||||
// map, that read as the day's own route and was the longest thing on screen. The
|
||||
// desktop has the same connection, but it has it beside every other day, which is the
|
||||
// view the setting exists for; here that view is the "all days" one, a tap away on the
|
||||
// same map.
|
||||
const ofDay: number[] = []
|
||||
routes.lineDays.forEach((n, i) => { if (n === stage.dayNumber) ofDay.push(i) })
|
||||
const own = ofDay.filter(i => !routes.lineJoins?.[i])
|
||||
@@ -88,6 +89,20 @@ export function stagePlaceIds(stage: RoadtripDay): Set<number> {
|
||||
return new Set(stage.stops.filter(s => !s.automaticNight).map(s => s.placeId))
|
||||
}
|
||||
|
||||
/**
|
||||
* The bookings the map draws as arcs on ONE stage: the rides that seam this stage's
|
||||
* drive, whatever day they were booked on, and of the ones switched on by hand only
|
||||
* those that run on the stage's day. Taking the rides of the whole drive put a flight
|
||||
* home across every stage before it, as if it were part of that day.
|
||||
*/
|
||||
export function stageConnectionIds(
|
||||
stage: RoadtripDay,
|
||||
switchedOn: readonly number[],
|
||||
runsOnStageDay: (reservationId: number) => boolean,
|
||||
): number[] {
|
||||
return [...new Set([...switchedOn.filter(runsOnStageDay), ...carrierReservationIds([stage])])]
|
||||
}
|
||||
|
||||
/** The stage's stops as coordinates, for the fit. */
|
||||
export function stagePoints(stage: RoadtripDay): [number, number][] {
|
||||
return stage.stops
|
||||
|
||||
@@ -631,7 +631,7 @@ describe('useRoadtripRoutes', () => {
|
||||
expect(result.current.totalDistance).toBe(300000)
|
||||
})
|
||||
|
||||
it('FE-ROADTRIP-ROUTES-022: the joining stroke wears the day it leaves, its kilometres the day it reaches', async () => {
|
||||
it('FE-ROADTRIP-ROUTES-022: the joining stroke wears the day it reaches, like its kilometres (#3123)', async () => {
|
||||
setting({ roadtrip_connect_days: true })
|
||||
const { days: daysList, assignments } = twoDays()
|
||||
const { result } = renderHook(() => useRoadtripRoutes(7, daysList, assignments))
|
||||
@@ -639,10 +639,9 @@ describe('useRoadtripRoutes', () => {
|
||||
|
||||
// Same length and same order as `lines`, or a colour lands on the wrong day.
|
||||
expect(result.current.lineDays).toHaveLength(result.current.lines.length)
|
||||
// The stroke starts at a stop on day 1, so drawing it as day 2 would make day 2
|
||||
// look like it begins somewhere it has no stop.
|
||||
expect(result.current.lineDays).toEqual([1, 1, 2])
|
||||
// The kilometres go the other way: they are driven on the day they arrive.
|
||||
// Day 1 ends at its last stop, so the drive on to day 2 is driven on day 2: its
|
||||
// kilometres are counted there, and drawn in day 1's colour the map said otherwise.
|
||||
expect(result.current.lineDays).toEqual([1, 2, 2])
|
||||
expect(result.current.days.map(d => d.distance)).toEqual([100000, 200000])
|
||||
})
|
||||
|
||||
@@ -666,7 +665,8 @@ describe('useRoadtripRoutes', () => {
|
||||
|
||||
setting({ roadtrip_connect_days: true })
|
||||
expect(result.current.lines).toHaveLength(3)
|
||||
expect(result.current.lineDays).toEqual([1, 2, 2])
|
||||
// The drive past midnight lands on day 2 and is drawn there, like day 2's own legs.
|
||||
expect(result.current.lineDays).toEqual([2, 2, 2])
|
||||
expect(result.current.days[0].distance).toBe(300000)
|
||||
})
|
||||
|
||||
|
||||
@@ -69,6 +69,10 @@ export function useTripRangeGuard(): { checking: boolean; check: (trip: Pick<Tri
|
||||
startDate: range.newStart,
|
||||
endDate: range.newEnd,
|
||||
dayCount: range.dayCount,
|
||||
// The rule the server lays the days out by when bookings keep their dates,
|
||||
// the default either dialog saves with. Shifting everything moves no day
|
||||
// that this keeps, so the dated days it removes are the same.
|
||||
keepDates: true,
|
||||
})
|
||||
if (plan.removed.length === 0) return null
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import { useNativeCapabilities } from '../native/capabilities'
|
||||
import { isNativeIos } from '../native/platform'
|
||||
import { useWindowFold } from '../native/windowFold'
|
||||
import './mobile.css'
|
||||
import './corner.css'
|
||||
|
||||
interface MobileShellProps {
|
||||
isPhone: boolean
|
||||
|
||||
@@ -48,7 +48,7 @@ export default function MImageViewer({
|
||||
type="button"
|
||||
onClick={onClose}
|
||||
aria-label={t('collab.chat.closeImage')}
|
||||
className="absolute end-4 top-[calc(var(--m-safe-top,12px)+4px)] z-10 flex h-10 w-10 items-center justify-center rounded-full bg-[color:var(--m-viewer-btn)] text-[color:var(--m-viewer-ink)]"
|
||||
className="m-corner-beside absolute end-4 top-[calc(var(--m-safe-top,12px)+4px)] z-10 flex h-10 w-10 items-center justify-center rounded-full bg-[color:var(--m-viewer-btn)] text-[color:var(--m-viewer-ink)]"
|
||||
>
|
||||
<X size={20} strokeWidth={2} />
|
||||
</button>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLayoutEffect, useRef, useState, type ReactNode, type RefObject } from 'react';
|
||||
import { useCallback, useLayoutEffect, useRef, useState, type ReactNode, type RefObject } from 'react';
|
||||
import { edgeFadeClass, useEdgeFade } from './useEdgeFade';
|
||||
|
||||
/**
|
||||
@@ -30,6 +30,13 @@ export function MRail({
|
||||
useEvenLines(listRef);
|
||||
// On a short window the entries scroll; the cut edge fades, so the foot's entries read as more below.
|
||||
const [list, setList] = useState<HTMLDivElement | null>(null);
|
||||
// One function for the rail's lifetime: React 19 detaches and attaches a ref
|
||||
// whose function changed, so an inline one set the state to null and back on
|
||||
// every render and the trip's rail rendered itself into React's update limit.
|
||||
const listNode = useCallback((node: HTMLDivElement | null) => {
|
||||
listRef.current = node;
|
||||
setList(node);
|
||||
}, []);
|
||||
const fade = useEdgeFade(list, 'y');
|
||||
return (
|
||||
<nav
|
||||
@@ -38,10 +45,7 @@ export function MRail({
|
||||
>
|
||||
{head && <div className="mb-2 flex flex-none justify-center">{head}</div>}
|
||||
<div
|
||||
ref={(node) => {
|
||||
listRef.current = node;
|
||||
setList(node);
|
||||
}}
|
||||
ref={listNode}
|
||||
className={`flex min-h-0 w-full flex-1 flex-col items-center gap-1 overflow-y-auto px-1 [scrollbar-width:none] ${edgeFadeClass(fade, 'y')}`}
|
||||
>
|
||||
{children}
|
||||
|
||||
@@ -89,7 +89,7 @@ export function MSectionList({
|
||||
* width on both screens.
|
||||
*/
|
||||
export const SECTION_SCREEN =
|
||||
'px-4 pb-[calc(var(--bottom-nav-h,84px)+16px)] pt-[var(--m-safe-top,12px)] wide:mx-auto wide:max-w-[1040px] wide:px-6 split:grid split:max-w-[1240px] split:grid-cols-[260px_minmax(0,1fr)] split:items-start split:gap-8';
|
||||
'm-corner-flow px-4 pb-[calc(var(--bottom-nav-h,84px)+16px)] pt-[var(--m-safe-top,12px)] wide:mx-auto wide:max-w-[1040px] wide:px-6 split:grid split:max-w-[1240px] split:grid-cols-[260px_minmax(0,1fr)] split:items-start split:gap-8';
|
||||
|
||||
interface MSectionNavProps {
|
||||
title: string;
|
||||
|
||||
@@ -86,11 +86,11 @@ type MSheetWideAnchor = 'center' | 'rail-foot'
|
||||
* docked sheet just above the dock; neither lies across the dock.
|
||||
*/
|
||||
const REGION: Record<MSheetVariant, string> = {
|
||||
card: 'inset-x-[14px] top-[var(--m-safe-top,12px)] bottom-[calc(var(--bottom-nav-h,84px)+12px)] justify-center',
|
||||
card: 'inset-x-[14px] top-[max(var(--m-safe-top,12px),var(--m-corner-clear,0px))] bottom-[calc(var(--bottom-nav-h,84px)+12px)] justify-center',
|
||||
// On a phone on its side the gap it keeps at the top would leave it a strip
|
||||
// of a few rows, so there it may rise nearly to the top.
|
||||
bottom:
|
||||
'inset-x-4 top-[calc(var(--m-safe-top,12px)+56px)] bottom-[calc(var(--bottom-nav-h,84px)+16px)] justify-end short:top-[calc(var(--m-safe-top,12px)+8px)]',
|
||||
'inset-x-4 top-[max(calc(var(--m-safe-top,12px)+56px),var(--m-corner-clear,0px))] bottom-[calc(var(--bottom-nav-h,84px)+16px)] justify-end short:top-[calc(var(--m-safe-top,12px)+8px)]',
|
||||
drawer: 'start-0 top-0 bottom-0 w-[78%] max-w-[320px]',
|
||||
}
|
||||
|
||||
@@ -116,7 +116,8 @@ const SHORT_FORM_BOX = 'short:max-w-[640px] short:flex-1'
|
||||
function regionClass(variant: MSheetVariant, anchor: MSheetWideAnchor = 'center', form = false): string {
|
||||
const base = 'pointer-events-none absolute flex flex-col'
|
||||
if (variant === 'drawer') return `${base} ${REGION.drawer}`
|
||||
return `${base} ${REGION[variant]} ${WIDE_REGION[anchor]}${form ? ` ${SHORT_FORM_REGION}` : ''}`
|
||||
// m-corner-side: on a wide window the sheet keeps off a corner element's side (a Duo's status capsule).
|
||||
return `${base} m-corner-side ${REGION[variant]} ${WIDE_REGION[anchor]}${form ? ` ${SHORT_FORM_REGION}` : ''}`
|
||||
}
|
||||
|
||||
/** The sheet's own box inside the region: its width, and the arrow when it has one. */
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
/* ── An element in a top corner (an iPhone Duo's status capsule) ──────────────
|
||||
Beside mobile.css, which holds the variables these read (--m-corner-*).
|
||||
For the screens that place their own controls rather than sit in .m-page
|
||||
(the trip, its map). Every variable is 0 without such an element, so these
|
||||
change nothing on any other device.
|
||||
m-corner-beside: a control row in the corner's height ends before it.
|
||||
m-corner-side: a layer that fills the page ends before the corner's side on
|
||||
a wide window (--m-corner-side-*, 0 upright, where content starts below the
|
||||
corner through --m-corner-clear instead).
|
||||
The element sits where the hardware puts it, whatever the reading
|
||||
direction, so right to left swaps the two sides back. */
|
||||
.m-corner-beside {
|
||||
margin-inline: var(--m-corner-l-gap, 0px) var(--m-corner-r-gap, 0px);
|
||||
}
|
||||
html[dir='rtl'] .m-corner-beside {
|
||||
margin-inline: var(--m-corner-r-gap, 0px) var(--m-corner-l-gap, 0px);
|
||||
}
|
||||
.m-corner-side {
|
||||
margin-inline: var(--m-corner-side-l, 0px) var(--m-corner-side-r, 0px);
|
||||
}
|
||||
html[dir='rtl'] .m-corner-side {
|
||||
margin-inline: var(--m-corner-side-r, 0px) var(--m-corner-side-l, 0px);
|
||||
}
|
||||
/* m-corner-beside-in: m-corner-beside for a row inside .m-page, upright only
|
||||
(on a wide window the page itself already ends before the corner). */
|
||||
.m-corner-beside-in {
|
||||
margin-inline: var(--m-corner-in-l, 0px) var(--m-corner-in-r, 0px);
|
||||
}
|
||||
html[dir='rtl'] .m-corner-beside-in {
|
||||
margin-inline: var(--m-corner-in-r, 0px) var(--m-corner-in-l, 0px);
|
||||
}
|
||||
@@ -86,6 +86,23 @@
|
||||
* the air is 0 too (min() of 0 and 8px). */
|
||||
--m-safe-l-gap: calc(var(--m-bar-l) + min(var(--m-bar-l), 8px));
|
||||
--m-safe-r-gap: calc(var(--m-bar-r) + min(var(--m-bar-r), 8px));
|
||||
/* The corner element alone, with the same air, for the screens that place
|
||||
* their own controls (the trip, the map): a control row in the corner's
|
||||
* height ends this far from the screen's side (m-corner-beside). Physical
|
||||
* sides, as the element is: right to left does not move it. */
|
||||
--m-corner-l-gap: calc(var(--trek-native-corner-left, 0px) + min(var(--trek-native-corner-left, 0px), 8px));
|
||||
--m-corner-r-gap: calc(var(--trek-native-corner-right, 0px) + min(var(--trek-native-corner-right, 0px), 8px));
|
||||
/* Where the content of a screen that places its own scroll body begins at
|
||||
* the latest, so its first row is not under the corner element: just below
|
||||
* it (m-corner-below). Upright that is the cheaper way round; on a wide
|
||||
* window the page gives up the corner's side instead (below). 0 elsewhere. */
|
||||
--m-corner-clear: calc(var(--m-corner-b) + min(var(--m-corner-b), 10px));
|
||||
--m-corner-side-l: 0px;
|
||||
--m-corner-side-r: 0px;
|
||||
/* The same air for a control row inside .m-page, which on a wide window has
|
||||
* already given up the corner's side (m-corner-beside-in). */
|
||||
--m-corner-in-l: var(--m-corner-l-gap);
|
||||
--m-corner-in-r: var(--m-corner-r-gap);
|
||||
/* The navigation rail's share of the leading edge (wide windows only), what
|
||||
* every full-width fixed bar and the page column start after. */
|
||||
--m-rail-w: 0px;
|
||||
@@ -98,10 +115,21 @@
|
||||
* reads the same values as the shell. */
|
||||
html:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-root {
|
||||
--bottom-nav-h: env(safe-area-inset-bottom, 0px);
|
||||
--m-rail-w: calc(var(--m-safe-l) + 100px);
|
||||
--m-rail-w: calc(var(--m-bar-l) + 100px);
|
||||
/* A wide window gives up the corner element's side over the whole height,
|
||||
* as an iPhone on its side does for its camera: on an unfolded Duo lifting
|
||||
* every page below the status capsule cost a quarter of the height. The
|
||||
* rail already takes the leading side, so only the trailing side's corner
|
||||
* counts here. */
|
||||
--m-corner-clear: 0px;
|
||||
--m-corner-side-r: var(--m-corner-r-gap);
|
||||
--m-corner-in-l: 0px;
|
||||
--m-corner-in-r: 0px;
|
||||
}
|
||||
html[dir='rtl']:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-root {
|
||||
--m-rail-w: calc(var(--m-safe-r) + 100px);
|
||||
--m-rail-w: calc(var(--m-bar-r) + 100px);
|
||||
--m-corner-side-l: var(--m-corner-l-gap);
|
||||
--m-corner-side-r: 0px;
|
||||
}
|
||||
|
||||
.dark .m-root {
|
||||
@@ -631,13 +659,30 @@ html[dir='rtl']:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-
|
||||
the leading inset on a wide window. */
|
||||
.m-page {
|
||||
margin-inline: var(--m-page-l, 0px) var(--m-page-r, 0px);
|
||||
padding-top: max(0px, calc(var(--m-corner-b, 0px) + 12px - var(--m-safe-top, 12px) - 70px));
|
||||
padding-top: max(0px, calc(var(--m-corner-clear, 0px) + 2px - var(--m-safe-top, 12px) - 70px));
|
||||
}
|
||||
html[dir='rtl'] .m-page {
|
||||
margin-inline: var(--m-page-r, 0px) var(--m-page-l, 0px);
|
||||
}
|
||||
/* The lift above counts on a floating top bar over the page. A screen whose
|
||||
first row is part of the page (m-corner-flow: settings, administration,
|
||||
collections) is lifted until that row starts below the corner element; one
|
||||
that keeps clear of it by itself (m-corner-own: a map under its own bars, a
|
||||
calendar under its own header) is not lifted at all. */
|
||||
.m-page:has(.m-corner-flow) {
|
||||
padding-top: max(0px, calc(var(--m-corner-clear, 0px) - var(--m-safe-top, 12px)));
|
||||
}
|
||||
.m-page:has(.m-corner-own) {
|
||||
padding-top: 0;
|
||||
}
|
||||
/* On a wide window the page starts at the top and ends before the corner
|
||||
element instead (--m-corner-side-*, 0 without one). */
|
||||
html:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-page {
|
||||
margin-inline-start: 0;
|
||||
margin-inline-end: max(var(--m-page-r, 0px), var(--m-corner-side-r, 0px));
|
||||
}
|
||||
html[dir='rtl']:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-page {
|
||||
margin-inline-end: max(var(--m-page-l, 0px), var(--m-corner-side-l, 0px));
|
||||
}
|
||||
/* A screen whose background is a map reaches under the rail: the map runs to
|
||||
the window's edge and the rail floats over it like the top controls do. Its
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import MAdminSchoolHolidayCatalog from './MAdminSchoolHolidayCatalog'
|
||||
import MAdminPaddleRegionsPanel from './MAdminPaddleRegionsPanel'
|
||||
import { useState } from 'react'
|
||||
import {
|
||||
ArrowUp,
|
||||
@@ -246,10 +245,17 @@ export default function MAdmin() {
|
||||
onToggleBagTracking={toggleBagTracking}
|
||||
collabFeatures={collabFeatures}
|
||||
onToggleCollabFeature={toggleCollabFeature}
|
||||
// Live flight status and the booking mail import are rows of the addon groups,
|
||||
// and the paddle water data a row under Tours (desktop parity).
|
||||
flightLive={{
|
||||
on: admin.flightLive,
|
||||
locked: admin.flightLiveLocked,
|
||||
managed: !!managed,
|
||||
onToggle: () =>
|
||||
void admin.handleToggleAuthSetting('flight_live_enabled', !admin.flightLive, admin.setFlightLive),
|
||||
}}
|
||||
mailImport={!managed}
|
||||
/>
|
||||
{/* How the integrations reach the world (live flights, booking mails), beside the addons they serve. */}
|
||||
<MAdminSettingsSection admin={admin} t={t} part="features" />
|
||||
<MAdminPaddleRegionsPanel />
|
||||
</div>
|
||||
)}
|
||||
{activeTab === 'plugins' && <MAdminPluginsPanel />}
|
||||
|
||||
@@ -3,7 +3,7 @@ import { useTranslation } from '../../../i18n'
|
||||
import { useIsDark } from '../../../hooks/useIsDark'
|
||||
import {
|
||||
Puzzle, ListChecks, Wallet, FileText, CalendarDays, Globe, Briefcase, Image, Terminal, Link2, Compass, BookOpen,
|
||||
Sparkles, Luggage, Plane, Bookmark, Users, Mountain, CarFront, Settings2, ChevronRight,
|
||||
Sparkles, Luggage, Plane, Bookmark, Users, Mountain, CarFront, Radar,
|
||||
} from 'lucide-react'
|
||||
import DawarichIcon from '../../../components/shared/DawarichIcon'
|
||||
import AirTrailIcon from '../../../components/shared/AirTrailIcon'
|
||||
@@ -21,7 +21,10 @@ import AiSettingsDialog from '../../../components/Admin/addons/AiAdminConfig'
|
||||
import { AI_ADDON_ICONS, type AiAddonId } from '../../../components/Admin/addons/aiAddons'
|
||||
import { useAiAddonTile } from '../../../components/Admin/addons/useAiAddonTile'
|
||||
import { ImmichIcon, SynologyIcon } from '../../../components/Admin/addons/PhotoProviderIcons'
|
||||
import { MAdminCard } from './MAdminUi'
|
||||
import { MAdminCard, MAdminOptionRow, MAdminSetupRow } from './MAdminUi'
|
||||
import MAdminPaddleRegionsPanel from './MAdminPaddleRegionsPanel'
|
||||
import MMailIngestAdminCard from './MMailIngestAdminCard'
|
||||
import type { FlightLiveOption } from '../../../components/Admin/AddonManager'
|
||||
import MHintLabel from '../../components/MHintLabel'
|
||||
import WandererMark from '../../../components/Tours/wanderer/WandererMark'
|
||||
import MSkeleton from '../../components/MSkeleton'
|
||||
@@ -59,7 +62,16 @@ function AddonIcon({ name, size = 18, enabled = true }: AddonIconProps) {
|
||||
return <Icon size={size} />
|
||||
}
|
||||
|
||||
export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTracking, collabFeatures, onToggleCollabFeature }: { bagTrackingEnabled?: boolean; onToggleBagTracking?: () => void; collabFeatures?: CollabFeatures; onToggleCollabFeature?: (key: string) => void }) {
|
||||
export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTracking, collabFeatures, onToggleCollabFeature, flightLive, mailImport = false }: {
|
||||
bagTrackingEnabled?: boolean
|
||||
onToggleBagTracking?: () => void
|
||||
collabFeatures?: CollabFeatures
|
||||
onToggleCollabFeature?: (key: string) => void
|
||||
/** Live flight status, a row of the trip group (desktop parity). */
|
||||
flightLive?: FlightLiveOption
|
||||
/** Booking mail import, a row of the integration group with its setup sheet; off on a managed install. */
|
||||
mailImport?: boolean
|
||||
}) {
|
||||
const { t } = useTranslation()
|
||||
const dark = useIsDark()
|
||||
const {
|
||||
@@ -98,7 +110,7 @@ export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTrac
|
||||
) : (
|
||||
<>
|
||||
{/* Trip Addons */}
|
||||
{tripAddons.length > 0 && (
|
||||
{(tripAddons.length > 0 || flightLive) && (
|
||||
<MAdminCard>
|
||||
<MGroupHead icon={Briefcase} label={t('admin.addons.type.trip')} hint={t('admin.addons.tripHint')} />
|
||||
{tripAddons.map((addon, i) => (
|
||||
@@ -135,6 +147,7 @@ export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTrac
|
||||
onToggle={() => void toggle()}
|
||||
/>
|
||||
))}
|
||||
<MAdminPaddleRegionsPanel />
|
||||
</>
|
||||
)}
|
||||
{addon.id === 'collab' && addon.enabled && collabFeatures && onToggleCollabFeature && (
|
||||
@@ -153,6 +166,7 @@ export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTrac
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
{flightLive && <MFlightLiveRow option={flightLive} first={tripAddons.length === 0} />}
|
||||
</MAdminCard>
|
||||
)}
|
||||
|
||||
@@ -171,13 +185,14 @@ export default function MAdminAddonManager({ bagTrackingEnabled, onToggleBagTrac
|
||||
)}
|
||||
|
||||
{/* Integration Addons, headed by the AI ones as one group, as on the desktop */}
|
||||
{(integrationAddons.length > 0 || aiAddons.length > 0) && (
|
||||
{(integrationAddons.length > 0 || aiAddons.length > 0 || mailImport) && (
|
||||
<MAdminCard>
|
||||
<MGroupHead icon={Link2} label={t('admin.addons.type.integration')} hint={t('admin.addons.integrationHint')} />
|
||||
{aiAddons.length > 0 && <MAiAddons addons={aiAddons} onToggle={handleToggle} />}
|
||||
{integrationAddons.map((addon, i) => (
|
||||
<MAddonRow key={addon.id} addon={addon} onToggle={handleToggle} t={t} first={i === 0 && aiAddons.length === 0} />
|
||||
))}
|
||||
{mailImport && <MMailIngestAdminCard first={integrationAddons.length === 0 && aiAddons.length === 0} />}
|
||||
</MAdminCard>
|
||||
)}
|
||||
</>
|
||||
@@ -216,16 +231,28 @@ interface MAddonRowProps {
|
||||
function MAddonRow({ addon, onToggle, t, first }: MAddonRowProps) {
|
||||
const label = getAddonLabel(t, addon)
|
||||
return (
|
||||
<div className={`flex items-center gap-3 py-[11px] ${first ? '' : 'border-t border-[color:var(--m-rowbr)]'}`}>
|
||||
{/* overflow-hidden so a brand mark that fills the slot keeps its rounded corners. */}
|
||||
<span className="flex h-[38px] w-[38px] flex-none items-center justify-center overflow-hidden rounded-[11px] bg-[color:var(--m-ic)] text-m-ink">
|
||||
<AddonIcon name={addon.icon} size={18} enabled={addon.enabled} />
|
||||
</span>
|
||||
<div className="min-w-0 flex-1">
|
||||
<MHintLabel label={label.name} hint={label.description} />
|
||||
</div>
|
||||
<MToggle checked={addon.enabled} ariaLabel={label.name} onChange={() => onToggle(addon)} />
|
||||
</div>
|
||||
<MAdminOptionRow
|
||||
icon={<AddonIcon name={addon.icon} size={18} enabled={addon.enabled} />}
|
||||
title={label.name}
|
||||
hint={label.description}
|
||||
first={first}
|
||||
trailing={<MToggle checked={addon.enabled} ariaLabel={label.name} onChange={() => onToggle(addon)} />}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/** Live flight status as a trip row, locked with a word when the server environment holds it. */
|
||||
function MFlightLiveRow({ option, first }: { option: FlightLiveOption; first: boolean }) {
|
||||
const { t } = useTranslation()
|
||||
const hint = option.managed ? t('flightLive.adminHintManaged') : t('flightLive.adminHint')
|
||||
return (
|
||||
<MAdminOptionRow
|
||||
icon={<Radar size={18} />}
|
||||
title={t('flightLive.adminTitle')}
|
||||
hint={option.locked ? `${hint} ${t('flightLive.envLocked')}` : hint}
|
||||
first={first}
|
||||
trailing={<MToggle checked={option.on} ariaLabel={t('flightLive.adminToggle')} disabled={option.locked} onChange={option.onToggle} />}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -301,17 +328,7 @@ function MAiAddons({ addons, onToggle }: { addons: Addon[]; onToggle: (addon: Ad
|
||||
/>
|
||||
)
|
||||
})}
|
||||
{tile.canSetUp && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={tile.openDialog}
|
||||
className="flex w-full items-center gap-3 border-t border-[color:var(--m-rowbr)] py-[11px] ps-[50px] text-start"
|
||||
>
|
||||
<Settings2 size={14} className="flex-none text-m-faint" />
|
||||
<span className="min-w-0 flex-1 truncate text-[0.75rem] font-bold text-m-ink">{t('admin.addons.ai.setup')}</span>
|
||||
<ChevronRight size={15} className="flex-none text-m-faint rtl:rotate-180" />
|
||||
</button>
|
||||
)}
|
||||
{tile.canSetUp && <MAdminSetupRow label={t('admin.addons.ai.setup')} onOpen={tile.openDialog} />}
|
||||
{tile.dialogOpen && <AiSettingsDialog addons={addons} onClose={tile.closeDialog} />}
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
Waves,
|
||||
WifiOff,
|
||||
} from 'lucide-react';
|
||||
import { useState } from 'react';
|
||||
import {
|
||||
AUTO_LOAD_MODES,
|
||||
autoLoadSizes,
|
||||
@@ -28,8 +29,9 @@ import { useTranslation } from '../../../i18n';
|
||||
import { formatDisplayDate } from '../../../utils/dateFormat';
|
||||
import MBadge from '../../components/MBadge';
|
||||
import MChip from '../../components/MChip';
|
||||
import MSheet from '../../components/MSheet';
|
||||
import MConfirmSheet from '../settings/MConfirmSheet';
|
||||
import { MAdminButton, MAdminCard, MAdminClampedText } from './MAdminUi';
|
||||
import { MAdminButton, MAdminClampedText, MAdminSetupRow, MAdminSheetFrame } from './MAdminUi';
|
||||
|
||||
type Admin = ReturnType<typeof usePaddleRegionsAdmin>;
|
||||
|
||||
@@ -393,32 +395,49 @@ function Regions({ admin }: { admin: Admin }) {
|
||||
|
||||
/**
|
||||
* PAD-05A/PAD-11C on the phone: the regions TREK reads paddle data for, how it
|
||||
* loads a paddler's region by itself and the regions that wait for an admin.
|
||||
* usePaddleRegionsAdmin is the desktop card's state; this is only the markup.
|
||||
* loads a paddler's region by itself and the regions that wait for an admin, as
|
||||
* a row under the Tours addon that opens them in a sheet. The row counts the
|
||||
* open requests, else the regions. usePaddleRegionsAdmin is the desktop
|
||||
* dialog's state; this is only the markup.
|
||||
*/
|
||||
export default function MAdminPaddleRegionsPanel() {
|
||||
const { t } = useTranslation();
|
||||
const admin = usePaddleRegionsAdmin();
|
||||
const [open, setOpen] = useState(false);
|
||||
if (!admin.toursOn) return null;
|
||||
const title = t('admin.paddleRegions.title');
|
||||
// A declined request no longer waits for anyone; only the open ones ask for a look.
|
||||
const waiting = admin.requests.filter((r) => !r.declined).length;
|
||||
const badge =
|
||||
waiting > 0 ? (
|
||||
<MBadge caps={false} tone="strong">
|
||||
{waiting}
|
||||
</MBadge>
|
||||
) : admin.regions.length > 0 ? (
|
||||
<MBadge caps={false}>{admin.regions.length}</MBadge>
|
||||
) : undefined;
|
||||
return (
|
||||
<MAdminCard>
|
||||
<div className="flex items-start gap-3">
|
||||
<span className="flex h-[38px] w-[38px] flex-none items-center justify-center rounded-[11px] bg-[color:var(--m-ic)] text-m-ink">
|
||||
<Waves size={18} />
|
||||
</span>
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="min-w-0 truncate text-[length:calc(14px*var(--fs-scale-body,1))] font-extrabold text-m-ink">
|
||||
{t('admin.paddleRegions.title')}
|
||||
</span>
|
||||
{admin.regions.length > 0 && <MBadge caps={false}>{admin.regions.length}</MBadge>}
|
||||
</div>
|
||||
<MAdminClampedText className="mt-[2px] text-[length:calc(10px*var(--fs-scale-caption,1))]">
|
||||
{t('admin.paddleRegions.hint')}
|
||||
</MAdminClampedText>
|
||||
</div>
|
||||
</div>
|
||||
<>
|
||||
<MAdminSetupRow label={title} onOpen={() => setOpen(true)} badge={badge} />
|
||||
{open && (
|
||||
<MSheet open onClose={() => setOpen(false)} variant="bottom" material="glass" ariaLabel={title}>
|
||||
<MAdminSheetFrame icon={<Waves size={19} strokeWidth={1.8} />} title={title} onClose={() => setOpen(false)}>
|
||||
<p className="m-0 font-geist text-[length:calc(10px*var(--fs-scale-caption,1))] leading-relaxed text-m-muted">
|
||||
{t('admin.paddleRegions.hint')}
|
||||
</p>
|
||||
<PanelBody admin={admin} />
|
||||
</MAdminSheetFrame>
|
||||
</MSheet>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/** What the sheet holds: the state of the list, the settings, the requests, the search and the regions. */
|
||||
function PanelBody({ admin }: { admin: Admin }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
{admin.offline && (
|
||||
<p
|
||||
role="status"
|
||||
@@ -462,6 +481,6 @@ export default function MAdminPaddleRegionsPanel() {
|
||||
danger
|
||||
onConfirm={admin.confirmRemove}
|
||||
/>
|
||||
</MAdminCard>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ import type { useAdmin } from '../../../pages/admin/useAdmin'
|
||||
import MToggle from '../../components/MToggle'
|
||||
import { MBlockDisclosure, MProviderBlock, MTrekApiBlock } from './MApiProviderBlocks'
|
||||
import MAdminOidcCard from './MAdminOidcCard'
|
||||
import MMailIngestAdminCard from './MMailIngestAdminCard'
|
||||
import MAdminGoogleDailyLimit from './MAdminGoogleDailyLimit'
|
||||
import MAdminPlaceContrib from './MAdminPlaceContrib'
|
||||
import MAdminServiceQuota from './MAdminServiceQuota'
|
||||
@@ -27,41 +26,22 @@ interface MAdminSettingsSectionProps {
|
||||
t: TranslationFn
|
||||
/**
|
||||
* Which section this renders, cut the way the desktop tabs are: who may sign
|
||||
* in and what it takes (security), what the install talks to outside
|
||||
* (services), and the setup of the features the addons switch on (features).
|
||||
* in and what it takes (security) or what the install talks to outside
|
||||
* (services). Live flight status and the booking mail import are rows of the
|
||||
* addon groups (MAdminAddonManager).
|
||||
*/
|
||||
part: 'security' | 'services' | 'features'
|
||||
part: 'security' | 'services'
|
||||
}
|
||||
|
||||
type PartProps = Omit<MAdminSettingsSectionProps, 'part'>
|
||||
|
||||
// The admin's security, services and feature setup sections as phone cards,
|
||||
// The admin's security and services sections as phone cards,
|
||||
// one function each. All state and mutations come from useAdmin.
|
||||
export default function MAdminSettingsSection({ admin, t, part }: MAdminSettingsSectionProps) {
|
||||
if (part === 'features') return <FeaturesPart admin={admin} t={t} />
|
||||
if (part === 'security') return <SecurityPart admin={admin} t={t} />
|
||||
return <ServicesPart admin={admin} t={t} />
|
||||
}
|
||||
|
||||
/** Live flights and booking mails: how the integrations of the addons tab reach the world. */
|
||||
function FeaturesPart({ admin, t }: PartProps) {
|
||||
const { managed, flightLive, setFlightLive, flightLiveLocked, handleToggleAuthSetting } = admin
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
{/* Live flight status: open ADS-B data, no key, on by default (desktop parity). */}
|
||||
<FlightLiveCard
|
||||
t={t}
|
||||
managed={!!managed}
|
||||
on={flightLive}
|
||||
locked={flightLiveLocked}
|
||||
onChange={(v) => void handleToggleAuthSetting('flight_live_enabled', v, setFlightLive)}
|
||||
/>
|
||||
{/* Booking mail import: self-hosted only, the operator runs the TREK Cloud relay (desktop parity). */}
|
||||
{!managed && <MMailIngestAdminCard />}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/** Who may sign in and what it takes, with the one destructive action last. */
|
||||
function SecurityPart({ admin, t }: PartProps) {
|
||||
const {
|
||||
@@ -482,23 +462,3 @@ function ServicesPart({ admin, t }: PartProps) {
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/** The live flight status switch, locked with a word when the server environment holds it. */
|
||||
function FlightLiveCard({ t, managed, on, locked, onChange }: {
|
||||
t: TranslationFn
|
||||
managed: boolean
|
||||
on: boolean
|
||||
locked: boolean
|
||||
onChange: (on: boolean) => void
|
||||
}) {
|
||||
return (
|
||||
<MAdminCard>
|
||||
<MAdminCardHead title={t('flightLive.adminTitle')} hint={managed ? t('flightLive.adminHintManaged') : t('flightLive.adminHint')} />
|
||||
<MAdminRow
|
||||
title={t('flightLive.adminToggle')}
|
||||
hint={locked ? t('flightLive.envLocked') : undefined}
|
||||
trailing={<MToggle checked={on} ariaLabel={t('flightLive.adminToggle')} disabled={locked} onChange={onChange} />}
|
||||
/>
|
||||
</MAdminCard>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { InputHTMLAttributes, ReactNode, useState } from 'react'
|
||||
import { ChevronDown, Eye, EyeOff, Loader2, X } from 'lucide-react'
|
||||
import { ChevronDown, ChevronRight, Eye, EyeOff, Loader2, Settings2, X } from 'lucide-react'
|
||||
import { useTranslation } from '../../../i18n'
|
||||
import MIconBtn from '../../components/MIconBtn'
|
||||
import MHintLabel from '../../components/MHintLabel'
|
||||
@@ -61,6 +61,58 @@ export function MAdminRow({
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A row of the addons screen: the icon tile, the name with its description
|
||||
* behind the info mark, and the switch. Addons and the instance options that
|
||||
* sit with them (live flight status, booking mails) share it.
|
||||
*/
|
||||
export function MAdminOptionRow({
|
||||
icon,
|
||||
title,
|
||||
hint,
|
||||
trailing,
|
||||
first = false,
|
||||
}: {
|
||||
icon: ReactNode
|
||||
title: string
|
||||
hint?: string
|
||||
trailing: ReactNode
|
||||
first?: boolean
|
||||
}) {
|
||||
return (
|
||||
<div className={`flex items-center gap-3 py-[11px] ${first ? '' : 'border-t border-[color:var(--m-rowbr)]'}`}>
|
||||
{/* overflow-hidden so a brand mark that fills the slot keeps its rounded corners. */}
|
||||
<span className="flex h-[38px] w-[38px] flex-none items-center justify-center overflow-hidden rounded-[11px] bg-[color:var(--m-ic)] text-m-ink">
|
||||
{icon}
|
||||
</span>
|
||||
<div className="min-w-0 flex-1">
|
||||
<MHintLabel label={title} hint={hint} />
|
||||
</div>
|
||||
{trailing}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* The last row under an addon that opens its settings: a gear, what it sets up,
|
||||
* an optional badge for what waits inside, and a chevron (AI, booking mails,
|
||||
* paddle water data).
|
||||
*/
|
||||
export function MAdminSetupRow({ label, onOpen, badge }: { label: string; onOpen: () => void; badge?: ReactNode }) {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
onClick={onOpen}
|
||||
className="flex w-full items-center gap-3 border-t border-[color:var(--m-rowbr)] py-[11px] ps-[50px] text-start"
|
||||
>
|
||||
<Settings2 size={14} className="flex-none text-m-faint" />
|
||||
<span className="min-w-0 flex-1 truncate text-[length:calc(12px*var(--fs-scale-body,1))] font-bold text-m-ink">{label}</span>
|
||||
{badge}
|
||||
<ChevronRight size={15} className="flex-none text-m-faint rtl:rotate-180" />
|
||||
</button>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A description that keeps to two lines until it is tapped. On a phone the long
|
||||
* ones (a map provider's terms, how a loader decides) pushed every control off
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Inbox, Upload, Webhook, type LucideIcon } from 'lucide-react';
|
||||
import { Inbox, Mail, Upload, Webhook, type LucideIcon } from 'lucide-react';
|
||||
import { useState } from 'react';
|
||||
import {
|
||||
TRANSPORTS,
|
||||
problemText,
|
||||
@@ -15,15 +16,16 @@ import { useTranslation } from '../../../i18n';
|
||||
import type { TranslationFn } from '../../../types';
|
||||
import { relativeTime } from '../../../utils/relativeTime';
|
||||
import MSegmented from '../../components/MSegmented';
|
||||
import MSheet from '../../components/MSheet';
|
||||
import MToggle from '../../components/MToggle';
|
||||
import {
|
||||
MAdminButton,
|
||||
MAdminCard,
|
||||
MAdminCardHead,
|
||||
MAdminField,
|
||||
MAdminInput,
|
||||
MAdminRow,
|
||||
MAdminOptionRow,
|
||||
MAdminSecretInput,
|
||||
MAdminSetupRow,
|
||||
MAdminSheetFrame,
|
||||
} from './MAdminUi';
|
||||
|
||||
interface PartProps {
|
||||
@@ -250,19 +252,23 @@ function Setup({ admin, form, t, locale }: PartProps & { locale: string }) {
|
||||
}
|
||||
|
||||
/**
|
||||
* The booking mail import in the phone's admin settings, the same card as on
|
||||
* the desktop (useMailIngestAdmin): the switch, how mail arrives, the address
|
||||
* template, the AI allowance, the test and the status. Self-hosted only.
|
||||
* The booking mail import as a row of the phone's integration group, the same
|
||||
* as on the desktop (useMailIngestAdmin): the switch, and while it is on a row
|
||||
* to the sheet that sets it up (how mail arrives, the address template, the AI
|
||||
* allowance, the test and the status). Self-hosted only.
|
||||
*/
|
||||
export default function MMailIngestAdminCard() {
|
||||
export default function MMailIngestAdminCard({ first = false }: { first?: boolean }) {
|
||||
const { t, locale } = useTranslation();
|
||||
const admin = useMailIngestAdmin(true);
|
||||
const [open, setOpen] = useState(false);
|
||||
const setupLabel = t('mailAdmin.setup');
|
||||
return (
|
||||
<MAdminCard>
|
||||
<MAdminCardHead title={t('mailAdmin.title')} hint={t('mailAdmin.hint')} />
|
||||
<MAdminRow
|
||||
title={t('mailAdmin.enabled')}
|
||||
hint={t('mailAdmin.enabledHint')}
|
||||
<>
|
||||
<MAdminOptionRow
|
||||
icon={<Mail size={18} />}
|
||||
title={t('mailAdmin.title')}
|
||||
hint={`${t('mailAdmin.hint')} ${t('mailAdmin.enabledHint')}`}
|
||||
first={first}
|
||||
trailing={
|
||||
<MToggle
|
||||
checked={admin.enabled}
|
||||
@@ -272,7 +278,18 @@ export default function MMailIngestAdminCard() {
|
||||
/>
|
||||
}
|
||||
/>
|
||||
{admin.enabled && admin.form && <Setup admin={admin} form={admin.form} t={t} locale={locale} />}
|
||||
</MAdminCard>
|
||||
{admin.enabled && admin.form && <MAdminSetupRow label={setupLabel} onOpen={() => setOpen(true)} />}
|
||||
{open && admin.enabled && admin.form && (
|
||||
<MSheet open onClose={() => setOpen(false)} variant="bottom" material="glass" ariaLabel={setupLabel}>
|
||||
<MAdminSheetFrame
|
||||
icon={<Mail size={19} strokeWidth={1.8} />}
|
||||
title={setupLabel}
|
||||
onClose={() => setOpen(false)}
|
||||
>
|
||||
<Setup admin={admin} form={admin.form} t={t} locale={locale} />
|
||||
</MAdminSheetFrame>
|
||||
</MSheet>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ export default function MAtlas() {
|
||||
return (
|
||||
// h-dvh, not h-full: the shell stopped providing a definite height (#1809)
|
||||
// and a map on a percentage of an auto-height parent collapses to zero.
|
||||
<div ref={rootRef} className="m-bleed relative h-dvh overflow-hidden">
|
||||
<div ref={rootRef} className="m-bleed m-corner-own relative h-dvh overflow-hidden">
|
||||
<div ref={mapRef} className="absolute inset-0 z-[1] bg-[color:var(--m-mapb)] [&_.leaflet-control-zoom]:hidden" />
|
||||
{/* Region hover tooltip — positioned imperatively by useAtlas. */}
|
||||
<div
|
||||
|
||||
@@ -50,7 +50,7 @@ export default function MAtlasSearch({
|
||||
const q = query.trim().toLowerCase()
|
||||
const rows = q ? options.filter((o) => o.label.toLowerCase().includes(q)).slice(0, 6) : suggestions
|
||||
|
||||
const scrimCls = 'm-fade-in fixed inset-0 z-[70] flex flex-col bg-[rgba(16,16,19,.28)] px-[18px] pt-[calc(var(--m-safe-top,12px)+12px)] backdrop-blur-[22px] backdrop-saturate-[1.6] wide:pt-[calc(var(--m-safe-top,12px)+72px)] wide:[&>*]:mx-auto wide:[&>*]:w-full wide:[&>*]:max-w-[640px]' // theme-lint-disable — fixed scrim value from the design
|
||||
const scrimCls = 'm-fade-in fixed inset-0 z-[70] flex flex-col bg-[rgba(16,16,19,.28)] px-[18px] pt-[max(calc(var(--m-safe-top,12px)+12px),var(--m-corner-clear,0px))] backdrop-blur-[22px] backdrop-saturate-[1.6] wide:pt-[calc(var(--m-safe-top,12px)+72px)] wide:[&>*]:mx-auto wide:[&>*]:w-full wide:[&>*]:max-w-[640px]' // theme-lint-disable — fixed scrim value from the design
|
||||
|
||||
return (
|
||||
<div
|
||||
|
||||
@@ -220,7 +220,7 @@ export default function MCollections() {
|
||||
// Map view fills the viewport like the trip and journal maps do (#2104);
|
||||
// h-dvh because the shell owns no scroll container (#1809). List view
|
||||
// keeps the document as the scroller.
|
||||
className={`px-4 pb-[calc(var(--bottom-nav-h,84px)+12px)] pt-[var(--m-safe-top,12px)] wide:px-6 split:grid split:grid-cols-[260px_minmax(0,1fr)] split:gap-8 ${c.view === 'map' ? 'flex h-dvh flex-col overflow-hidden' : 'wide:mx-auto wide:max-w-[1040px] split:max-w-[1240px] split:items-start'}`}
|
||||
className={`m-corner-flow px-4 pb-[calc(var(--bottom-nav-h,84px)+12px)] pt-[var(--m-safe-top,12px)] wide:px-6 split:grid split:grid-cols-[260px_minmax(0,1fr)] split:gap-8 ${c.view === 'map' ? 'flex h-dvh flex-col overflow-hidden' : 'wide:mx-auto wide:max-w-[1040px] split:max-w-[1240px] split:items-start'}`}
|
||||
>
|
||||
{split && (
|
||||
<nav
|
||||
|
||||
@@ -66,7 +66,7 @@ export default function MUserMenu({ open, onClose }: MUserMenuProps): React.Reac
|
||||
}
|
||||
|
||||
return (
|
||||
<MDropdownPanel open={open} onClose={onClose} className="end-4 top-[calc(var(--m-safe-top,12px)+68px)]">
|
||||
<MDropdownPanel open={open} onClose={onClose} className="m-corner-beside end-4 top-[calc(var(--m-safe-top,12px)+68px)]">
|
||||
<div className="flex items-center gap-[10px] p-[10px_10px_12px]">
|
||||
<span className="flex h-10 w-10 flex-none items-center justify-center overflow-hidden rounded-full bg-[image:linear-gradient(135deg,#6A6A74,#1A1A1E)] text-[0.9375rem] font-bold text-white">
|
||||
{user?.avatar_url
|
||||
|
||||
@@ -346,7 +346,7 @@ export default function MJourneyDetail({ journeyId, embedded = false }: JourneyD
|
||||
return (
|
||||
// h-dvh, not h-full: the shell stopped providing a definite height (#1809)
|
||||
// and a map on a percentage of an auto-height parent collapses to zero.
|
||||
<div ref={rootRef} className="m-bleed relative h-dvh overflow-hidden" style={headSlot ? IN_SHELL_ROW : undefined}>
|
||||
<div ref={rootRef} className="m-bleed m-corner-own relative h-dvh overflow-hidden" style={headSlot ? IN_SHELL_ROW : undefined}>
|
||||
{/* Integrated map — always mounted, the gallery overlays it. Beside the feed
|
||||
it begins where the feed ends, so its controls and its framing stay in
|
||||
the part that can be seen. */}
|
||||
@@ -358,7 +358,7 @@ export default function MJourneyDetail({ journeyId, embedded = false }: JourneyD
|
||||
ref={mapRef}
|
||||
layers={mapLayers}
|
||||
hideLayerControl
|
||||
controlsTop="calc(var(--m-safe-top, 12px) + 50px)"
|
||||
controlsTop="max(calc(var(--m-safe-top, 12px) + 50px), var(--m-corner-clear, 0px))"
|
||||
// Its satellite switch sits in the bar above, beside the menu.
|
||||
baseLayer={mapBase}
|
||||
onOpenEntry={handleMarkerClick}
|
||||
@@ -382,7 +382,7 @@ export default function MJourneyDetail({ journeyId, embedded = false }: JourneyD
|
||||
|
||||
{/* Gallery tab overlay */}
|
||||
{view === 'gallery' && (
|
||||
<div className="m-span-x absolute inset-y-0 z-[5] overflow-y-auto bg-[color:var(--m-bg)] bg-[image:var(--m-scr)] px-4 pt-[calc(var(--m-safe-top,12px)+56px)] pb-[calc(var(--bottom-nav-h,84px)+16px)] wide:px-6">
|
||||
<div className="m-span-x absolute inset-y-0 z-[5] overflow-y-auto bg-[color:var(--m-bg)] bg-[image:var(--m-scr)] px-4 pt-[max(calc(var(--m-safe-top,12px)+56px),var(--m-corner-clear,0px))] pb-[calc(var(--bottom-nav-h,84px)+16px)] wide:px-6">
|
||||
{gallery.length === 0 ? (
|
||||
<div className="flex min-h-full flex-col items-center justify-center px-8 py-10 text-center">
|
||||
<MDancingTrek scene="journey" className="mb-2" />
|
||||
|
||||
@@ -29,7 +29,7 @@ import { useDayPreviewStore } from '../../dayPreviewStore'
|
||||
import { useIsSplit, useIsWide } from '../../../hooks/sizeClass'
|
||||
import MTripRail from './MTripRail'
|
||||
import {
|
||||
CollabSegment, CompactToggle, DockMoreButton, DocSyncButton, GlassSegment, HeaderActions, PrimaryPill, ROW_AFTER_BACK, ROW_CENTRED,
|
||||
CHROME_ROW, CollabSegment, CompactToggle, DockMoreButton, DocSyncButton, GlassSegment, HeaderActions, PrimaryPill, ROW_AFTER_BACK, ROW_CENTRED,
|
||||
} from './MTripShellParts'
|
||||
import { edgeFadeClass, useEdgeFade } from '../../components/useEdgeFade'
|
||||
import { useShortcuts } from '../../keyboard/useShortcuts'
|
||||
@@ -634,13 +634,15 @@ export default function MTripShell({
|
||||
)}
|
||||
{!MAP_TABS.has(trTab) && (
|
||||
<div className="absolute inset-0 z-30 bg-[color:var(--m-bg)] bg-[image:var(--m-scr)] wide:start-[var(--m-rail-w)]">
|
||||
<TabPanel planner={planner} shell={shell} tab={trTab} />
|
||||
<div className="m-corner-side relative h-full">
|
||||
<TabPanel planner={planner} shell={shell} tab={trTab} />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ── Day chips (z-25 — covered by non-plan tab overlays, stays mounted) ── */}
|
||||
{days.length > 0 && (
|
||||
<div className={`absolute end-4 start-[calc(var(--m-rail-w,0px)+16px)] z-[25] flex gap-[6px] top-[calc(var(--m-safe-top,12px)+50px)] ${chromeSpan}`}>
|
||||
<div className={`${CHROME_ROW} z-[25] flex gap-[6px] top-[calc(var(--m-safe-top,12px)+50px)] ${chromeSpan}`}>
|
||||
{/* The glass is the outer box, the scroller sits inside its padding: that way
|
||||
the fade at an edge that runs on takes the chips, not the glass's rim. */}
|
||||
<div className="relative flex min-w-0 flex-1 rounded-full border border-[color:var(--m-gbr)] bg-[color:var(--m-glass)] p-[3px] backdrop-blur-[24px] backdrop-saturate-[1.7]">
|
||||
@@ -711,7 +713,7 @@ export default function MTripShell({
|
||||
)}
|
||||
|
||||
{/* ── Top controls (z-42 — above every layer incl. tab overlays) ── */}
|
||||
<div className={`absolute end-4 start-[calc(var(--m-rail-w,0px)+16px)] z-[42] flex h-10 items-center justify-between top-[var(--m-safe-top,12px)] ${chromeSpan}`}>
|
||||
<div className={`${CHROME_ROW} z-[42] flex h-10 items-center justify-between top-[var(--m-safe-top,12px)] ${chromeSpan}`}>
|
||||
<MIconBtn ariaLabel={t('common.back')} onClick={() => navigate('/dashboard')} className="backdrop-blur-[24px] backdrop-saturate-[1.7]">
|
||||
<ChevronLeft size={19} strokeWidth={2.2} />
|
||||
</MIconBtn>
|
||||
|
||||
@@ -64,6 +64,12 @@ export function GlassSegment({ children, activeKey }: { children: ReactNode; act
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The box of the trip's floating rows (the top controls, the day chips): the page's width after
|
||||
* the rail, beside an element in a top corner such as a Duo's status capsule (mobile.css).
|
||||
*/
|
||||
export const CHROME_ROW = 'm-corner-beside absolute end-4 start-[calc(var(--m-rail-w,0px)+16px)]';
|
||||
|
||||
/** A phone's header group: after the back button (transports, bookings), or centred on the bar (costs, files). */
|
||||
export const ROW_AFTER_BACK = 'absolute start-[52px] end-2 justify-center';
|
||||
export const ROW_CENTRED = 'absolute inset-x-0 mx-auto w-fit';
|
||||
|
||||
@@ -216,10 +216,10 @@ export function AssistantScreen({ tripId, tripTitle, hidden, hops, onOpenTripCha
|
||||
hidden={hidden}
|
||||
tabIndex={-1}
|
||||
onKeyDown={(e) => keepTabInside(e, sectionRef.current)}
|
||||
className={`fixed inset-0 z-[var(--z-bar)] ${hidden ? 'hidden' : 'flex'} m-panel-in flex-col bg-[var(--m-bg)] bg-[image:var(--m-scr)] text-m-ink outline-none wide:inset-auto wide:bottom-3 wide:end-3 wide:top-3 wide:w-[min(500px,calc(100vw-var(--m-rail-w,0px)-24px))] wide:overflow-hidden wide:rounded-[28px] wide:border wide:border-[color:var(--m-shbr)] wide:shadow-modal`}
|
||||
className={`m-corner-side fixed inset-0 z-[var(--z-bar)] ${hidden ? 'hidden' : 'flex'} m-panel-in flex-col bg-[var(--m-bg)] bg-[image:var(--m-scr)] text-m-ink outline-none wide:inset-auto wide:bottom-3 wide:end-3 wide:top-3 wide:w-[min(500px,calc(100vw-var(--m-rail-w,0px)-24px))] wide:overflow-hidden wide:rounded-[28px] wide:border wide:border-[color:var(--m-shbr)] wide:shadow-modal`}
|
||||
style={{ paddingBottom: `max(env(safe-area-inset-bottom, 0px), ${keyboard}px)` }}
|
||||
>
|
||||
<header className="flex flex-none items-center gap-2 px-4 pb-2 pt-[var(--m-safe-top,12px)] wide:pt-3">
|
||||
<header className="m-corner-beside-in flex flex-none items-center gap-2 px-4 pb-2 pt-[var(--m-safe-top,12px)] wide:pt-3">
|
||||
<MIconBtn ariaLabel={t('common.back')} onClick={close}>
|
||||
<ChevronLeft size={19} strokeWidth={2.2} />
|
||||
</MIconBtn>
|
||||
@@ -256,7 +256,7 @@ export function AssistantScreen({ tripId, tripTitle, hidden, hops, onOpenTripCha
|
||||
<MDropdownPanel
|
||||
open={panel === 'history'}
|
||||
onClose={() => setPanel(null)}
|
||||
className="end-4 top-[calc(var(--m-safe-top,12px)+48px)] max-h-[60vh] overflow-y-auto"
|
||||
className="m-corner-beside-in end-4 top-[calc(var(--m-safe-top,12px)+48px)] max-h-[60vh] overflow-y-auto"
|
||||
>
|
||||
<MListRow icon={Plus} label={t('assistant.history.new')} onClick={() => pick(thread.newThread)} />
|
||||
{threads.length === 0 ? (
|
||||
@@ -285,7 +285,7 @@ export function AssistantScreen({ tripId, tripTitle, hidden, hops, onOpenTripCha
|
||||
<MDropdownPanel
|
||||
open={panel === 'menu'}
|
||||
onClose={() => setPanel(null)}
|
||||
className="end-4 top-[calc(var(--m-safe-top,12px)+48px)]"
|
||||
className="m-corner-beside-in end-4 top-[calc(var(--m-safe-top,12px)+48px)]"
|
||||
>
|
||||
{tripChat && (
|
||||
<MListRow
|
||||
|
||||
@@ -8,7 +8,7 @@ import PoiCategoryPill from '../../../../components/Map/PoiCategoryPill'
|
||||
import { usePoiExplore } from '../../../../components/Map/usePoiExplore'
|
||||
import { useMergedMapPois } from '../../../../components/Map/useMergedMapPois'
|
||||
import { firstStopOfPlace, stageOf } from '../../../../components/Roadtrip/roadtripRowModel'
|
||||
import { stageMapData } from '../../../../components/Roadtrip/stageMap'
|
||||
import { stageConnectionIds, stageMapData } from '../../../../components/Roadtrip/stageMap'
|
||||
import { usePlanMapViewport } from '../../../../hooks/usePlanMapViewport'
|
||||
import { useIsDark } from '../../../../hooks/useIsDark'
|
||||
import { useTileUrl } from '../../../../hooks/useTileUrl'
|
||||
@@ -21,6 +21,7 @@ import { RT_ALT_BAR_LIFT } from '../roadtrip/useMRtAlternatives'
|
||||
import type { MMapAreaProps } from '../MTripShell'
|
||||
import type { Poi } from '../../../../components/Map/poiCategories'
|
||||
import type { ViewportPadding } from '../../../../utils/mapViewport'
|
||||
import { runsOnDay } from '../../../../utils/reservationRoutes'
|
||||
|
||||
/** One array, so an explore set switched off does not move every pin on the stage. */
|
||||
const NO_POIS: Poi[] = []
|
||||
@@ -215,6 +216,20 @@ export default function MMapArea({ planner, shell }: MMapAreaProps) {
|
||||
() => onStage ? stageMapData(planner.roadtripRoutes, stage, !!dayColorsOn) : null,
|
||||
[onStage, planner.roadtripRoutes, stage, dayColorsOn],
|
||||
)
|
||||
// The arcs the stage draws: its own rides and what was switched on for its day. The
|
||||
// all-days view keeps every ride of the drive.
|
||||
const stageConnections = useMemo(() => {
|
||||
if (!onStage) return null
|
||||
if (!stage) return planner.roadtripConnections
|
||||
const byId = new Map(planner.reservations.map(r => [r.id, r]))
|
||||
return stageConnectionIds(stage, planner.visibleConnections, id => {
|
||||
const r = byId.get(id)
|
||||
return !r || runsOnDay(r, planner.selectedDayId, planner.days)
|
||||
})
|
||||
}, [
|
||||
onStage, stage, planner.roadtripConnections, planner.reservations,
|
||||
planner.visibleConnections, planner.selectedDayId, planner.days,
|
||||
])
|
||||
|
||||
// Only what the stage carries, so a trip's other 200 pins stay off a screen that
|
||||
// is answering one question. Without a stage (the all-days view) every place a stored
|
||||
@@ -412,10 +427,11 @@ export default function MMapArea({ planner, shell }: MMapAreaProps) {
|
||||
// toggled on or not, the way the desktop map does it in road trip mode. The
|
||||
// ride's leg carries no geometry, so without this the road ended at the
|
||||
// departure terminal and picked up again at the arrival with nothing between.
|
||||
visibleConnectionIds={onStage ? planner.roadtripConnections : planner.visibleConnections}
|
||||
visibleConnectionIds={stageConnections ?? planner.visibleConnections}
|
||||
// The plan map shows one day, so a booking switched on for another day stays off
|
||||
// it until that day is picked, or the whole trip is. The switch itself is still
|
||||
// trip-wide. The stage keeps its seamed rides whatever day they were booked on.
|
||||
// trip-wide. The stage scopes its own set above, since its seamed rides stay on
|
||||
// it whatever day they were booked on.
|
||||
scopeConnectionsToDay={!onStage}
|
||||
// Transport overlay tap → the mobile transport detail sheet (desktop
|
||||
// routes this through mapTransportDetail into the day sidebar instead).
|
||||
@@ -457,7 +473,7 @@ export default function MMapArea({ planner, shell }: MMapAreaProps) {
|
||||
<div
|
||||
// Beside the trip's pane nothing lies over the map, so the bar takes the
|
||||
// top edge, level with the pane's own top row.
|
||||
className={`pointer-events-none absolute end-4 start-[calc(var(--trip-map-inset,0px)+16px)] z-[25] flex flex-col items-center gap-2 ${
|
||||
className={`m-corner-beside pointer-events-none absolute end-4 start-[calc(var(--trip-map-inset,0px)+16px)] z-[25] flex flex-col items-center gap-2 ${
|
||||
shell.paneOpen ? 'top-[var(--m-safe-top,12px)]' : 'top-[calc(var(--m-safe-top,12px)+96px)]'
|
||||
}`}
|
||||
>
|
||||
|
||||
@@ -117,7 +117,7 @@ export default function MPlacesBrowser({ planner, shell }: MPlacesBrowserProps)
|
||||
|
||||
return (
|
||||
<div className="flex h-full flex-col">
|
||||
<div className="min-h-0 flex-1 overflow-x-hidden overflow-y-auto px-4 pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[calc(var(--m-safe-top,12px)+58px)]">
|
||||
<div className="min-h-0 flex-1 overflow-x-hidden overflow-y-auto px-4 pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))]">
|
||||
{/* ── Places/Tours, the filter chips and Import (Add sits in the search row
|
||||
below to free space). The switch has a row of its own, except where the
|
||||
screen is short (a phone on its side): there it shares the chips' row,
|
||||
|
||||
@@ -212,7 +212,7 @@ function PlanDayPage({ planner, shell, dayId: pageDayId, active, editing, legMen
|
||||
Beside the map the card is the pane and runs down to that line, as the
|
||||
places list does; across the page it is as tall as its day, so a short
|
||||
day leaves no empty card under it. */}
|
||||
<div className="absolute inset-x-4 flex flex-col gap-3 top-[calc(var(--m-safe-top,12px)+102px)] bottom-[calc(env(safe-area-inset-bottom,0px)+90px)] wide:bottom-[calc(env(safe-area-inset-bottom,0px)+12px)]">
|
||||
<div className="absolute inset-x-4 flex flex-col gap-3 top-[max(calc(var(--m-safe-top,12px)+102px),var(--m-corner-clear,0px))] bottom-[calc(env(safe-area-inset-bottom,0px)+90px)] wide:bottom-[calc(env(safe-area-inset-bottom,0px)+12px)]">
|
||||
{!editing && <UpNextCard tl={tl} t={t} onOpen={openPlace} />}
|
||||
{editing && <EditHeader tl={tl} planner={planner} shell={shell} />}
|
||||
|
||||
@@ -508,12 +508,15 @@ function TimelineHeader({ tl, dayLabel, openLabel, weatherLabel, onOpenDay, onOp
|
||||
stayLabel: (chip: HotelChip) => string
|
||||
}) {
|
||||
const WeatherIcon = weatherIconFor(tl.weather?.main)
|
||||
const [strip, setStrip] = useState<HTMLSpanElement | null>(null)
|
||||
const stripFade = useEdgeFade(strip)
|
||||
return (
|
||||
<div className="flex items-center gap-1.5 border-b border-[color:var(--m-rowbr)] px-0.5 py-[9px]">
|
||||
{/* The one horizontal scroller inside the day pager. Nested scrolling is
|
||||
the browser's: while the chips overflow they pan first, and the pager
|
||||
takes over at their end or when they fit. */}
|
||||
<span className="flex min-w-0 items-center gap-1.5 overflow-x-auto">
|
||||
takes over at their end or when they fit. The ends fade while more
|
||||
waits behind them. */}
|
||||
<span ref={setStrip} className={`flex min-w-0 items-center gap-1.5 overflow-x-auto ${edgeFadeClass(stripFade)}`}>
|
||||
{/* The same glass controls as the edit header's: a round one when the day
|
||||
is already named above it, a pill with the day's name otherwise. */}
|
||||
<button
|
||||
@@ -532,20 +535,20 @@ function TimelineHeader({ tl, dayLabel, openLabel, weatherLabel, onOpenDay, onOp
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
{/* A stay gives way before anything else in the header does: its name ends
|
||||
in an ellipsis rather than under the edge or the weather (the chip's
|
||||
label says it whole), and the time after it stays. */}
|
||||
{/* A stay's name stands whole: two stays and the weather rarely fit a
|
||||
phone, and a name cut to a letter or two said nothing, so the strip
|
||||
scrolls instead of squeezing the chips. */}
|
||||
{tl.hotelChips.map(chip => (
|
||||
<button
|
||||
key={chip.key}
|
||||
type="button"
|
||||
onClick={() => onOpenStay(chip)}
|
||||
aria-label={stayLabel(chip)}
|
||||
className={`${GLASS_CHIP} min-w-[4.5rem] shrink gap-[5px] px-2.5`}
|
||||
className={`${GLASS_CHIP} gap-[5px] px-2.5`}
|
||||
>
|
||||
<HotelChipIcon variant={chip.variant} />
|
||||
{/* Its own direction, so a Latin name in an Arabic header is cut at its end, not its start. */}
|
||||
<span dir="auto" className="min-w-0 truncate">{chip.name}</span>
|
||||
{/* Its own direction, so a Latin name reads the right way in an Arabic header. */}
|
||||
<span dir="auto">{chip.name}</span>
|
||||
{chip.time && <span className="flex-none tabular-nums text-m-muted">{chip.time.slice(0, 5)}</span>}
|
||||
</button>
|
||||
))}
|
||||
|
||||
@@ -350,8 +350,11 @@ function TransitLegRows({ legs, t }: { legs: TransitLegDisplay[]; t: Translation
|
||||
const hasSeg = i < legs.length - 1
|
||||
return (
|
||||
<div key={i} className="flex gap-[9px]">
|
||||
<span className="w-9 flex-none pt-[9px] text-end font-geist text-[0.65625rem] font-semibold tabular-nums text-m-muted">
|
||||
{isWalk ? '' : leg.from?.time?.slice(0, 5) || ''}
|
||||
{/* A ride's departure stands beside its stops, its arrival at the
|
||||
bottom of its row, so the open card holds the whole journey (#3139). */}
|
||||
<span className="flex w-9 flex-none flex-col justify-between py-[9px] text-end font-geist text-[0.65625rem] font-semibold tabular-nums text-m-muted">
|
||||
<span>{isWalk ? '' : leg.from?.time?.slice(0, 5) || ''}</span>
|
||||
{!isWalk && leg.to?.time && <span className="text-m-faint">{leg.to.time.slice(0, 5)}</span>}
|
||||
</span>
|
||||
<div className="flex w-3 flex-none flex-col items-center">
|
||||
{isWalk ? (
|
||||
@@ -371,16 +374,16 @@ function TransitLegRows({ legs, t }: { legs: TransitLegDisplay[]; t: Translation
|
||||
</div>
|
||||
<div className="min-w-0 flex-1 py-[7px]">
|
||||
{isWalk ? (
|
||||
<div className="truncate font-geist text-[0.6875rem] font-semibold text-m-muted">
|
||||
<div className="break-words font-geist text-[0.6875rem] font-semibold text-m-muted [overflow-wrap:anywhere]">
|
||||
<Footprints size={10} strokeWidth={2.2} className="me-1 inline-block align-[-1px]" />
|
||||
{[mins ? t('transit.min', { count: mins }) : '', t('transit.walkTo', { name: leg.to?.name || '' })]
|
||||
.filter(Boolean).join(' · ')}
|
||||
</div>
|
||||
) : (
|
||||
<div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<LineBadge leg={leg} className="flex-none" />
|
||||
<span className="truncate text-[0.78125rem] font-bold">
|
||||
<div className="flex items-start gap-1.5">
|
||||
<LineBadge leg={leg} className="mt-px flex-none" />
|
||||
<span dir="auto" className="min-w-0 break-words text-[0.78125rem] font-bold [overflow-wrap:anywhere]">
|
||||
{flowText([leg.from?.name, leg.to?.name].filter((n): n is string => !!n))}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -64,7 +64,7 @@ export default function MRoadtripTab({ planner, shell }: MTripTabPanelProps) {
|
||||
// fall back to the trip's first routed day, which is not the one on screen, and every
|
||||
// distance it answered with would be measured against a road nobody is looking at.
|
||||
const searchBar = stage && (
|
||||
<div className="pointer-events-auto absolute inset-x-4 top-[calc(var(--m-safe-top,12px)+96px)] z-[26]">
|
||||
<div className="m-corner-beside pointer-events-auto absolute inset-x-4 top-[calc(var(--m-safe-top,12px)+96px)] z-[26]">
|
||||
<MRtCorridorBar planner={planner} corridor={corridor} onOpen={() => shell.openSheet('rtsearch')} />
|
||||
</div>
|
||||
)
|
||||
@@ -197,7 +197,7 @@ function RoadtripStagePage({ planner, shell, dayId: pageDayId, alts, chrome }: O
|
||||
return (
|
||||
<div
|
||||
className={`absolute inset-0 overflow-x-hidden overflow-y-auto overscroll-y-contain px-4 pb-[calc(var(--bottom-nav-h,84px)+22px)] ${
|
||||
stage ? 'pt-[calc(var(--m-safe-top,12px)+150px)]' : 'pt-[calc(var(--m-safe-top,12px)+102px)]'
|
||||
stage ? 'pt-[max(calc(var(--m-safe-top,12px)+150px),var(--m-corner-clear,0px))]' : 'pt-[max(calc(var(--m-safe-top,12px)+102px),var(--m-corner-clear,0px))]'
|
||||
}`}
|
||||
>
|
||||
<UndatedRides rides={undated} t={t} onOpen={openBooking} />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useState } from 'react'
|
||||
import { ArrowRight, Check, Hotel, MapPin, X } from 'lucide-react'
|
||||
import { ArrowRight, Check, Hotel, MapPin, Plus, X } from 'lucide-react'
|
||||
import MSheet from '../../../components/MSheet'
|
||||
import MIconBtn from '../../../components/MIconBtn'
|
||||
import CustomSelect from '../../../../components/shared/CustomSelect'
|
||||
@@ -88,6 +88,15 @@ export default function MAccommodationSheet({ planner, shell }: MTripSheetsProps
|
||||
|
||||
const filteredPlaces = stayPlaceChoices(places, form.place_id, categoryFilter)
|
||||
|
||||
// Same opener as the places tab's add button: a blank form, no prefilled position.
|
||||
const canAddPlace = planner.can('place_edit', planner.trip)
|
||||
const openAddPlace = () => {
|
||||
planner.setEditingPlace(null)
|
||||
planner.setEditingAssignmentId(null)
|
||||
planner.setPrefillCoords(null)
|
||||
planner.setShowPlaceForm(true)
|
||||
}
|
||||
|
||||
const save = async () => {
|
||||
setSaving(true)
|
||||
const body = stayRequestBody(form, range)
|
||||
@@ -204,9 +213,21 @@ export default function MAccommodationSheet({ planner, shell }: MTripSheetsProps
|
||||
{/* Place picker */}
|
||||
<Eyebrow className="mb-[6px] mt-3">{t('reservations.meta.pickHotel')}</Eyebrow>
|
||||
{filteredPlaces.length === 0 ? (
|
||||
<p className="rounded-[14px] bg-[color:var(--m-ic)] px-3 py-6 text-center font-geist text-[0.75rem] text-m-faint">
|
||||
{t('day.noPlacesForHotel')}
|
||||
</p>
|
||||
<div className="flex flex-col items-center gap-2.5 rounded-[14px] bg-[color:var(--m-ic)] px-3 py-5 text-center">
|
||||
<p className="font-geist text-[0.75rem] text-m-faint">{t('day.noPlacesForHotel')}</p>
|
||||
{/* A new trip has no place yet, and the stay needs one: the place form
|
||||
opens over this sheet and its place is listed here once saved. */}
|
||||
{canAddPlace && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={openAddPlace}
|
||||
className="flex items-center gap-1.5 rounded-full bg-m-act px-3.5 py-[7px] text-caption font-semibold text-m-actfg"
|
||||
>
|
||||
<Plus size={13} strokeWidth={2.4} />
|
||||
{t('planner.addPlace')}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex flex-col gap-1.5">
|
||||
{filteredPlaces.map(p => {
|
||||
|
||||
@@ -122,3 +122,15 @@ describe('MPlaceSheet ask the assistant', () => {
|
||||
expect(chatOf(useAssistantStore.getState(), 5).focus).toEqual({ placeIds: [42] })
|
||||
})
|
||||
})
|
||||
|
||||
describe('MPlaceSheet header (#3140)', () => {
|
||||
it('lets a long place name wrap instead of cutting it to one line', () => {
|
||||
const longName = 'Broad Street Christmas Lights & Market'
|
||||
render(<MPlaceSheet planner={planner({ selectedPlace: buildPlace({ id: 7, name: longName, address: 'Broad Street, RG1 2AF, Reading' }) })} shell={shell} />)
|
||||
|
||||
const title = screen.getByText(longName)
|
||||
expect(title).not.toHaveClass('truncate')
|
||||
expect(title).toHaveClass('break-words')
|
||||
expect(screen.getByText('Broad Street, RG1 2AF, Reading').closest('div')).not.toHaveClass('truncate')
|
||||
})
|
||||
})
|
||||
|
||||
@@ -208,12 +208,14 @@ export default function MPlaceSheet({ planner, shell }: MTripSheetsProps) {
|
||||
</PlacePhotoGallery>
|
||||
</div>
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span dir="auto" className="min-w-0 truncate text-[1rem] font-bold leading-snug">{place.name}</span>
|
||||
<div className="flex items-start gap-1.5">
|
||||
{/* The sheet is where a place is read in full, so its name wraps
|
||||
onto as many lines as it needs, as on the desktop (#3140). */}
|
||||
<span dir="auto" className="min-w-0 break-words text-[1rem] font-bold leading-snug [overflow-wrap:anywhere]">{place.name}</span>
|
||||
{/* Accepted out of the traveller's own recordings — the same
|
||||
mark the desktop inspector carries. */}
|
||||
{place.source === 'dawarich' && (
|
||||
<span className="flex-none overflow-hidden rounded-[5px]">
|
||||
<span className="mt-[3px] flex-none overflow-hidden rounded-[5px]">
|
||||
<DawarichIcon size={15} />
|
||||
</span>
|
||||
)}
|
||||
|
||||
@@ -11,6 +11,7 @@ import AirportSelect from '../../../../components/Planner/AirportSelect'
|
||||
import LocationSelect from '../../../../components/Planner/LocationSelect'
|
||||
import { toLocationPicks } from '../../../../components/Planner/locationPicks'
|
||||
import TransitSearchPanel from '../../../../components/Planner/TransitSearchPanel'
|
||||
import { getTransitDayPlaces } from '../../../../components/Planner/transitDayPlaces'
|
||||
import {
|
||||
EMPTY_TRANSPORT_FIELDS, TRANSPORT_TYPE_OPTIONS as TYPE_OPTIONS, emptyCarStop, emptyStationWaypoint, emptyWaypoint,
|
||||
transportDayOptions, type StationWaypointForm, type WaypointForm,
|
||||
@@ -21,7 +22,7 @@ import { useBookingFollowUp } from '../../../../components/Planner/useBookingFol
|
||||
import { useBookingExpenseIntent } from '../../../../components/Planner/useBookingExpenseIntent'
|
||||
import { Eyebrow, FIELD_CLS, FormSheetBody, FormSheetFooter, FormSheetHeader } from './PlSheetChrome'
|
||||
import MBookingFilesCosts from './MBookingFilesCosts'
|
||||
import type { Place, Reservation } from '../../../../types'
|
||||
import type { Reservation } from '../../../../types'
|
||||
import type { BookingReviewDraft } from '../../../../components/Planner/parsedItemToDraft'
|
||||
import type { BookingExpenseRequest } from '../../../../components/Planner/BookingCostsSection.types'
|
||||
import type { TripPlanner } from '../MTripShell'
|
||||
@@ -226,23 +227,21 @@ export default function MTransportFormSheet({ planner, onOpenExpense }: MTranspo
|
||||
if (!transitDay) {
|
||||
return <div className="mt-3 font-geist text-[0.78125rem] text-m-faint">{t('transit.pickDay')}</div>
|
||||
}
|
||||
// Quick picks offer the chosen day's itinerary, not the whole trip.
|
||||
const dayPlaces = (assignments[String(transitDay.id)] || [])
|
||||
.slice().sort((a, b) => a.order_index - b.order_index)
|
||||
.map(a => places.find(p => p.id === a.place_id))
|
||||
.filter((p): p is Place => p != null)
|
||||
const dayPlaces = getTransitDayPlaces(transitDay.id, assignments, places)
|
||||
const dayPrefill = transitDay.id === transportModalDayId ? transitPrefill : null
|
||||
return (
|
||||
<div className="mt-4">
|
||||
<TransitSearchPanel
|
||||
key={transitDay.id}
|
||||
day={transitDay}
|
||||
days={days}
|
||||
places={dayPlaces}
|
||||
accommodations={tripAccommodations}
|
||||
onAdd={(p) => saveTransport(p as Record<string, unknown> & { title: string })}
|
||||
initialFrom={transitPrefill?.from ?? null}
|
||||
initialTo={transitPrefill?.to ?? null}
|
||||
initialTime={transitPrefill?.time ?? null}
|
||||
walk={transitPrefill?.walk ?? null}
|
||||
initialFrom={dayPrefill?.from ?? null}
|
||||
initialTo={dayPrefill?.to ?? null}
|
||||
initialTime={dayPrefill?.time ?? null}
|
||||
walk={dayPrefill?.walk ?? null}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -16,7 +16,7 @@ import { useSearchParams } from 'react-router'
|
||||
import { isTransportReservationType } from '@trek/shared'
|
||||
import { useBookingLink } from '../../../../hooks/useBookingLink'
|
||||
import { bookingFacts, stayStats } from '../../../../components/Planner/bookings/bookingFacts'
|
||||
import { parseMeta } from '../../../../components/Planner/bookings/bookingsModel'
|
||||
import { bookingDates, parseMeta } from '../../../../components/Planner/bookings/bookingsModel'
|
||||
import { ActionCircle, Eyebrow, INNER_CLS, StatBox, TileHeader, displayTime } from './MTripSheetUi'
|
||||
import { CardFiles } from '../tabs/MReservationCardParts'
|
||||
import { downloadAttachment, openAttachment } from '../../../../components/Planner/bookings/openAttachment'
|
||||
@@ -131,9 +131,10 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
const canEdit = liveRes != null && (isTransportReservationType(liveRes.type) ? canEditDays : canEditBookings)
|
||||
const ResIcon = RES_ICONS[res.type as keyof typeof RES_ICONS] || RES_ICONS.other
|
||||
|
||||
const from = (res.endpoints || []).find(e => e.role === 'from')
|
||||
const to = (res.endpoints || []).find(e => e.role === 'to')
|
||||
const { date, time: startTime } = splitReservationDateTime(res.reservation_time)
|
||||
const endpoints = res.endpoints || []
|
||||
const from = endpoints.find(e => e.role === 'from')
|
||||
const to = endpoints.find(e => e.role === 'to')
|
||||
const { time: startTime } = splitReservationDateTime(res.reservation_time)
|
||||
const { time: endTime } = splitReservationDateTime(res.reservation_end_time)
|
||||
const bookingDepTime = from?.local_time || startTime
|
||||
const bookingArrTime = to?.local_time || endTime
|
||||
@@ -151,6 +152,12 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
const arrTime = leg ? leg.arr_time || '' : bookingArrTime
|
||||
const depLabel = (leg ? leg.from : from?.name) || t('reservations.time')
|
||||
const arrLabel = (leg ? leg.to : to?.name) || t('reservations.time')
|
||||
// The calendar date each time falls on (#3122): a time alone cannot be placed
|
||||
// when the sheet is opened from a compact list that shows nothing else.
|
||||
const legDate = (dayId?: number | null) => (dayId != null ? planner.days.find(d => d.id === dayId)?.date : null) || null
|
||||
const dates = leg ? { start: legDate(leg.dep_day_id), end: legDate(leg.arr_day_id) } : bookingDates(res, planner.days)
|
||||
const depDate = dates.start ? bookingDayLabel(dates.start, locale) : null
|
||||
const arrDate = dates.end ? bookingDayLabel(dates.end, locale) : null
|
||||
|
||||
const subParts: string[] = []
|
||||
const airline = leg ? legDetail.airline : meta.airline
|
||||
@@ -161,7 +168,6 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
if (trainNumber) subParts.push(trainNumber)
|
||||
if (leg && (leg.from || leg.to)) subParts.push(flowText([leg.from, leg.to].filter((n): n is string => !!n)))
|
||||
else if (from?.name && to?.name) subParts.push(flowText([from.name, to.name]))
|
||||
else if (date) subParts.push(bookingDayLabel(date, locale))
|
||||
|
||||
// A flight's legs carry no seat or platform of their own, so those stay the booking's.
|
||||
const seat = leg && !isFlight ? legDetail.seat : meta.seat
|
||||
@@ -170,6 +176,11 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
|
||||
// Opened from one leg's row, only that leg's live card; from the booking, every followed leg.
|
||||
const shownLive = leg ? liveLegs.filter(l => l.leg_index === payload.legIndex) : liveLegs
|
||||
const showTimes = shownLive.length === 0
|
||||
// A shown time box carries its own date. Without one (no time entered yet, or the
|
||||
// live card in its place) the subline names the day, route and airline or not.
|
||||
const datedTime = showTimes && ((depTime && depDate) || (arrTime && arrDate))
|
||||
if (depDate && !datedTime) subParts.push(depDate)
|
||||
|
||||
const resFiles = filesFor(res, planner.files || [])
|
||||
|
||||
@@ -225,8 +236,9 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
<div className="flex-none px-[18px] pt-4">
|
||||
<TileHeader
|
||||
icon={<ResIcon size={19} strokeWidth={1.8} />}
|
||||
title={<span dir="auto" className="truncate text-[1rem]">{res.title}</span>}
|
||||
title={<span dir="auto" className="min-w-0 break-words text-[1rem] [overflow-wrap:anywhere]">{res.title}</span>}
|
||||
sub={subParts.length > 0 ? subParts.join(' · ') : undefined}
|
||||
subWrap
|
||||
onClose={shell.closeSheet}
|
||||
closeLabel={t('common.close')}
|
||||
/>
|
||||
@@ -263,13 +275,13 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
))}
|
||||
|
||||
{/* ── Times / seat stats (the live card already shows the times) ── */}
|
||||
{hotelStats.length === 0 && ((shownLive.length === 0 && (depTime || arrTime)) || seat || platform) && (
|
||||
{hotelStats.length === 0 && ((showTimes && (depTime || arrTime)) || seat || platform) && (
|
||||
<div className="mt-[14px] flex gap-[6px]">
|
||||
{shownLive.length === 0 && depTime && (
|
||||
<StatBox value={displayTime(depTime, locale, timeFormat)} label={depLabel} />
|
||||
{showTimes && depTime && (
|
||||
<StatBox caption={depDate} value={displayTime(depTime, locale, timeFormat)} label={depLabel} />
|
||||
)}
|
||||
{shownLive.length === 0 && arrTime && (
|
||||
<StatBox value={displayTime(arrTime, locale, timeFormat)} label={arrLabel} />
|
||||
{showTimes && arrTime && (
|
||||
<StatBox caption={arrDate} value={displayTime(arrTime, locale, timeFormat)} label={arrLabel} />
|
||||
)}
|
||||
{platform && <StatBox value={platform} label={t('reservations.meta.platform')} />}
|
||||
{seat && <StatBox value={seat} label={t('reservations.meta.seat')} />}
|
||||
@@ -303,9 +315,9 @@ export default function MTransportSheet({ planner, shell }: MTripSheetsProps) {
|
||||
<span className="text-m-muted">{t('transit.walkTo', { name: leg.to?.name || '' })}</span>
|
||||
) : (
|
||||
<>
|
||||
<span dir="auto" className="truncate">{leg.from?.name}</span>
|
||||
<span dir="auto" className="min-w-0 break-words [overflow-wrap:anywhere]">{leg.from?.name}</span>
|
||||
<ArrowRight size={10} strokeWidth={2} className="flex-none text-m-faint" />
|
||||
<span dir="auto" className="truncate">{leg.to?.name}</span>
|
||||
<span dir="auto" className="min-w-0 break-words [overflow-wrap:anywhere]">{leg.to?.name}</span>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -121,6 +121,8 @@ export function TileHeader({ icon, title, sub, subWrap = false, onClose, closeLa
|
||||
interface StatBoxProps {
|
||||
value: ReactNode
|
||||
label: ReactNode
|
||||
/** A line above the value, such as the calendar date a time falls on. */
|
||||
caption?: ReactNode
|
||||
blurred?: boolean
|
||||
onClick?: () => void
|
||||
/** Colours the label, so a check-in or check-out time carries its own state. */
|
||||
@@ -133,10 +135,11 @@ const LABEL_TONE: Record<NonNullable<StatBoxProps['labelTone']>, string> = {
|
||||
}
|
||||
|
||||
/** Small stat box (check-in / times / code): value 700 tabular over a faint Geist label. */
|
||||
export function StatBox({ value, label, blurred = false, onClick, labelTone }: StatBoxProps) {
|
||||
export function StatBox({ value, label, caption, blurred = false, onClick, labelTone }: StatBoxProps) {
|
||||
const box = 'min-w-0 flex-1 rounded-[10px] bg-[color:var(--m-ic)] px-[9px] py-[7px] text-center'
|
||||
const inner = (
|
||||
<>
|
||||
{caption && <div className="truncate font-geist text-caption leading-tight text-m-muted">{caption}</div>}
|
||||
<div
|
||||
className={`truncate text-[0.8125rem] font-bold tabular-nums leading-tight ${blurred ? 'blur-[4px] select-none' : ''}`}
|
||||
>
|
||||
|
||||
@@ -91,7 +91,7 @@ export default function MCollabChat({ planner }: MCollabChatProps) {
|
||||
|
||||
return (
|
||||
<div
|
||||
className="flex h-full flex-col px-4 pb-[var(--bottom-nav-h,84px)] pt-[calc(var(--m-safe-top,12px)+58px)] wide:mx-auto wide:w-full wide:max-w-[808px] wide:px-6 wide:pb-[calc(var(--bottom-nav-h,0px)+12px)]"
|
||||
className="flex h-full flex-col px-4 pb-[var(--bottom-nav-h,84px)] pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))] wide:mx-auto wide:w-full wide:max-w-[808px] wide:px-6 wide:pb-[calc(var(--bottom-nav-h,0px)+12px)]"
|
||||
style={keyboard > 0 ? { paddingBottom: keyboard + 8 } : undefined}
|
||||
>
|
||||
{loading ? (
|
||||
|
||||
@@ -74,7 +74,7 @@ function CollabPanel({ planner, tab }: { planner: MTabScreenProps['planner']; ta
|
||||
if (tab === 'chat') {
|
||||
if (!planner.collabFeatures.chat) {
|
||||
return (
|
||||
<div className="flex h-full flex-col px-4 pb-[var(--bottom-nav-h,84px)] pt-[calc(var(--m-safe-top,12px)+58px)]">
|
||||
<div className="flex h-full flex-col px-4 pb-[var(--bottom-nav-h,84px)] pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))]">
|
||||
<CollabDisabledNotice icon={MessageCircle} label={label} />
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -265,12 +265,12 @@ export default function MFilesTab({ planner, shell }: MTabScreenProps) {
|
||||
if (split && picked) {
|
||||
return (
|
||||
<div className="flex h-full">
|
||||
<div className="min-h-0 min-w-0 flex-1 overflow-y-auto overflow-x-hidden pb-[calc(var(--bottom-nav-h,84px)+22px)] pe-3 ps-6 pt-[calc(var(--m-safe-top,12px)+58px)]">
|
||||
<div className="min-h-0 min-w-0 flex-1 overflow-y-auto overflow-x-hidden pb-[calc(var(--bottom-nav-h,84px)+22px)] pe-3 ps-6 pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))]">
|
||||
{body}
|
||||
</div>
|
||||
<aside
|
||||
aria-label={t('common.preview')}
|
||||
className="m-pane-trail min-h-0 flex-none overflow-y-auto overflow-x-hidden border-s border-[color:var(--m-rowbr)] px-5 pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[calc(var(--m-safe-top,12px)+58px)]"
|
||||
className="m-pane-trail min-h-0 flex-none overflow-y-auto overflow-x-hidden border-s border-[color:var(--m-rowbr)] px-5 pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))]"
|
||||
>
|
||||
<FilePreviewPane
|
||||
file={picked}
|
||||
|
||||
@@ -37,7 +37,7 @@ export default function MTripTabPanel({ planner, shell, tab }: MTripTabPanelProp
|
||||
if (tab.startsWith('plugin:')) {
|
||||
return (
|
||||
<div
|
||||
className="absolute inset-0 pt-[calc(var(--m-safe-top,12px)+58px)] pb-[calc(var(--bottom-nav-h,84px)+22px)]"
|
||||
className="absolute inset-0 pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))] pb-[calc(var(--bottom-nav-h,84px)+22px)]"
|
||||
>
|
||||
<PluginFrame
|
||||
pluginId={tab.slice('plugin:'.length)}
|
||||
|
||||
@@ -33,8 +33,8 @@ export function TabScroller({ children, wide = 'readable' }: { children: ReactNo
|
||||
}
|
||||
|
||||
/** The room a tab's scroll body keeps clear: the floating top controls above, the dock (or the home indicator) below. */
|
||||
const TAB_INSETS = 'px-4 pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[calc(var(--m-safe-top,12px)+58px)] wide:px-6'
|
||||
const PANE_INSETS = 'pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[calc(var(--m-safe-top,12px)+58px)]'
|
||||
const TAB_INSETS = 'px-4 pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))] wide:px-6'
|
||||
const PANE_INSETS = 'pb-[calc(var(--bottom-nav-h,84px)+22px)] pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))]'
|
||||
|
||||
/**
|
||||
* The cards of a list tab (transports, bookings, tasks, polls): one column on a
|
||||
|
||||
@@ -91,9 +91,9 @@ export default function MVacay() {
|
||||
|
||||
return (
|
||||
// h-dvh, not h-full: the shell stopped providing a definite height (#1809).
|
||||
<div className="relative h-dvh">
|
||||
{/* Header */}
|
||||
<div className="absolute inset-x-4 z-[5] flex items-center gap-2 top-[var(--m-safe-top,12px)]">
|
||||
<div className="m-corner-own relative h-dvh">
|
||||
{/* Header, beside a corner element (a Duo's status capsule) upright */}
|
||||
<div className="m-corner-beside-in absolute inset-x-4 z-[5] flex items-center gap-2 top-[var(--m-safe-top,12px)]">
|
||||
<MIconBtn onClick={() => v.setSheet('invite')} ariaLabel={t('vacay.inviteUser')}>
|
||||
<UserPlus size={16} strokeWidth={2} className="text-m-muted" />
|
||||
</MIconBtn>
|
||||
@@ -115,7 +115,7 @@ export default function MVacay() {
|
||||
</div>
|
||||
|
||||
{/* Scroll container */}
|
||||
<div className={`absolute inset-0 overflow-y-auto px-4 pt-[calc(var(--m-safe-top,12px)+44px)] pb-[calc(var(--bottom-nav-h,84px)+12px)] ${edit ? 'wide:pb-[calc(env(safe-area-inset-bottom,0px)+84px)]' : ''}`}>
|
||||
<div className={`absolute inset-0 overflow-y-auto px-4 pt-[max(calc(var(--m-safe-top,12px)+44px),var(--m-corner-clear,0px))] pb-[calc(var(--bottom-nav-h,84px)+12px)] ${edit ? 'wide:pb-[calc(env(safe-area-inset-bottom,0px)+84px)]' : ''}`}>
|
||||
{/* Selected person card */}
|
||||
{v.selectedUser && stat && (
|
||||
<div className="mt-2 flex items-center gap-3 rounded-[18px] border border-[color:var(--m-gbr)] bg-[color:var(--m-glass)] px-[14px] py-[9px]">
|
||||
|
||||
@@ -143,3 +143,56 @@ describe('closeOnDone', () => {
|
||||
expect(document.activeElement).toBe(handled);
|
||||
});
|
||||
});
|
||||
|
||||
describe('closeOnTapAway', () => {
|
||||
function touch(target: Element, type: 'touchstart' | 'touchend', x: number, y: number) {
|
||||
const e = new Event(type, { bubbles: true, cancelable: true });
|
||||
const point = [{ clientX: x, clientY: y }];
|
||||
Object.defineProperty(e, type === 'touchstart' ? 'touches' : 'changedTouches', { value: point });
|
||||
if (type === 'touchend') Object.defineProperty(e, 'touches', { value: [] });
|
||||
target.dispatchEvent(e);
|
||||
}
|
||||
function tap(target: Element, moveBy = 0) {
|
||||
touch(target, 'touchstart', 100, 100);
|
||||
touch(target, 'touchend', 100, 100 + moveBy);
|
||||
}
|
||||
function sheet(): { notes: HTMLTextAreaElement; title: HTMLInputElement; label: HTMLElement; stop: () => void } {
|
||||
document.body.innerHTML =
|
||||
'<div><p id="label">Notes for this day</p><textarea id="notes"></textarea><input id="title"></div>';
|
||||
const stop = prepareKeyboardFields(document);
|
||||
return {
|
||||
notes: document.getElementById('notes') as HTMLTextAreaElement,
|
||||
title: document.getElementById('title') as HTMLInputElement,
|
||||
label: document.getElementById('label') as HTMLElement,
|
||||
stop,
|
||||
};
|
||||
}
|
||||
|
||||
it('closes the keyboard of a textarea when the sheet beside it is tapped', () => {
|
||||
const { notes, label, stop } = sheet();
|
||||
notes.focus();
|
||||
tap(label);
|
||||
expect(document.activeElement).not.toBe(notes);
|
||||
stop();
|
||||
});
|
||||
|
||||
it('keeps it while the finger scrolls, taps the field itself or moves to another field', () => {
|
||||
const { notes, title, label, stop } = sheet();
|
||||
notes.focus();
|
||||
tap(label, 40);
|
||||
expect(document.activeElement).toBe(notes);
|
||||
tap(notes);
|
||||
expect(document.activeElement).toBe(notes);
|
||||
tap(title);
|
||||
expect(document.activeElement).toBe(notes);
|
||||
stop();
|
||||
});
|
||||
|
||||
it('stops listening when told to', () => {
|
||||
const { notes, label, stop } = sheet();
|
||||
stop();
|
||||
notes.focus();
|
||||
tap(label);
|
||||
expect(document.activeElement).toBe(notes);
|
||||
});
|
||||
});
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user