Compare commits

...
Author SHA1 Message Date
Bendik Aagaard LynghaugandClaude Opus 5.5 48ae5e07c2 Release 0.6.18
docs / deploy (push) Successful in 2s
Test / test (push) Successful in 2m0s
Publish release / publish (push) Successful in 1m50s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-03 10:48:22 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 b619926a11 generate follows its findings through, and stops when it stalls
Each structure round is logged as fixed, still open, new and reopened;
a fix round sees the open findings with their fixes and only the files
they name; a change that reopens a closed finding is undone; a round
that closes nothing ends the phase with what is left in run.log. A
hesitant visitor alone no longer triggers a wording rewrite.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-03 10:48:09 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 706c8108df iris check --findings: every finding as JSON with a stable id
The id hashes scope, need, code and subject, nothing of the wording, so
the same gap keeps its id across runs. Every message that knows its fix
says it after "fix:". Codes listed in docs/lint.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-03 10:48:09 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 2feeea0810 Release 0.6.17
docs / deploy (push) Successful in 2s
Test / test (push) Successful in 2m12s
Publish release / publish (push) Successful in 1m55s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MznPTC31w5mSUK4XMehcpi
2026-10-02 11:26:13 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 6b91258ebe One set of mail variables for every mail, and {link} in state mails
{site} and {site_name} everywhere; a state mail adds {self_link} (the
submitter's own page, when their record's state allows a move there),
{desk_link} and {link}, which picks by who the mail is to. gullberg's
{link} mails went out blank until now. Documented in docs/mail.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MznPTC31w5mSUK4XMehcpi
2026-10-02 11:25:49 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 ae119af987 A desk shows the three newest finished records, and older on request
Every record still moving stays; of those in a final state only the
three most recently decided, plus one so the page knows to offer
"Show older", three more at a time.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MznPTC31w5mSUK4XMehcpi
2026-10-02 11:25:49 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 92dd9bfc79 The lint walks every state of every bucket a need lands in
Clocks count as moves and a visitor's link only from its own states.
Per bucket: a state nothing reaches fails, a state a record can reach
and never leave fails (after done too), a declared move nobody offers
warns, a desk gated twice warns, and a mail from an unreachable state
or naming a field no form collects is caught. Working stages must
follow each other. Every finding ends in its fix, and a schema error no
longer hides the needs findings.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MznPTC31w5mSUK4XMehcpi
2026-10-02 11:25:49 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 2cc74e3354 CI builds and lints every plan with this portal
Test / test (push) Successful in 2m35s
The check portal-trainer's CI ran with the standalone trainer, which
kept failing on a builder bug fixed here long ago. Now it runs where the
trainer lives, with the same binary.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MznPTC31w5mSUK4XMehcpi
2026-10-02 09:27:44 +02:00
Bendik Aagaard Lynghaug 7b54c4c6d7 Release 0.6.16
Test / test (push) Successful in 1m8s
Publish release / publish (push) Successful in 1m56s
2026-10-01 21:46:45 +02:00
bl 951fac9aec Merge pull request 'Test fixtures get the action the lint now requires' (#28) from fixture-action into main
Test / test (push) Successful in 1m10s
2026-10-01 19:46:29 +00:00
Bendik Aagaard LynghaugandClaude Fable 5.1 738dbac7fe Test fixtures: every form has the action the lint now requires
Test / test (pull_request) Successful in 21s
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 21:46:24 +02:00
bl 98f93f5ad5 Merge pull request 'A form with no action is refused; portal iris' (#27) from form-needs-action into main
docs / deploy (push) Successful in 3s
Test / test (push) Failing after 1m7s
2026-10-01 19:42:03 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 4049809aa4 The lint refuses a form with no action, which would have no button; portal iris names the lint
Test / test (pull_request) Failing after 1m11s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 21:41:56 +02:00
Bendik Aagaard Lynghaug b43ff57eab Release 0.6.15
Test / test (push) Successful in 1m14s
Publish release / publish (push) Successful in 2m5s
2026-10-01 18:06:16 +02:00
bl ed235cd134 Merge pull request 'An invite may carry its own mail' (#26) from invite-mail into main
docs / deploy (push) Successful in 3s
Test / test (push) Successful in 1m52s
2026-10-01 16:06:14 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 cc9f1c5d87 An invite may carry its own mail, with the form's fields and a spoken date and time
Test / test (pull_request) Successful in 1m9s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 18:06:12 +02:00
bl 01abf79005 Merge pull request 'Klingenberg Bygg plan: Fredrik's caption corrections' (#25) from kb-fredrik-captions into main
Test / test (push) Successful in 1m9s
2026-10-01 15:57:10 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 506bb712fe Klingenberg Bygg plan: Fredrik's two caption corrections from the live site
Test / test (pull_request) Successful in 1m10s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 17:57:08 +02:00
Bendik Aagaard Lynghaug 74fd2d1750 Release 0.6.14
Test / test (push) Successful in 1m11s
Publish release / publish (push) Successful in 1m57s
2026-10-01 17:47:51 +02:00
bl ae521c0fa2 Merge pull request 'Less room above the wordmark' (#24) from hero-top-space into main
docs / deploy (push) Successful in 11s
Test / test (push) Successful in 1m13s
2026-10-01 15:47:47 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 d0ee06f48c Less room above the wordmark, now that who is here sits on its line
Test / test (pull_request) Successful in 1m51s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 17:47:45 +02:00
Bendik Aagaard Lynghaug 6a9be3bef4 Release 0.6.13
Test / test (push) Successful in 1m5s
Publish release / publish (push) Successful in 1m48s
2026-10-01 11:40:32 +02:00
bl 49be010e8e Merge pull request 'Who is here on the wordmark's line; signed-in people aren't asked for their name' (#23) from prefill-everywhere into main
docs / deploy (push) Successful in 3s
Test / test (push) Successful in 1m5s
2026-10-01 09:40:29 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 78f42e6f8a Who is here on the wordmark's line; every form carries a signed-in person's name and address
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 11:40:27 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 9b50c9cab8 Gullberg: i Ås, ikke på Ås
Test / test (push) Successful in 1m4s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 11:09:08 +02:00
bl 858a66d84e Merge pull request 'GULLBERG sanatorium: plan, words, wordmark; a board may publish its own list' (#20) from gullberg-plan into main
Test / test (push) Successful in 1m5s
2026-10-01 08:44:09 +00:00
Bendik Aagaard Lynghaug bf92666b3e Merge branch 'main' into gullberg-plan
Test / test (pull_request) Successful in 1m4s
2026-10-01 10:42:35 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 b070d77acd Gullberg: the house behind Ås kirke, rooms for everyone with students first, mails written to the reader who opens them
Test / test (pull_request) Successful in 1m5s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 10:41:41 +02:00
Bendik Aagaard Lynghaug cc07cd321d Release 0.6.12
Test / test (push) Successful in 1m5s
Publish release / publish (push) Successful in 1m44s
2026-10-01 10:41:31 +02:00
bl 7a2e45c6c4 Merge pull request 'Trainer: the words model knows who opens each mail' (#22) from mail-recipients into main
docs / deploy (push) Successful in 3s
Test / test (push) Successful in 1m43s
2026-10-01 08:41:29 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 8f24e5483c Trainer: tell the words model who opens each mail
Test / test (pull_request) Successful in 1m9s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 10:41:27 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 b970c64c6a Gullberg wordmark: sanatorium set in a little from the edges
Test / test (pull_request) Successful in 1m7s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 10:19:43 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 8a1fbd92ba Gullberg wordmark: sanatorium spread to GULLBERG's width
Test / test (pull_request) Successful in 1m8s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 10:16:04 +02:00
Bendik Aagaard Lynghaug 1929d2f44e Release 0.6.11
Test / test (push) Successful in 1m8s
Publish release / publish (push) Successful in 1m50s
2026-10-01 09:33:31 +02:00
bl 26c1d447f3 Merge pull request 'wordmark_ink: the wordmark in the page's own ink' (#21) from wordmark-ink into main
docs / deploy (push) Successful in 3s
Test / test (push) Successful in 1m8s
2026-10-01 07:33:28 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 8376c68f8f wordmark_ink: an SVG wordmark drawn in the page's own ink, following light and dark everywhere
Test / test (pull_request) Successful in 1m8s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 09:33:27 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 b9f69a5e7a Gullberg wordmark as Futura outlines, cropped to the letters
Test / test (pull_request) Successful in 1m7s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 09:28:47 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 37624e8e2b Gullberg: reviewed Norwegian words (nine misreadings fixed, invite mail written), tenants follow their own fault reports
Test / test (pull_request) Successful in 1m7s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:36:45 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 902dc36831 Gullberg: lighter on the bank, the co-owner offer held back, and the points the shareholder agreement must cover
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:28:28 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 54efedef56 Gullberg draft: the site as the bank's running proof that the company operates; the ownership transfer step by step; a read-only bank group
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:20:35 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 742be200a9 Gullberg draft: two of the four quarters are for sale; finding the co-owners comes first; the bank parts only if the company borrows
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:18:25 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 2d695f990b Gullberg draft: four equal shareholders; faults go to Klingenberg Bygg, its estimates to the board and the reports
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:15:35 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 b016dfd964 Gullberg draft: the whole house in Gullberg AS, two shareholders, a bank lender; what the bank requires
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:11:44 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 35e9586e77 Gullberg draft: the repayment plan all shareholders approve, and the monthly rent ledger
Test / test (pull_request) Successful in 1m7s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 07:07:26 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 4e211ddbff Draft: GULLBERG sanatorium's plan, business-plan outline and wordmark; a board's published list may be public
Test / test (pull_request) Successful in 1m14s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-09-30 22:34:33 +02:00
Bendik Aagaard Lynghaug c8901558b2 Release 0.6.10
Test / test (push) Successful in 1m18s
Publish release / publish (push) Successful in 2m1s
2026-09-30 21:52:28 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 02c94ae5dc Changelog: 0.6.10
docs / deploy (push) Successful in 2s
Test / test (push) Successful in 1m11s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-09-30 21:52:25 +02:00
bl 5fc29fe5a6 Merge pull request 'Who we are, on its own page; inside forms ask real questions' (#19) from present-yourself into main
docs / deploy (push) Successful in 3s
Test / test (push) Successful in 1m10s
2026-09-30 19:52:24 +00:00
34 changed files with 2985 additions and 105 deletions
+19
View File
@@ -38,6 +38,25 @@ jobs:
- name: Test - name: Test
run: cargo test --features ssr run: cargo test --features ssr
# Every plan under plans/ built deterministically and held to the
# lint, both by this very portal: a builder change that renders a
# site the lint rejects fails here, not at the next training run.
# (portal-trainer's CI did this until the trainer moved in.)
- name: Build and lint every plan
run: |
set -euo pipefail
cargo build --features ssr --bin portal
bin="$CARGO_TARGET_DIR/debug/portal"
tmp=$(mktemp -d)
lint="$tmp/portal-lint"
printf '#!/bin/sh\nexec %s lint "$@"\n' "$bin" > "$lint" && chmod +x "$lint"
for plan in plans/*.yaml; do
name=$(basename "$plan" .yaml)
echo "== $plan"
rm -rf "$tmp/plan-$name"
"$bin" build --plan "$plan" --out "$tmp/plan-$name" --lint "$lint"
done
- name: Stop the throwaway JetStream - name: Stop the throwaway JetStream
if: always() if: always()
run: docker rm -f portal-test-nats >/dev/null 2>&1 || true run: docker rm -f portal-test-nats >/dev/null 2>&1 || true
+38 -1
View File
@@ -4,7 +4,44 @@ One line per change, grouped by the release that shipped it. Newest
first. A release is a Cargo.toml bump plus a `v<version>` tag; the first. A release is a Cargo.toml bump plus a `v<version>` tag; the
content repos pin the tag they run (see the end of this file). content repos pin the tag they run (see the end of this file).
## Unreleased ## 0.6.18 (2026-10-03)
- `iris check --findings <out.jsonl>` writes every finding as JSON: a stable `id` (scope, need, code and subject, nothing of the wording), `level`, `code`, `scope`, `need`, `subject`, `message` and `fix`. Every message that knows its fix now says it after "fix:". The codes are listed in docs/lint.md.
- `portal generate` follows its findings through: each structure round is logged as fixed, still open, new and reopened; a fix round is shown the open findings with their fixes and only the files they name; a change that reopens a closed finding is undone; and the phase stops when a round closes nothing, writing what is left to run.log. A hesitant visitor no longer triggers a wording rewrite by itself, only a misroute does. A lint without `--findings` is still driven the old way.
## 0.6.17 (2026-10-02)
- A desk shows every record still moving and only the three most recently finished (a final state: no move out of it), with "Show older" for three more at a time. A desk that has run for a year is still about the work in hand.
- Mail variables are one set for every kind of mail (docs: Mail). Every mail has `{site}` and `{site_name}`; a state mail also has `{link}`, `{self_link}` and `{desk_link}`: the reader's own page for the record (a self-service page with `?chain=&email=`, when the record's state allows a move there), the desk that moves it, and `{link}` choosing between them by who the mail is to. `{link}` in a state mail used to render as nothing.
- The lint follows every state of every bucket a need lands in: a state no desk, link or clock reaches fails; a state a record can reach and never leave fails, after "done" too; a declared move nobody offers warns; a desk gated to one group on the page and another on its list warns; working stages must follow each other in the business's order; a mail from an unreachable state warns, and one naming a field no form collects fails. Clocks (`after:`) count as moves, and a visitor's own link only from the states it names. Each finding ends in the fix: the `{ from, to, label }` and the desk page it goes on, or the group that already has the button. A schema error no longer hides the needs findings.
## 0.6.16 (2026-10-01)
- The lint refuses an alternative that has a form to send (fields to fill in, an invite, or a bucket to record into) and no `action`. The button is only drawn for an alternative with an `action`, so such a form could be filled in and never sent, which is what happened to uhhm.no's first invite form. An alternative that moves its own record (`self_transition`) draws its own button and is left alone.
- `portal iris` is the lint's name, after the iris that keeps bad content out of the portal. `portal lint` is the same command and keeps working.
## 0.6.15 (2026-10-01)
- An invite may carry its own mail: `invite: { group, mail: { subject, body } }`. Every field of the form is a placeholder besides `{name}`, `{link}`, `{expires}` and the rest, and a date and time (`type: datetime-local`) is written out in words ("tirsdag 6. oktober kl. 15:00"). The words and the form are kept with the invite, so sending it again sends the same mail. This is for a desk that invites someone to a conversation at an hour, not into a group for good.
## 0.6.14 (2026-10-01)
- Less room above the wordmark: 1.75rem, 1.25rem on a narrow screen (it was 4rem). The space was kept for who is here, which now sits on the wordmark's own line, and on a tall, narrow screen it read as dead space.
## 0.6.13 (2026-10-01)
- Who is here (the name and "sign out", or "sign in") sits on the wordmark's own line instead of being pinned to the corner of the page, where it read as a row of its own. With a picture strip it is in the wordmark's bar; without, it is level with the mark at the right edge. On a narrow screen it drops under the mark.
- Trainer: every form, public ones included, carries a signed-in person's name and address from the login instead of asking for them; a visitor still sees the fields. Only the inside forms did before, so someone signed in filled in their own name and address again on a public form.
## 0.6.12 (2026-10-01)
- Trainer: the words model is told who opens each mail: the person who sent the case, the person who posted the record an answer is about, or someone at the business. Mails to the business about another person's case used to be written as if to that person ("you will hear from us"); on Gullberg, three of nine were.
## 0.6.11 (2026-10-01)
- `wordmark_ink: true` in `site.yaml`: an SVG wordmark is drawn in the page's own ink, as a mask over the text colour, so it follows the page's light and dark in every browser. A wordmark shown as an `<img>` only knows the system's setting, and some browsers don't pass even that on. Opacity in the file still shows, so a lighter line stays lighter. Opt-in, for one-colour marks; a mark with a colour of its own keeps its colours.
## 0.6.10 (2026-09-30)
- Trainer: who a business is gets a page of its own ("who are we?", `/hvem` in Norwegian), with nothing to do on it. It has one card per need that `presents` (the people, the work, each shown as picture cards) and one for the plan's `values`. The front door leads there instead of carrying it all. - Trainer: who a business is gets a page of its own ("who are we?", `/hvem` in Norwegian), with nothing to do on it. It has one card per need that `presents` (the people, the work, each shown as picture cards) and one for the plan's `values`. The front door leads there instead of carrying it all.
- Trainer: the words model is told that a form page from the inside asks a real question and says where the answer ends up ("How do you present yourself?", not "Your card on the front page"), and that a `one_per_person` form is the colleague's own. - Trainer: the words model is told that a form page from the inside asks a real question and says where the answer ends up ("How do you present yourself?", not "Your card on the front page"), and that a `one_per_person` form is the colleague's own.
Generated
+1 -1
View File
@@ -3357,7 +3357,7 @@ dependencies = [
[[package]] [[package]]
name = "portal" name = "portal"
version = "0.6.9" version = "0.6.18"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "portal" name = "portal"
version = "0.6.9" version = "0.6.18"
edition = "2021" edition = "2021"
[lib] [lib]
+1
View File
@@ -7,6 +7,7 @@
- [Getting started](getting-started.md) - [Getting started](getting-started.md)
- [Content reference](content-reference.md) - [Content reference](content-reference.md)
- [State machines](state-machines.md) - [State machines](state-machines.md)
- [Mail](mail.md)
- [Access](access.md) - [Access](access.md)
- [Storylines](storylines.md) - [Storylines](storylines.md)
- [Memberships](memberships.md) - [Memberships](memberships.md)
+13
View File
@@ -24,6 +24,7 @@ on every hot reload, and in CI through `iris check`.
```yaml ```yaml
title: Vestmark kommune # the browser title and the header title: Vestmark kommune # the browser title and the header
wordmark: /site/logo.svg # an image instead of the title wordmark: /site/logo.svg # an image instead of the title
wordmark_ink: true # a one-colour SVG mark drawn in the page's own ink
wordmark_invert: true # flip it in dark mode wordmark_invert: true # flip it in dark mode
wordmark_height: 2.4 # rem wordmark_height: 2.4 # rem
lang: no # the interface language: en or no lang: no # the interface language: en or no
@@ -124,6 +125,10 @@ answer:
from: [open, incomplete] # defaults to the initial state alone from: [open, incomplete] # defaults to the initial state alone
label: Send them label: Send them
invite: { group: case_officers } # onboard someone into Kanidm invite: { group: case_officers } # onboard someone into Kanidm
# or with words of its own, using any field of the form:
# invite:
# group: guests
# mail: { subject: "...", body: "... {tidspunkt} ... {link} ..." }
``` ```
`self_transition.from` is what keeps a person in dialogue with their `self_transition.from` is what keeps a person in dialogue with their
@@ -280,6 +285,14 @@ markdown on stricter rules than the site's own: paragraphs, line
breaks as typed, lists, emphasis and links to https, mailto or tel breaks as typed, lists, emphasis and links to https, mailto or tel
(marked `nofollow ugc`); no images, no raw HTML. (marked `nofollow ugc`); no images, no raw HTML.
A desk (a list with `transitions`) shows every record still moving,
and of those in a final state - one the state machine has no move out
of - only the three most recently decided, newest first. "Show older"
under the list brings three more each time it is pressed. The desk
stays about the work in hand however long the site has run; nothing
is hidden from a read-only list, and `leaves_after` still takes a
record out of every list altogether.
`states` and `where` narrow a listing. They matter most for a register `states` and `where` narrow a listing. They matter most for a register
that is public by law — public about what was decided, not about what that is public by law — public about what was decided, not about what
was withdrawn — while the desk working the same bucket is a different was withdrawn — while the desk working the same bucket is a different
+42 -2
View File
@@ -4,11 +4,15 @@ The iris over a site. A content push is an incoming wormhole; nothing
comes through until it checks out. comes through until it checks out.
``` ```
portal lint --path questions # a local checkout portal iris --path questions # a local checkout
portal lint --repo https://project.uhhm.no/uhhm/questions portal lint --repo https://project.uhhm.no/uhhm/questions
portal lint replay --path questions --nats nats://127.0.0.1:14222 portal lint replay --path questions --nats nats://127.0.0.1:14222
``` ```
`portal iris` is the lint's name, after the iris that keeps bad content
out of the portal; `portal lint` runs the same thing, so workflows that
already call it keep working.
It was its own binary, iris, until portal 0.6: the same code, released It was its own binary, iris, until portal 0.6: the same code, released
as portal's twin. Now it is the `portal` binary's `lint` command, so a as portal's twin. Now it is the `portal` binary's `lint` command, so a
content repo's CI downloads the release and runs it: content repo's CI downloads the release and runs it:
@@ -30,7 +34,43 @@ in `needs.yaml`, when it has one:
- the handling group holds a desk over that bucket, and every - the handling group holds a desk over that bucket, and every
finished state is reachable through the buttons it (and any finished state is reachable through the buttons it (and any
`also_moved_by` group) offers; no record strands on the way; `also_moved_by` group) offers; no record strands on the way;
- every stage the business named is a state of the machine. - every stage the business named is a state of the machine, and each
working stage can follow the one before it;
- across each bucket, whichever need brought a record in: every state
is somewhere a record can get to, no state a record gets to holds it
with no way on (before done or after), every declared move is a
button, a visitor's own link or a clock (a move nobody offers warns),
no desk is gated to one group on the page and another on its list,
and every mail goes out from a state records reach and names only
fields the forms collect.
Every finding says what to change and where: the missing
`{ from, to, label }` and the desk page it goes on, the group that
already has the button, or the edge aggregates.yaml lacks. A schema
error no longer hides the needs findings - both are printed, so one
round can fix them together.
`--findings <out.jsonl>` writes the same findings one JSON object per
line: `id`, `level` (`fail`/`warn`), `code`, `scope` (`need`,
`bucket`, or `repo` for a schema error), `need` (the need's id, or the
bucket's name), `subject` (the state, the move as `from>to`, or the
page), `message` and `fix`. The file is written empty when the content
is clean. `id` hashes scope, need, code and subject and nothing of the
wording, so the same gap keeps its id from one run to the next: a
trainer can tell what a round closed, what is still open and what it
broke. The codes:
| code | |
|---|---|
| `schema` | content the site would refuse to load |
| `need-duplicate`, `persona-unknown-need` | needs.yaml itself |
| `entry-missing`, `entry-gated`, `entry-no-responsible` | the page a visitor arrives on |
| `path-missing`, `path-closed`, `path-over-budget`, `path-no-action` | getting the answer recorded |
| `machine-missing`, `desk-missing`, `desk-gated-twice` | who works the bucket |
| `done-unknown`, `done-unreachable`, `success-not-done` | finishing a case |
| `stage-unknown`, `stage-unreachable`, `stage-order` | the business's own stages |
| `state-unreached`, `strand`, `edge-unoffered` | every state and move of the bucket |
| `mail-unreachable`, `mail-unknown-field` | what a state mails |
A need marked `planned` warns instead of failing. Exit status is the A need marked `planned` warns instead of failing. Exit status is the
verdict, so a content repo's CI is one line. verdict, so a content repo's CI is one line.
+59
View File
@@ -0,0 +1,59 @@
# Mail
Portal writes every mail itself and hands it to gdo to deliver
(`portal.mail.send`); a reply comes back as a note beside the record
(`portal.mail.received`). A mail is a subject and a markdown body with
`{placeholders}`, sent as text with an HTML alternative. The kinds of
mail are the ones content declares on a state (see
[State machines](state-machines.md#mail)), the invite and its
rewording (`invite: { group, mail }`, `mail.invite` in site.yaml), the
note to a person named responsible for a question, and the answers to
a suggested change.
## Variables
A placeholder is `{` letters, digits, `_`, `-` or `.` `}`. One that
names nothing renders as nothing; a brace that opens no name stays a
brace. The variables come in layers, so a template written for one
kind of mail reads the same in another.
**On every mail**
| | |
|---|---|
| `{site}` | the instance's public URL, no trailing slash |
| `{site_name}` | site.yaml's `title` |
**On a mail about a record** (every state mail)
| | |
|---|---|
| `{field}` | any field of the record, as the form sent it |
| `{chain}` | the record's id |
| `{email}` | the record's `email` field, trimmed |
| `{bucket}`, `{state}` | where it is and the state it just entered |
| `{notice.field}` | a field of the record this one belongs to, through its `type: record` field `notice` |
| `{self_link}` | the record's own page for the person it belongs to: a page offering a self-service move (`self_transition`) on the bucket from the state the record is in, with the `?chain=&email=` that lets them act without signing in. Empty when there is no such page or no address |
| `{desk_link}` | the desk that moves the record: the page whose list over the bucket has `transitions`, else one that reads it. Empty when no page reads the bucket |
| `{link}` | where this reader acts: `{self_link}` in a mail `to: submitter`, `{desk_link}` in one to anyone else, and `{site}` when that link is empty |
`{link}` is the one to reach for. "Se meldingen og avtal befaring:
{link}" sent to the caretaker opens the desk the report is on; "Feilen
du meldte om er utbedret. {link}" sent to the tenant opens their own
case where they can still act on it, or the site when there is
nothing left for them to do.
**On an invite and the note to someone responsible**, beside every
field of the invite's form: `{name}`, `{username}`, `{email}`,
`{group}` (invite), `{questions}` (responsible), `{expires}`, and
`{link}`, which here is the one-time sign-in link.
## What the lint holds a mail to
A state mail that sends from a state no record reaches warns; one that
names a field no form recording into the bucket collects fails, since
it would go out with a blank where the field should be. The lint
knows every variable above, so `{link}` and the rest are never
flagged. `to: submitter` requires a required `email` on every form
filling the bucket, and `to: "{notice.email}"` requires the `notice`
field.
+3 -1
View File
@@ -57,7 +57,9 @@ a record arrives in it.
``` ```
`{field}` is any field of the record, plus `{site}`, `{chain}`, `{field}` is any field of the record, plus `{site}`, `{chain}`,
`{email}`, `{bucket}` and `{state}`. The body is markdown; it is sent `{email}`, `{bucket}`, `{state}` and `{link}` - the page where the
reader acts on the record, their own or the desk's (every variable is
in [Mail](mail.md#variables)). The body is markdown; it is sent
as text with an HTML alternative. `to: submitter` means the record's as text with an HTML alternative. `to: submitter` means the record's
`email` field, and the lint then requires every form filling that `email` field, and the lint then requires every form filling that
bucket to collect a required `email`. bucket to collect a required `email`.
+16 -5
View File
@@ -243,13 +243,24 @@ against the lint. It is kept for the record of what it measured.
visitor will tolerate. visitor will tolerate.
2. **Structure.** Pages, state machines and desks are generated, then 2. **Structure.** Pages, state machines and desks are generated, then
revised against the lint, `iris check`, until every need is met: revised against the lint, `iris check`, until every need is met:
a path within budget, a desk held by the right group, every a path within budget, a desk held by the right group, every state
finished state reachable, no record stranding. The page-writing of every bucket reachable and none stranding a record. The
model sees the needs and never the personas. page-writing model sees the needs and never the personas. Each
round the lint writes its findings with stable ids (`--findings`,
kept in `<out>/findings/round-N.jsonl`), and the round is logged as
what it fixed, what is still open, what is new and what it
reopened. A fix round is shown only the open findings, each with
the change that closes it, and the files they name (the whole repo
when a finding is about getting around the site). A change that
reopens a closed finding is undone and the model told what it
broke. A round that closes nothing, or leaves as many open as it
found, ends the phase: what is left is written to `run.log` rather
than polished at again.
3. **Wording.** A separate model plays each persona, blind, first with 3. **Wording.** A separate model plays each persona, blind, first with
headings only and then with descriptions. A misroute is a wording headings only and then with descriptions. A misroute is a wording
defect and goes back to the generator. A rewrite that breaks defect and goes back to the generator; a visitor who chose right
structure is reverted. but hesitated is reported and rewrites nothing by itself. A rewrite
that breaks structure is reverted.
Model output is only ever written to `aggregates.yaml`, `site.yaml` Model output is only ever written to `aggregates.yaml`, `site.yaml`
and `questions/**.yaml` inside the output directory. and `questions/**.yaml` inside the output directory.
+26
View File
@@ -0,0 +1,26 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 409.87222 77.398003" role="img" aria-label="GULLBERG sanatorium">
<title>GULLBERG sanatorium</title>
<!-- Futura, drawn as outlines so every machine shows the same mark.
"sanatorium" is spaced out to run the width of GULLBERG, set in
a little from each edge. As an image it colours itself for light
and dark; with wordmark_ink in site.yaml, portal colours it with
the page's own ink instead, and "sanatorium" stays lighter by its
opacity. -->
<style>
.mark { fill: #1d1b18; }
.sub { fill: #1d1b18; fill-opacity: 0.6; }
@media (prefers-color-scheme: dark) {
.mark, .sub { fill: #f1ece3; }
}
</style>
<path class="mark"
d="M 0,25.216 Q 0,19.84 1.984,15.232 3.968,10.624 7.36,7.232 10.816,3.84 15.424,1.92 20.032,0 25.216,0 q 2.88,0 5.44,0.576 2.624,0.512 4.992,1.728 2.432,1.216 4.736,3.072 2.304,1.856 4.608,4.48 l -5.184,4.928 Q 33.856,6.912 25.344,6.912 q -3.84,0 -7.168,1.408 -3.264,1.408 -5.696,3.904 -2.432,2.432 -3.84,5.76 -1.344,3.328 -1.344,7.232 0,3.968 1.472,7.296 1.536,3.328 3.968,5.76 2.496,2.368 5.632,3.712 3.136,1.344 6.4,1.344 3.008,0 5.568,-0.96 2.56,-1.024 4.416,-2.688 1.92,-1.664 3.072,-3.904 1.152,-2.304 1.408,-4.8 V 30.912 H 27.2 v -6.848 h 19.968 v 1.6 q 0,5.504 -1.6,10.048 -1.6,4.48 -4.544,7.68 -2.88,3.2 -7.104,4.992 -4.16,1.728 -9.344,1.728 -5.12,0 -9.6,-1.92 Q 10.496,46.208 7.168,42.816 3.84,39.424 1.92,34.88 0,30.336 0,25.216 Z M 69.360026,0.96 h 7.296004 v 30.208 q 0,3.328 0.832,5.696 0.832,2.304 2.24,3.712 1.472,1.408 3.392,2.048 1.92,0.64 4.096,0.64 2.176,0 4.096,-0.64 1.92,-0.64 3.328,-2.048 1.472,-1.472 2.304,-3.84 0.896,-2.368 0.896,-5.824 V 0.96 h 7.232 V 32 q 0,4.352 -1.472,7.744 -1.408,3.392 -3.84,5.696 -2.432,2.304 -5.696,3.52 -3.2,1.152 -6.848,1.152 -3.648,0 -6.912,-1.152 -3.2,-1.216 -5.632004,-3.52 -2.432,-2.304 -3.904,-5.696 -1.408,-3.392 -1.408,-7.744 z M 129.18404,49.216 V 0.96 h 7.296 v 41.408 h 14.208 v 6.848 z m 41.90405,0 V 0.96 h 7.296 v 41.408 h 14.208 v 6.848 z m 41.90405,0 V 0.96 h 8.32 q 8.064,0 12.48,3.264 4.48,3.2 4.48,9.792 0,3.2 -1.536,5.76 -1.472,2.496 -3.904,3.84 v 0.064 q 4.416,1.28 6.912,4.416 2.56,3.136 2.56,7.296 0,3.52 -1.28,6.144 -1.28,2.56 -3.584,4.288 -2.304,1.728 -5.568,2.56 -3.2,0.832 -7.168,0.832 z m 12.416,-6.848 q 2.496,0 4.288,-0.576 1.792,-0.576 2.944,-1.536 1.152,-0.96 1.664,-2.24 0.512,-1.344 0.512,-2.88 0,-1.536 -0.512,-2.816 -0.512,-1.344 -1.728,-2.368 -1.152,-1.024 -3.136,-1.6 -1.92,-0.576 -4.8,-0.576 h -4.352 v 14.592 z m -2.688,-20.672 q 4.352,0 6.336,-1.984 1.984,-1.984 1.984,-5.504 0,-3.456 -2.048,-4.992 -1.984,-1.536 -6.272,-1.536 h -2.432 V 21.696 Z M 291.31219,0.96 v 6.848 h -19.328 v 11.584 h 18.816 v 6.848 h -18.816 v 16.128 h 19.328 v 6.848 h -26.624 V 0.96 Z m 32.56003,0 q 4.16,0 7.552,0.832 3.392,0.832 5.824,2.56 2.432,1.728 3.776,4.416 1.344,2.624 1.344,6.336 0,4.736 -2.688,8.32 -2.624,3.52 -7.808,5.376 l 14.72,20.416 h -8.896 l -13.568,-19.776 h -1.536 v 19.776 h -7.296 V 0.96 Z m -1.28,22.144 h 2.304 q 5.12,0 7.744,-1.984 2.624,-1.984 2.624,-5.888 0,-7.424 -10.048,-7.424 h -2.624 z m 40.112,2.112 q 0,-5.376 1.984,-9.984 1.984,-4.608 5.376,-8 3.456,-3.392 8.064,-5.312 4.608,-1.92 9.792,-1.92 2.88,0 5.44,0.576 2.624,0.512 4.992,1.728 2.432,1.216 4.736,3.072 2.304,1.856 4.608,4.48 l -5.184,4.928 q -5.952,-7.872 -14.464,-7.872 -3.84,0 -7.168,1.408 -3.264,1.408 -5.696,3.904 -2.432,2.432 -3.84,5.76 -1.344,3.328 -1.344,7.232 0,3.968 1.472,7.296 1.536,3.328 3.968,5.76 2.496,2.368 5.632,3.712 3.136,1.344 6.4,1.344 3.008,0 5.568,-0.96 2.56,-1.024 4.416,-2.688 1.92,-1.664 3.072,-3.904 1.152,-2.304 1.408,-4.8 v -0.064 h -12.032 v -6.848 h 19.968 v 1.6 q 0,5.504 -1.6,10.048 -1.6,4.48 -4.544,7.68 -2.88,3.2 -7.104,4.992 -4.16,1.728 -9.344,1.728 -5.12,0 -9.6,-1.92 -4.48,-1.984 -7.808,-5.376 -3.328,-3.392 -5.248,-7.936 -1.92,-4.544 -1.92,-9.664 z"
id="g"
aria-label="GULLBERG" />
<path class="sub"
d="m 11.999999,76.176 1.079,-0.819 q 0.195,0.338 0.481,0.546 0.286,0.195 0.676,0.195 0.351,0 0.546,-0.143 0.195,-0.156 0.195,-0.442 0,-0.143 -0.065,-0.26 -0.052,-0.117 -0.195,-0.234 -0.143,-0.117 -0.39,-0.247 -0.247,-0.13 -0.624,-0.299 -0.793,-0.364 -1.118,-0.793 -0.325,-0.442 -0.325,-1.066 0,-0.403 0.156,-0.728 0.156,-0.325 0.416,-0.546 0.273,-0.234 0.624,-0.351 0.364,-0.13 0.78,-0.13 0.676,0 1.17,0.247 0.507,0.247 0.793,0.663 l -1.053,0.845 q -0.143,-0.182 -0.403,-0.325 -0.247,-0.143 -0.52,-0.143 -0.273,0 -0.429,0.117 -0.156,0.117 -0.156,0.312 0,0.104 0.052,0.195 0.052,0.091 0.195,0.195 0.143,0.104 0.39,0.234 0.26,0.13 0.663,0.312 0.819,0.377 1.118,0.832 0.299,0.442 0.299,1.066 0,0.455 -0.156,0.832 -0.156,0.364 -0.442,0.624 -0.286,0.26 -0.676,0.39 -0.39,0.143 -0.845,0.143 -0.884,0 -1.443,-0.377 -0.559,-0.377 -0.793,-0.845 z m 40.993985,-2.067 q 0,-0.689 0.221,-1.274 0.234,-0.598 0.637,-1.027 0.416,-0.442 0.962,-0.689 0.559,-0.247 1.209,-0.247 0.585,0 1.079,0.195 0.494,0.195 0.962,0.65 h 0.013 v -0.689 h 1.43 v 6.188 h -1.43 v -0.689 h -0.013 q -0.468,0.455 -0.962,0.663 -0.481,0.208 -1.04,0.208 -0.663,0 -1.235,-0.247 -0.559,-0.26 -0.975,-0.702 -0.403,-0.442 -0.637,-1.04 -0.221,-0.598 -0.221,-1.3 z m 1.456,0 q 0,0.429 0.117,0.806 0.13,0.364 0.364,0.637 0.234,0.273 0.572,0.429 0.351,0.143 0.78,0.143 0.429,0 0.767,-0.143 0.351,-0.156 0.598,-0.416 0.247,-0.273 0.377,-0.637 0.143,-0.364 0.143,-0.793 0,-0.416 -0.143,-0.78 -0.13,-0.364 -0.377,-0.624 -0.247,-0.273 -0.598,-0.429 -0.338,-0.156 -0.754,-0.156 -0.416,0 -0.767,0.156 -0.338,0.156 -0.585,0.416 -0.234,0.26 -0.364,0.624 -0.13,0.351 -0.13,0.767 z M 98.512,71.028 v 0.663 h 0.026 q 0.338,-0.39 0.78,-0.611 0.455,-0.221 1.092,-0.221 1.079,0 1.599,0.676 0.533,0.663 0.533,1.885 v 3.796 h -1.43 v -3.458 q 0,-0.897 -0.286,-1.248 -0.286,-0.364 -0.884,-0.364 -0.663,0 -1.053,0.442 -0.377,0.442 -0.377,1.521 v 3.107 h -1.43 v -6.188 z m 41.05899,3.081 q 0,-0.689 0.221,-1.274 0.234,-0.598 0.637,-1.027 0.416,-0.442 0.962,-0.689 0.559,-0.247 1.209,-0.247 0.585,0 1.079,0.195 0.494,0.195 0.962,0.65 h 0.013 v -0.689 h 1.43 v 6.188 h -1.43 v -0.689 h -0.013 q -0.468,0.455 -0.962,0.663 -0.481,0.208 -1.04,0.208 -0.663,0 -1.235,-0.247 -0.559,-0.26 -0.975,-0.702 -0.403,-0.442 -0.637,-1.04 -0.221,-0.598 -0.221,-1.3 z m 1.456,0 q 0,0.429 0.117,0.806 0.13,0.364 0.364,0.637 0.234,0.273 0.572,0.429 0.351,0.143 0.78,0.143 0.429,0 0.767,-0.143 0.351,-0.156 0.598,-0.416 0.247,-0.273 0.377,-0.637 0.143,-0.364 0.143,-0.793 0,-0.416 -0.143,-0.78 -0.13,-0.364 -0.377,-0.624 -0.247,-0.273 -0.598,-0.429 -0.338,-0.156 -0.754,-0.156 -0.416,0 -0.767,0.156 -0.338,0.156 -0.585,0.416 -0.234,0.26 -0.364,0.624 -0.13,0.351 -0.13,0.767 z M 183.958,71.028 v -2.262 h 1.43 v 2.262 h 1.105 v 1.339 h -1.105 v 4.849 h -1.43 v -4.849 h -1.001 v -1.339 z m 38.849,3.055 q 0,-0.663 0.234,-1.248 0.234,-0.585 0.663,-1.014 0.442,-0.442 1.04,-0.702 0.611,-0.26 1.352,-0.26 0.741,0 1.339,0.26 0.611,0.247 1.04,0.689 0.442,0.442 0.676,1.04 0.247,0.598 0.247,1.287 0,0.689 -0.247,1.287 -0.234,0.598 -0.676,1.04 -0.429,0.429 -1.04,0.689 -0.611,0.247 -1.365,0.247 -0.728,0 -1.339,-0.247 -0.598,-0.26 -1.027,-0.702 -0.429,-0.442 -0.663,-1.053 -0.234,-0.611 -0.234,-1.313 z m 1.456,0.026 q 0,0.923 0.494,1.469 0.494,0.546 1.339,0.546 0.832,0 1.339,-0.546 0.507,-0.546 0.507,-1.443 0,-0.884 -0.507,-1.43 -0.494,-0.559 -1.339,-0.559 -0.403,0 -0.741,0.143 -0.338,0.143 -0.585,0.416 -0.247,0.26 -0.377,0.624 -0.13,0.351 -0.13,0.78 z m 42.28101,-3.081 h 1.43 v 0.559 h 0.026 q 0.351,-0.377 0.65,-0.546 0.312,-0.182 0.767,-0.182 0.559,0 1.17,0.377 l -0.65,1.3 q -0.403,-0.286 -0.793,-0.286 -1.17,0 -1.17,1.755 v 3.211 h -1.43 z m 42.15098,0 v 6.188 h -1.43 v -6.188 z m -1.651,-2.691 q 0,-0.377 0.273,-0.65 0.273,-0.273 0.65,-0.273 0.39,0 0.663,0.273 0.286,0.273 0.286,0.65 0,0.377 -0.273,0.663 -0.273,0.273 -0.663,0.273 -0.403,0 -0.676,-0.273 -0.26,-0.286 -0.26,-0.663 z m 39.122,2.691 h 1.43 v 3.549 q 0,1.547 1.209,1.547 1.222,0 1.222,-1.547 v -3.549 h 1.43 v 3.588 q 0,1.313 -0.676,2.054 -0.676,0.728 -1.976,0.728 -0.598,0 -1.092,-0.169 -0.481,-0.169 -0.832,-0.507 -0.338,-0.351 -0.533,-0.871 -0.182,-0.52 -0.182,-1.235 z m 42.74902,0 h 1.43 V 71.6 h 0.013 q 0.286,-0.338 0.65,-0.533 0.377,-0.208 0.962,-0.208 0.624,0 1.027,0.234 0.403,0.221 0.702,0.689 h 0.013 q 0.377,-0.455 0.845,-0.689 0.481,-0.234 1.118,-0.234 1.105,0 1.651,0.637 0.546,0.637 0.546,1.898 v 3.822 h -1.43 v -3.432 q 0,-0.897 -0.26,-1.261 -0.26,-0.377 -0.845,-0.377 -0.65,0 -0.949,0.429 -0.286,0.416 -0.286,1.313 v 3.328 h -1.43 v -3.523 q 0,-0.806 -0.26,-1.17 -0.26,-0.377 -0.819,-0.377 -0.637,0 -0.949,0.429 -0.299,0.416 -0.299,1.313 v 3.328 h -1.43 z"
id="s"
aria-label="sanatorium" />
</svg>

After

Width:  |  Height:  |  Size: 8.5 KiB

@@ -0,0 +1,61 @@
# Aksjonæravtalen for Gullberg AS: punkter å dekke
Ikke en avtale, og ikke på siden. En liste over det aksjonæravtalen bør
svare på, til samtale mellom de fire og med advokat eller regnskapsfører.
Lånet går over lang tid (rundt 100 000 kr i året mot 1,6 millioner), så
avtalen må tåle at livene til de fire endrer seg underveis.
## Eierskapet
- Hvem de fire aksjonærene er, med 25 % hver, og hva hver har skutt inn.
- Hvordan huset går fra dødsboet til selskapet: skjøte, takst som legges
til grunn, og hvem som betaler dokumentavgiften.
- Hva søsknene som løses ut får, når, og at de ikke har noe krav etterpå.
## Lånet
- Hvem som står for lånet overfor banken, og om noen har kausjonert
personlig. Hvis bare noen kausjonerer: hvordan de holdes skadesløse av
de andre.
- Hva som skjer hvis husleia ikke dekker avdraget en måned, eller et
halvår: hvem skyter inn, i hvilket forhold, og som lån eller kapital.
- Hva som skjer hvis renta stiger mye.
## Driften
- Hva styret avgjør alene, og hva som krever alle fire (nye lån, salg av
huset, store utbedringer over et beløp, endring av husleia, ny eier).
- Hva som skjer ved stemmelikhet, to mot to: hvem eller hva som bryter.
- Klingenberg Bygg som forvalter, og som den som gir overslag og gjør
arbeidet: hvordan overslag godkjennes, og hvordan en mulig
interessekonflikt håndteres.
- Et vedlikeholdsfond: hvor mye av overskuddet som settes av før noe
deles ut.
## Bruken av huset
- Hvordan sommerukene fordeles mellom de fire, hvem som velger først, og
hva som skjer med uker ingen bruker.
- Om uker kan leies ut til andre, og hvem som får inntekten.
- Hva aksjonærene betaler for egne uker, om noe.
## Når noe endrer seg
- En aksjonær vil selge: forkjøpsrett for de andre, hvordan prisen
fastsettes (takst, formel), og hvor lang tid de andre har.
- En aksjonær dør eller skiller seg: om aksjene går til arvinger eller
ektefelle, eller om de andre kan løse dem ut.
- En aksjonær klarer ikke sin del: hva som skjer med andelen.
- Huset skal selges: hvordan, og hvordan pengene fordeles etter lånet.
- Brann, stor skade, eller at huset ikke kan leies ut: forsikring, og
hva som skjer med lånet.
## Utbytte og innsyn
- Når det deles ut utbytte, og i hvilken rekkefølge (lån, fond, utbytte).
- Hva hver aksjonær har rett til å se (rapportene på siden, regnskapet).
## Tvister og varighet
- Hvordan uenighet løses før noen går til retten (mekling).
- Når avtalen tas opp igjen, for eksempel hvert femte år.
@@ -0,0 +1,27 @@
# Huset
Utkast, skrives av eierne: hva huset er, hvor det ligger, hvor mange rom det har og i hvilken stand.
# Forretningen
Utkast, skrives av eierne: de to inntektene, romleie til studenter og timeshare-uker, og hva hver av dem gir i året.
# Eierne
Utkast, skrives av eierne: Gullberg AS eies av fire aksjonærer med 25 % hver. Hvem de er, hvordan styret er satt sammen, og hva som krever alle fire.
# Lånet
Utkast, skrives av eierne: 1,6 millioner til å løse ut de to søsknene som ikke blir med (800 000 kr hver), og at selskapet overtar huset ved skjøte tinglyst på selskapet. Dokumentavgiften (normalt 2,5 % av verdien), rente, løpetid og sikkerhet slik banken tilbyr, og hvordan avdraget betjenes av husleia.
# Budsjettet
Utkast, skrives av eierne: inntekter, drift, renter og avdrag for et normalår, og hvor rapportene står.
# Det som mangler
Utkast, skrives av eierne: de største manglene ved huset, hva de koster å rette, og planen for det. Lista på siden holdes oppdatert.
# Forvaltningen
Utkast, skrives av eierne: at Klingenberg Bygg forvalter huset, og hva det innebærer.
+327
View File
@@ -0,0 +1,327 @@
# GULLBERG sanatorium - et Klingenberg Bygg-prosjekt på
# gullberg.klingenbergbygg.no. UTKAST 2026-09-30, til samtale; ikke
# bygget eller satt ut.
#
# Oppsettet (samtale 2026-10-01): hele huset legges i Gullberg AS, som
# eies av fire aksjonærer med 25 % hver. Selskapet låner 1,6 millioner i
# banken for å løse ut de to søsknene som ikke blir med (800 000 kr hver),
# og overtar huset (skjøte tinglyst på selskapet). Dokumentavgiften,
# normalt 2,5 % av verdien, må med i lånet eller budsjettet. Rundt
# 100 000 kr i året til banken er en lang nedbetaling: alt som kan gå
# galt underveis hører hjemme i aksjonæravtalen (se
# documents/gullberg-aksjonaeravtale-punkter.md, ikke på siden).
#
# Huset ligger bak Ås kirke, i Syverudveien (17?), et kort stykke fra
# NMBU. Rommene er for alle, men studenter går foran.
#
# Siden er huset i drift: rom til leie, feil meldt til Klingenberg
# Bygg som forvalter, styrets liste over det som er bra, mangler og er
# planlagt, husleia måned for måned, kvartalsrapporter, nedbetalingsplanen
# alle fire står bak, og eierskiftet steg for steg. Banken er ikke en egen
# gruppe på siden ennå; styret sender rapportene.
#
# Pengene: 3 soverom à 8 000 kr er 24 000 kr i måneden, rundt 264 000 i
# året over 11 måneder; sommeren er timeshare-uker. Husleia går som fast
# trekk eller AvtaleGiro til selskapets konto; Vipps eller Stripe bare for
# engangsbeløp. Depositum på egen depositumskonto (husleieloven).
#
# Åpne spørsmål:
# - hvem de fire aksjonærene er, og om nye medeiere søkes ved siden av
# lånet (medeier-tilbudet er tatt ut av forsiden til det er avgjort)
# - bankens tilbud: rente, løpetid, sikkerhet, kausjon
# - takst; hvem som sitter i styret
# - antall måneder studentene leier; timeshare bare for aksjonærene?
# - regnskapsfører/advokat: skiftet, dokumentavgift, skatt på husleie
# - kontakt og avsender (under er plassholdere)
business: GULLBERG sanatorium
language: no
# Plassholder til styret har en adresse.
contact: { name: Styret i Gullberg, email: bl@klingenbergbygg.no, group: styret }
people: memberships
mail: { from: "Gullberg <gullberg@klingenbergbygg.no>", reply_to: bl@klingenbergbygg.no }
about: >
Et gammelt hus bak Ås kirke, i Syverudveien, med rimelige rom til leie;
studenter ved NMBU går foran, men alle kan søke,
og uker om sommeren for dem som eier det. Drevet av eierne, forvaltet
av Klingenberg Bygg; det som mangler, står på lista med planen for
det, og tallene ligger åpent.
groups:
- { id: styret, label: Styret }
- { id: aksjonaerer, label: Aksjonærer }
- { id: leietakere, label: Leietakere }
- { id: klingenberg, label: Klingenberg Bygg }
invites_by: [styret]
does:
- id: rom
for: leie-rom
text: >
Rimelige rom bak Ås kirke, et kort stykke fra NMBU. Studenter går
foran, men alle kan søke. Du søker her, kommer på visning og sier
selv ja til tilbudet.
# Forretningsplanen, ord for ord: ett kort per del. Skal skrives av
# eierne; filen har bare delene og hva som hører hjemme i dem.
documents:
- id: forretningsplan
question: Hvordan går Gullberg rundt?
description: Forretningsplanen for Gullberg, slik eierne har lagt den fram for banken.
file: documents/gullberg-forretningsplan.md
needs:
# Offentlig: noen søker rom. Studenter går foran; styret ser hva den
# som søker gjør til daglig, og velger etter det.
- id: leie-rom
who: en som trenger et rimelig rom i Ås, oftest en student ved NMBU
wants: et rom å bo på til en leie som går opp, med studenter først i køen
lands_in: romsoknader
handled_by: styret
stages: [open, visning, tilbud, akseptert, signert, avslatt]
stages_text: { open: "mottatt", visning: "visning avtalt", tilbud: "tilbud sendt", akseptert: "tilbud godtatt", signert: "kontrakt signert", avslatt: "avsluttet uten leie" }
done_when: [signert, avslatt]
success: [signert]
turned_down_from: [open, visning, tilbud]
moves_by: { akseptert: [submitter], avslatt: [submitter, styret] }
mails: { open: submitter, visning: submitter, tilbud: submitter, akseptert: bl@klingenbergbygg.no, signert: submitter }
grants: { signert: leietakere }
max_fields: 4
collects:
- { name: name }
- { name: email, type: email }
- { name: telefon, type: tel }
- { name: situasjon, type: select, options: [Student ved NMBU, Student et annet sted, Jobber eller annet] }
- { name: innflytting, type: date, optional: true }
- { name: om, type: textarea, optional: true }
# Rommene som er ledige, som bildekort styret legger inn og tar ned.
- id: ledig-rom
who: styret, når et rom blir ledig
wants: at de som søker ser rommet før de søker
enters_as: styret
lands_in: rom
handled_by: styret
watched_by: [public]
presents: true
public_states: [open]
stages: [open, utleid]
stages_text: { open: "ledig", utleid: "leid ut" }
done_when: [utleid]
success: [utleid]
leaves_after: { utleid: { minutes: 10 } }
max_fields: 3
collects:
- { name: tittel }
- { name: bilde, type: picture }
- { name: om, type: textarea }
# Styrets liste: det som er bra, det som mangler, det som er planlagt.
# Aksjonærene ser alt; allmennheten bare planene styret har publisert,
# og de står som kunngjøringer.
- id: liste
who: styret, om huset og driften
wants: én liste over det som er bra, det som mangler og det som er planlagt, med pris og tid
enters_as: styret
lands_in: liste
handled_by: styret
watched_by: [aksjonaerer, public]
public_states: [publisert]
stages: [open, vedtatt, publisert, forkastet]
stages_text: { open: "utkast", vedtatt: "vedtatt", publisert: "publisert", forkastet: "forkastet" }
done_when: [publisert, forkastet]
success: [publisert]
max_fields: 3
collects:
- { name: tittel }
- { name: slag, type: select, options: [Kvalitet, Mangel, Plan] }
- { name: beskrivelse, type: textarea }
- { name: kostnad, optional: true }
- { name: naar, optional: true }
# Budsjettrapporten: tallene i felt, ikke bare en PDF. Aksjonærene ser
# den her; styret sender den til banken og fører inn at den er sendt.
- id: rapport
who: styret, hvert kvartal
wants: at aksjonærene ser hvordan det går, i tall, og at banken får det den skal ha
enters_as: styret
lands_in: rapporter
handled_by: styret
watched_by: [aksjonaerer]
stages: [open, sendt]
stages_text: { open: "lagt fram for aksjonærene", sendt: "sendt til banken" }
done_when: [sendt]
success: [sendt]
max_fields: 7
collects:
- { name: periode }
- { name: leieinntekter }
- { name: timeshare }
- { name: driftskostnader }
- { name: renter-og-avdrag }
- { name: saldo }
- { name: kommentar, type: textarea }
- { name: dokument, type: file, optional: true }
# Nedbetalingsplanen: hvordan pengene går og hva banken får. Styret
# legger den fram, BEGGE aksjonærene må godkjenne før den går til
# banken, og styret fører inn bankens svar. "Alle i gruppa" finnes ikke
# i portal ennå: i dag holder det at én trykker. Ny portal-funksjon før
# dette brukes.
- id: nedbetalingsplan
who: styret, når veien videre og pengestrømmen skal avtales
wants: en nedbetalingsplan alle fire aksjonærene står bak, som banken sier ja til
enters_as: styret
lands_in: nedbetalingsplaner
handled_by: styret
watched_by: [aksjonaerer]
stages: [open, godkjent, sendt, innvilget, endringer]
stages_text: { open: "til godkjenning hos aksjonærene", godkjent: "godkjent av aksjonærene", sendt: "sendt til banken", innvilget: "innvilget av banken", endringer: "banken ber om endringer" }
reached_from: { godkjent: [open], sendt: [godkjent], innvilget: [sendt], endringer: [sendt] }
done_when: [innvilget, endringer]
success: [innvilget]
moves_by: { godkjent: [aksjonaerer], sendt: [styret], innvilget: [styret], endringer: [styret] }
max_fields: 6
collects:
- { name: tittel }
- { name: laanebelop }
- { name: maanedlig-avdrag }
- { name: forste-trekk, type: date }
- { name: pengestrom, type: textarea }
- { name: dokument, type: file, optional: true }
# Husleia, måned for måned: forventet mot betalt, fra kontoutskriften.
# Aksjonærene og långiveren ser hvordan det går mellom rapportene.
- id: husleie
who: styret, når husleia for en måned er kommet inn
wants: at aksjonærene ser hvilke rom som har betalt, og hva som gikk til banken
enters_as: styret
lands_in: husleie
handled_by: styret
watched_by: [aksjonaerer]
stages: [open, betalt, purret]
stages_text: { open: "forventet", betalt: "betalt", purret: "purret" }
reached_from: { purret: [open], betalt: [open, purret] }
done_when: [betalt]
success: [betalt]
max_fields: 4
collects:
- { name: rom }
- { name: maaned }
- { name: belop }
- { name: betalt-dato, type: date, optional: true }
# Feil i huset: en leietaker melder fra, Klingenberg Bygg ser på det og
# gir et overslag, styret godkjenner kostnaden før arbeidet gjøres.
- id: feil
who: en leietaker som har funnet noe som er galt i huset
wants: at det blir sett på og rettet
enters_as: leietakere
lands_in: feil
handled_by: klingenberg
# Leietakeren ser sine egne meldinger og hvor langt de har kommet.
followed_by: [leietakere]
watched_by: [styret]
stages: [open, befaring, overslag, godkjent, utbedret, avvist]
stages_text: { open: "meldt", befaring: "befaring avtalt", overslag: "overslag gitt", godkjent: "godkjent av styret", utbedret: "utbedret", avvist: "avvist" }
reached_from: { avvist: [open, befaring, overslag] }
done_when: [utbedret, avvist]
success: [utbedret]
moves_by: { godkjent: [styret], avvist: [styret, klingenberg] }
mails: { open: fredrik@klingenbergbygg.no, overslag: bl@klingenbergbygg.no, utbedret: submitter }
max_fields: 3
collects:
- { name: hva }
- { name: hvor, optional: true }
- { name: beskrivelse, type: textarea }
- { name: email, type: email }
- { name: bilde, type: picture, optional: true }
# Overslaget: Klingenberg Bygg gir et beløp for å rette en feil. Styret
# og aksjonærene ser det; godkjente overslag hører med i rapporten.
- id: overslag
who: Klingenberg Bygg, når en feil er sett på
wants: at styret får et beløp å ta stilling til, og at det havner i regnskapet
enters_as: klingenberg
lands_in: overslag
handled_by: styret
watched_by: [aksjonaerer, klingenberg]
stages: [open, godkjent, avvist, fakturert]
stages_text: { open: "til styret", godkjent: "godkjent", avvist: "avvist", fakturert: "fakturert" }
reached_from: { avvist: [open], fakturert: [godkjent] }
done_when: [fakturert, avvist]
success: [fakturert]
moves_by: { fakturert: [klingenberg] }
mails: { open: bl@klingenbergbygg.no }
max_fields: 3
collects:
- { name: gjelder }
- { name: belop }
- { name: hva-det-dekker, type: textarea }
- { name: dokument, type: file, optional: true }
# Eierskiftet, steg for steg: fra selskapet stiftes til søsknene er
# utbetalt. Aksjonærene og banken ser hvor langt det har kommet.
- id: eierskifte
who: styret, mens huset går over til selskapet
wants: at aksjonærene og banken ser hvor langt eierskiftet har kommet, med dokumentene
enters_as: styret
lands_in: eierskifte
handled_by: styret
watched_by: [aksjonaerer]
stages: [open, arbeid, ferdig]
stages_text: { open: "ikke startet", arbeid: "i gang", ferdig: "ferdig" }
done_when: [ferdig]
success: [ferdig]
max_fields: 2
collects:
- { name: steg, type: select, options: [Selskapet stiftet, Takst, Lånet innvilget, Aksjonæravtale signert, Skjøte signert, Skjøte tinglyst, Dokumentavgift betalt, Søsknene utbetalt] }
- { name: merknad, type: textarea, optional: true }
- { name: dokument, type: file, optional: true }
# Aksjonærene: uker i huset, og saker til styret.
- id: uke
who: en aksjonær som vil bruke huset en periode
wants: en uke i huset, bekreftet av styret
enters_as: aksjonaerer
lands_in: uker
handled_by: styret
stages: [open, bekreftet, avslatt]
stages_text: { open: "ønsket", bekreftet: "bekreftet", avslatt: "ikke ledig" }
done_when: [bekreftet, avslatt]
success: [bekreftet]
max_fields: 3
collects:
- { name: fra, type: date }
- { name: til, type: date }
- { name: merknad, type: textarea, optional: true }
- id: sak
who: en aksjonær som vil ha noe avgjort
wants: at styret tar saken opp og avgjør den
enters_as: aksjonaerer
lands_in: saker
handled_by: styret
watched_by: [aksjonaerer]
stages: [open, sakslisten, vedtatt, avvist]
stages_text: { open: "meldt", sakslisten: "på sakslisten", vedtatt: "vedtatt", avvist: "avvist" }
done_when: [vedtatt, avvist]
success: [vedtatt]
max_fields: 2
collects:
- { name: tittel }
- { name: sak, type: textarea }
personas:
- { id: student-nmbu, need: leie-rom, text: "Jeg begynner på master på NMBU til høsten og har ikke råd til hybel i Ås sentrum. Et rimelig rom i et stort hus høres perfekt ut." }
- { id: ung-arbeider, need: leie-rom, text: "Jeg har fått jobb i Ås og trenger et rimelig sted å bo. Jeg er ikke student; kan jeg søke likevel?" }
- { id: student-kort, need: leie-rom, text: "Jeg skal på utveksling og trenger et rom bare for ett semester. Går det an?" }
- { id: styret-rom, need: ledig-rom, text: "Rommet i andre etasje blir ledig til jul, og jeg har et fint bilde av det. Det vil jeg legge ut." }
- { id: styret-mangel, need: liste, text: "Taket på uthuset lekker. Det må stå på lista, og vi må ha en plan og en pris for det." }
- { id: styret-kvartal, need: rapport, text: "Tredje kvartal er gjort opp. Leia kom inn, men strømmen ble dyrere enn vi trodde. Rapporten skal til banken." }
- { id: leietaker-vann, need: feil, text: "Det drypper fra taket på badet i andre etasje når noen dusjer over. Hvem sier jeg fra til?" }
- { id: klingenberg-overslag, need: overslag, text: "Vi har sett på lekkasjen på badet. Det er en pakning og litt flis, rundt 6 500 kroner. Styret må si ja før vi setter i gang." }
- { id: styret-skjote, need: eierskifte, text: "Skjøtet er tinglyst på selskapet i dag. Banken skal se det, og kopien skal ligge ved." }
- { id: aksjonaer-sommer, need: uke, text: "Vi vil gjerne være i huset første uka i juli med barna." }
- { id: styret-plan, need: nedbetalingsplan, text: "Vi har regnet på det: 24 000 i måneden fra rommene, og vi kan sette av en fast sum til långiveren hver måned. Alle fire må stå bak det før vi går til banken." }
- { id: styret-husleie, need: husleie, text: "Oktober er inne for to av rommene, det tredje mangler. Det må stå et sted alle ser." }
- { id: aksjonaer-sak, need: sak, text: "Jeg mener vi bør se på solceller før vi tar opp mer lån. Kan styret ta det opp?" }
+2 -2
View File
@@ -289,7 +289,7 @@ slideshow:
- image: images/bildeserie/20.webp - image: images/bildeserie/20.webp
width: 1867 width: 1867
height: 1400 height: 1400
caption: Her heises Moelvens modulskole i Vestby på plass. Den blir stående i 10 år. caption: Her heises Moelvens modulskole i Vestby på plass. Den blir stående i minst 10 år.
- image: images/bildeserie/21.webp - image: images/bildeserie/21.webp
width: 1867 width: 1867
height: 1400 height: 1400
@@ -309,4 +309,4 @@ slideshow:
- image: images/bildeserie/25.webp - image: images/bildeserie/25.webp
width: 1487 width: 1487
height: 1400 height: 1400
caption: pH-test av borprøver i mur fra forskjellige dybder caption: pH-test av borprøver i betong fra forskjellige dybder
+985
View File
@@ -0,0 +1,985 @@
{
"aggregates.yaml": {
"feil": {
"open": {
"subject": "Ny feil meldt på Gullberg: {hva}",
"body": "En leietaker på Gullberg har meldt fra om {hva}. Se meldingen og avtal befaring: {link}"
},
"overslag": {
"subject": "Overslag til styret: {hva}",
"body": "Klingenberg Bygg har sett på {hva} og gitt et overslag. Styret godkjenner eller avviser det før arbeidet settes i gang: {link}"
},
"utbedret": {
"subject": "{hva} er rettet",
"body": "Feilen du meldte om, {hva}, er nå utbedret. Si gjerne til hvis noe fortsatt ikke er som det skal. {link}"
}
},
"overslag": {
"open": {
"subject": "Nytt overslag fra Klingenberg Bygg: {gjelder}",
"body": "Klingenberg Bygg har sendt et overslag for {gjelder}. Det ligger hos styret til godkjenning: {link}"
}
},
"romsoknader": {
"akseptert": {
"subject": "{name} har takket ja til rommet",
"body": "{name} har takket ja til tilbudet om rom på Gullberg. Neste steg er kontrakten og depositumet. {link}"
},
"open": {
"subject": "Søknaden din om rom på Gullberg er mottatt",
"body": "Hei {name},\n\nsøknaden din om rom på Gullberg er mottatt. Styret går gjennom søknadene fortløpende; studenter går foran, men alle blir sett på. Du hører fra oss om visning. {link}\n\nDet du kan gjøre nå: {site}/decide/leie-rom?chain={chain}&email={email}\n\nHilsen styret i Gullberg"
},
"signert": {
"subject": "Kontrakten er signert",
"body": "Kontrakten for rommet du søkte om er nå signert av begge parter. Rommet er ditt - velkommen inn. {link}"
},
"tilbud": {
"subject": "Du har fått tilbud om rom",
"body": "Styret har sett på søknaden din og kan tilby deg rommet. Svar her så snart du kan, så går vi videre med kontrakten. {link}\n\nDet du kan gjøre nå: {site}/decide/leie-rom?chain={chain}&email={email}"
},
"visning": {
"subject": "Visning av rommet er satt opp",
"body": "Søknaden din har kommet til visning - styret vil vise deg rommet før det avgjøres. Du hører fra oss om tid og sted. {link}\n\nDet du kan gjøre nå: {site}/decide/leie-rom?chain={chain}&email={email}"
}
}
},
"questions/aksjonaerer/index.yaml": {
"question": "Hvordan ligger huset og driften an?",
"description": "Her ser aksjonærene hvordan huset og driften står: eierskiftet, husleia, lista, overslagene og sakene.",
"confirm": "Bekreft",
"buckets": {
"eierskifte": {
"heading": "Se hvor langt eierskiftet har kommet",
"description": "Hvert steg i overgangen til Gullberg AS, med dokumentene som hører til.",
"moves": {},
"list_title": "Steg i eierskiftet",
"list_note": "Hver rad er et steg med merknad og dokument; flytt det videre når det er i arbeid eller ferdig."
},
"husleie": {
"heading": "Se hvilke rom som har betalt",
"description": "Husleia for hvert rom, måned for måned, og hva som er purret på.",
"moves": {},
"list_title": "Husleie",
"list_note": "Hver rad er ett rom for én måned, med beløp og betalingsdato; merk den betalt eller purret."
},
"liste": {
"heading": "Se det som er bra, mangler og planlagt",
"description": "Én liste over tilstanden i huset, med pris og tid på det som står igjen.",
"moves": {},
"list_title": "Lista",
"list_note": "Hver rad er ett punkt med kostnad og tidspunkt; vedta den, publiser den eller forkast den."
},
"nedbetalingsplaner": {
"heading": "Godkjenn nedbetalingsplanen",
"description": "Planen for lånet, lagt fram for alle fire aksjonærene og banken.",
"moves": {
"open->godkjent": "Godkjenn planen"
},
"list_title": "Nedbetalingsplaner",
"list_note": "Hver rad er en plan med lånebeløp og pengestrøm; følg den fra godkjent til innvilget hos banken."
},
"overslag": {
"heading": "Se overslagene fra Klingenberg Bygg",
"description": "Beløpet Klingenberg Bygg har satt på en feil, klart til vedtak.",
"moves": {},
"list_title": "Overslag",
"list_note": "Hver rad er ett overslag med beløp og hva det dekker; godkjenn, avvis eller fakturer det."
},
"rapporter": {
"heading": "Se kvartalsrapportene",
"description": "Tallene aksjonærene og banken skal ha, kvartal for kvartal.",
"moves": {},
"list_title": "Rapporter",
"list_note": "Hver rad er én periode med inntekter, kostnader og saldo; send den når den er klar."
},
"saker": {
"heading": "Se sakene som er meldt til styret",
"description": "Det en aksjonær vil ha styrets ord på, samlet på ett sted.",
"moves": {},
"list_title": "Saksliste",
"list_note": "Hver rad er én sak; sett den på sakslisten, vedta den eller avvis den."
}
},
"links": {
"uke": {
"heading": "Be om en uke i huset",
"description": "Reserver en periode selv, bekreftet av styret.",
"button": "Søk om uke"
},
"sak": {
"heading": "Få noe avgjort av styret",
"description": "Meld en sak du vil ha styrets ord på.",
"button": "Meld sak"
}
},
"invites": {
"aksjonaerer": {
"heading": "Inviter en ny aksjonær inn",
"description": "De får en konto og en lenke som gjelder én gang.",
"button": "Send invitasjon",
"form_title": "Ny aksjonær",
"form_description": "Ha navn, e-post og telefon klart.",
"labels": {
"name": "Navn",
"phone": "Telefon",
"email": "E-post"
}
}
},
"invited": {
"heading": "Se hvem som er invitert",
"description": "Status på invitasjonene som er sendt ut.",
"done": "Aktiv",
"withdraw": "Trekk tilbake",
"again": "Send på nytt",
"list_title": "Invitasjoner",
"list_note": "Hver rad er én invitasjon; send den på nytt om lenken har gått ut, eller trekk den tilbake."
},
"suggestions": null
},
"questions/aksjonaerer/sak-sent.yaml": {
"question": "Hva skjer med saken jeg nettopp sendte inn?",
"description": "Saken er sendt til styret. Den havner på sakslisten og blir tatt opp der.",
"next_heading": "Følg saken videre",
"next_description": "Styret vurderer saken og vedtar eller avviser den. Du finner status på sakslisten."
},
"questions/aksjonaerer/sak.yaml": {
"heading": "Få en sak opp i styret",
"description": "Noe som bør avgjøres, men ikke er ditt å avgjøre alene? Legg den fram, så tar styret den opp.",
"button": "Send saken",
"encouragement": "Styret ser den og setter den på sakslisten.",
"icon": "vote",
"paused": "Pause mottak av saker",
"requires_title": "Krev tittel",
"requires_description": "Krev beskrivelse av saken",
"requires_icon": "Krev ikon",
"road_title": "Fra forslag til vedtak",
"road_description": "Saken kommer inn og settes på sakslisten, blir tatt opp av styret og ender med et vedtak eller en avvisning.",
"road_icon": "list",
"who_title": "Hvem som leser den",
"who_description": "Styret får saken og tar stilling til den; haster det, nå dem på bl@klingenbergbygg.no.",
"who_icon": "users",
"form_title": "Ny sak",
"form_description": "Skriv kort hva saken går ut på og hvorfor den bør opp.",
"labels": {
"tittel": "Tittel på saken",
"sak": "Hva gjelder saken"
},
"hints": {
"tittel": "Fast eller flytende leie for sommeren",
"sak": "Vi bør avklare om timeshare-ukene skal prises likt hele året, eller om sommeren skal koste mer. Foreslår at styret tar stilling til dette før neste sesong."
},
"question": "Er det noe som bør avgjøres av styret?",
"page_description": "Her melder du inn en sak du vil at styret skal ta opp og avgjøre."
},
"questions/aksjonaerer/uke-sent.yaml": {
"question": "Hva skjer nå med ukesøknaden din?",
"description": "Den er sendt og ligger hos styret, som avgjør om uken blir bekreftet.",
"next_heading": "Styret ser på søknaden din",
"next_description": "De bekrefter eller avslår uken. Du finner svaret i oversikten når det er klart."
},
"questions/aksjonaerer/uke.yaml": {
"heading": "Reserver en uke i huset",
"description": "Si fra når du vil bruke huset, så ser styret om datoene passer.",
"button": "Send ønske",
"encouragement": "Du hører fra styret så snart datoene er sjekket.",
"icon": "calendar",
"paused": "Tar vi ikke imot ukeønsker nå",
"requires_title": "Krever tittel",
"requires_description": "Krever beskrivelse",
"requires_icon": "Krever ikon",
"road_title": "Veien videre",
"road_description": "Styret ser på ønsket ditt og bekrefter eller avslår uken.",
"road_icon": "route",
"who_title": "Hvem leser dette",
"who_description": "Styret ser ønsket ditt; skriv til bl@klingenbergbygg.no om det haster.",
"who_icon": "users",
"form_title": "Ukeønske",
"form_description": "Fyll inn datoene du ønsker huset.",
"labels": {
"fra": "Fra dato",
"til": "Til dato",
"merknad": "Merknad"
},
"hints": {
"fra": "f.eks. 6. juli 2027",
"til": "f.eks. 13. juli 2027",
"merknad": "f.eks. kommer med familie, trenger ekstra seng"
},
"question": "Hvilken uke vil du bruke huset?",
"page_description": "Meld fra om uken du ønsker, så bekrefter styret den."
},
"questions/decide/leie-rom.yaml": {
"question": "Vil du ta imot tilbudet om rom?",
"description": "Styret har sett på søknaden din og tilbyr deg et rom. Si ja og det er ditt, si nei og det går videre til neste på lista.",
"moves": {
"akseptert": {
"heading": "Ta imot rommet",
"description": "Du sier ja til rommet du har fått tilbud om. Styret tar kontakt om innflytting og signering.",
"button": "Ta imot"
},
"avslatt": {
"heading": "Takk nei til rommet",
"description": "Du sier nei til tilbudet, og rommet går videre til neste søker.",
"button": "Takk nei"
}
}
},
"questions/hvem.yaml": {
"question": "Hva er Gullberg?",
"description": "Et gammelt hus bak Ås kirke, eid av fire aksjonærer og drevet av styret, med Klingenberg Bygg som forvalter. Her er rommene som er ledige nå.",
"presents": {
"rom": {
"heading": "Rommene som er ledige",
"description": "Rommene som står ledige for dem som søker et sted å bo.",
"empty": "Ingen rom er ledige akkurat nå, men nye kommer når noen flytter ut."
}
},
"values": {
"heading": "Det styret har vedtatt",
"description": "Det som gjelder for huset og driften, slik styret har satt det.",
"items": {}
}
},
"questions/index.yaml": {
"question": "Trenger du et rimelig rom i Ås?",
"description": "Gullberg er et gammelt hus bak Ås kirke, et kort stykke fra NMBU. Eierne driver det selv, og Klingenberg Bygg forvalter huset og vedlikeholdet.",
"opener": {
"heading": "Et rimelig sted å bo, nær NMBU",
"description": "Rommene leies ut for et år av gangen, til en pris som går opp med studielånet. Studenter går foran, men alle kan søke.",
"features": {
"rom": {
"heading": "Rom til leie, studenter først",
"description": "Du leier et rom i huset for et år av gangen. Studenter ved NMBU får rommene først; er det ledig, får andre også.",
"icon": "house"
}
}
},
"who": {
"heading": "Hva er Gullberg?",
"description": "Fire aksjonærer eier huset sammen og driver det selv, med Klingenberg Bygg som forvalter.",
"button": "Se huset og rommene"
},
"shopping": {
"heading": "Hva som er gjort, og hva som mangler",
"description": "Det styret har vedtatt for huset: planene, med pris og tid der det er kjent.",
"items": {
"status-liste": {
"heading": "Siste fra lista",
"description": "Punktene styret har tatt stilling til, ferskest øverst.",
"link": "Se hele lista",
"empty": "Snart kommer de første punktene på lista.",
"icon": "clipboard-list"
}
}
},
"doors": {},
"needs": {
"leie-rom": {
"heading": "Søk om et rom",
"description": "Fortell litt om deg og hva du gjør til daglig. Studenter går foran, men alle kan søke.",
"button": "Søk rom",
"encouragement": "Det tar bare et par minutter, og du hører fra styret så snart et rom er ledig.",
"icon": "key",
"paused": "Søknader er satt på pause",
"requires_title": "Dette trenger vi",
"requires_description": "Navn, e-post og hvilket lærested du går på.",
"requires_icon": "clipboard-list",
"road_title": "Veien videre",
"road_description": "Søknaden havner hos styret, som inviterer deg på visning av et ledig rom. Sier du ja til tilbudet, signerer du leieavtalen og flytter inn.",
"road_icon": "route",
"who_title": "Hvem leser søknaden",
"who_description": "Styret i Gullberg leser søknaden din, og du når dem i mellomtiden på bl@klingenbergbygg.no.",
"who_icon": "users",
"form_title": "Søknadsskjema",
"form_description": "Fyll inn det du vet nå - resten kan vente til visningen.",
"labels": {
"name": "Navn",
"email": "E-post",
"telefon": "Telefon",
"innflytting": "Ønsket innflytting",
"om": "Litt om deg",
"situasjon": "Hva gjør du til daglig?"
},
"hints": {
"name": "Kari Nordmann",
"email": "kari@student.no",
"telefon": "123 45 678",
"innflytting": "August 2026",
"om": "Jeg studerer medisin og trenger et rolig sted å bo nær campus.",
"situasjon": ""
}
}
}
},
"questions/klingenberg/index.yaml": {
"question": "Hva trenger huset nå?",
"description": "Her samler Klingenberg Bygg det leietakerne melder inn, og styret ser overslagene før de godkjennes.",
"confirm": "Bekreft",
"buckets": {
"feil": {
"heading": "Se hva som er meldt inn av feil",
"description": "Her ser du det leietakerne har meldt, fra ny melding til den er utbedret.",
"moves": {
"befaring->overslag": "Lag overslag",
"befaring->avvist": "Avvis saken",
"godkjent->utbedret": "Meld utbedret",
"open->befaring": "Sett opp befaring",
"open->avvist": "Avvis saken",
"overslag->avvist": "Avvis overslaget"
},
"list_title": "Meldte feil",
"list_note": "Hver rad er en feil som er meldt inn; knappene under flytter den videre til befaring, overslag eller utbedret."
},
"overslag": {
"heading": "Følg opp overslagene dine",
"description": "Her ser du overslagene du har levert, og om styret har godkjent dem.",
"moves": {
"godkjent->fakturert": "Merk fakturert"
},
"list_title": "Leverte overslag",
"list_note": "Hver rad er et overslag du har levert; marker det fakturert når regningen er sendt."
}
},
"links": {
"overslag": {
"heading": "Se alle overslag i ett regnskap",
"description": "Her finner du overslagene samlet, uansett hvem som har meldt feilen.",
"button": "Åpne overslag"
}
},
"invites": {
"klingenberg": {
"heading": "Gi noen hos Klingenberg Bygg tilgang",
"description": "Personen får en konto og en lenke som gjelder én gang, så de kan logge inn og se feilene selv.",
"button": "Send invitasjon",
"form_title": "Inviter ny person",
"form_description": "Ha navn, telefon og e-post klart.",
"labels": {
"name": "Navn",
"phone": "Telefon",
"email": "E-post"
}
}
},
"invited": {
"heading": "Hold oversikt over inviterte",
"description": "Her ser du hvem som er invitert, og om de har tatt lenken i bruk.",
"done": "Tatt i bruk",
"withdraw": "Trekk tilbake",
"again": "Send på nytt",
"list_title": "Sendte invitasjoner",
"list_note": "Hver rad er en invitasjon; send den på nytt hvis lenken har gått ut, eller trekk den tilbake."
},
"suggestions": null
},
"questions/klingenberg/overslag-sent.yaml": {
"question": "Hva skjer med overslaget du nettopp sendte inn?",
"description": "Det ligger nå hos styret, med beløp og hva det dekker. De tar stilling til det og fører det videre i regnskapet.",
"next_heading": "Styret vurderer overslaget",
"next_description": "Du hører fra dem hvis de trenger mer, ellers venter du på svar om det blir godkjent, avvist eller fakturert."
},
"questions/klingenberg/overslag.yaml": {
"heading": "Overslaget går til styret",
"description": "Når du har sett på en feil og satt en pris, sender du overslaget hit, så styret kan ta stilling til det.",
"button": "Send overslag",
"encouragement": "Styret ser det i løpet av kort tid, og det følger saken videre til regnskapet.",
"icon": "receipt",
"paused": "Ta ikke mot nye overslag nå",
"requires_title": "Krev tittel",
"requires_description": "Krev beskrivelse",
"requires_icon": "Krev ikon",
"road_title": "Veien videre",
"road_description": "Styret godkjenner eller avviser overslaget. Blir det godkjent og arbeidet utført, blir det fakturert.",
"road_icon": "route",
"who_title": "Hvem leser det",
"who_description": "Styret i Gullberg leser overslaget og tar stilling til det, du når dem på bl@klingenbergbygg.no i mellomtiden.",
"who_icon": "users",
"form_title": "Overslag på feil",
"form_description": "Ha prisen og hva den dekker klart før du sender.",
"labels": {
"gjelder": "Hva overslaget gjelder",
"belop": "Beløp",
"hva-det-dekker": "Hva beløpet dekker",
"dokument": "Dokument"
},
"hints": {
"gjelder": "Lekkasje på badet i rom 4",
"belop": "12 500 kr",
"hva-det-dekker": "Ny membran, fliser og arbeidstid, to dagers arbeid",
"dokument": "overslag-rom4.pdf"
},
"question": "Hva vil det koste å rette feilen?",
"page_description": "Overslaget går til styret, som godkjenner eller avviser det før det føres i regnskapet."
},
"questions/leietakere/feil-sent.yaml": {
"question": "Hva skjer nå med feilen jeg meldte?",
"description": "Meldingen er sendt til Klingenberg Bygg, som drar på befaring og vurderer hva den koster å rette.",
"next_heading": "Klingenberg Bygg ser på saken",
"next_description": "De befarer feilen og lager et overslag som styret tar stilling til."
},
"questions/leietakere/feil.yaml": {
"heading": "Meld fra om noe som er galt i huset",
"description": "Fant du noe som ikke virker eller er ødelagt? Si fra, så ser styret på det.",
"button": "Send feilen",
"encouragement": "Tar et par minutter, og styret får beskjed med én gang.",
"icon": "wrench",
"paused": "Ta imot nye feilmeldinger",
"requires_title": "Overskrift",
"requires_description": "Forklaring",
"requires_icon": "Ikon",
"road_title": "Hva skjer videre",
"road_description": "Styret ser på feilen og avtaler en befaring. Deretter henter de inn et overslag, godkjenner det, og feilen rettes opp – eller avvises, med beskjed om hvorfor.",
"road_icon": "route",
"who_title": "Hvem leser dette",
"who_description": "Styret i Gullberg får meldingen og følger den opp; haster det, send en e-post til bl@klingenbergbygg.no.",
"who_icon": "users",
"form_title": "Meld en feil",
"form_description": "Fortell hva som er galt og hvor, gjerne med bilde.",
"labels": {
"hva": "Hva er galt",
"hvor": "Hvor i huset",
"beskrivelse": "Beskriv feilen",
"email": "E-post",
"bilde": "Bilde"
},
"hints": {
"hva": "Vannlekkasje under kjøkkenvasken",
"hvor": "Kjøkkenet i 2. etasje",
"beskrivelse": "Det drypper fra røret under vasken, har blitt verre siste uken",
"email": "navn@student.no",
"bilde": "Last opp et bilde av feilen"
},
"question": "Har du funnet noe i huset som bør rettes opp?",
"page_description": "Meldingen går rett til Klingenberg Bygg, som forvalter huset. De ser på det, og styret godkjenner det som koster penger."
},
"questions/leietakere/index.yaml": {
"question": "Hva kan vi gjøre for deg i huset?",
"description": "Feil leietakerne melder inn, og overslagene Klingenberg Bygg sender over, samlet på ett sted.",
"confirm": "Bekreft",
"buckets": {},
"links": {
"feil": {
"heading": "Har du funnet noe som er galt i huset?",
"description": "Meld fra, så går det rett til Klingenberg Bygg.",
"button": "Meld fra"
}
},
"invites": {},
"invited": null,
"suggestions": null
},
"questions/received/leie-rom.yaml": {
"question": "Hva skjer med søknaden min nå?",
"description": "Styret går gjennom romsøknader fortløpende og svarer så snart det er en visning å tilby.",
"next_heading": "Du hører fra styret om en visning",
"next_description": "Styret tar kontakt på e-post eller telefon for å avtale tid. Får du tilbud om rommet, får du beskjed rett etter."
},
"questions/status/liste/index.yaml": {
"question": "Hva er vedtatt og gjort for huset?",
"description": "Her ligger det som styret har vedtatt og satt i verk, med pris og tid der det er kjent.",
"heading": "Det som er vedtatt og gjort",
"list_description": "Åpen liste over det styret har vedtatt for huset.",
"list_title": "Vedtatt og gjort",
"list_note": "Hver rad er én sak, med hva den gjelder, kostnad og tidspunkt der det er satt.",
"empty": "Ingen saker er publisert ennå.",
"answer": "Svar"
},
"questions/status/rom/index.yaml": {
"question": "Hvilke rom er ledige nå?",
"description": "Her finner du rommene som er ledige for innflytting, med bilde og en kort beskrivelse av hvert rom.",
"heading": "Ledige rom i huset",
"list_description": "Rommene som er ledige akkurat nå.",
"list_title": "Ledige rom",
"list_note": "Hver rad er et rom du kan søke på.",
"empty": "Ingen rom er ledige akkurat nå, men se gjerne innom igjen senere.",
"answer": "Svar"
},
"questions/styret/eierskifte-sent.yaml": {
"question": "Hva skjer nå med eierskiftesaken du sendte inn?",
"description": "Steget er registrert og legger seg på listen over eierskiftet. Aksjonærene ser det neste gang de ser på fremdriften.",
"next_heading": "Følg eierskiftet videre",
"next_description": "Du finner status og alle steg i oversikten over eierskiftet, og kan legge inn mer når noe nytt skjer."
},
"questions/styret/eierskifte.yaml": {
"heading": "Se hvor eierskiftet står",
"description": "Meld fra om neste steg i overgangen til selskapet, så ser aksjonærene og banken fremgangen.",
"button": "Legg inn steg",
"encouragement": "Tar et minutt, og listen oppdateres med én gang.",
"icon": "file-text",
"paused": "Satt på vent",
"requires_title": "Krever tittel",
"requires_description": "Krever beskrivelse",
"requires_icon": "Krever ikon",
"road_title": "Fra melding til ferdig",
"road_description": "Steget legges inn, så arbeides det med, og til slutt merkes det som ferdig.",
"road_icon": "route",
"who_title": "Hvem leser det",
"who_description": "Styret følger eierskiftet her; ring styret i mellomtiden hvis noe ikke kan vente.",
"who_icon": "users",
"form_title": "Nytt steg i eierskiftet",
"form_description": "Skriv hva som er gjort, og legg ved dokumentet hvis det finnes et.",
"labels": {
"steg": "Hva er gjort",
"merknad": "Merknad",
"dokument": "Dokument"
},
"hints": {
"steg": "Skjøtet er sendt til tinglysing",
"merknad": "Megler venter på signatur fra den siste selgeren",
"dokument": "skjote-gullberg.pdf"
},
"question": "Hvor langt har eierskiftet kommet?",
"page_description": "Her legger styret inn stegene i overgangen til selskapet, så aksjonærene kan følge med. Banken får det den skal ha fra styret."
},
"questions/styret/husleie-sent.yaml": {
"question": "Hva skjer nå med husleia jeg registrerte?",
"description": "Betalingen er lagt inn og synlig for resten av styret, sammen med de andre rommenes status denne måneden.",
"next_heading": "Følg med i husleielista",
"next_description": "Der ser dere hvilke rom som har betalt og hva som er purret på."
},
"questions/styret/husleie.yaml": {
"heading": "Husleia for måneden, samlet ett sted",
"description": "Legg inn hva som er betalt per rom, så aksjonærene ser det og banken får sitt.",
"button": "Registrer husleie",
"encouragement": "Det tar et minutt per rom.",
"icon": "banknote",
"paused": "Tas ikke imot nå",
"requires_title": "Krever tittel",
"requires_description": "Krever beskrivelse",
"requires_icon": "Krever ikon",
"road_title": "Hva som skjer videre",
"road_description": "Du registrerer at husleia er betalt. Hvis et rom ikke har betalt, markeres det som purret til det kommer inn.",
"road_icon": "refresh-cw",
"who_title": "Hvem som ser dette",
"who_description": "Styret ser oversikten; har du spørsmål underveis, ta kontakt med styret på bl@klingenbergbygg.no.",
"who_icon": "users",
"form_title": "Registrer husleie",
"form_description": "Ha rom, måned og beløp klart.",
"labels": {
"rom": "Hvilket rom",
"maaned": "Hvilken måned",
"belop": "Beløp",
"betalt-dato": "Betalt dato"
},
"hints": {
"rom": "Rom 2",
"maaned": "Oktober 2026",
"belop": "4500",
"betalt-dato": "2026-10-05"
},
"question": "Hvilke rom har betalt husleie denne måneden?",
"page_description": "Her ser styret hvilke rom som har betalt husleia og hva som har gått til banken."
},
"questions/styret/index.yaml": {
"question": "Hva trenger styret å gjøre nå?",
"description": "Her samler styret alt som skjer i huset: søknader, feil, økonomi og eierskiftet, med knappene som flytter hver sak videre.",
"confirm": "Bekreft",
"buckets": {
"eierskifte": {
"heading": "Se hvor langt eierskiftet har kommet",
"description": "Følg stegene når huset går over til selskapet, med dokumentene på plass for aksjonærer og bank.",
"moves": {
"arbeid->ferdig": "Merk steget ferdig",
"open->arbeid": "Start arbeidet"
},
"list_title": "Steg i eierskiftet",
"list_note": "Hver rad er ett steg i overgangen, med merknad og dokument; knappen under flytter steget videre."
},
"feil": {
"heading": "Følg opp feil som er meldt inn",
"description": "Se hva leietakerne har funnet galt i huset, og send det videre til Klingenberg Bygg for befaring og overslag.",
"moves": {
"befaring->avvist": "Avvis feilen",
"open->avvist": "Avvis feilen",
"overslag->godkjent": "Godkjenn overslaget",
"overslag->avvist": "Avvis overslaget"
},
"list_title": "Meldte feil",
"list_note": "Hver rad er en feil meldt av en leietaker, med bilde og beskrivelse; knappene under sender den videre eller avviser den."
},
"husleie": {
"heading": "Hold oversikt over husleia hver måned",
"description": "Se hvilke rom som har betalt, og purr dem som ikke har gjort det.",
"moves": {
"open->betalt": "Merk som betalt",
"open->purret": "Send purring",
"purret->betalt": "Merk som betalt"
},
"list_title": "Husleie per rom",
"list_note": "Hver rad er husleia for ett rom én måned, med beløp og betalingsdato; knappene under merker betalt eller sender purring."
},
"liste": {
"heading": "Styr lista over det som er bra, mangler og er planlagt",
"description": "Vedta punktene, sett pris og tid, og publiser dem som leietakerne skal se.",
"moves": {
"open->vedtatt": "Vedta punktet",
"open->forkastet": "Forkast punktet",
"vedtatt->publisert": "Publiser punktet",
"vedtatt->forkastet": "Forkast punktet"
},
"list_title": "Punkter på lista",
"list_note": "Hver rad er ett punkt med slag, beskrivelse, kostnad og tid; knappene under vedtar, publiserer eller forkaster det."
},
"nedbetalingsplaner": {
"heading": "Følg nedbetalingsplanen fra aksjonærene til banken",
"description": "Følg planen fra forslag til bankens svar, med pengestrømmen alle fire aksjonærene står bak.",
"moves": {
"godkjent->sendt": "Send til banken",
"sendt->endringer": "Be om endringer",
"sendt->innvilget": "Merk som innvilget"
},
"list_title": "Nedbetalingsplaner",
"list_note": "Hver rad er en plan med lånebeløp, avdrag og pengestrøm; knappene under sender den til banken eller merker svaret."
},
"overslag": {
"heading": "Ta stilling til overslag fra Klingenberg Bygg",
"description": "Se beløpet for hver feil som er sett på, og godkjenn det som skal inn i regnskapet.",
"moves": {
"open->godkjent": "Godkjenn overslaget",
"open->avvist": "Avvis overslaget"
},
"list_title": "Overslag",
"list_note": "Hver rad er et overslag med beløp og hva det dekker; knappene under godkjenner eller avviser det."
},
"rapporter": {
"heading": "Send kvartalsrapporten til aksjonærene og banken",
"description": "Samle tallene for kvartalet, og send rapporten videre når den er klar.",
"moves": {
"open->sendt": "Send rapporten"
},
"list_title": "Kvartalsrapporter",
"list_note": "Hver rad er rapporten for ett kvartal, med leieinntekter, kostnader og saldo; knappen under sender den."
},
"rom": {
"heading": "Vis ledige rom frem til studentene",
"description": "Legg ut rommet som er blitt ledig, og merk det utleid når noen har flyttet inn.",
"moves": {
"open->utleid": "Merk som utleid"
},
"list_title": "Rom",
"list_note": "Hver rad er et rom med bilde og beskrivelse; knappen under merker det utleid."
},
"romsoknader": {
"heading": "Følg opp søknader om rom",
"description": "Se hvem som har søkt og hva de gjør til daglig (studenter går foran), sett opp visning, og før søknaden frem til signert leieavtale.",
"moves": {
"akseptert->signert": "Merk som signert",
"open->visning": "Sett opp visning",
"open->avslatt": "Avslå søknaden",
"tilbud->avslatt": "Avslå søknaden",
"visning->tilbud": "Gi tilbud om rom",
"visning->avslatt": "Avslå søknaden"
},
"list_title": "Søknader om rom",
"list_note": "Hver rad er en søknad, med hva søkeren gjør til daglig og ønsket innflytting. Studenter går foran. Knappene fører søknaden videre eller avslår den."
},
"saker": {
"heading": "Saker aksjonærene har meldt",
"description": "Ta saker aksjonærene melder inn, sett dem på sakslisten, og vedta eller avvis dem.",
"moves": {
"open->sakslisten": "Sett på sakslisten",
"open->avvist": "Avvis saken",
"sakslisten->vedtatt": "Vedta saken",
"sakslisten->avvist": "Avvis saken"
},
"list_title": "Saker",
"list_note": "Hver rad er en sak meldt inn av en aksjonær, med tittel og beskrivelse; knappene under setter den på sakslisten, vedtar eller avviser den."
},
"uker": {
"heading": "Bekreft ukene aksjonærene vil bruke huset",
"description": "Se hvem som har meldt seg på en uke, og bekreft eller avslå den.",
"moves": {
"open->bekreftet": "Bekreft uken",
"open->avslatt": "Avslå uken"
},
"list_title": "Ønskede uker",
"list_note": "Hver rad er en uke en aksjonær har meldt seg på, med datoer og merknad; knappene under bekrefter eller avslår den."
}
},
"links": {
"ledig-rom": {
"heading": "Legg ut et rom som er blitt ledig",
"description": "Skriv tittel, legg ved bilde og beskriv rommet, så studentene kan søke.",
"button": "Legg ut rom"
},
"liste": {
"heading": "Legg til et nytt punkt på lista",
"description": "Skriv hva som er bra, mangler eller planlagt, med pris og tid om du har det.",
"button": "Legg til punkt"
},
"rapport": {
"heading": "Lag kvartalets rapport",
"description": "Fyll inn tallene for kvartalet, så aksjonærene og banken får det de skal ha.",
"button": "Lag rapport"
},
"nedbetalingsplan": {
"heading": "Lag en ny nedbetalingsplan",
"description": "Skriv lånebeløp, avdrag og pengestrøm, så banken har noe å ta stilling til.",
"button": "Lag plan"
},
"husleie": {
"heading": "Registrer husleie for et rom",
"description": "Før inn beløp og måned når husleia for et rom er kommet inn.",
"button": "Registrer husleie"
},
"eierskifte": {
"heading": "Legg til et steg i eierskiftet",
"description": "Beskriv steget og legg ved dokument, så aksjonærene ser fremgangen.",
"button": "Legg til steg"
}
},
"invites": {
"aksjonaerer": {
"heading": "Gi en aksjonær tilgang til sin side",
"description": "Send en invitasjon så aksjonæren får konto og engangslenke.",
"button": "Send invitasjon",
"form_title": "Inviter aksjonær",
"form_description": "Ha navn, e-post og telefon klart.",
"labels": {
"name": "Navn",
"phone": "Telefon",
"email": "E-post"
}
},
"klingenberg": {
"heading": "Gi Klingenberg Bygg tilgang til feilmeldinger",
"description": "Send en invitasjon så de får konto og engangslenke.",
"button": "Send invitasjon",
"form_title": "Inviter Klingenberg Bygg",
"form_description": "Ha navn, e-post og telefon klart.",
"labels": {
"name": "Navn",
"phone": "Telefon",
"email": "E-post"
}
},
"leietakere": {
"heading": "Gi en leietaker tilgang til sin side",
"description": "Send en invitasjon så leietakeren får konto og engangslenke.",
"button": "Send invitasjon",
"form_title": "Inviter leietaker",
"form_description": "Ha navn, e-post og telefon klart.",
"labels": {
"name": "Navn",
"phone": "Telefon",
"email": "E-post"
}
},
"styret": {
"heading": "Gi et styremedlem tilgang til desken",
"description": "Send en invitasjon så styremedlemmet får konto og engangslenke.",
"button": "Send invitasjon",
"form_title": "Inviter styremedlem",
"form_description": "Ha navn, e-post og telefon klart.",
"labels": {
"name": "Navn",
"phone": "Telefon",
"email": "E-post"
}
}
},
"invited": {
"heading": "Se hvem som er invitert og hvor langt de har kommet",
"description": "Følg med på invitasjoner som er sendt, og send en ny lenke om den gamle har løpt ut.",
"done": "Tatt i bruk",
"withdraw": "Trekk tilbake",
"again": "Send på nytt",
"list_title": "Sendte invitasjoner",
"list_note": "Hver rad er en invitasjon sendt til en person; knappene under trekker den tilbake eller sender den på nytt."
},
"suggestions": {
"heading": "Ta stilling til foreslåtte endringer",
"description": "Se hva andre har foreslått å endre på sidene de har ansvar for.",
"list_title": "Foreslåtte endringer",
"list_note": "Hver rad er en foreslått endring; knappene under tar den til vurdering, godtar eller avslår den.",
"looking": "Tar en titt",
"changed": "Endret",
"declined": "Avslått"
}
},
"questions/styret/ledig-rom-sent.yaml": {
"question": "Hva skjer med rommet du nettopp la ut?",
"description": "Rommet er lagt inn og synlig for dem som søker. Dere ser det under ledige rom til det er leid ut.",
"next_heading": "Studenter kan søke på rommet nå",
"next_description": "Søknader kommer inn etter hvert, og dere i styret ser dem sammen med de andre søknadene.",
"see_all": {
"heading": "Se alle rommene og status",
"description": "Full oversikt over hvilke rom som er ledige og hvilke som er leid ut.",
"button": "Se rommene"
}
},
"questions/styret/ledig-rom.yaml": {
"heading": "Meld inn et rom som er ledig",
"description": "Når et rom står tomt, legger du det ut her, så ser de som søker det først.",
"button": "Legg ut rommet",
"encouragement": "Så snart det er lagt ut, kan folk søke på det.",
"icon": "key",
"paused": "Ta rommet ned fra listen for nå",
"requires_title": "Krever tittel",
"requires_description": "Krever beskrivelse",
"requires_icon": "Krever bilde",
"road_title": "Fra ledig til utleid",
"road_description": "Rommet ligger ute til det er utleid.",
"road_icon": "key",
"who_title": "Hvem ser dette",
"who_description": "Studenter som søker rom ser dette, og styret kan nås på bl@klingenbergbygg.no i mellomtiden.",
"who_icon": "users",
"form_title": "Om rommet",
"form_description": "Et bilde og en kort beskrivelse er nok til at de som søker kan se seg om.",
"labels": {
"tittel": "Tittel på rommet",
"bilde": "Bilde av rommet",
"om": "Om rommet"
},
"hints": {
"tittel": "Rom i 2. etasje, mot gata",
"bilde": "",
"om": "Lyst rom med eget bad, nær kjøkken og felles stue."
},
"question": "Hvilket rom er ledig nå?",
"page_description": "Legg ut et rom som har blitt ledig, så de som søker kan se det."
},
"questions/styret/liste-sent.yaml": {
"question": "Hva skjer med punktet nå?",
"description": "Forslaget ditt er lagret. Styret tar det opp til behandling.",
"next_heading": "Styret vedtar eller forkaster punktet",
"next_description": "Det blir stående til styret har tatt stilling, med pris og tid synlig for alle.",
"see_all": {
"heading": "Se hele lista",
"description": "Alt som er meldt inn, vedtatt eller publisert ligger samlet.",
"button": "Til lista"
}
},
"questions/styret/liste.yaml": {
"heading": "Listen over huset og planene",
"description": "Legg til det som er bra, det som mangler og det som er planlagt, med pris og tid der dere vet det.",
"button": "Legg til punkt",
"encouragement": "Det havner på listen med en gang, og dere kan vedta det senere.",
"icon": "list",
"paused": "Listen er stengt for nye punkter",
"requires_title": "Krev tittel",
"requires_description": "Krev beskrivelse",
"requires_icon": "Krev ikon",
"road_title": "Fra forslag til vedtak",
"road_description": "Punktet legges inn, styret tar stilling til det og vedtar eller forkaster, og det som vedtas blir publisert på listen alle ser.",
"road_icon": "check-circle",
"who_title": "Hvem ser listen",
"who_description": "Styret fører og vedtar listen; ta kontakt på bl@klingenbergbygg.no om noe haster.",
"who_icon": "users",
"form_title": "Nytt punkt på listen",
"form_description": "Skriv kort hva det gjelder, og ta med pris og tid hvis dere har tall.",
"labels": {
"tittel": "Tittel",
"slag": "Hva slags punkt",
"beskrivelse": "Beskrivelse",
"kostnad": "Kostnad",
"naar": "Når"
},
"hints": {
"tittel": "Nytt kjøkken i andre etasje",
"slag": "Mangler",
"beskrivelse": "Kjøkkenet er slitt og trenger nye hvitevarer og benkeplate.",
"kostnad": "ca. 45 000 kr",
"naar": "Våren 2027"
},
"question": "Hva bør med på listen over huset og driften?",
"page_description": "Punktene går inn på listen styret fører over det som er bra, det som mangler og det som er planlagt."
},
"questions/styret/nedbetalingsplan-sent.yaml": {
"question": "Hvor er nedbetalingsplanen nå?",
"description": "Den ligger nå hos aksjonærene. Når alle fire har godkjent den, sender styret den til banken og fører inn svaret.",
"next_heading": "Følg svaret fra banken",
"next_description": "Når banken svarer, oppdaterer dere planen med godkjent, innvilget eller endringer – så de andre aksjonærene ser hvor den står."
},
"questions/styret/nedbetalingsplan.yaml": {
"heading": "Nedbetalingsplanen alle fire står bak",
"description": "Legg fram planen for lånet, så banken og aksjonærene vet hvordan det skal betales ned.",
"button": "Send plan",
"encouragement": "Styret tar den videre til banken så snart alle fire har sagt ja.",
"icon": "banknote",
"paused": "Satt på pause",
"requires_title": "Krever tittel",
"requires_description": "Krever beskrivelse",
"requires_icon": "Krever ikon",
"road_title": "Veien videre",
"road_description": "Planen går til godkjenning hos aksjonærene, så sendes den til banken. Sier banken ja, er den innvilget; ber den om endringer, kommer det en ny runde.",
"road_icon": "route",
"who_title": "Hvem ser den",
"who_description": "Styret og aksjonærene ser planen; spørsmål før den er sendt går til styret på bl@klingenbergbygg.no.",
"who_icon": "users",
"form_title": "Nedbetalingsplan",
"form_description": "Ha lånebeløp, avdrag og når det første trekket kommer, klart.",
"labels": {
"tittel": "Tittel",
"laanebelop": "Lånebeløp",
"maanedlig-avdrag": "Månedlig avdrag",
"forste-trekk": "Første trekk",
"pengestrom": "Hvordan pengene flyter",
"dokument": "Dokument"
},
"hints": {
"tittel": "Nedbetalingsplan 2026",
"laanebelop": "2 400 000 kr",
"maanedlig-avdrag": "18 000 kr",
"forste-trekk": "1. desember 2026",
"pengestrom": "Husleie dekker avdraget, timeshare går til vedlikehold, overskudd settes av til buffer",
"dokument": "Last opp plan eller avtaleutkast"
},
"question": "Hvordan skal lånet betales ned, og står alle fire bak det?",
"page_description": "Planen går til aksjonærene og banken, og viser hvordan lånet skal betales ned."
},
"questions/styret/rapport-sent.yaml": {
"question": "Hvor går rapporten nå?",
"description": "Den er sendt. Aksjonærene får tallene, og det som skal til banken går dit.",
"next_heading": "Neste rapport venter til kvartalet er omme",
"next_description": "Neste rapport legger styret inn når kvartalet er omme."
},
"questions/styret/rapport.yaml": {
"heading": "Rapporten som viser hvordan det går",
"description": "Hvert kvartal legger styret inn tallene, så aksjonærene ser status og banken får det den skal ha.",
"button": "Send rapport",
"encouragement": "Så snart den er sendt, ligger den klar for aksjonærene og banken.",
"icon": "file-text",
"paused": "Sett rapportering på pause",
"requires_title": "Krev tittel",
"requires_description": "Krev beskrivelse",
"requires_icon": "Krev ikon",
"road_title": "Hva skjer videre",
"road_description": "Rapporten sendes til aksjonærene og banken. Når den er ute, merkes den som sendt.",
"road_icon": "send",
"who_title": "Hvem leser den",
"who_description": "Styret står for rapportene; har du spørsmål underveis, ta kontakt på bl@klingenbergbygg.no.",
"who_icon": "users",
"form_title": "Kvartalets tall",
"form_description": "Ha regnskapstallene for kvartalet klare før du fyller ut.",
"labels": {
"periode": "Hvilket kvartal gjelder dette",
"leieinntekter": "Leieinntekter",
"timeshare": "Inntekter fra ukene",
"driftskostnader": "Driftskostnader",
"renter-og-avdrag": "Renter og avdrag til banken",
"saldo": "Saldo ved kvartalets slutt",
"kommentar": "Kommentar til tallene",
"dokument": "Regnskapsdokument"
},
"hints": {
"periode": "3. kvartal 2026",
"leieinntekter": "54 000",
"timeshare": "12 000",
"driftskostnader": "18 500",
"renter-og-avdrag": "22 000",
"saldo": "145 000",
"kommentar": "Ett rom stod tomt i juli, ellers som normalt",
"dokument": "kvartalsregnskap-q3-2026.pdf"
},
"question": "Hvordan gikk kvartalet, i tall?",
"page_description": "Rapporten går til aksjonærene og banken, så de ser inntekter, kostnader og saldo for kvartalet."
},
"site.yaml": {
"invite": {
"subject": "Du er invitert til Gullberg",
"body": "Hei {name},\n\nDu er invitert inn på Gullberg sin side, som {group}.\n\nVelg passord her før {expires}:\n{link}\n\nBrukernavnet ditt er {username}. Etterpå logger du inn på {site}.\n\nHilsen styret i Gullberg"
}
}
}
+8
View File
@@ -38,6 +38,11 @@ pub struct Answer {
/// not see before. /// not see before.
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub notes: Vec<Note>, pub notes: Vec<Note>,
/// Set by a desk listing, never stored: the record is in a final
/// state (one with no move out). A desk shows the newest few of
/// those and offers the rest on request (`resource::cap_finished`).
#[serde(default, skip_serializing_if = "std::ops::Not::not")]
pub finished: bool,
} }
/// One reply on a record. It lives here rather than with the mail /// One reply on a record. It lives here rather than with the mail
@@ -97,6 +102,7 @@ pub async fn store_answer(
storyline, storyline,
decided_ms: None, decided_ms: None,
notes: Vec::new(), notes: Vec::new(),
finished: false,
decided_by: None, decided_by: None,
}; };
let data = serde_json::to_vec(&answer)?; let data = serde_json::to_vec(&answer)?;
@@ -537,6 +543,7 @@ mod tests {
decided_ms: None, decided_ms: None,
decided_by: None, decided_by: None,
notes: Vec::new(), notes: Vec::new(),
finished: false,
}, },
Answer { Answer {
id: "def456".to_string(), id: "def456".to_string(),
@@ -549,6 +556,7 @@ mod tests {
decided_ms: Some(1_700_000_002_000), decided_ms: Some(1_700_000_002_000),
decided_by: Some("bl".to_string()), decided_by: Some("bl".to_string()),
notes: Vec::new(), notes: Vec::new(),
finished: false,
}, },
]; ];
let value = serde_json::Value::Array( let value = serde_json::Value::Array(
+77 -11
View File
@@ -973,16 +973,37 @@ fn Hero(
} }
}); });
let has_slides = slideshow.is_some(); let has_slides = slideshow.is_some();
let mark = move || view! { // In the page's ink (`wordmark_ink`): a span the file masks, sized
// by the file's own proportions through an invisible copy of it,
// and named for screen readers as the image would have been.
let ink = site.wordmark_ink;
let mark = move || {
if ink {
let mask = format!("--wordmark-src:url(\"{}\")", wordmark.replace('"', "%22"));
view! {
<a class="wordmark wordmark-ink" href="/" aria-label=site_title.clone()>
<span class="wordmark-ink-mark" style=mask>
<img src=wordmark.clone() alt="" aria-hidden="true" style=wordmark_style.clone()/>
</span>
</a>
}
.into_any()
} else {
view! {
<a class="wordmark" class:wordmark-house=house_wordmark href="/"> <a class="wordmark" class:wordmark-house=house_wordmark href="/">
<img src=wordmark.clone() alt=site_title.clone() style=wordmark_style.clone()/> <img src=wordmark.clone() alt=site_title.clone() style=wordmark_style.clone()/>
</a> </a>
}
.into_any()
}
}; };
let top = view! { <div class="hero-top">{mark()}{session}</div> };
let (bar_top, copy_top) = if has_slides { (Some(top), None) } else { (None, Some(top)) };
view! { view! {
<header class="hero" class:hero-module=has_module class:hero-slides=has_slides> <header class="hero" class:hero-module=has_module class:hero-slides=has_slides>
<Announcements current_id=current_id/> <Announcements current_id=current_id/>
{session}
{has_module {has_module
.then(|| { .then(|| {
view! { view! {
@@ -993,10 +1014,12 @@ fn Hero(
// With pictures, the wordmark is a bar of its own above // With pictures, the wordmark is a bar of its own above
// them and the question comes under; without, the wordmark // them and the question comes under; without, the wordmark
// heads the copy as it always has. // heads the copy as it always has.
{has_slides.then(|| view! { <div class="hero-bar">{mark()}</div> })} // Who is here sits on the wordmark's own line, not on a row
// of its own above it.
{bar_top.map(|top| view! { <div class="hero-bar">{top}</div> })}
{slideshow.map(|show| view! { <SlideStrip show=show/> })} {slideshow.map(|show| view! { <SlideStrip show=show/> })}
<div class="hero-copy"> <div class="hero-copy">
{(!has_slides).then(|| mark())} {copy_top}
<h1>{title}</h1> <h1>{title}</h1>
<p inner_html=render_inline_markdown(&description)></p> <p inner_html=render_inline_markdown(&description)></p>
</div> </div>
@@ -1913,18 +1936,26 @@ fn ResourceFeature(
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>, pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
transition_batch: ServerAction<TransitionAnswers>, transition_batch: ServerAction<TransitionAnswers>,
) -> impl IntoView { ) -> impl IntoView {
// A desk shows the newest few finished records; "show older" asks
// for more (see `resource::cap_finished`).
let finished_shown = RwSignal::new(crate::resource::FINISHED_SHOWN);
let data = Resource::new( let data = Resource::new(
{ {
let question_id = question_id.clone(); let question_id = question_id.clone();
let alternative = alternative.clone(); let alternative = alternative.clone();
let feature_name = feature_name.clone(); let feature_name = feature_name.clone();
move || (question_id.clone(), alternative.clone(), feature_name.clone()) move || (question_id.clone(), alternative.clone(), feature_name.clone(), finished_shown.get())
},
// Forwarding sibling requirement values as query params (for a
// resource parameterized by other form fields) is deferred, see
// the resource-backed multi-select requirement UI follow-up.
|(q, a, f, shown)| {
let mut params = std::collections::HashMap::new();
if shown != crate::resource::FINISHED_SHOWN {
params.insert(crate::resource::FINISHED_PARAM.to_string(), shown.to_string());
}
get_resource(q, a, f, params)
}, },
// Empty params for now - forwarding sibling requirement values
// as query params (for a resource parameterized by other form
// fields) is deferred, see the resource-backed multi-select
// requirement UI follow-up.
|(q, a, f)| get_resource(q, a, f, std::collections::HashMap::new()),
); );
// The shared batch button lives on `AlternativeCard`, above every // The shared batch button lives on `AlternativeCard`, above every
@@ -1959,6 +1990,7 @@ fn ResourceFeature(
value=value value=value
pending_transitions=pending_transitions pending_transitions=pending_transitions
transition_batch=transition_batch transition_batch=transition_batch
finished_shown=finished_shown
/> />
} }
.into_any() .into_any()
@@ -1988,6 +2020,7 @@ fn ResourceValue(
value: serde_json::Value, value: serde_json::Value,
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>, pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
transition_batch: ServerAction<TransitionAnswers>, transition_batch: ServerAction<TransitionAnswers>,
finished_shown: RwSignal<usize>,
) -> impl IntoView { ) -> impl IntoView {
// A jq like `.[] | {...}` over an empty list yields no output at // A jq like `.[] | {...}` over an empty list yields no output at
// all - that arrives as null, and it's the same silence as []. // all - that arrives as null, and it's the same silence as [].
@@ -2011,6 +2044,32 @@ fn ResourceValue(
let when = if cards { a.submitted_ms.cmp(&b.submitted_ms) } else { b.submitted_ms.cmp(&a.submitted_ms) }; let when = if cards { a.submitted_ms.cmp(&b.submitted_ms) } else { b.submitted_ms.cmp(&a.submitted_ms) };
open(&a.state).cmp(&open(&b.state)).then(when) open(&a.state).cmp(&open(&b.state)).then(when)
}); });
// The desk sent one finished record more than it shows, when
// there are older ones: drop the oldest and offer the rest.
let shown = finished_shown.get_untracked();
let older = answers.iter().filter(|a| a.finished).count() > shown;
if older {
if let Some(oldest) = answers
.iter()
.enumerate()
.filter(|(_, a)| a.finished)
.min_by_key(|(_, a)| a.decided_ms.unwrap_or(a.submitted_ms))
.map(|(i, _)| i)
{
answers.remove(oldest);
}
}
let show_older = older.then(|| {
view! {
<button
type="button"
class="show-older"
on:click=move |_| finished_shown.update(|n| *n += crate::resource::FINISHED_SHOWN)
>
{move || t(&lang().get(), "show_older")}
</button>
}
});
return view! { return view! {
<div class="answer-list" class:answer-cards=cards> <div class="answer-list" class:answer-cards=cards>
<For <For
@@ -2037,6 +2096,7 @@ fn ResourceValue(
} }
} }
/> />
{show_older}
</div> </div>
} }
.into_any(); .into_any();
@@ -3059,10 +3119,16 @@ pub async fn submit_answer(
let Some((name, who)) = crate::people::who_for(&responses) else { let Some((name, who)) = crate::people::who_for(&responses) else {
return Err(ServerFnError::new("an invite needs a name, and a phone number or an email")); return Err(ServerFnError::new("an invite needs a name, and a phone number or an email"));
}; };
let invited = people let mut invited = people
.invite(&state, &name, &who, &invite.group, &principal_name(&principal)) .invite(&state, &name, &who, &invite.group, &principal_name(&principal))
.await .await
.map_err(|e| ServerFnError::new(format!("invite failed: {e}")))?; .map_err(|e| ServerFnError::new(format!("invite failed: {e}")))?;
// This invite's own words, and the form they draw on: kept with
// the invite, so sending it again says the same thing.
invited.mail = invite.mail.clone();
if invited.mail.is_some() {
invited.fields = responses.as_object().cloned().unwrap_or_default();
}
if let Some(map) = responses.as_object_mut() { if let Some(map) = responses.as_object_mut() {
map.insert("invited".to_string(), serde_json::to_value(&invited).unwrap_or_default()); map.insert("invited".to_string(), serde_json::to_value(&invited).unwrap_or_default());
} }
+21 -3
View File
@@ -391,6 +391,13 @@ pub struct Alternative {
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Invite { pub struct Invite {
pub group: String, pub group: String,
/// This invite's own mail, in place of the site's (`mail.invite`):
/// an invitation to a conversation at an hour, say. Besides
/// `{name}`, `{link}`, `{expires}`, `{username}`, `{group}`,
/// `{site}` and `{site_name}`, every field of the form is a
/// placeholder; a date and time is written out in words.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub mail: Option<MailTemplate>,
} }
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -767,6 +774,14 @@ pub struct SiteConfig {
/// intrinsic pixel height. /// intrinsic pixel height.
#[serde(default)] #[serde(default)]
pub wordmark_height: Option<f32>, pub wordmark_height: Option<f32>,
/// Draw an SVG wordmark in the page's own ink instead of its own
/// colours: the file becomes a mask over the text colour, so it
/// follows the page's light and dark (and any theme a site adds),
/// where an `<img>` only ever knows the system's. Opacity in the
/// file still shows, so a lighter line stays lighter. For a
/// one-colour mark; a mark with a colour of its own keeps `false`.
#[serde(default)]
pub wordmark_ink: bool,
/// BCP 47-ish language code for the portal's own chrome strings /// BCP 47-ish language code for the portal's own chrome strings
/// ("Asked by", the nav lead...) and the html lang attribute. /// ("Asked by", the nav lead...) and the html lang attribute.
/// `None` means "en"; unknown codes fall back to English per key. /// `None` means "en"; unknown codes fall back to English per key.
@@ -1308,6 +1323,7 @@ alternatives:
public: true public: true
source: {{ kind: kv, bucket: things }} source: {{ kind: kv, bucket: things }}
- name: Object - name: Object
action: /object
record_as: things record_as: things
features: features:
- name: Yours - name: Yours
@@ -1405,6 +1421,7 @@ id: /t
name: Where is it? name: Where is it?
alternatives: alternatives:
- name: A - name: A
action: /t
features: features:
- name: Where - name: Where
requirements: requirements:
@@ -1508,6 +1525,7 @@ id: /b
name: B name: B
alternatives: alternatives:
- name: A - name: A
action: /b
features: features:
- name: "" - name: ""
requirements: requirements:
@@ -1549,7 +1567,7 @@ alternatives:
fn question_with_requirement(req_yaml: &str) -> std::collections::HashMap<String, Question> { fn question_with_requirement(req_yaml: &str) -> std::collections::HashMap<String, Question> {
let question: Question = serde_yaml::from_str(&format!( let question: Question = serde_yaml::from_str(&format!(
"id: /g\nname: G\nalternatives:\n - name: A\n features:\n - name: \"\"\n requirements:\n{req_yaml}\n" "id: /g\nname: G\nalternatives:\n - name: A\n action: /g\n features:\n - name: \"\"\n requirements:\n{req_yaml}\n"
)) ))
.unwrap(); .unwrap();
std::collections::HashMap::from([(question.id.clone(), question)]) std::collections::HashMap::from([(question.id.clone(), question)])
@@ -1820,7 +1838,7 @@ alternatives:
fn recorded_buckets_must_be_attended() { fn recorded_buckets_must_be_attended() {
let write_only = vec![( let write_only = vec![(
"index.yaml".to_string(), "index.yaml".to_string(),
"name: Home\nalternatives:\n - name: send\n record_as: black_hole\n".to_string(), "name: Home\nalternatives:\n - name: send\n action: /\n record_as: black_hole\n".to_string(),
)]; )];
let questions = build_questions(&write_only).unwrap(); let questions = build_questions(&write_only).unwrap();
let err = validate_questions(&questions, &Default::default()).unwrap_err(); let err = validate_questions(&questions, &Default::default()).unwrap_err();
@@ -1831,7 +1849,7 @@ alternatives:
let with_desk = vec![ let with_desk = vec![
( (
"index.yaml".to_string(), "index.yaml".to_string(),
"name: Home\nalternatives:\n - name: send\n record_as: inbox\n".to_string(), "name: Home\nalternatives:\n - name: send\n action: /\n record_as: inbox\n".to_string(),
), ),
( (
"review/index.yaml".to_string(), "review/index.yaml".to_string(),
+14
View File
@@ -512,6 +512,20 @@ pub fn validate_questions(
} }
for question in questions.values() { for question in questions.values() {
for alternative in &question.alternatives { for alternative in &question.alternatives {
// A form is sent with its button, and the button is only
// drawn for an alternative that says where to go afterwards:
// without `action` the person fills it in and cannot send it.
let asks = alternative.features.iter().any(|f| f.requirements.iter().any(|r| r.kind != "hidden"));
if (asks || alternative.invite.is_some() || alternative.record_as.is_some())
&& alternative.action.is_none()
&& alternative.self_transition.is_none()
{
anyhow::bail!(
"question {:?} alternative {:?}: it has a form to send but no `action`, so no button is drawn; give it `action:`, the page to go to once it is sent (its own page is fine)",
question.id,
alternative.name
);
}
if alternative.one_per_person && alternative.record_as.is_none() { if alternative.one_per_person && alternative.record_as.is_none() {
anyhow::bail!( anyhow::bail!(
"question {:?} alternative {:?}: one_per_person keeps each person's own record, and there is no record_as to keep it in", "question {:?} alternative {:?}: one_per_person keeps each person's own record, and there is no record_as to keep it in",
+1 -1
View File
@@ -194,7 +194,7 @@ aggregates:
Answer { Answer {
id: "r".into(), question_id: "/q".into(), alternative: "a".into(), id: "r".into(), question_id: "/q".into(), alternative: "a".into(),
responses: serde_json::json!({}), state: state.into(), responses: serde_json::json!({}), state: state.into(),
submitted_ms: since_ms, decided_ms: None, decided_by: None, notes: vec![], submitted_ms: since_ms, decided_ms: None, decided_by: None, notes: vec![], finished: false,
storyline: 0, storyline: 0,
} }
} }
+3
View File
@@ -24,6 +24,7 @@ fn lookup(lang: &str, key: &str) -> Option<&'static str> {
("en", "sign_in") => "Sign in", ("en", "sign_in") => "Sign in",
("en", "sign_out") => "Sign out", ("en", "sign_out") => "Sign out",
("en", "nothing_here_yet") => "Nothing here yet.", ("en", "nothing_here_yet") => "Nothing here yet.",
("en", "show_older") => "Show older",
("en", "upload_failed") => "The file did not arrive, so nothing was sent. Try again.", ("en", "upload_failed") => "The file did not arrive, so nothing was sent. Try again.",
("en", "upload_too_large") => "The file is larger than 20 MB, so nothing was sent. Choose a smaller one, or a picture taken at a lower resolution.", ("en", "upload_too_large") => "The file is larger than 20 MB, so nothing was sent. Choose a smaller one, or a picture taken at a lower resolution.",
("en", "upload_unavailable") => "This site cannot take files at the moment, so nothing was sent. Let whoever runs the site know.", ("en", "upload_unavailable") => "This site cannot take files at the moment, so nothing was sent. Let whoever runs the site know.",
@@ -60,6 +61,7 @@ fn lookup(lang: &str, key: &str) -> Option<&'static str> {
("no", "sign_in") => "Logg inn", ("no", "sign_in") => "Logg inn",
("no", "sign_out") => "Logg ut", ("no", "sign_out") => "Logg ut",
("no", "nothing_here_yet") => "Ingenting her ennå.", ("no", "nothing_here_yet") => "Ingenting her ennå.",
("no", "show_older") => "Vis eldre",
("no", "upload_failed") => "Filen kom ikke fram, så ingenting ble sendt. Prøv igjen.", ("no", "upload_failed") => "Filen kom ikke fram, så ingenting ble sendt. Prøv igjen.",
("no", "upload_too_large") => "Filen er større enn 20 MB, så ingenting ble sendt. Velg en mindre fil, eller et bilde med lavere oppløsning.", ("no", "upload_too_large") => "Filen er større enn 20 MB, så ingenting ble sendt. Velg en mindre fil, eller et bilde med lavere oppløsning.",
("no", "upload_unavailable") => "Siden kan ikke ta imot filer akkurat nå, så ingenting ble sendt. Si fra til den som har siden.", ("no", "upload_unavailable") => "Siden kan ikke ta imot filer akkurat nå, så ingenting ble sendt. Si fra til den som har siden.",
@@ -114,6 +116,7 @@ mod tests {
"sign_in", "sign_in",
"sign_out", "sign_out",
"nothing_here_yet", "nothing_here_yet",
"show_older",
"upload_failed", "upload_failed",
"upload_too_large", "upload_too_large",
"upload_unavailable", "upload_unavailable",
+61 -12
View File
@@ -24,6 +24,7 @@ pub async fn run(argv: Vec<String>) -> anyhow::Result<()> {
let mut skim = false; let mut skim = false;
let mut sim_out: Option<String> = None; let mut sim_out: Option<String> = None;
let mut show_access = false; let mut show_access = false;
let mut findings_out: Option<String> = None;
while let Some(arg) = args.next() { while let Some(arg) = args.next() {
match arg.as_str() { match arg.as_str() {
@@ -35,6 +36,7 @@ pub async fn run(argv: Vec<String>) -> anyhow::Result<()> {
"--skim" => skim = true, "--skim" => skim = true,
"--needs-sim" => sim_out = args.next(), "--needs-sim" => sim_out = args.next(),
"--access" => show_access = true, "--access" => show_access = true,
"--findings" => findings_out = args.next(),
"--needs-score" => answers_in = args.next(), "--needs-score" => answers_in = args.next(),
"--min-accuracy" => { "--min-accuracy" => {
min_accuracy = args.next().and_then(|v| v.parse().ok()).unwrap_or(min_accuracy) min_accuracy = args.next().and_then(|v| v.parse().ok()).unwrap_or(min_accuracy)
@@ -66,13 +68,14 @@ pub async fn run(argv: Vec<String>) -> anyhow::Result<()> {
(questions, aggregates_map, site, needs_raw) (questions, aggregates_map, site, needs_raw)
} else { } else {
eprintln!( eprintln!(
"usage: iris check (--repo <gitea-url> [--branch main] [--subdir questions] | --path <local-dir>) [--needs-tasks <out.jsonl> [--skim]] [--needs-sim <model.json>] [--access] [--needs-score <answers.jsonl> [--min-accuracy 0.8]]" "usage: iris check (--repo <gitea-url> [--branch main] [--subdir questions] | --path <local-dir>) [--findings <out.jsonl>] [--needs-tasks <out.jsonl> [--skim]] [--needs-sim <model.json>] [--access] [--needs-score <answers.jsonl> [--min-accuracy 0.8]]"
); );
std::process::exit(2); std::process::exit(2);
}; };
if let Err(e) = site.validate() { if let Err(e) = site.validate() {
eprintln!("FAIL: {e}"); eprintln!("FAIL: {e}");
write_findings(findings_out.as_deref(), &[schema_finding(&e.to_string())]);
std::process::exit(1); std::process::exit(1);
} }
let aggregates_map = content::with_builtin_aggregates(aggregates_map); let aggregates_map = content::with_builtin_aggregates(aggregates_map);
@@ -114,6 +117,7 @@ pub async fn run(argv: Vec<String>) -> anyhow::Result<()> {
println!(); println!();
} }
check_needs( check_needs(
findings_out.as_deref(),
needs_raw.as_deref(), needs_raw.as_deref(),
&questions, &questions,
&aggregates_map, &aggregates_map,
@@ -126,15 +130,67 @@ pub async fn run(argv: Vec<String>) -> anyhow::Result<()> {
} }
Err(e) => { Err(e) => {
eprintln!("FAIL: {e}"); eprintln!("FAIL: {e}");
// One schema error is no reason to hide the rest: the needs
// pass reads the same content and says what else is wrong,
// so a fix round can take them all at once.
let mut all = vec![schema_finding(&e.to_string())];
if let Some(file) = needs_raw.as_deref().and_then(|raw| needs::parse(raw).ok()) {
let findings = needs::check(&file, &questions, &aggregates_map);
print_findings(&findings);
all.extend(findings);
}
write_findings(findings_out.as_deref(), &all);
std::process::exit(1); std::process::exit(1);
} }
} }
} }
/// A content error the schema pass stopped at, as a finding: the repo
/// is its scope and the message its subject, since it has no other.
fn schema_finding(message: &str) -> needs::Finding {
needs::Finding {
need: String::new(),
level: needs::Level::Fail,
message: message.to_string(),
scope: "repo",
code: "schema",
subject: message.to_string(),
}
}
/// `--findings`: every finding as one JSON line (id, level, code,
/// scope, need, subject, message, fix), the same ones the text output
/// prints - an empty file when there are none, so a reader can tell
/// "clean" from "not run".
fn write_findings(out: Option<&str>, findings: &[needs::Finding]) {
let Some(out) = out else { return };
let lines: String = findings.iter().map(|f| format!("{}\n", f.to_json())).collect();
if let Err(e) = std::fs::write(out, lines) {
eprintln!("WARN: could not write the findings to {out}: {e}");
}
}
/// Each finding on its own line, FAIL or WARN first; the count of FAILs.
fn print_findings(findings: &[needs::Finding]) -> usize {
let mut failed = 0;
for finding in findings {
let level = match finding.level {
needs::Level::Fail => {
failed += 1;
"FAIL"
}
needs::Level::Warn => "WARN",
};
eprintln!("{level}: {} {:?}: {}", finding.scope, finding.need, finding.message);
}
failed
}
/// The business-needs pass (see `crate::lint::needs`): structure always, /// The business-needs pass (see `crate::lint::needs`): structure always,
/// then the wording tasks written out and/or an engine's answers /// then the wording tasks written out and/or an engine's answers
/// scored, when asked. A repo without `needs.yaml` skips all of it. /// scored, when asked. A repo without `needs.yaml` skips all of it.
fn check_needs( fn check_needs(
findings_out: Option<&str>,
raw: Option<&str>, raw: Option<&str>,
questions: &std::collections::HashMap<String, content::Question>, questions: &std::collections::HashMap<String, content::Question>,
aggregates_map: &std::collections::HashMap<String, aggregates::AggregateSchema>, aggregates_map: &std::collections::HashMap<String, aggregates::AggregateSchema>,
@@ -145,6 +201,7 @@ fn check_needs(
min_accuracy: f64, min_accuracy: f64,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let Some(raw) = raw else { let Some(raw) = raw else {
write_findings(findings_out, &[]);
if tasks_out.is_some() || answers_in.is_some() { if tasks_out.is_some() || answers_in.is_some() {
eprintln!("FAIL: --needs-tasks/--needs-score given, but the repo has no needs.yaml"); eprintln!("FAIL: --needs-tasks/--needs-score given, but the repo has no needs.yaml");
std::process::exit(1); std::process::exit(1);
@@ -155,21 +212,13 @@ fn check_needs(
Ok(file) => file, Ok(file) => file,
Err(e) => { Err(e) => {
eprintln!("FAIL: {e}"); eprintln!("FAIL: {e}");
write_findings(findings_out, &[schema_finding(&e.to_string())]);
std::process::exit(1); std::process::exit(1);
} }
}; };
let findings = needs::check(&file, questions, aggregates_map); let findings = needs::check(&file, questions, aggregates_map);
let mut failed = 0; let failed = print_findings(&findings);
for finding in &findings { write_findings(findings_out, &findings);
let level = match finding.level {
needs::Level::Fail => {
failed += 1;
"FAIL"
}
needs::Level::Warn => "WARN",
};
eprintln!("{level}: need {:?}: {}", finding.need, finding.message);
}
for need in &file.needs { for need in &file.needs {
if let Some(path) = needs::path_for(questions, need) { if let Some(path) = needs::path_for(questions, need) {
let steps: Vec<String> = path let steps: Vec<String> = path
+549 -28
View File
@@ -137,9 +137,55 @@ pub enum Level {
#[derive(Debug)] #[derive(Debug)]
pub struct Finding { pub struct Finding {
/// The need's id, or the bucket's name when `scope` is "bucket".
pub need: String, pub need: String,
pub level: Level, pub level: Level,
pub message: String, pub message: String,
/// "need" for a need's own path; "bucket" for what holds for every
/// record in a bucket whichever need brought it in.
pub scope: &'static str,
/// What kind of gap it is, stable across releases: `strand`,
/// `edge-unoffered`, `done-unreachable`, ... (docs/lint.md).
pub code: &'static str,
/// What in the content it is about: a state, a move (`from>to`), a
/// page. With the scope, need and code it makes the finding's id.
pub subject: String,
}
impl Finding {
/// The same gap keeps the same id however its message is worded,
/// so a fix round can tell what it closed, what is still open and
/// what it broke. FNV-1a over scope, need, code and subject.
pub fn id(&self) -> String {
let mut hash: u64 = 0xcbf2_9ce4_8422_2325;
for part in [self.scope, &self.need, self.code, &self.subject] {
for byte in part.bytes().chain(std::iter::once(0)) {
hash ^= u64::from(byte);
hash = hash.wrapping_mul(0x0100_0000_01b3);
}
}
format!("{:08x}", hash >> 32)
}
/// The change that closes it, when the lint knows one: what follows
/// "fix:" in the message.
pub fn fix(&self) -> Option<&str> {
self.message.split_once(" - fix: ").map(|(_, fix)| fix)
}
/// One line of `--findings` JSONL.
pub fn to_json(&self) -> serde_json::Value {
serde_json::json!({
"id": self.id(),
"level": match self.level { Level::Fail => "fail", Level::Warn => "warn" },
"code": self.code,
"scope": self.scope,
"need": self.need,
"subject": self.subject,
"message": self.message,
"fix": self.fix(),
})
}
} }
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
@@ -255,6 +301,10 @@ pub fn path_for(questions: &Questions, need: &Need) -> Option<Vec<Step>> {
struct Desk { struct Desk {
page: String, page: String,
group: Option<String>, group: Option<String>,
/// The page's own `qualifies`, kept apart from the resource's
/// `requires_group`: when both are set and differ, only members of
/// both ever see the buttons.
page_group: Option<String>,
/// (from, to, button label) /// (from, to, button label)
moves: Vec<(String, String, String)>, moves: Vec<(String, String, String)>,
} }
@@ -272,6 +322,7 @@ fn desks_over(questions: &Questions, bucket: &str) -> Vec<Desk> {
desks.push(Desk { desks.push(Desk {
page: q.id.clone(), page: q.id.clone(),
group: resource.requires_group.clone().or_else(|| q.qualifies.clone()), group: resource.requires_group.clone().or_else(|| q.qualifies.clone()),
page_group: q.qualifies.clone(),
moves: resource moves: resource
.transitions .transitions
.iter() .iter()
@@ -284,15 +335,49 @@ fn desks_over(questions: &Questions, bucket: &str) -> Vec<Desk> {
desks desks
} }
/// Self-service moves into `bucket` - a visitor holding their own /// Self-service moves in `bucket` - a visitor holding their own
/// record's link, no group involved (unsubscribe). /// record's link, no group involved (unsubscribe, withdraw) - as
fn self_moves(questions: &Questions, bucket: &str) -> Vec<String> { /// (from, to), from the states each may be made from.
fn self_moves(questions: &Questions, bucket: &str, initial: &str) -> Vec<(String, String)> {
questions questions
.values() .values()
.flat_map(|q| &q.alternatives) .flat_map(|q| &q.alternatives)
.filter_map(|a| a.self_transition.as_ref()) .filter_map(|a| a.self_transition.as_ref())
.filter(|s| s.bucket == bucket) .filter(|s| s.bucket == bucket)
.map(|s| s.to.clone()) .flat_map(|s| s.from_states(initial).into_iter().map(|from| (from, s.to.clone())))
.collect()
}
/// The moves a clock makes in `schema` (`after:` on a state), as
/// (from, to). Nobody presses them, and they still move records.
fn clock_moves(schema: &AggregateSchema) -> Vec<(String, String)> {
let mut moves: Vec<(String, String)> =
schema.after_for_state.iter().map(|(from, after)| (from.clone(), after.to.clone())).collect();
moves.sort();
moves
}
/// States reachable from `start` along `moves`.
fn reachable(start: &str, moves: &[(String, String)]) -> HashSet<String> {
let mut reached = HashSet::from([start.to_string()]);
let mut queue = VecDeque::from([start.to_string()]);
while let Some(state) = queue.pop_front() {
for (_, to) in moves.iter().filter(|(from, _)| *from == state) {
if reached.insert(to.clone()) {
queue.push_back(to.clone());
}
}
}
reached
}
/// Who else offers `from -> to` in the bucket, as "page (group)", for
/// a finding that has to say where the missing button already is.
fn offered_elsewhere(desks: &[Desk], from: &str, to: &str) -> Vec<String> {
desks
.iter()
.filter(|d| d.moves.iter().any(|(f, t, _)| f == from && t == to))
.map(|d| format!("{} ({})", d.page, d.group.as_deref().unwrap_or("ungated")))
.collect() .collect()
} }
@@ -305,10 +390,18 @@ pub fn check(
) -> Vec<Finding> { ) -> Vec<Finding> {
let mut findings = Vec::new(); let mut findings = Vec::new();
let mut seen = HashSet::new(); let mut seen = HashSet::new();
// (bucket, state) a need already reported - stranding on its way
// to done, or out of its reach - so the bucket pass does not say
// it twice.
let mut strands_reported: HashSet<(String, String)> = HashSet::new();
let mut unreached_reported: HashSet<(String, String)> = HashSet::new();
for need in &file.needs { for need in &file.needs {
let mut report = |level: Level, message: String| { let mut report = |level: Level, code: &'static str, subject: String, message: String| {
findings.push(Finding { findings.push(Finding {
need: need.id.clone(), need: need.id.clone(),
scope: "need",
code,
subject,
level: if need.planned || need.paused { Level::Warn } else { level }, level: if need.planned || need.paused { Level::Warn } else { level },
message: match (need.paused, need.planned, level == Level::Fail) { message: match (need.paused, need.planned, level == Level::Fail) {
(true, _, true) => format!("paused, not open now: {message}"), (true, _, true) => format!("paused, not open now: {message}"),
@@ -318,15 +411,17 @@ pub fn check(
}) })
}; };
if !seen.insert(need.id.as_str()) { if !seen.insert(need.id.as_str()) {
report(Level::Fail, "declared more than once".to_string()); report(Level::Fail, "need-duplicate", String::new(), "declared more than once".to_string());
continue; continue;
} }
// The visitor's side: can they get their answer recorded? // The visitor's side: can they get their answer recorded?
match questions.get(&need.enters) { match questions.get(&need.enters) {
None => report(Level::Fail, format!("entry page {:?} does not exist", need.enters)), None => report(Level::Fail, "entry-missing", need.enters.clone(), format!("entry page {:?} does not exist", need.enters)),
Some(page) if !visible(page, need.enters_as.as_deref()) => report( Some(page) if !visible(page, need.enters_as.as_deref()) => report(
Level::Fail, Level::Fail,
"entry-gated",
need.enters.clone(),
format!( format!(
"entry page {:?} is gated on {:?}, which this visitor does not hold", "entry page {:?} is gated on {:?}, which this visitor does not hold",
need.enters, page.qualifies need.enters, page.qualifies
@@ -336,6 +431,8 @@ pub fn check(
if page.responsible.is_none() { if page.responsible.is_none() {
report( report(
Level::Warn, Level::Warn,
"entry-no-responsible",
need.enters.clone(),
format!("entry page {:?} names no one responsible to turn to", need.enters), format!("entry page {:?} names no one responsible to turn to", need.enters),
); );
} }
@@ -363,6 +460,8 @@ pub fn check(
.unwrap_or_default(); .unwrap_or_default();
report( report(
Level::Fail, Level::Fail,
"path-closed",
at.clone(),
format!( format!(
"the path exists but is closed: {at} is `disabled`, so the answer is advertised and refused" "the path exists but is closed: {at} is `disabled`, so the answer is advertised and refused"
), ),
@@ -370,6 +469,8 @@ pub fn check(
} }
None => report( None => report(
Level::Fail, Level::Fail,
"path-missing",
String::new(),
format!( format!(
"no path from {:?}{} records into {:?} within {} submission(s)", "no path from {:?}{} records into {:?} within {} submission(s)",
need.enters, need.enters,
@@ -386,6 +487,8 @@ pub fn check(
if best.fields > budget { if best.fields > budget {
report( report(
Level::Fail, Level::Fail,
"path-over-budget",
String::new(),
format!( format!(
"the path asks for {} required field(s), over the budget of {budget}", "the path asks for {} required field(s), over the budget of {budget}",
best.fields best.fields
@@ -396,6 +499,8 @@ pub fn check(
if best.records_with_action == Some(false) { if best.records_with_action == Some(false) {
report( report(
Level::Warn, Level::Warn,
"path-no-action",
String::new(),
"the recording alternative has no `action` - the visitor is never told what happens next".to_string(), "the recording alternative has no `action` - the visitor is never told what happens next".to_string(),
); );
} }
@@ -408,6 +513,8 @@ pub fn check(
let Some(schema) = aggregates.get(&need.lands_in) else { let Some(schema) = aggregates.get(&need.lands_in) else {
report( report(
Level::Fail, Level::Fail,
"machine-missing",
need.lands_in.clone(),
format!("aggregates.yaml declares no state machine for {:?}", need.lands_in), format!("aggregates.yaml declares no state machine for {:?}", need.lands_in),
); );
continue; continue;
@@ -426,6 +533,8 @@ pub fn check(
.collect(); .collect();
report( report(
Level::Fail, Level::Fail,
"desk-missing",
need.handled_by.clone(),
format!( format!(
"no desk gated on {:?} reads {:?}{}", "no desk gated on {:?} reads {:?}{}",
need.handled_by, need.handled_by,
@@ -439,23 +548,44 @@ pub fn check(
); );
continue; continue;
} }
let selfs = self_moves(questions, &need.lands_in); // Every move that carries this need's records: the buttons on
let exits = |state: &str| -> Vec<String> { // the desks of handled_by/also_moved_by, the visitor's own
let allowed = schema.allowed(state); // links, and the clocks.
let mut to: Vec<String> = own let mut moves: Vec<(String, String)> = own
.iter() .iter()
.flat_map(|d| &d.moves) .flat_map(|d| &d.moves)
.filter(|(from, to, _)| from == state && allowed.contains(to)) .filter(|(from, to, _)| schema.allowed(from).contains(to))
.map(|(_, to, _)| to.clone()) .map(|(from, to, _)| (from.clone(), to.clone()))
.collect(); .collect();
to.extend(selfs.iter().filter(|to| allowed.contains(to)).cloned()); moves.extend(self_moves(questions, &need.lands_in, &schema.initial));
to moves.extend(clock_moves(schema));
let exits = |state: &str| -> Vec<String> {
moves.iter().filter(|(from, _)| from == state).map(|(_, to)| to.clone()).collect()
};
let movers = std::iter::once(need.handled_by.as_str())
.chain(need.also_moved_by.iter().map(String::as_str))
.map(|g| format!("{g:?}"))
.collect::<Vec<_>>()
.join(" or ");
// The fix for a missing move: the button on handled_by's desk,
// or the group whose desk already has it added to also_moved_by.
let fix_for = |from: &str, to: &str| -> String {
let elsewhere = offered_elsewhere(&desks, from, to);
let desk = own.first().map(|d| d.page.as_str()).unwrap_or("their desk");
if elsewhere.is_empty() {
format!("add `{{ from: {from}, to: {to}, label: ... }}` to the transitions on {desk}")
} else {
format!(
"{} already offers it - add that group to also_moved_by, or add `{{ from: {from}, to: {to}, label: ... }}` on {desk}",
elsewhere.join(", ")
)
}
}; };
let done: HashSet<&str> = need.done_when.iter().map(String::as_str).collect(); let done: HashSet<&str> = need.done_when.iter().map(String::as_str).collect();
// Reachability walks the whole machine (a finished state may // Reachability walks the whole machine (a finished state may
// lead on to another: subscribed, then unsubscribed). Stranding // lead on to another: subscribed, then unsubscribed). Stranding
// only counts on the way to the first finished state - what // only counts on the way to the first finished state here; what
// happens to a handled record afterwards is not this need. // strands a record afterwards is the bucket's finding (below).
let mut reached: HashSet<String> = HashSet::from([schema.initial.clone()]); let mut reached: HashSet<String> = HashSet::from([schema.initial.clone()]);
let mut queue = VecDeque::from([(schema.initial.clone(), false)]); let mut queue = VecDeque::from([(schema.initial.clone(), false)]);
let mut stranded = Vec::new(); let mut stranded = Vec::new();
@@ -471,18 +601,44 @@ pub fn check(
} }
} }
} }
// The declared edges into `state` from somewhere a record does
// get to: the moves that would close the gap.
let ways_in = |state: &str| -> Vec<(String, String)> {
let mut ways: Vec<(String, String)> = reached
.iter()
.filter(|from| schema.allowed(from).iter().any(|to| to == state))
.map(|from| (from.clone(), state.to_string()))
.collect();
ways.sort();
ways
};
let missing = |state: &str| -> String {
match ways_in(state).first() {
Some((from, to)) => format!(" - fix: {}", fix_for(from, to)),
None => format!(
" - fix: no state a record reaches has a declared edge into it; add one in aggregates.yaml under {:?}",
need.lands_in
),
}
};
for state in &need.done_when { for state in &need.done_when {
if !schema.has_state(state) { if !schema.has_state(state) {
report( report(
Level::Fail, Level::Fail,
"done-unknown",
state.clone(),
format!("done_when names {state:?}, which {:?} has no such state", need.lands_in), format!("done_when names {state:?}, which {:?} has no such state", need.lands_in),
); );
} else if !reached.contains(state) { } else if !reached.contains(state) {
unreached_reported.insert((need.lands_in.clone(), state.clone()));
report( report(
Level::Fail, Level::Fail,
"done-unreachable",
state.clone(),
format!( format!(
"{:?} cannot move a record to {state:?} - no desk of theirs offers the moves", "{:?} cannot move a record to {state:?} - no desk of theirs offers the moves{}",
need.handled_by need.handled_by,
missing(state)
), ),
); );
} }
@@ -491,17 +647,48 @@ pub fn check(
if !schema.has_state(stage) { if !schema.has_state(stage) {
report( report(
Level::Fail, Level::Fail,
"stage-unknown",
stage.clone(),
format!( format!(
"the business describes a stage {stage:?} that {:?} has no state for", "the business describes a stage {stage:?} that {:?} has no state for",
need.lands_in need.lands_in
), ),
); );
} else if !reached.contains(stage) { } else if !reached.contains(stage) {
unreached_reported.insert((need.lands_in.clone(), stage.clone()));
report( report(
Level::Fail, Level::Fail,
"stage-unreachable",
stage.clone(),
format!( format!(
"stage {stage:?} exists but {:?} is offered no moves that reach it", "stage {stage:?} exists but {:?} is offered no moves that reach it{}",
need.handled_by need.handled_by,
missing(stage)
),
);
}
}
// In the business's order: each working stage reachable from
// the one before it, so a machine where "quoted" cannot follow
// "surveyed" does not pass for one that goes surveyed -> quoted.
// The finished states that close the list are alternatives
// (won, lost), not a sequence, so they are left out.
for pair in need.stages.windows(2) {
let (before, after) = (&pair[0], &pair[1]);
if done.contains(before.as_str()) || done.contains(after.as_str()) {
continue;
}
if reached.contains(before) && reached.contains(after) && !reachable(before, &moves).contains(after) {
report(
Level::Fail,
"stage-order",
format!("{before}>{after}"),
format!(
"stage {after:?} comes after {before:?} for the business, but no move leads on from {before:?} to it{}",
match schema.allowed(before).iter().find(|to| reachable(to, &moves).contains(after) || *to == after) {
Some(to) => format!(" - fix: {}", fix_for(before, to)),
None => format!(" - fix: add an edge from {before:?} toward {after:?} in aggregates.yaml under {:?}", need.lands_in),
}
), ),
); );
} }
@@ -510,27 +697,43 @@ pub fn check(
if !need.done_when.contains(state) { if !need.done_when.contains(state) {
report( report(
Level::Fail, Level::Fail,
"success-not-done",
state.clone(),
format!("success names {state:?}, which is not one of done_when"), format!("success names {state:?}, which is not one of done_when"),
); );
} }
} }
stranded.sort(); stranded.sort();
for state in &stranded {
strands_reported.insert((need.lands_in.clone(), state.clone()));
}
for state in stranded { for state in stranded {
let fix = match schema.allowed(&state).first() {
Some(to) => format!(" - fix: {}", fix_for(&state, to)),
None => format!(
" - fix: {:?} declares no way out of it; add {state:?} to done_when if it is finished, or an edge out in aggregates.yaml",
need.lands_in
),
};
report( report(
Level::Fail, Level::Fail,
format!( "strand",
"records strand in {state:?}: {:?} is offered no move out of it", state.clone(),
need.handled_by format!("records strand in {state:?}: {movers} is offered no move out of it{fix}"),
),
); );
} }
} }
findings.extend(operations(file, questions, aggregates, &strands_reported, &unreached_reported));
let need_ids: HashSet<&str> = file.needs.iter().map(|n| n.id.as_str()).collect(); let need_ids: HashSet<&str> = file.needs.iter().map(|n| n.id.as_str()).collect();
for persona in &file.personas { for persona in &file.personas {
if !need_ids.contains(persona.need.as_str()) { if !need_ids.contains(persona.need.as_str()) {
findings.push(Finding { findings.push(Finding {
need: persona.need.clone(), need: persona.need.clone(),
scope: "need",
code: "persona-unknown-need",
subject: persona.id.clone(),
level: Level::Fail, level: Level::Fail,
message: format!("persona {:?} points at a need that is not declared", persona.id), message: format!("persona {:?} points at a need that is not declared", persona.id),
}); });
@@ -539,6 +742,200 @@ pub fn check(
findings findings
} }
/// What must hold for every record in a bucket some need lands in,
/// whichever need brought it: every state is somewhere a record can
/// get to, no state a record gets to holds it with no way on (before
/// done or after), every declared move is a button someone has, every
/// desk can be seen by whoever its buttons are for, and every mail
/// goes out from a state records reach, saying only what the record
/// holds.
fn operations(
file: &NeedsFile,
questions: &Questions,
aggregates: &HashMap<String, AggregateSchema>,
strands_reported: &HashSet<(String, String)>,
unreached_reported: &HashSet<(String, String)>,
) -> Vec<Finding> {
let mut findings = Vec::new();
let mut buckets: Vec<&str> = file.needs.iter().map(|n| n.lands_in.as_str()).collect();
buckets.sort();
buckets.dedup();
for bucket in buckets {
let Some(schema) = aggregates.get(bucket) else { continue };
let needs: Vec<&Need> = file.needs.iter().filter(|n| n.lands_in == bucket).collect();
// Only open needs make a gap fail; a bucket that only planned
// or paused needs use reports it as a warning.
let open = needs.iter().any(|n| !n.planned && !n.paused);
let mut report = |level: Level, code: &'static str, subject: String, message: String| {
findings.push(Finding {
need: bucket.to_string(),
scope: "bucket",
code,
subject,
level: if open { level } else { Level::Warn },
message,
})
};
let desks = desks_over(questions, bucket);
let mut moves: Vec<(String, String)> = desks
.iter()
.flat_map(|d| &d.moves)
.filter(|(from, to, _)| schema.allowed(from).contains(to))
.map(|(from, to, _)| (from.clone(), to.clone()))
.collect();
moves.extend(self_moves(questions, bucket, &schema.initial));
moves.extend(clock_moves(schema));
let reached = reachable(&schema.initial, &moves);
let offered = |from: &str, to: &str| moves.iter().any(|(f, t)| f == from && t == to);
// Where a missing button goes: the desk of the group answerable
// for the bucket's first need.
let home = needs
.iter()
.find_map(|n| desks.iter().find(|d| d.group.as_deref() == Some(n.handled_by.as_str())))
.map(|d| d.page.clone())
.unwrap_or_else(|| "the handling group's desk".to_string());
let button = |from: &str, to: &str| format!("add `{{ from: {from}, to: {to}, label: ... }}` to the transitions on {home}");
let mut states: Vec<&String> = schema.event_for_state.keys().collect();
states.sort();
for state in &states {
if reached.contains(*state) || unreached_reported.contains(&(bucket.to_string(), (*state).clone())) {
continue;
}
let mut ways: Vec<&String> = reached.iter().filter(|from| schema.allowed(from).contains(state)).collect();
ways.sort();
report(
Level::Fail,
"state-unreached",
(*state).clone(),
format!(
"state {state:?} is never reached: no desk, link or clock moves a record there - fix: {}",
match ways.first() {
Some(from) => button(from, state),
None => "declare an edge into it from a state records reach in aggregates.yaml, or remove it".to_string(),
}
),
);
}
for state in states.iter().filter(|s| reached.contains(**s)) {
let out = schema.allowed(state);
if out.is_empty() {
continue; // a final state: nothing should move it
}
let offered_out: Vec<&String> = out.iter().filter(|to| offered(state, to)).collect();
if offered_out.is_empty() {
if !strands_reported.contains(&(bucket.to_string(), (*state).clone())) {
report(
Level::Fail,
"strand",
(*state).clone(),
format!(
"records strand in {state:?}: {bucket:?} declares moves on to {} but no desk, link or clock offers one - fix: {}",
out.join(", "),
button(state, &out[0])
),
);
}
continue;
}
for to in out.iter().filter(|to| !offered(state, to)) {
report(
Level::Warn,
"edge-unoffered",
format!("{state}>{to}"),
format!(
"the move {state:?} -> {to:?} is declared but no desk, link or clock offers it - fix: {}, or drop the edge from aggregates.yaml",
button(state, to)
),
);
}
}
for desk in &desks {
if let (Some(page_group), Some(group)) = (&desk.page_group, &desk.group) {
if page_group != group {
report(
Level::Warn,
"desk-gated-twice",
desk.page.clone(),
format!(
"the desk on {} is gated twice: the page qualifies {page_group:?}, its list requires {group:?}, so only members of both see the buttons - fix: make them the same group",
desk.page
),
);
}
}
}
// The fields a record of this bucket holds: everything asked on
// a form that records into it.
let fields: Vec<(&str, &str)> = questions
.values()
.flat_map(|q| &q.alternatives)
.filter(|a| a.record_as.as_deref() == Some(bucket))
.flat_map(|a| &a.features)
.flat_map(|f| &f.requirements)
.map(|r| (r.name.as_str(), r.kind.as_str()))
.collect();
let mut mail_states: Vec<(&String, &crate::aggregates::MailSpec)> = schema.mail_for_state.iter().collect();
mail_states.sort_by(|a, b| a.0.cmp(b.0));
for (state, mail) in mail_states {
if !reached.contains(state) {
report(Level::Warn, "mail-unreachable", state.clone(), format!("the mail on entering {state:?} never goes out: no record reaches {state:?} - fix: make {state:?} reachable, or drop its mail"));
}
let mut unknown: Vec<String> = Vec::new();
for key in placeholders(&mail.subject).into_iter().chain(placeholders(&mail.body)) {
let known = match key.split_once('.') {
Some((parent, _)) => fields.iter().any(|(name, kind)| *name == parent && *kind == "record"),
None => MAIL_BUILTINS.contains(&key.as_str()) || fields.iter().any(|(name, _)| *name == key),
};
if !known && !unknown.contains(&key) {
unknown.push(key);
}
}
if !unknown.is_empty() {
let mut names: Vec<&str> = fields.iter().map(|(n, _)| *n).collect();
names.sort();
names.dedup();
report(
Level::Fail,
"mail-unknown-field",
state.clone(),
format!(
"the mail on entering {state:?} uses {}, which no form recording into {bucket:?} collects, so it would go out blank there - fix: use one of the fields the forms collect ({}), or ask for it on the form",
unknown.iter().map(|k| format!("{{{k}}}")).collect::<Vec<_>>().join(", "),
if names.is_empty() { "nothing".to_string() } else { names.join(", ") }
),
);
}
}
}
findings
}
/// What the mailer fills in on every state mail, whatever the record
/// holds (`mail::vars_for`, `mail::site_vars`, `mail::record_links`).
const MAIL_BUILTINS: &[&str] = &["site", "site_name", "chain", "email", "bucket", "state", "link", "self_link", "desk_link"];
/// The `{key}`s in a mail template, read the way `mail::render` reads
/// them: letters, digits, `_`, `-` and `.`, closed by `}`.
fn placeholders(template: &str) -> Vec<String> {
let mut keys = Vec::new();
let mut rest = template;
while let Some(start) = rest.find('{') {
let after = &rest[start + 1..];
let len = after
.char_indices()
.take_while(|(_, c)| c.is_ascii_alphanumeric() || *c == '_' || *c == '-' || *c == '.')
.last()
.map(|(i, c)| i + c.len_utf8())
.unwrap_or(0);
if len > 0 && after[len..].starts_with('}') {
keys.push(after[..len].to_string());
}
rest = after;
}
keys
}
/// Everything a simulation of the business needs, resolved: each /// Everything a simulation of the business needs, resolved: each
/// need's path with the choice on every page and the form that gets /// need's path with the choice on every page and the form that gets
/// filled, each bucket's state machine with the buttons every desk /// filled, each bucket's state machine with the buttons every desk
@@ -611,6 +1008,11 @@ pub fn sim_model(
"steps": steps, "steps": steps,
})); }));
if let Some(schema) = aggregates.get(&need.lands_in) { if let Some(schema) = aggregates.get(&need.lands_in) {
// The simulator's shape: the states a visitor's own link
// moves to (it does not model where from).
let mut self_move_targets: Vec<String> =
self_moves(questions, &need.lands_in, &schema.initial).into_iter().map(|(_, to)| to).collect();
self_move_targets.dedup();
buckets.entry(need.lands_in.clone()).or_insert_with(|| { buckets.entry(need.lands_in.clone()).or_insert_with(|| {
json!({ json!({
"initial": schema.initial, "initial": schema.initial,
@@ -623,7 +1025,7 @@ pub fn sim_model(
"from": from, "to": to, "label": label, "from": from, "to": to, "label": label,
})).collect::<Vec<_>>(), })).collect::<Vec<_>>(),
})).collect::<Vec<_>>(), })).collect::<Vec<_>>(),
"self_moves": self_moves(questions, &need.lands_in), "self_moves": self_move_targets,
}) })
}); });
} }
@@ -895,8 +1297,8 @@ mod tests {
assert_eq!( assert_eq!(
fails(&findings), fails(&findings),
vec![ vec![
"\"owners\" cannot move a record to \"won\" - no desk of theirs offers the moves", "\"owners\" cannot move a record to \"won\" - no desk of theirs offers the moves - fix: add `{ from: quoted, to: won, label: ... }` to the transitions on /desk",
"records strand in \"quoted\": \"owners\" is offered no move out of it", "records strand in \"quoted\": \"owners\" is offered no move out of it - fix: add `{ from: quoted, to: won, label: ... }` to the transitions on /desk",
] ]
); );
} }
@@ -1037,4 +1439,123 @@ mod tests {
assert_eq!(score(&tasks, &[], 0.6).unanswered, vec!["founder@/"]); assert_eq!(score(&tasks, &[], 0.6).unanswered, vec!["founder@/"]);
} }
/// The fixture site with its aggregates replaced, for the checks
/// that are about the state machine rather than the pages.
fn site_with(desk_moves: &str, projects: &str) -> (Questions, HashMap<String, AggregateSchema>) {
let (questions, _) = site(desk_moves);
let aggregates = parse_aggregates_yaml(&format!(
"aggregates:\n - bucket: projects\n{projects} - bucket: subscribers\n attended_by: a mailer\n initial: open\n states:\n open: {{ event: subscribed }}\n transitions: {{}}\n"
))
.unwrap();
(questions, aggregates)
}
fn warns(findings: &[Finding]) -> Vec<&str> {
findings.iter().filter(|f| f.level == Level::Warn).map(|f| f.message.as_str()).collect()
}
#[test]
fn a_clock_is_a_move() {
// Nobody closes a stale quote; six weeks do. That is not a strand.
let (questions, aggregates) = site_with(
" - { to: quoted, label: Quote }\n - { from: quoted, to: won, label: Win }\n",
" initial: open\n states:\n open: { event: submitted }\n quoted: { event: quoted, after: { days: 42, to: lost } }\n won: { event: won }\n lost: { event: lost }\n transitions:\n open: [quoted]\n quoted: [won, lost]\n",
);
let findings = check(&needs(""), &questions, &aggregates);
assert!(fails(&findings).is_empty(), "{findings:?}");
}
#[test]
fn a_state_nobody_reaches_and_a_strand_after_done_are_the_buckets() {
// "archived" follows "won" but no desk offers it; "parked" has
// no way in at all.
let (questions, aggregates) = site_with(
FULL_DESK,
" initial: open\n states:\n open: { event: submitted }\n quoted: { event: quoted }\n won: { event: won }\n lost: { event: lost }\n archived: { event: archived }\n done: { event: done }\n parked: { event: parked }\n transitions:\n open: [quoted, lost]\n quoted: [won, lost]\n won: [archived]\n archived: [done]\n parked: [open]\n",
);
let findings = check(&needs(""), &questions, &aggregates);
let bucket: Vec<&Finding> = findings.iter().filter(|f| f.scope == "bucket").collect();
assert!(bucket.iter().all(|f| f.need == "projects"), "{bucket:?}");
assert_eq!(
fails(&findings),
vec![
"state \"archived\" is never reached: no desk, link or clock moves a record there - fix: add `{ from: won, to: archived, label: ... }` to the transitions on /desk",
"state \"done\" is never reached: no desk, link or clock moves a record there - fix: declare an edge into it from a state records reach in aggregates.yaml, or remove it",
"state \"parked\" is never reached: no desk, link or clock moves a record there - fix: declare an edge into it from a state records reach in aggregates.yaml, or remove it",
"records strand in \"won\": \"projects\" declares moves on to archived but no desk, link or clock offers one - fix: add `{ from: won, to: archived, label: ... }` to the transitions on /desk",
]
);
}
#[test]
fn an_edge_nobody_offers_is_a_warning_when_there_is_another_way_on() {
let (questions, aggregates) = site(" - { to: quoted, label: Quote }\n - { from: quoted, to: won, label: Win }\n - { from: quoted, to: lost, label: Lose }\n");
let findings = check(&needs(""), &questions, &aggregates);
assert!(fails(&findings).is_empty(), "{findings:?}");
assert_eq!(
warns(&findings),
vec!["the move \"open\" -> \"lost\" is declared but no desk, link or clock offers it - fix: add `{ from: open, to: lost, label: ... }` to the transitions on /desk, or drop the edge from aggregates.yaml"]
);
}
#[test]
fn working_stages_must_follow_each_other() {
// The business surveys, then quotes; this machine can only
// quote straight from open, and surveying leads nowhere.
let (questions, aggregates) = site_with(
" - { to: quoted, label: Quote }\n - { to: surveyed, label: Survey }\n - { from: surveyed, to: lost, label: Lose }\n - { from: quoted, to: won, label: Win }\n - { from: quoted, to: lost, label: Lose }\n",
" initial: open\n states:\n open: { event: submitted }\n surveyed: { event: surveyed }\n quoted: { event: quoted }\n won: { event: won }\n lost: { event: lost }\n transitions:\n open: [surveyed, quoted]\n surveyed: [lost]\n quoted: [won, lost]\n",
);
let findings = check(&needs(" stages: [open, surveyed, quoted, won, lost]\n"), &questions, &aggregates);
assert_eq!(
fails(&findings),
vec!["stage \"quoted\" comes after \"surveyed\" for the business, but no move leads on from \"surveyed\" to it - fix: add an edge from \"surveyed\" toward \"quoted\" in aggregates.yaml under \"projects\""]
);
}
#[test]
fn a_mail_may_only_say_what_the_record_holds() {
let (questions, aggregates) = site_with(
FULL_DESK,
" initial: open\n states:\n open: { event: submitted, mail: { to: submitter, subject: 'Got it, {email}', body: 'We read {brief} and will reply at {site}. {refnr} {link}' } }\n quoted: { event: quoted }\n won: { event: won }\n lost: { event: lost }\n transitions:\n open: [quoted, lost]\n quoted: [won, lost]\n",
);
let findings = check(&needs(""), &questions, &aggregates);
assert_eq!(
fails(&findings),
vec!["the mail on entering \"open\" uses {refnr}, which no form recording into \"projects\" collects, so it would go out blank there - fix: use one of the fields the forms collect (brief, budget, email), or ask for it on the form"]
);
}
#[test]
fn a_desk_gated_twice_is_seen_only_by_members_of_both() {
let (mut questions, aggregates) = site(FULL_DESK);
questions.get_mut("/desk").unwrap().qualifies = Some("staff".into());
let findings = check(&needs(""), &questions, &aggregates);
assert!(
warns(&findings).contains(&"the desk on /desk is gated twice: the page qualifies \"staff\", its list requires \"owners\", so only members of both see the buttons - fix: make them the same group"),
"{findings:?}"
);
}
#[test]
fn a_finding_keeps_its_id_when_reworded_and_says_its_fix() {
let (questions, aggregates) = site(" - { to: quoted, label: Quote }\n - { to: lost, label: Lose }\n");
let findings = check(&needs(""), &questions, &aggregates);
let strand = findings.iter().find(|f| f.code == "strand").unwrap();
assert_eq!(strand.subject, "quoted");
assert_eq!(strand.fix(), Some("add `{ from: quoted, to: won, label: ... }` to the transitions on /desk"));
let reworded = Finding { message: "something else entirely".into(), ..clone_of(strand) };
assert_eq!(reworded.id(), strand.id());
let elsewhere = Finding { subject: "open".into(), ..clone_of(strand) };
assert_ne!(elsewhere.id(), strand.id());
let json = strand.to_json();
assert_eq!(json["code"], "strand");
assert_eq!(json["level"], "fail");
assert_eq!(json["id"], strand.id());
}
fn clone_of(f: &Finding) -> Finding {
Finding { need: f.need.clone(), level: f.level, message: f.message.clone(), scope: f.scope, code: f.code, subject: f.subject.clone() }
}
} }
+144 -6
View File
@@ -251,6 +251,80 @@ pub fn vars_for(bucket: &str, id: &str, state: &str, responses: &serde_json::Val
vars vars
} }
/// What every mail portal sends may say, whatever made it - a state
/// mail, an invite, a suggestion's answer: `{site}` (the instance's
/// public URL) and `{site_name}` (site.yaml's title). One place, so a
/// template written for one kind of mail reads the same in another
/// (docs/mail.md, Variables).
pub fn site_vars(site: &crate::content::SiteConfig) -> serde_json::Map<String, serde_json::Value> {
let mut vars = serde_json::Map::new();
vars.insert("site".into(), public_url().into());
vars.insert("site_name".into(), site_name(site).into());
vars
}
/// Where a mail about a record can send its reader (docs/mail.md):
///
/// - `{self_link}`: the record's own page for the person it belongs
/// to - a page offering a self-service move on this bucket from the
/// state the record is in, with the `?chain=&email=` that
/// lets them act without signing in;
/// - `{desk_link}`: the desk that moves the record - the page whose
/// list over the bucket carries transitions, else one that reads it;
/// - `{link}`: `{self_link}` in a mail to the submitter, `{desk_link}`
/// in one to anyone else, and the site itself when there is neither.
///
/// Empty strings, never missing keys, for a link the content has no
/// page for: a template naming one renders blank there rather than
/// with a broken URL.
pub fn record_links(
questions: &std::collections::HashMap<String, crate::content::Question>,
initial: &str,
bucket: &str,
id: &str,
state: &str,
email: &str,
to_submitter: bool,
) -> serde_json::Map<String, serde_json::Value> {
let mut pages: Vec<&crate::content::Question> = questions.values().collect();
pages.sort_by(|a, b| a.id.cmp(&b.id));
// Only a move the engine would accept from where the record is:
// a link to a button that refuses is worse than none.
let self_page = pages.iter().find(|q| {
q.alternatives
.iter()
.filter_map(|a| a.self_transition.as_ref())
.any(|st| st.bucket == bucket && st.from_states(initial).iter().any(|f| f == state))
});
let reads = |q: &&crate::content::Question, moving: bool| {
q.alternatives
.iter()
.flat_map(|a| &a.features)
.filter_map(|f| f.resource.as_ref())
.any(|r| r.bucket() == Some(bucket) && (!moving || !r.transitions.is_empty()))
};
let desk_page = pages.iter().find(|q| reads(q, true)).or_else(|| pages.iter().find(|q| reads(q, false)));
let site = public_url();
let self_link = match self_page {
Some(q) if email.contains('@') => {
let email: String = url::form_urlencoded::byte_serialize(email.as_bytes()).collect();
format!("{site}{}?chain={id}&email={email}", q.id)
}
_ => String::new(),
};
let desk_link = desk_page.map(|q| format!("{site}{}", q.id)).unwrap_or_default();
let link = match (to_submitter, self_link.is_empty(), desk_link.is_empty()) {
(true, false, _) => self_link.clone(),
(false, _, false) => desk_link.clone(),
_ => site,
};
let mut vars = serde_json::Map::new();
vars.insert("self_link".into(), self_link.into());
vars.insert("desk_link".into(), desk_link.into());
vars.insert("link".into(), link.into());
vars
}
/// The record field a `to` reaches through, when it is neither /// The record field a `to` reaches through, when it is neither
/// `submitter` nor an address: `{notice.email}` gives `notice`. /// `submitter` nor an address: `{notice.email}` gives `notice`.
pub fn parent_of(to: &str) -> Option<&str> { pub fn parent_of(to: &str) -> Option<&str> {
@@ -325,6 +399,13 @@ pub async fn on_state(state: &crate::server::AppState, bucket: &str, id: &str, t
}; };
let mut vars = vars_for(bucket, id, to_state, responses); let mut vars = vars_for(bucket, id, to_state, responses);
parent_vars(state, bucket, responses, &mut vars).await; parent_vars(state, bucket, responses, &mut vars).await;
vars.extend(site_vars(site));
{
let email = vars.get("email").and_then(|v| v.as_str()).unwrap_or_default().to_string();
let questions = state.questions.load();
let initial = state.aggregates.load().at(storyline).get(bucket).map(|s| s.initial.clone()).unwrap_or_default();
vars.extend(record_links(questions.at(storyline), &initial, bucket, id, to_state, &email, spec.to_submitter()));
}
let to = if spec.to_submitter() { let to = if spec.to_submitter() {
match vars.get("email").and_then(|v| v.as_str()).filter(|e| e.contains('@')) { match vars.get("email").and_then(|v| v.as_str()).filter(|e| e.contains('@')) {
Some(e) => e.to_string(), Some(e) => e.to_string(),
@@ -416,12 +497,19 @@ pub async fn on_responsible(state: &crate::server::AppState, invited: &crate::pe
.map(|t| t.format("%Y-%m-%d %H:%M UTC").to_string()) .map(|t| t.format("%Y-%m-%d %H:%M UTC").to_string())
.unwrap_or_default(); .unwrap_or_default();
let mut vars = serde_json::Map::new(); let mut vars = serde_json::Map::new();
// The form's own fields first, so the invite's fixed placeholders
// win a clash; a date and time reads as one.
for (key, value) in &invited.fields {
let text = value.as_str().map(|v| spoken_datetime(v, norwegian).unwrap_or_else(|| v.to_string()));
if let Some(text) = text {
vars.insert(key.clone(), text.into());
}
}
vars.insert("name".into(), invited.display_name.clone().into()); vars.insert("name".into(), invited.display_name.clone().into());
vars.insert("username".into(), invited.username.clone().into()); vars.insert("username".into(), invited.username.clone().into());
vars.insert("questions".into(), list.into()); vars.insert("questions".into(), list.into());
vars.extend(site_vars(&site));
vars.insert("link".into(), invited.reset_link.clone().unwrap_or_default().into()); vars.insert("link".into(), invited.reset_link.clone().unwrap_or_default().into());
vars.insert("site".into(), public_url().into());
vars.insert("site_name".into(), site_name(&site).into());
vars.insert("expires".into(), expires.into()); vars.insert("expires".into(), expires.into());
let text = render(&body, &vars); let text = render(&body, &vars);
let mail = Outgoing { let mail = Outgoing {
@@ -493,7 +581,7 @@ async fn on_suggestion_state(state: &crate::server::AppState, id: &str, to_state
return; return;
} }
let quoted: String = field("text").lines().map(|l| format!("> {l}")).collect::<Vec<_>>().join("\n"); let quoted: String = field("text").lines().map(|l| format!("> {l}")).collect::<Vec<_>>().join("\n");
let mut vars = serde_json::Map::new(); let mut vars = site_vars(&site);
vars.insert("name".into(), field("name").into()); vars.insert("name".into(), field("name").into());
vars.insert("question".into(), field("question").into()); vars.insert("question".into(), field("question").into());
vars.insert("page".into(), format!("{}{}", public_url(), field("page")).into()); vars.insert("page".into(), format!("{}{}", public_url(), field("page")).into());
@@ -553,6 +641,25 @@ pub async fn on_edit_suggestion(state: &crate::server::AppState, question_id: &s
/// Built in, since portal knows everything about it; `mail.invite` in /// Built in, since portal knows everything about it; `mail.invite` in
/// site.yaml rewords it. `{name}`, `{email}`, `{group}`, `{link}`, /// site.yaml rewords it. `{name}`, `{email}`, `{group}`, `{link}`,
/// `{site}`, `{expires}`. /// `{site}`, `{expires}`.
/// A form's date and time (`2026-10-06T15:00`, from a `datetime-local`
/// field) as a person says it: "tirsdag 6. oktober kl. 15:00", "Tuesday
/// 6 October at 15:00". Anything else is left as it is.
pub fn spoken_datetime(value: &str, norwegian: bool) -> Option<String> {
use chrono::{Datelike, NaiveDateTime, Timelike};
let t = NaiveDateTime::parse_from_str(value, "%Y-%m-%dT%H:%M").ok()?;
let day = t.weekday().num_days_from_monday() as usize;
let month = t.month0() as usize;
Some(if norwegian {
const DAYS: [&str; 7] = ["mandag", "tirsdag", "onsdag", "torsdag", "fredag", "lørdag", "søndag"];
const MONTHS: [&str; 12] = ["januar", "februar", "mars", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "desember"];
format!("{} {}. {} kl. {:02}:{:02}", DAYS[day], t.day(), MONTHS[month], t.hour(), t.minute())
} else {
const DAYS: [&str; 7] = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
const MONTHS: [&str; 12] = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
format!("{} {} {} at {:02}:{:02}", DAYS[day], t.day(), MONTHS[month], t.hour(), t.minute())
})
}
pub async fn on_invite(state: &crate::server::AppState, invited: &crate::people::Invited) { pub async fn on_invite(state: &crate::server::AppState, invited: &crate::people::Invited) {
let site = state.site.load(); let site = state.site.load();
let Some(cfg) = &site.mail else { let Some(cfg) = &site.mail else {
@@ -560,7 +667,7 @@ pub async fn on_invite(state: &crate::server::AppState, invited: &crate::people:
return; return;
}; };
let norwegian = site.lang.as_deref().is_some_and(|l| l.starts_with("no") || l.starts_with("nb") || l.starts_with("nn")); let norwegian = site.lang.as_deref().is_some_and(|l| l.starts_with("no") || l.starts_with("nb") || l.starts_with("nn"));
let (subject, body) = match (&cfg.invite, invited.reset_link.is_some(), norwegian) { let (subject, body) = match (invited.mail.as_ref().or(cfg.invite.as_ref()), invited.reset_link.is_some(), norwegian) {
(Some(t), _, _) => (t.subject.clone(), t.body.clone()), (Some(t), _, _) => (t.subject.clone(), t.body.clone()),
(None, true, true) => ( (None, true, true) => (
"Du er invitert inn i {group} på {site_name}".to_string(), "Du er invitert inn i {group} på {site_name}".to_string(),
@@ -590,9 +697,8 @@ pub async fn on_invite(state: &crate::server::AppState, invited: &crate::people:
vars.insert("username".into(), invited.username.clone().into()); vars.insert("username".into(), invited.username.clone().into());
vars.insert("email".into(), invited.email.clone().into()); vars.insert("email".into(), invited.email.clone().into());
vars.insert("group".into(), invited.group.clone().into()); vars.insert("group".into(), invited.group.clone().into());
vars.extend(site_vars(&site));
vars.insert("link".into(), invited.reset_link.clone().unwrap_or_default().into()); vars.insert("link".into(), invited.reset_link.clone().unwrap_or_default().into());
vars.insert("site".into(), public_url().into());
vars.insert("site_name".into(), site_name(&site).into());
vars.insert("expires".into(), expires.into()); vars.insert("expires".into(), expires.into());
let text = render(&body, &vars); let text = render(&body, &vars);
let mail = Outgoing { let mail = Outgoing {
@@ -613,6 +719,30 @@ pub async fn on_invite(state: &crate::server::AppState, invited: &crate::people:
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
#[test]
fn a_record_mail_links_its_reader_to_where_they_act() {
let files = vec![
("index.yaml".to_string(), "name: Meld fra\nalternatives:\n - name: Feil\n action: /takk\n record_as: feil\n features:\n - name: Feil\n requirements:\n - { name: email, type: email }\n".to_string()),
("takk.yaml".to_string(), "name: Takk\nfollowup: true\n".to_string()),
("trekk.yaml".to_string(), "name: Trekk saken\nalternatives:\n - name: Trekk\n self_transition: { bucket: feil, to: trukket, label: Trekk, from: [open, befaring] }\n".to_string()),
("styret/index.yaml".to_string(), "name: Styret\nqualifies: styret\nalternatives:\n - name: Feil\n features:\n - name: \"\"\n resource:\n source: { kind: kv, bucket: feil }\n requires_group: styret\n transitions:\n - { to: befaring, label: Befaring }\n".to_string()),
];
let questions = crate::content::build_questions(&files).unwrap();
let site = public_url();
let to_tenant = record_links(&questions, "open", "feil", "abc", "befaring", "kari@x.no", true);
assert_eq!(to_tenant["self_link"], format!("{site}/trekk?chain=abc&email=kari%40x.no"));
assert_eq!(to_tenant["desk_link"], format!("{site}/styret"));
assert_eq!(to_tenant["link"], to_tenant["self_link"]);
let to_board = record_links(&questions, "open", "feil", "abc", "befaring", "kari@x.no", false);
assert_eq!(to_board["link"], to_board["desk_link"]);
// Past where the self-service move can be made: the person has
// no page of their own, so `{link}` is the site.
let after = record_links(&questions, "open", "feil", "abc", "utbedret", "kari@x.no", true);
assert_eq!(after["self_link"], "");
assert_eq!(after["link"], site);
}
use super::*; use super::*;
#[test] #[test]
@@ -662,6 +792,13 @@ mod tests {
assert_eq!(vars["state"], "fixed"); assert_eq!(vars["state"], "fixed");
} }
#[test]
fn a_date_and_time_from_a_form_reads_as_a_person_says_it() {
assert_eq!(spoken_datetime("2026-10-06T15:00", true).as_deref(), Some("tirsdag 6. oktober kl. 15:00"));
assert_eq!(spoken_datetime("2026-10-06T15:00", false).as_deref(), Some("Tuesday 6 October at 15:00"));
assert_eq!(spoken_datetime("Anders Kluge", true), None);
}
#[test] #[test]
fn the_html_alternative_keeps_markdown_and_drops_raw_html() { fn the_html_alternative_keeps_markdown_and_drops_raw_html() {
let html = to_html("Hello **there**\n\n<script>x()</script>\n\n[link](https://x.no)"); let html = to_html("Hello **there**\n\n<script>x()</script>\n\n[link](https://x.no)");
@@ -709,6 +846,7 @@ mod tests {
decided_ms: None, decided_ms: None,
decided_by: None, decided_by: None,
notes: Vec::new(), notes: Vec::new(),
finished: false,
} }
} }
+4 -3
View File
@@ -1,5 +1,6 @@
/// One binary, three jobs: `portal` (or `portal serve`) runs a site; /// One binary, three jobs: `portal` (or `portal serve`) runs a site;
/// `portal lint` checks a content repo the way the site reads it; /// `portal iris` checks a content repo the way the site reads it (the
/// iris keeps bad content out of the portal; `portal lint` is the same);
/// `portal plan`, `build`, `report` and the rest train one. The lint /// `portal plan`, `build`, `report` and the rest train one. The lint
/// and the trainer are the same code as the server, at the same /// and the trainer are the same code as the server, at the same
/// version, so they never disagree about what content means. /// version, so they never disagree about what content means.
@@ -8,7 +9,7 @@
async fn main() -> anyhow::Result<()> { async fn main() -> anyhow::Result<()> {
let argv: Vec<String> = std::env::args().skip(1).collect(); let argv: Vec<String> = std::env::args().skip(1).collect();
match argv.first().map(String::as_str) { match argv.first().map(String::as_str) {
Some("lint") => return portal::lint::run(argv[1..].to_vec()).await, Some("iris" | "lint") => return portal::lint::run(argv[1..].to_vec()).await,
Some("plan" | "build" | "answer" | "rate" | "prefer" | "score" | "simulate" | "compare" | "report" | "generate") => { Some("plan" | "build" | "answer" | "rate" | "prefer" | "score" | "simulate" | "compare" | "report" | "generate") => {
// The trainer runs models through shell commands and waits // The trainer runs models through shell commands and waits
// on them; off the runtime's threads, as a CLI should. // on them; off the runtime's threads, as a CLI should.
@@ -19,7 +20,7 @@ async fn main() -> anyhow::Result<()> {
return Ok(()); return Ok(());
} }
Some("serve") | None => {} Some("serve") | None => {}
Some(other) => anyhow::bail!("portal: unknown command {other:?}; one of serve, lint, plan, build, answer, rate, prefer, score, simulate, compare, report, generate"), Some(other) => anyhow::bail!("portal: unknown command {other:?}; one of serve, iris (or lint), plan, build, answer, rate, prefer, score, simulate, compare, report, generate"),
} }
serve().await serve().await
} }
+3
View File
@@ -254,6 +254,8 @@ pub async fn grant(state: &crate::server::AppState, group: &str, name: &str, who
reset_link: None, reset_link: None,
link_expires_ms: None, link_expires_ms: None,
created, created,
mail: None,
fields: Default::default(),
already_member: !created, already_member: !created,
}; };
match existing { match existing {
@@ -351,6 +353,7 @@ mod tests {
decided_ms: None, decided_ms: None,
decided_by: None, decided_by: None,
notes: Vec::new(), notes: Vec::new(),
finished: false,
} }
} }
+9
View File
@@ -127,6 +127,12 @@ pub struct Invited {
/// the membership is not portal's to take back. /// the membership is not portal's to take back.
#[serde(default)] #[serde(default)]
pub already_member: bool, pub already_member: bool,
/// The invite's own mail and the form it was sent from, kept with
/// the invite so that sending it again sends the same words.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub mail: Option<crate::content::MailTemplate>,
#[serde(default, skip_serializing_if = "serde_json::Map::is_empty")]
pub fields: serde_json::Map<String, serde_json::Value>,
} }
/// When a link runs out, from Kanidm's `expiry_time`: seconds since /// When a link runs out, from Kanidm's `expiry_time`: seconds since
@@ -367,6 +373,8 @@ impl Kanidm {
reset_link, reset_link,
link_expires_ms, link_expires_ms,
created, created,
mail: None,
fields: Default::default(),
already_member, already_member,
}) })
} }
@@ -714,6 +722,7 @@ mod tests {
decided_ms: None, decided_ms: None,
decided_by: None, decided_by: None,
notes: Vec::new(), notes: Vec::new(),
finished: false,
} }
} }
+69
View File
@@ -328,6 +328,11 @@ async fn fetch_resource_value(
} }
} }
} }
if !resource.transitions.is_empty() {
if let Some(schema) = state.aggregates.load().at(0).get(bucket) {
items = cap_finished(items, schema, finished_wanted(params));
}
}
serde_json::Value::Array(items) serde_json::Value::Array(items)
} }
} }
@@ -348,6 +353,41 @@ async fn fetch_resource_value(
} }
} }
/// How many finished records a desk listing should show: three, or
/// what the page asked for with `__finished` after "show older".
pub const FINISHED_PARAM: &str = "__finished";
pub const FINISHED_SHOWN: usize = 3;
#[cfg(feature = "ssr")]
fn finished_wanted(params: &std::collections::HashMap<String, String>) -> usize {
params.get(FINISHED_PARAM).and_then(|n| n.parse().ok()).unwrap_or(FINISHED_SHOWN)
}
/// A desk is for the cases still moving. Every record still open stays;
/// of those in a final state (no move out), only the `shown` most
/// recently decided, plus one more so the page knows there are older
/// ones to offer. Each finished record is marked, so the page can tell
/// them apart without knowing the state machine.
#[cfg(feature = "ssr")]
pub(crate) fn cap_finished(items: Vec<serde_json::Value>, schema: &crate::aggregates::AggregateSchema, shown: usize) -> Vec<serde_json::Value> {
let is_final = |v: &serde_json::Value| {
v.get("state").and_then(|s| s.as_str()).is_some_and(|s| schema.has_state(s) && schema.allowed(s).is_empty())
};
let when = |v: &serde_json::Value| {
v.get("decided_ms").and_then(|d| d.as_i64()).or_else(|| v.get("submitted_ms").and_then(|d| d.as_i64())).unwrap_or(0)
};
let (mut finished, mut open): (Vec<_>, Vec<_>) = items.into_iter().partition(is_final);
finished.sort_by_key(|v| std::cmp::Reverse(when(v)));
finished.truncate(shown + 1);
for v in &mut finished {
if let Some(obj) = v.as_object_mut() {
obj.insert("finished".into(), true.into());
}
}
open.extend(finished);
open
}
/// Fetches JSON from a path on the same Gitea instance content is /// Fetches JSON from a path on the same Gitea instance content is
/// loaded from (`AppState.gitea_base`), attaching `GITEA_API_TOKEN` if /// loaded from (`AppState.gitea_base`), attaching `GITEA_API_TOKEN` if
/// set - confirmed live against `project.uhhm.no` that at least the /// set - confirmed live against `project.uhhm.no` that at least the
@@ -758,3 +798,32 @@ mod tests {
assert_eq!(out, serde_json::json!(["id: /x\n"])); assert_eq!(out, serde_json::json!(["id: /x\n"]));
} }
} }
#[cfg(all(test, feature = "ssr"))]
mod finished_tests {
use super::*;
#[test]
fn a_desk_keeps_every_open_case_and_the_newest_finished_ones() {
let schema = crate::aggregates::parse_aggregates_yaml(
"aggregates:\n - bucket: leads\n initial: open\n states:\n open: { event: in }\n won: { event: won }\n lost: { event: lost }\n transitions:\n open: [won, lost]\n",
)
.unwrap()
.remove("leads")
.unwrap();
let rec = |id: &str, state: &str, decided: i64| serde_json::json!({ "id": id, "state": state, "submitted_ms": 0, "decided_ms": decided });
let mut items = vec![rec("o1", "open", 0), rec("o2", "open", 0)];
items.extend((1..=6).map(|n| rec(&format!("f{n}"), if n % 2 == 0 { "won" } else { "lost" }, n)));
let ids = |v: &[serde_json::Value]| v.iter().map(|x| x["id"].as_str().unwrap().to_string()).collect::<Vec<_>>();
let shown = cap_finished(items.clone(), &schema, 3);
// Both open cases, then the three newest finished and one more
// to tell the page there are older ones.
assert_eq!(ids(&shown), ["o1", "o2", "f6", "f5", "f4", "f3"]);
assert!(shown[2..].iter().all(|v| v["finished"] == true));
assert!(shown[..2].iter().all(|v| v.get("finished").is_none()));
// Asking for all of them: no extra, so no "show older".
assert_eq!(cap_finished(items, &schema, 6).len(), 8);
}
}
+2
View File
@@ -410,6 +410,8 @@ mod tests {
reset_link: None, reset_link: None,
link_expires_ms: None, link_expires_ms: None,
created: true, created: true,
mail: None,
fields: Default::default(),
already_member, already_member,
}, },
) )
+42 -8
View File
@@ -664,11 +664,14 @@ impl Plan {
// small application and the firm's large one, and is one // small application and the firm's large one, and is one
// page either way. A bucket only a role ever writes to has // page either way. A bucket only a role ever writes to has
// its group's desk and nothing to publish. // its group's desk and nothing to publish.
// Unless it presents: the people are entered from inside // Unless it presents - the people are entered from inside
// precisely so that everyone can see them. // precisely so that everyone can see them - or publishes:
// a board's list whose public view is only the stages it
// has published (`public_states`) is announcements.
if need.watched_by.iter().any(|g| g == PUBLIC) if need.watched_by.iter().any(|g| g == PUBLIC)
&& need.enters_as.is_some() && need.enters_as.is_some()
&& !need.presents && !need.presents
&& need.public_states.is_empty()
&& !self && !self
.needs .needs
.iter() .iter()
@@ -1950,13 +1953,12 @@ fn form_alternative(plan: &Plan, need: &PlanNeed, w: &Value, action: &str) -> Va
if f.multiple { r["multiple"] = json!(true); } if f.multiple { r["multiple"] = json!(true); }
let hint = s(&w["hints"][&f.name]).trim(); let hint = s(&w["hints"][&f.name]).trim();
if !hint.is_empty() && f.kind != "select" { r["placeholder"] = json!(hint); } if !hint.is_empty() && f.kind != "select" { r["placeholder"] = json!(hint); }
// Someone signed in is not asked for what the site knows: on a // Someone signed in is not asked for what the site knows, on any
// group's page they always are, and answering a record they // form: portal carries their name and address and the fields take
// may be. // no room (`content::fill_from_user`). A visitor sees the fields
if parent.is_some() || need.enters_as.is_some() { // as usual, so a public form loses nothing by it.
if f.kind == "email" && matches!(f.name.as_str(), "email" | "epost" | "e-post") { r["value"] = json!("{user.email}"); } if f.kind == "email" && matches!(f.name.as_str(), "email" | "epost" | "e-post") { r["value"] = json!("{user.email}"); }
if f.kind == "text" && matches!(f.name.as_str(), "name" | "navn") { r["value"] = json!("{user.name}"); } if f.kind == "text" && matches!(f.name.as_str(), "name" | "navn") { r["value"] = json!("{user.name}"); }
}
r r
}).collect(); }).collect();
// The record this answer is about, carried in from the page's own // The record this answer is about, carried in from the page's own
@@ -2524,6 +2526,8 @@ pub fn render(plan: &Plan, words: &BTreeMap<String, Value>) -> anyhow::Result<BT
files.into_iter().map(|(path, value)| Ok((path, serde_yaml::to_string(&value)?))).collect() files.into_iter().map(|(path, value)| Ok((path, serde_yaml::to_string(&value)?))).collect()
} }
const MAILS_PURPOSE: &str = "the mails the site sends. Under each bucket, each stage that sends one has a `subject` and a `body`: the mail a person gets the moment their case enters that stage, saying what happened and what, if anything, they can do now. Plain text, at most three short sentences plus the link line, no greeting longer than one word, in the business's voice. Keep every `{...}` placeholder exactly as it is - `{site}`, `{chain}`, `{email}` and any field name are filled in by the site - and keep any line with a link in it. The person reads the mail alone, days later, maybe among others, so what works is a mail that says what it is about in their terms - a field they filled in, as a `{placeholder}`, names their case far better than `this` or `your message` (each bucket's fields are listed under the needs above) - and ends with the business's name so they know who wrote. Short fields (a name, a place, a choice) make good subjects; a field marked `(long)` is a whole answer and a field marked `(optional)` may be blank, so those serve better elsewhere or not at all. A desk's decision carries no written reason, but a reply to the mail reaches the people who decided, so inviting a reply is the honest way to offer an explanation.";
const DESK_PURPOSE: &str = "a desk: the page one role inside the business works from. Under `buckets`, each entry is a list of cases; `moves` are the buttons that move a case from one stage to the next (key `from->to`), so label each with what the person has just done. Under `links` are pages this role can open. Under `invites`, each entry is a form that invites a person into that group - they get an account and a one-time link - and `invited` is the list of invites sent, where `again` is the button that sends an invite whose link ran out once more. `suggestions`, on the desk that has it, is the list of changes the people responsible for a page have suggested: `looking`, `changed` and `declined` are its buttons."; const DESK_PURPOSE: &str = "a desk: the page one role inside the business works from. Under `buckets`, each entry is a list of cases; `moves` are the buttons that move a case from one stage to the next (key `from->to`), so label each with what the person has just done. Under `links` are pages this role can open. Under `invites`, each entry is a form that invites a person into that group - they get an account and a one-time link - and `invited` is the list of invites sent, where `again` is the button that sends an invite whose link ran out once more. `suggestions`, on the desk that has it, is the list of changes the people responsible for a page have suggested: `looking`, `changed` and `declined` are its buttons.";
/// The page about who the business is: a question with nothing to do /// The page about who the business is: a question with nothing to do
@@ -2634,13 +2638,35 @@ fn words_prompt(plan: &Plan, path: &str, fallback: &Value, tone: Option<&str>) -
Some(n) => format!("a page shown right after someone in the group `{}` has sent a form from inside the business. The reader is that colleague, at work, not a visitor: nobody comes back to them. Say what has now happened to what they entered, and who it reaches.", n.enters_as.as_deref().unwrap_or_default()), Some(n) => format!("a page shown right after someone in the group `{}` has sent a form from inside the business. The reader is that colleague, at work, not a visitor: nobody comes back to them. Say what has now happened to what they entered, and who it reaches.", n.enters_as.as_deref().unwrap_or_default()),
None => "a page shown right after someone has sent a form. Say who reads it, when they answer, and what happens next.".to_string(), None => "a page shown right after someone has sent a form. Say who reads it, when they answer, and what happens next.".to_string(),
}; };
// Who reads each mail. A mail to the business about someone else's
// case was written as if to the person who sent it ("you will hear
// from us") until the model was told who opens it.
let recipients: Vec<String> = plan
.needs
.iter()
.flat_map(|n| {
n.mails.iter().map(move |(stage, to)| {
let reader = match to.as_str() {
"submitter" => "the person who sent it".to_string(),
"owner" => "the person who posted the record this answers".to_string(),
address => format!("someone at the business ({address}), about another person's case; write to them, not to the person who sent it"),
};
format!("- `{}` entering `{stage}`: read by {reader}", n.lands_in)
})
})
.collect();
let mails_purpose = format!(
"{MAILS_PURPOSE}\n\nWho opens each mail:\n{}",
recipients.join("\n")
);
let who_purpose = "the page about who the business is, with nothing to do on it, only things to read. `question` asks it as a question (\"Who are we?\"). Under `presents`, each entry heads one list shown as cards with a picture each - the people who work there, the work they have done - loosely, as a person would introduce them. `values` heads the business's own statements, which are its facts: head them, never add to them.".to_string(); let who_purpose = "the page about who the business is, with nothing to do on it, only things to read. `question` asks it as a question (\"Who are we?\"). Under `presents`, each entry heads one list shown as cards with a picture each - the people who work there, the work they have done - loosely, as a person would introduce them. `values` heads the business's own statements, which are its facts: head them, never add to them.".to_string();
let purpose = if path == who_page_path(plan) { let purpose = if path == who_page_path(plan) {
who_purpose.as_str() who_purpose.as_str()
} else if path == "site.yaml" { } else if path == "site.yaml" {
"the invite mail: the first mail a person gets when a member of the business brings them in to help (onto a desk, into a committee), carrying the one-time link that lets them set a password. `subject` and `body` under `invite`. They did not ask for it, so say who brought them in and to what, then the link and when it runs out, then where they sign in afterwards. Plain text, short lines. Keep every `{...}` placeholder exactly as it is: `{name}`, `{username}`, `{group}`, `{link}`, `{expires}`, `{site}`, `{site_name}` are filled in by the site, and `{link}` must stay on a line of its own." "the invite mail: the first mail a person gets when a member of the business brings them in to help (onto a desk, into a committee), carrying the one-time link that lets them set a password. `subject` and `body` under `invite`. They did not ask for it, so say who brought them in and to what, then the link and when it runs out, then where they sign in afterwards. Plain text, short lines. Keep every `{...}` placeholder exactly as it is: `{name}`, `{username}`, `{group}`, `{link}`, `{expires}`, `{site}`, `{site_name}` are filled in by the site, and `{link}` must stay on a line of its own."
} else if path == "aggregates.yaml" { } else if path == "aggregates.yaml" {
"the mails the site sends. Under each bucket, each stage that sends one has a `subject` and a `body`: the mail a person gets the moment their case enters that stage, saying what happened and what, if anything, they can do now. Plain text, at most three short sentences plus the link line, no greeting longer than one word, in the business's voice. Keep every `{...}` placeholder exactly as it is - `{site}`, `{chain}`, `{email}` and any field name are filled in by the site - and keep any line with a link in it. The person reads the mail alone, days later, maybe among others, so what works is a mail that says what it is about in their terms - a field they filled in, as a `{placeholder}`, names their case far better than `this` or `your message` (each bucket's fields are listed under the needs above) - and ends with the business's name so they know who wrote. Short fields (a name, a place, a choice) make good subjects; a field marked `(long)` is a whole answer and a field marked `(optional)` may be blank, so those serve better elsewhere or not at all. A desk's decision carries no written reason, but a reply to the mail reaches the people who decided, so inviting a reply is the honest way to offer an explanation." mails_purpose.as_str()
} else if path.contains("/decide/") { } else if path.contains("/decide/") {
"a page the person who sent a form reaches later, through a private link, to make a decision that is theirs: under `moves`, each entry is one thing they can decide." "a page the person who sent a form reaches later, through a private link, to make a decision that is theirs: under `moves`, each entry is one thing they can decide."
} else if path == "questions/index.yaml" { } else if path == "questions/index.yaml" {
@@ -3223,6 +3249,14 @@ mod tests {
assert!(bad.validate().unwrap_err().to_string().contains("multiple is for select")); assert!(bad.validate().unwrap_err().to_string().contains("multiple is for select"));
} }
#[test]
fn the_words_model_is_told_who_opens_each_mail() {
let plan: Plan = serde_yaml::from_str("business: Vel\ncontact: { name: S, email: s@v.example }\nmail: { from: v@v.example }\nneeds:\n - id: notice\n who: en nabo\n wants: et oppslag\n lands_in: oppslag\n handled_by: redaktor\n stages: [open, tatt_ned]\n done_when: [tatt_ned]\n mails: { open: s@v.example }\n watched_by: [public]\n max_fields: 2\n collects:\n - { name: email, type: email }\n - id: answer\n who: en nabo\n wants: svare\n about: notice\n lands_in: svar\n handled_by: redaktor\n stages: [open, lest]\n done_when: [lest]\n mails: { open: owner }\n max_fields: 1\n collects:\n - { name: email, type: email }\n").unwrap();
let prompt = words_prompt(&plan, "aggregates.yaml", &json!({}), None);
assert!(prompt.contains("`oppslag` entering `open`: read by someone at the business (s@v.example)"), "{prompt}");
assert!(prompt.contains("`svar` entering `open`: read by the person who posted the record this answers"));
}
#[test] #[test]
fn a_need_no_persona_tries_is_named() { fn a_need_no_persona_tries_is_named() {
let plan: Plan = serde_yaml::from_str("business: B\ncontact: { name: I, email: i@b.example }\nmail: { from: post@b.example }\nneeds:\n - id: ask\n who: a customer\n wants: an answer\n lands_in: asks\n handled_by: desk\n stages: [open, done]\n done_when: [done]\n max_fields: 2\n collects:\n - { name: email, type: email }\n - id: card\n who: one of us\n wants: to be seen\n enters_as: desk\n lands_in: cards\n handled_by: desk\n stages: [open, gone]\n done_when: [gone]\n max_fields: 1\n collects:\n - { name: name }\n - id: later\n who: someone\n wants: something\n paused: true\n lands_in: later\n handled_by: desk\n stages: [open, done]\n done_when: [done]\n max_fields: 1\n collects:\n - { name: email, type: email }\npersonas:\n - { id: p, need: ask, text: I need an answer }\n").unwrap(); let plan: Plan = serde_yaml::from_str("business: B\ncontact: { name: I, email: i@b.example }\nmail: { from: post@b.example }\nneeds:\n - id: ask\n who: a customer\n wants: an answer\n lands_in: asks\n handled_by: desk\n stages: [open, done]\n done_when: [done]\n max_fields: 2\n collects:\n - { name: email, type: email }\n - id: card\n who: one of us\n wants: to be seen\n enters_as: desk\n lands_in: cards\n handled_by: desk\n stages: [open, gone]\n done_when: [gone]\n max_fields: 1\n collects:\n - { name: name }\n - id: later\n who: someone\n wants: something\n paused: true\n lands_in: later\n handled_by: desk\n stages: [open, done]\n done_when: [done]\n max_fields: 1\n collects:\n - { name: email, type: email }\npersonas:\n - { id: p, need: ask, text: I need an answer }\n").unwrap();
+251 -4
View File
@@ -132,23 +132,43 @@ pub fn run(argv: Vec<String>) -> anyhow::Result<()> {
.to_string(); .to_string();
let mut green = false; let mut green = false;
let mut report = String::new(); let mut report = String::new();
// What the lint found, by id, round over round (`--findings`): what
// a round closed, what it left, what it broke. `None` while the
// lint is one that predates `--findings`; then the whole report
// goes back, as it always did.
let mut ledger = Ledger::default();
let mut tracked = true;
let mut undone = String::new();
std::fs::create_dir_all(opts.out.join("findings"))?;
for round in 1..=opts.rounds { for round in 1..=opts.rounds {
let prompt = if round == 1 { let prompt = if round == 1 {
format!( format!(
"{REFERENCE}\n\n# Task\n\nWrite the content repo that meets this frozen `needs.yaml`: `aggregates.yaml`, `site.yaml`, and every page under `questions/` - the front door, followup pages, role-gated pages, one desk per handling group. Do not return needs.yaml.\n\n## Intake\n\n{intake}\n\n## needs.yaml (frozen)\n\n```yaml\n{needs}\n```\n\n{FORMAT}" "{REFERENCE}\n\n# Task\n\nWrite the content repo that meets this frozen `needs.yaml`: `aggregates.yaml`, `site.yaml`, and every page under `questions/` - the front door, followup pages, role-gated pages, one desk per handling group. Do not return needs.yaml.\n\n## Intake\n\n{intake}\n\n## needs.yaml (frozen)\n\n```yaml\n{needs}\n```\n\n{FORMAT}"
) )
} else if tracked {
let (heading, files) = match named_files(&opts.out, ledger.open.values()) {
Some(files) => ("Files the findings name", dump_files(&opts.out, &files)?),
None => ("Current files", dump(&opts.out)?),
};
format!(
"{REFERENCE}\n\n# Task\n\nThe verifier rejected the repo. Below is every finding still open, each with the change that closes it. Make those changes and nothing else: findings already closed stay closed. Return only the files you change, each complete. To remove a file, return it with the single line DELETE. needs.yaml is frozen; do not return it.\n\n## Open findings\n\n{}\n{undone}## needs.yaml (frozen)\n\n```yaml\n{needs}\n```\n\n## {heading}\n\n{files}\n\n{FORMAT}",
ledger.open_list(round)
)
} else { } else {
format!( format!(
"{REFERENCE}\n\n# Task\n\nThe verifier rejected the repo below. Fix it. Return only the files you change, each complete. To remove a file, return it with the single line DELETE. needs.yaml is frozen; do not return it.\n\n## Verifier output\n\n```\n{report}\n```\n\n## needs.yaml (frozen)\n\n```yaml\n{needs}\n```\n\n## Current files\n\n{}\n\n{FORMAT}", "{REFERENCE}\n\n# Task\n\nThe verifier rejected the repo below. Fix it. Return only the files you change, each complete. To remove a file, return it with the single line DELETE. needs.yaml is frozen; do not return it.\n\n## Verifier output\n\n```\n{report}\n```\n\n## needs.yaml (frozen)\n\n```yaml\n{needs}\n```\n\n## Current files\n\n{}\n\n{FORMAT}",
dump(&opts.out)? dump(&opts.out)?
) )
}; };
let before = snapshot(&opts.out)?;
match parse_files(&llm(&opts.llm, &prompt)?) { match parse_files(&llm(&opts.llm, &prompt)?) {
Ok(files) => apply(&opts.out, files)?, Ok(files) => apply(&opts.out, files)?,
Err(_) => eprintln!("structure round {round}: the reply had no file blocks"), Err(_) => eprintln!("structure round {round}: the reply had no file blocks"),
} }
let (ok, r) = lint(&opts, &[])?; let (ok, r, found) = lint_findings(&opts, &opts.out.join(format!("findings/round-{round}.jsonl")))?;
report = r; report = r;
let Some(found) = found else {
tracked = false;
let fails = report.lines().filter(|l| l.starts_with("FAIL")).count(); let fails = report.lines().filter(|l| l.starts_with("FAIL")).count();
eprintln!("structure round {round}: {}", if ok { "green".to_string() } else { format!("{fails} FAIL line(s)") }); eprintln!("structure round {round}: {}", if ok { "green".to_string() } else { format!("{fails} FAIL line(s)") });
log.push(format!("structure round {round}: ok={ok} fails={fails}")); log.push(format!("structure round {round}: ok={ok} fails={fails}"));
@@ -156,10 +176,47 @@ pub fn run(argv: Vec<String>) -> anyhow::Result<()> {
green = true; green = true;
break; break;
} }
continue;
};
let previous = ledger.clone();
let progress = ledger.update(round, found.into_iter().filter(|f| f.level == "fail").collect());
let line = format!("structure round {round}: {}", progress.summary(ledger.open.len()));
eprintln!("{line}");
log.push(line);
undone.clear();
if ok {
green = true;
break;
}
if round == 1 {
continue;
}
// A fix that reopens what an earlier round closed is undone,
// and the model is told what it broke, rather than chasing the
// same findings round after round.
if !progress.reopened.is_empty() {
restore(&opts.out, before)?;
ledger = previous;
undone = format!(
"## Your last change was undone\n\nIt reopened findings an earlier round had closed:\n\n{}\nClose the open findings without touching what made these pass.\n\n",
progress.reopened.iter().map(|f| format!("- [{}] {}\n", f.id, f.message)).collect::<String>()
);
eprintln!("structure round {round}: reopened {} closed finding(s), undone", progress.reopened.len());
log.push(format!("structure round {round}: undone (reopened {})", progress.reopened.len()));
continue;
}
// No progress, no more rounds: another pass at the same findings
// is how a site gets over-trained. What is left is reported.
if progress.fixed.is_empty() || ledger.open.len() >= previous.open.len() {
eprintln!("structure round {round}: no finding closed, stopping");
log.push(format!("structure round {round}: stalled"));
break;
}
} }
if !green { if !green {
std::fs::write(opts.out.join("run.log"), format!("{}\n\n{report}", log.join("\n")))?; let open = if tracked { format!("\n\nStill open:\n{}", ledger.open_list(opts.rounds + 1)) } else { String::new() };
bail!("structure never went green in {} round(s); last verifier output is in run.log", opts.rounds); std::fs::write(opts.out.join("run.log"), format!("{}{open}\n\n{report}", log.join("\n")))?;
bail!("structure did not go green; what is still open is in run.log");
} }
// Phase 3: wording. // Phase 3: wording.
@@ -191,7 +248,10 @@ pub fn run(argv: Vec<String>) -> anyhow::Result<()> {
} }
eprintln!("wording round {round}: {}", summary.join(" | ")); eprintln!("wording round {round}: {}", summary.join(" | "));
log.push(format!("wording round {round}: {}", summary.join(" | "))); log.push(format!("wording round {round}: {}", summary.join(" | ")));
if defects.is_empty() || round == opts.wording_rounds { // A visitor who chose right, hesitantly, is not a defect worth a
// rewrite on its own: only a misroute is. Hesitations ride along
// as context when there is one.
if !defects.contains("MISROUTE") || round == opts.wording_rounds {
break; break;
} }
let personas = needs_full.split("\npersonas:").nth(1).unwrap_or_default(); let personas = needs_full.split("\npersonas:").nth(1).unwrap_or_default();
@@ -311,6 +371,152 @@ fn lint(opts: &Opts, extra: &[String]) -> anyhow::Result<(bool, String)> {
Ok((output.status.success(), report)) Ok((output.status.success(), report))
} }
/// One finding as the lint's `--findings` writes it (docs/lint.md).
#[derive(Clone, Debug, serde::Deserialize)]
struct Finding {
id: String,
level: String,
code: String,
#[serde(default)]
need: String,
message: String,
#[serde(default)]
fix: Option<String>,
}
/// The lint with `--findings` into `out`, and what it found; `None` for
/// the findings when the lint predates the flag (then it is run again
/// the old way, and only its text comes back).
fn lint_findings(opts: &Opts, out: &Path) -> anyhow::Result<(bool, String, Option<Vec<Finding>>)> {
let (ok, report) = lint(opts, &["--findings".to_string(), out.display().to_string()])?;
if report.contains("unknown argument: --findings") {
let (ok, report) = lint(opts, &[])?;
return Ok((ok, report, None));
}
let raw = std::fs::read_to_string(out).unwrap_or_default();
let found = raw
.lines()
.filter(|l| !l.trim().is_empty())
.map(|l| serde_json::from_str::<Finding>(l).with_context(|| format!("reading {}", out.display())))
.collect::<anyhow::Result<Vec<_>>>()?;
Ok((ok, report, Some(found)))
}
/// Every failing finding by id, across rounds.
#[derive(Clone, Default)]
struct Ledger {
open: BTreeMap<String, Finding>,
/// The round each open finding was first seen in.
since: BTreeMap<String, usize>,
/// Ids a round has closed, so one that comes back is a regression,
/// not news.
closed: std::collections::BTreeSet<String>,
}
struct Progress {
fixed: Vec<Finding>,
new: Vec<Finding>,
still: usize,
reopened: Vec<Finding>,
}
impl Progress {
fn summary(&self, open: usize) -> String {
if open == 0 {
return format!("green (fixed {})", self.fixed.len());
}
format!(
"{open} open - fixed {}, still open {}, new {}, reopened {}",
self.fixed.len(),
self.still,
self.new.len(),
self.reopened.len()
)
}
}
impl Ledger {
fn update(&mut self, round: usize, fails: Vec<Finding>) -> Progress {
let now: BTreeMap<String, Finding> = fails.into_iter().map(|f| (f.id.clone(), f)).collect();
let fixed: Vec<Finding> = self.open.values().filter(|f| !now.contains_key(&f.id)).cloned().collect();
let mut new = Vec::new();
let mut reopened = Vec::new();
let mut still = 0;
for (id, f) in &now {
if self.open.contains_key(id) {
still += 1;
} else if self.closed.contains(id) {
reopened.push(f.clone());
} else {
new.push(f.clone());
}
self.since.entry(id.clone()).or_insert(round);
}
for f in &fixed {
self.closed.insert(f.id.clone());
self.since.remove(&f.id);
}
self.open = now;
Progress { fixed, new, still, reopened }
}
/// The open findings for a prompt or a log: id, how long open, the
/// message and its fix.
fn open_list(&self, round: usize) -> String {
self.open
.values()
.map(|f| {
let age = match self.since.get(&f.id) {
Some(&first) if first + 1 < round => format!(", open since round {first}"),
_ => String::new(),
};
let scope = if f.need.is_empty() { String::new() } else { format!(" {:?}", f.need) };
format!("- [{}] {}{scope}{age}: {}\n", f.id, f.code, f.message)
})
.collect()
}
}
/// The files open findings point at - every desk page their fixes name,
/// plus aggregates.yaml - when that is enough to act on. `None` when a
/// finding is about getting around the site (a path, an entry page, a
/// missing desk) or names no page: then the model needs to see it all.
fn named_files<'a>(out: &Path, findings: impl Iterator<Item = &'a Finding>) -> Option<Vec<PathBuf>> {
const WHOLE_SITE: &[&str] = &["schema", "entry-missing", "entry-gated", "path-missing", "path-closed", "path-over-budget", "desk-missing", "need-duplicate"];
let mut files = vec![out.join("aggregates.yaml")];
for f in findings {
if WHOLE_SITE.contains(&f.code.as_str()) {
return None;
}
let text = format!("{} {}", f.message, f.fix.as_deref().unwrap_or_default());
for page in text.split_whitespace().filter(|w| w.starts_with('/')) {
let page = page.trim_end_matches(|c: char| !(c.is_alphanumeric() || c == '_' || c == '-' || c == '/'));
let rel = page.trim_start_matches('/');
let candidates = if rel.is_empty() {
vec![out.join("questions/index.yaml")]
} else {
vec![out.join(format!("questions/{rel}.yaml")), out.join(format!("questions/{rel}/index.yaml"))]
};
if let Some(path) = candidates.into_iter().find(|p| p.exists()) {
if !files.contains(&path) {
files.push(path);
}
}
}
}
Some(files)
}
/// `dump`, for the named files only.
fn dump_files(out: &Path, files: &[PathBuf]) -> anyhow::Result<String> {
let mut text = String::new();
for path in files.iter().filter(|p| p.exists()) {
let rel = path.strip_prefix(out).unwrap_or(path).display().to_string();
text.push_str(&format!("<<<FILE {rel}>>>\n{}<<<END>>>\n\n", std::fs::read_to_string(path)?));
}
Ok(text)
}
/// `<<<FILE path>>> ... <<<END>>>` blocks. Anything outside a block is /// `<<<FILE path>>> ... <<<END>>>` blocks. Anything outside a block is
/// ignored, so a model that adds a sentence does no harm. /// ignored, so a model that adds a sentence does no harm.
fn parse_files(text: &str) -> anyhow::Result<BTreeMap<String, String>> { fn parse_files(text: &str) -> anyhow::Result<BTreeMap<String, String>> {
@@ -591,3 +797,44 @@ mod tests {
assert!(!allowed(".gitea/workflows/deploy.yaml")); assert!(!allowed(".gitea/workflows/deploy.yaml"));
} }
} }
#[cfg(test)]
mod ledger_tests {
use super::*;
fn f(id: &str, code: &str, message: &str) -> Finding {
Finding { id: id.into(), level: "fail".into(), code: code.into(), need: "hire".into(), message: message.into(), fix: None }
}
#[test]
fn a_round_is_told_what_it_closed_kept_added_and_broke() {
let mut ledger = Ledger::default();
let p = ledger.update(1, vec![f("a", "strand", "x"), f("b", "strand", "y")]);
assert_eq!((p.fixed.len(), p.new.len(), p.still, p.reopened.len()), (0, 2, 0, 0));
let p = ledger.update(2, vec![f("b", "strand", "y"), f("c", "edge-unoffered", "z")]);
assert_eq!((p.fixed.len(), p.new.len(), p.still, p.reopened.len()), (1, 1, 1, 0));
assert_eq!(p.summary(ledger.open.len()), "2 open - fixed 1, still open 1, new 1, reopened 0");
// "a" was closed in round 2; its return is a regression.
let p = ledger.update(3, vec![f("a", "strand", "x"), f("b", "strand", "y")]);
assert_eq!(p.reopened.iter().map(|f| f.id.as_str()).collect::<Vec<_>>(), ["a"]);
assert!(ledger.open_list(4).contains("[b] strand \"hire\", open since round 1: y"));
let p = ledger.update(4, vec![]);
assert_eq!(p.summary(ledger.open.len()), "green (fixed 2)");
}
#[test]
fn a_fix_round_sees_the_pages_its_findings_name() {
let dir = std::env::temp_dir().join(format!("ledger-test-{}", std::process::id()));
std::fs::create_dir_all(dir.join("questions/desk")).unwrap();
std::fs::write(dir.join("aggregates.yaml"), "x").unwrap();
std::fs::write(dir.join("questions/desk/index.yaml"), "x").unwrap();
std::fs::write(dir.join("questions/index.yaml"), "x").unwrap();
let mut strand = f("a", "strand", "records strand in \"quoted\"");
strand.fix = Some("add `{ from: quoted, to: won, label: ... }` to the transitions on /desk".into());
let files = named_files(&dir, [&strand].into_iter()).unwrap();
assert_eq!(files, vec![dir.join("aggregates.yaml"), dir.join("questions/desk/index.yaml")]);
// A finding about getting around the site needs all of it.
assert!(named_files(&dir, [&strand, &f("b", "path-missing", "no path")].into_iter()).is_none());
std::fs::remove_dir_all(&dir).ok();
}
}
+10 -1
View File
@@ -190,7 +190,16 @@ not done. Its messages are exact:
- `no desk gated on "g" reads "b"`: add the desk. - `no desk gated on "g" reads "b"`: add the desk.
- `"g" cannot move a record to "s"` / `records strand in "s"`: the desk - `"g" cannot move a record to "s"` / `records strand in "s"`: the desk
is missing a transition the state machine allows, or the state is missing a transition the state machine allows, or the state
machine is missing the edge. machine is missing the edge. The message ends in `fix:` with the
exact `{ from, to, label }` and the desk page to put it on - do that.
- `state "s" is never reached`: nothing moves a record into it. Offer
the move it names, or remove the state.
- `stage "b" comes after "a" ... but no move leads on`: the machine
cannot go the way the business works; add the edge it names.
- `the mail on entering "s" uses {x}`: the mail names a field no form
collects. Use one of the fields it lists, or collect `x`.
- WARN `the move "a" -> "b" is declared but no desk ... offers it`:
offer it, or drop the edge - every edge should be a button.
- `action ... does not match any declared question id`: the page does - `action ... does not match any declared question id`: the page does
not exist. not exist.
- `entry page ... names no one responsible`: add `responsible`. - `entry page ... names no one responsible`: add `responsible`.
+86 -5
View File
@@ -162,10 +162,13 @@ main.not-found {
/* hero */ /* hero */
/* No room is kept at the top for who is here: that sits on the
wordmark's own line now (.hero-top), and the 4rem it used to need
read as dead space above the mark on a tall, narrow screen. */
.hero { .hero {
max-width: 46rem; max-width: 46rem;
margin: 0 auto; margin: 0 auto;
padding: 4rem 1.5rem 2.5rem; padding: 1.75rem 1.5rem 2.5rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@@ -176,10 +179,6 @@ main.not-found {
/* Who is here and the way in or out: top right of every page, on a /* Who is here and the way in or out: top right of every page, on a
site that has sign-in. */ site that has sign-in. */
.session { .session {
position: absolute;
top: 1rem;
right: 1.5rem;
z-index: 5;
display: flex; display: flex;
gap: 0.9rem; gap: 0.9rem;
align-items: baseline; align-items: baseline;
@@ -201,6 +200,55 @@ main.not-found {
color: var(--ink-dim); color: var(--ink-dim);
} }
/* The wordmark's line, with who is here on it: the mark centred and the
session at the right edge, level with the mark. A skin that sets
everything on one left edge spreads the two apart instead (see
Klingenberg Bygg's and Gullberg's). On a narrow screen the session
drops under the mark rather than over it. */
.hero-top {
position: relative;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
gap: 1rem;
}
.hero-top .session {
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
.hero-bar .hero-top {
justify-content: space-between;
}
.hero-bar .hero-top .session {
position: static;
transform: none;
}
@media (max-width: 34rem) {
.hero {
padding-top: 1.25rem;
}
.hero-bar {
padding-block: 0.75rem;
}
.hero-top {
flex-wrap: wrap;
}
.hero-top .session {
position: static;
transform: none;
}
}
/* A page with pictures: the wordmark is a bar of its own, the strip /* A page with pictures: the wordmark is a bar of its own, the strip
runs the full width under it, and the question follows. */ runs the full width under it, and the question follows. */
.hero-slides { .hero-slides {
@@ -244,6 +292,20 @@ main.not-found {
display: block; display: block;
} }
/* A wordmark in the page's ink (site.yaml `wordmark_ink`): the file is a
mask over the text colour. The invisible image inside gives the span
the file's own size. */
.wordmark-ink-mark {
display: block;
background: var(--ink);
-webkit-mask: var(--wordmark-src) center / contain no-repeat;
mask: var(--wordmark-src) center / contain no-repeat;
}
.wordmark-ink-mark img {
visibility: hidden;
}
.hero-copy h1 { .hero-copy h1 {
font-size: 2.1rem; font-size: 2.1rem;
} }
@@ -1218,6 +1280,25 @@ textarea:focus {
gap: 0.8rem; gap: 0.8rem;
} }
/* After the newest finished cases: the older ones, on request. Quiet,
since the desk is for what is still moving. */
.show-older {
justify-self: start;
background: none;
border: 0.06rem solid var(--line);
border-radius: 0.4rem;
color: var(--ink-dim);
font: inherit;
font-size: 0.9rem;
padding: 0.35rem 0.8rem;
cursor: pointer;
}
.show-older:hover {
color: inherit;
border-color: var(--ink-dim);
}
.answer-row { .answer-row {
border: 0.06rem solid var(--line); border: 0.06rem solid var(--line);
border-radius: 0.8rem; border-radius: 0.8rem;