mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-10-21 16:03:26 +00:00
* fix(datatables): refuse a save that drops a data table's roles through an undeclared rename
A data table's roles follow its entry only through a declared rename. A
settings sync sends the whole map and never declares one, so renaming a
data table under roles there read as a delete and a new entry on the same
database: the new entry carried no roles, and every caller connected as
admin. Such a save is now refused, naming both entries.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): no entry without roles may newly reach a database under roles
The previous guard only caught a new name replacing an entry under roles.
A whole-map save could also repoint an existing entry without roles at
that database, or another workspace could point one there, and every
caller of that entry would connect as admin. The rule is now stated on
the saved entries: one that carries no roles and newly points at an
instance database any entry under roles uses, in this workspace or
another, is refused. A declared rename carries its roles and passes.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): move data table role catalog and resolution to the enterprise edition
Roles are an Enterprise Edition feature. The catalog, the Postgres logins,
CONNECT convergence, tenant evaluation and the role half of connection
resolution move to windmill-ee-private. Every public function keeps its path
and signature and forwards through datatable_roles_oss, which re-exports the
enterprise implementation or, without it, refuses.
Without the enterprise edition a data table under roles, or a caller naming a
role, is refused a connection rather than resolved as admin, and the reach and
admin-access checks refuse one under roles. A data table not under roles
resolves as before in every edition, and an instance database keeps the
CONNECT grants it was created with. The catalog lock, the stream lock, the
tenant cascades and the permissions stripping stay in OSS: they only restrict.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): move the data table permissions endpoints to the enterprise edition
The permissions read, save and usable-roles handlers move to
windmill-ee-private; the routes stay registered and, without the enterprise
edition, answer that data table roles are an Enterprise Edition feature.
ensure_governs_datatable and ensure_reaches_datatable keep their paths: the
first refuses, the second passes a data table not under roles.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): move the data table role catalog endpoints to the enterprise edition
The superadmin list, create, update and delete handlers move to
windmill-ee-private. The routes stay registered and, without the enterprise
edition, refuse after authentication.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* test(datatables): run the roles tests on the enterprise edition, refusals without it
Each test that exercises roles runs with private and enterprise. Two tests run
without them: every roles route answers the Enterprise refusal, and a data
table saved under roles, or a named role, is refused a connection while one
not under roles resolves as before.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): gate the roles UI mount sites on an enterprise license
Both mount sites are still commented out; the gate travels with them.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* test(datatables): run the tenant matcher test on the enterprise edition
The matcher it covers is enterprise code now, so without the enterprise
edition the test hit the stub and failed the default windmill-common run. It
runs with private and enterprise, and a counterpart without them asserts that
no tenant list covers anyone, the wildcard and a workspace admin included.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* chore: update ee-repo-ref to a1873dbb67f2302b85ff5362f8387b48eccdb607
This commit updates the EE repository reference after PR #783 was merged in windmill-ee-private.
Previous ee-repo-ref: 5c853e2c20eca6b748415fc0d6862a6ebfb5fec4
New ee-repo-ref: a1873dbb67f2302b85ff5362f8387b48eccdb607
Automated by sync-ee-ref workflow.
* fix(datatables): refuse roles while a same-workspace alias reaches the database
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): add an ACL editor for data table roles
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): data table roles in the DB manager and raw apps
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: never add a role to the reference of a data table whose name contains '?'
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: read the roles of a data table whose name contains '?'
The generated client leaves a '?' in a path param unencoded, so the lookup
404'd and the raw-app picker blocked Start on such a data table.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: take every pooled connection before the ACL apply locks
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: refresh grant options only after the ACL apply validates its plan
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix(datatables): refuse a reference naming both a legacy data table and a role
When a workspace stores both `sales` and a legacy `sales?role=analytics`, the
reference resolved to the legacy entry without a role, so browsing `sales` as
`analytics` reached another data table.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: declare the default role in migrations written for a data table whose name contains '?'
Such a data table connects as its default role without naming it, so the
migrations the manager wrote for it declared no role and ran as admin.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): let CE migrations connect as an explicitly named admin
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: add only missing grant options before an ACL apply, never default privileges
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix(datatables): serialize roles going on with aliases saved from other workspaces
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* docs(datatables): note that legacy names with ? cannot be migrated
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: run one data table ACL apply at a time per server before it connects
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* feat(datatables): set up an external instance cluster for data tables
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): send external cluster passwords as SCRAM verifiers
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): scope external cluster credential readers to the crate
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* [ee] feat(datatables): external_instance data tables on the external cluster
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: hold the ACL connection to the database that was authorized
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix(datatables): compare the external cluster settings under a row lock before storing setup
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): only drop external databases Windmill marked, and check use under the lock
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: build the ACL connection from the authorized data table entry
Resolving the settings again could land on a resource with the same
database name on another server, which the later entry checks never see.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: check ACL read reach against the entry it connects from
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* feat(datatables): put a data table's connection under Postgres roles
A data table backed by the instance database resolved to exactly one Postgres connection,
`custom_instance_user`, for everyone who could reach it at all. There was no way to say
this job reads, that one writes, this one never sees the salaries table.
A data table role is now a real Postgres login on the cluster, defined once for the
instance by a superadmin and named exactly as they named it. A script that declares
`-- role analytics` connects as `analytics`, and Postgres decides what it may touch —
grants are ordinary SQL. Windmill answers only "may this caller ask for this role", from
the tenant lists on the data table entry: `u/alice`, `g/analysts`, `f/finance` or `*`.
A data table with no `permissions` block behaves exactly as before.
Everything that opens a connection on someone's behalf goes through one chokepoint,
`get_datatable_resource_from_db`, which takes the identity explicitly and fails closed when
there is none. The role logs in as itself — never `SET ROLE`, which a script could
`RESET ROLE` its way out of.
A fork's data table entry becomes a pointer at the workspace that governs it rather than a
copy of it. The settings clone used to hand a fork a byte-identical entry naming the
parent's database, which a fork admin could edit to grant themselves `admin` there; a
pointer has nothing local to edit, and its tenants are evaluated as a member of the
governing workspace, by email. `permissions` is stripped from the workspace export and
ignored on import: tenants name principals of one workspace, and a settings push is not
where an access decision should be made.
Operations that see the whole database whatever the roles grant stay with the governing
workspace's admins: editing the roles, a migration that declares none, and opening a
replication stream for a Postgres trigger or capture.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): gate the paths that reach a whole database as admin
Auditing what still resolved through the unchecked resolver turned up three that act for a
caller and hand back the admin connection: `resolve_pg_source_checked` (behind schema
export, the full-schema read, database creation, import and the forked-database drop), the
connection test, and the schema snapshot a fork clone takes of its parent. On a data table
under roles each let any workspace member — or a fork admin who is nobody in the governing
workspace — read or copy the whole database whatever its roles grant.
All three now require admin reach on the governing workspace. A dump taken under a
restricted role would be a silently truncated copy rather than an error, so refusing is the
only right answer for the copy paths.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): confine roles to the instance database, and stop a fork reaching the parent's bookkeeping
A data table role is a login on Windmill's own Postgres. Nothing stopped a workspace admin
putting a *resource-backed* data table under roles, at which point the executor dialled the
host that resource names — one the admin chose — with the role's real cluster password, and
`CONNECT` is granted to every registered instance database. Both ends now refuse: the
permissions endpoint rejects the save, and the chokepoint refuses to substitute credentials
on a non-instance entry rather than trusting the record it read.
Two more places reached the governing database without answering to it. The initial-migration
generator returned a `pg_dump` of the whole schema to any member. And the migration
rename/delete cascade followed a fork's pointer into the parent, so a fork admin renaming or
removing their own local entry relabelled or wiped the parent's `_wm_migrations` — after
which the parent re-runs every migration from zero. The remote half is now skipped when the
entry resolves into another workspace, which is also just correct: a fork renaming what it
calls a data table changes nothing about the data table.
Also: revoking a tenant now bounces the replication streams of every workspace holding an
entry that resolves here, not only the governing one, so a fork's trigger stops rather than
living on inside its open connection; the instance role catalog and the governing workspace's
tenant lists are no longer returned to someone who cannot edit them; and the tenant rename
dedup collapses non-adjacent duplicates, per role rather than once any role changed.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): fail loudly where a role or a pointer can be left half-recorded
Three ways the feature could end up in a state nobody could see or undo.
Creating a role writes the cluster first and the catalog second, but the catalog write was an
`UPDATE` that matched nothing when the instance Postgres settings row was absent — leaving a
live login with a password nobody recorded: invisible to the catalog, un-recreatable because
the name is taken, and un-deletable because there is no entry to delete. It now errors, so
the operation is retryable once the row is restored.
Deleting a workspace only nulls the fork lineage; the data table entries pointing at it are
left resolving to nothing. Sweeping them is not an option — turning a pointer back into a copy
would hand each fork the database outright — so the delete now names the data tables it
stranded, and resolving one says which workspace is missing rather than reporting a data table
this workspace never had.
`InstanceDatatableRole` derived `Debug` while holding a Postgres password; it is now
hand-written so `{:?}` on the catalog cannot put a live credential in a log line.
Adds the two branches the reviews found unpinned: a caller who is not a member of the
governing workspace at all, and `NoIdentity` — the compatibility path for an agent worker that
predates this and sends no job id.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): unbreak two operator messages and two comments that described other code
The two strings this branch added for states an operator hits once — the catalog write that
matched nothing, and the delete that stranded a pointer — were collapsed from their multi-line
form with the indentation left in, so both rendered with a fourteen-space gap mid-sentence.
`list_datatables` claimed to report a chain it cannot follow and then dropped it; it does drop
it, and the comment now says why that is the right place to stay quiet. The non-superadmin
check in `edit_datatable_config` was introduced as also covering references, which it does not
and need not: `reference` is overwritten from the stored entry for every caller before the
check runs.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): serialize role catalog mutations, and state each helper's authorization contract
The catalog is one JSON document, so create, rename, enable and delete are all
read-modify-write. Two concurrent creates read the same snapshot, both succeed in the
cluster, and the second write drops the first — leaving a live Postgres login with a password
nobody recorded, which is the exact state the delete path exists to prevent. Every mutation
now runs in one transaction holding an advisory lock across the read, the cluster DDL and the
write, so a lost update cannot happen and a failure rolls the whole thing back. The DDL
helpers take that transaction rather than the pool, which is what makes the lock cover them.
Their statements moved off `sqlx::raw_sql`: the simple protocol is only needed for genuinely
multi-statement SQL, and its future is not `Send`, which an axum handler holding the
transaction requires. Each of these is one statement anyway.
The new cross-crate surface now says what callers must do. `read_role_catalog` returns
plaintext credentials; `create`/`rename`/`set_login`/`drop_instance_role` and
`converge_connect_grants` mutate cluster-wide state; `read_datatable_entry` reads a workspace's
raw config. All of them are superadmin-gated by their current handlers, but nothing said so at
the definition, which is where the next caller looks.
Also: the roles table reloads after a failed login toggle instead of leaving it claiming a flip
that did not land; the rename affordance is the design-system `Button`, not a raw one; and
`resolve_datatable_pg_as_caller` drops a `role` parameter no caller ever filled — browsing
resolves as the data table's default until the database manager grows a picker.
Why role passwords stay a plain `String` while the instance user's password beside them is a
`StringOrSecretRef`, asked three times across reviews: that one is a secret ref because an
operator supplies it and may want it from their own backend, while these are minted here and
never entered by anyone, so there is nothing for a ref to point at. Encrypting generated
secrets at rest is a separate change that would take the replication password with it. Now
said at the field.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): give the role catalog its own row, out of reach of the config machinery
Putting it inside `custom_instance_pg_databases` was the wrong call, and it cost two ways.
The catalog serializes a generated Postgres password per role, and that row is the
operator-facing instance config, so the passwords reached `get_instance_config` and its YAML
editor — a live cluster credential in a response body, a UI field and any log of either.
Worse in the other direction: `to_settings_map` strips the catalog, so a full-row upsert of
that key writes the row back without it and the catalog is gone, while the cluster keeps every
login it described.
`custom_instance_replication_pwd` is the precedent and says exactly why — a generated secret,
written only by the server, never operator-authored, hidden so the config machinery cannot
read, rewrite or drop it. The catalog is the same thing, so it now has the same shape:
`datatable_roles`, in `HIDDEN_SETTINGS`, `PROTECTED_SETTINGS` and the agent-worker denylist.
No redaction to keep in step with three code paths, and no way for a neighbouring write to
take it out.
Two races on the same shared documents. `edit_datatable_config` read the stored data tables
outside its transaction and then wrote the whole `datatable` document, so a permissions save
committing in between was silently rolled back; it now reads under `FOR UPDATE`. And
`set_datatable_permissions` validated role ids against the catalog before opening its
transaction, so a deletion in between let it write a deleted role back — including as the
default, which every later job then fails on; it now holds the catalog lock and the settings
row across validation and write.
Completes the authorization contracts the previous commit claimed but did not finish:
`read_datatable_entry` (which it named and missed), `resolve_governing_datatable`, whose whole
job is to answer for a workspace the caller may not belong to, and
`converge_connect_grants_with`, which had not inherited its wrapper's.
Also the generic Python SDK reference: `_format_py_params` learned the bare `*` last time, but
`extract_py_functions` is a second formatter and still rendered `datatable(name, role)`, so
code written from that page passed a keyword-only argument positionally.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): make the concurrency test pin the handlers, and the contracts describe what is enforced
The concurrency test reimplemented the read-modify-write inline, so deleting the lock from all
three handlers left it green — it pinned Postgres, not the code it was written for. It now
drives `create_datatable_role` twice concurrently and asserts the catalog kept both names.
Checked the way the last one should have been: removing the lock from the handler makes it
fail with "wmtest_a_… is a live cluster login the catalog forgot".
The contracts added last commit were stricter than this PR's own callers, which is worse than
none — the next reader sees a rule already broken and learns to ignore it.
`read_role_catalog` said superadmin-only while two of its four callers are open to any
workspace member, and `converge_connect_grants` said superadmin while
`set_datatable_permissions` reaches it as a workspace admin. Both were fine on substance: the
rule that actually holds is about the credential never reaching a response, log, audit record
or export, not about who may call. They now say that. `read_datatable_entry` gets the same
treatment rather than the one the earlier message claimed for it: it is the primitive every
resolution goes through, so it is deliberately open, and what must not escape is `permissions`
— it names the governing workspace's users, groups and folders.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): close the last ways a role or a pointer can be left pointing at nothing
The raw settings readers hand back whatever is in the row, so moving the catalog into its own
`global_settings` key protected the config machinery and left `GET /settings/global/datatable_roles`
and the settings listing returning every live password. Both now filter that one key. The
neighbouring `custom_instance_replication_pwd` has the same shape and is not touched here: it
predates this and widening the fix to it is a decision about an operator workflow, not a
consequence of this change.
Three ways a save could leave something resolving to nothing:
A permissioned data table could be moved to a PostgreSQL resource. The block was carried across
as a server-owned field, the runtime refuses roles on a resource-backed table, so the save
succeeded and every job afterwards failed. Refused instead — turning roles off first is one step,
and it keeps discarding an access decision something somebody chose.
Renaming a governing data table left every fork pointing at the old name: the data table
disappears from their pickers and their jobs stop, with nothing in the renaming workspace to
suggest why. The rename now follows into the pointers in the same transaction.
Deleting one cannot be followed the same way, so it is reported instead — the response names what
it stranded, the way deleting a workspace does, and the fork's own error already says which
workspace is gone.
Also: `ensure_instance_db_grant_options_unchecked` claimed superadmin while the permissions
handler reaches it as a workspace admin (the same class fixed last commit, one instance missed);
the role entry kept an `instance_config_schema` derive it no longer needs; `write_role_catalog`
was the one writer of that table not stamping `updated_at`; and the concurrency test dropped its
roles only on success — a failing run is exactly the one that creates them without recording them.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* refactor(datatables): put the role catalog in its own table, not in global_settings
Five findings across three rounds were all the same choice. A set of live Postgres credentials
was living in `global_settings`, which has generic read, list, write, config-export and CLI
round-trip paths that know nothing about what they carry: the passwords reached the instance
config and its YAML editor, a full-row upsert of a neighbouring key erased the catalog,
`GET /settings/global/{key}` and the settings listing returned them raw, and this round the
redaction that fixed the last two turned `wmill instance push` into something that wipes every
password — a fix breaking the assumption the previous fix made. `POST /settings/global/datatable_roles`
could also empty it outside the lock.
The approved plan offered a table or `global_settings`, so this is the other option it already
allowed rather than a new design. `datatable_role` is a table: no generic settings path can read
it, list it, export it, write it or round-trip it, so none of the five needs a guard. The
redaction, the hidden/protected/agent-denylist entries and the JSON document all go with it.
One row per role also removes the read-modify-write the concurrency work was about: two
concurrent creates are two inserts, and the unique index on `name` is what settles a collision.
The advisory lock stays for the one window rows do not cover — `CREATE ROLE` is invisible to
another transaction until commit, so without it both creates pass their `pg_roles` check.
Also from this round: rename mappings are checked against the configuration they claim to
describe, since fork pointers are rewritten from them — a caller could otherwise submit
`main -> missing` against an unchanged config and repoint every fork of `main` at a name nothing
has, and `A -> B` plus `B -> C` moved what pointed at `A` all the way to `C`. And the warning
naming forks a delete stranded reached the response but not the screen: both the data table
settings save and the workspace delete now show it.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): validate a rename against the save it describes, and re-check under the locks
Three from the round, all about deciding on state that could already have moved.
A permission save resolved the data table and checked it was instance-backed before taking any
lock, then wrote under one. A config save committing in between could move the table onto a
PostgreSQL resource — recreating exactly what the transition guard refuses — or rename it, in
which case the write targeted a key that no longer existed and reported success having changed
nothing. It now re-resolves and re-checks on the locked state.
Rename validation checked that the source existed before and the target existed after, which
still accepts `main -> decoy` against a save that keeps both: every fork of `main` then follows
onto a different data table, silently, because it keeps resolving. The rule is now the actual
old-to-new key transition — a source may only survive if another rename took its name, and a
target may only pre-exist if another rename freed it. That also stops two sources sharing one
target, and it admits a swap, which the previous guard refused: `datatables` is keyed by name, so
a swap cannot be done one save at a time, and refusing it was a regression against main. The
pointer cascade now runs in two passes through a temporary name, the way the migration cascade
one layer down already handles the same shape, so `A -> B` with `B -> C` moves each pointer once
from what it named before the save.
The tenant mutators say what they are for: they write an access decision for any workspace named,
with an arbitrary mutation, and exist for the transaction that frees or renames a principal.
Editing a decision on purpose belongs in the permissions endpoint.
Carried in the same change: the stranded-fork list is a field rather than a phrase to grep out of
a success string; the pointer cascade matches with `EXISTS` instead of a `LIKE` over the whole
document, so a workspace whose pointers name something else is not rewritten to a byte-identical
value under an exclusive lock; and `InstanceDatatableRole` drops the serde derives left over from
the JSON document, one of which would emit `pwd`.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): cascade on the leave route that is used, gate migrations before the admin connection, and drop a role atomically
The tenant cascade on leaving went onto `/users/leave`. The UI and the generated client call
`/workspaces/leave` — a different handler in a different crate with the same name — which
deleted the membership and left `u/<username>` in the tenant lists. Leaving and rejoining
therefore restored the access the leave was supposed to end, and a later account taking the
username would have inherited it. The regression test drives the route the client actually
calls; without the fix it fails with "leaving kept the tenant".
The migration endpoints authorized too late. `run_datatable_migrations` opened the data table's
admin connection, created `_wm_migrations` and read it before reaching the per-migration role
check — so with nothing pending, nothing was checked at all. Rollback returned before its check
when nothing was applied, and the status endpoint had none. All three now ask, before any
connection is opened, whether the caller can reach the data table as any role at all; which role
a given migration runs as is still decided per migration, and by the executor after that.
Deleting a role committed the cluster drop and the catalog row, then swept the tenant lists in
separate transactions. A sweep failing part-way left workspaces naming a role nothing can connect
as, while the retry answered `NotFound` because the catalog entry was already gone. The sweep now
runs in the same transaction, so the drop, the row and every tenant list commit together.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): refuse to copy a data table that is under roles
pg_dump carries no roles and the import runs with --no-privileges, so a copied
data table arrives owned by the admin connection with no GRANT for any role.
The settings clone brings `permissions` across, so the fork's tenants pass
Windmill's check, connect as the role they were given, and are denied by
Postgres on everything: an entry that reads as configured and answers nothing.
Refuse the copy — in the import endpoint before any data moves, and in the fork
path the CLI takes. Replaying the source's owners and ACLs into the clone is
what lifts this, and is a change of its own. Dropping `permissions` from the
copy instead would be the unsafe half, since the copy holds the parent's rows.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): refuse the clone's database too, not only its data
A clone is two endpoints: `create_pg_database` then `import_pg_database`. Only
the second refused a data table under roles, so a fork asking to clone one
created and registered an empty `wm_fork_…` instance database and then failed —
and nothing collects it, since `drop_forked_datatable_databases` only drops
entries carrying `forked_from` and no entry names this one.
Refuse in both, so the clone stops before a database exists.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* nit worker error msg
* fix pg_dump stuck on version 17 on nix
* fix(datatables): refuse a malformed role annotation instead of ignoring it
`-- Role operator`, `-- role operator;` and `-- role operator -- why` all failed
the annotation parser's exact-match rule, so the query fell through to the data
table's default role and ran, silently, under a login the author did not choose.
Naming a role exists precisely to not do that.
A leading comment whose first word is `role` is now an annotation attempt: the
keyword matches case-insensitively, one trailing `;` is tolerated, and anything
else is an error naming the line. Only callers that already know the target is a
`datatable://` reference ever run this, so ordinary SQL keeps its comments.
Also bumps the dev shell's postgres client to 18 — it trailed the server the dev
database runs, which takes out every data table export, clone and fork-with-data.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): refuse a malformed role query string instead of ignoring it
`?Role=analytics`, `?role=` and `?x=1&role=…` all fell through the reference
parser's exact-match rule, so the connection resolved to the data table's default
role and ran under a login the caller never asked for — the URI half of the same
trap as a malformed `-- role` annotation.
The key now matches case-insensitively, and anything else in the query string is
an error naming it; `role` is the only parameter a reference takes. Callers that
only need the entry keep a lenient `datatable_ref_name`, since they never act on
the role. The DuckDB `ATTACH` parser propagates it rather than attaching under
the default.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ti5HyeTikPMYyW8YSdiHR
* fix(datatables): carry the role annotation into the row_to_json retry
The retry rebuilds its SQL from `pruneComments(code)`, so the leading comment
block never reached the second attempt — and with it the `-- role <name>` line
that decides which login the query runs as. The retry connected as the data
table's default role instead, so a query the first attempt was denied could
succeed on the second, reported as "recovered with the row_to_json fix".
Carry the leading comment block over. The retry itself is unchanged.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* chore(datatables): don't mount the roles UI until the ACL editor lands
Enforcement ships first. The permissions drawer is what turns roles on, and the
catalog section is what creates them — both are only useful once there is a way
to grant a role the privileges it needs, which arrives with the ACL editor. Left
mounted they would offer a feature whose other half does not exist.
The two components are complete and reviewed; only their call sites here are
commented out, with a note pointing the follow-up PRs at them.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): honour `-- role: x`, and fix the DuckDB attach test
Two review findings, both real.
`attach_datatable_parses_name_and_role` never compiled: `parse_attach_datatable`
returns `Result<Option<_>>` now and one call site kept a single `unwrap`. Its
`?Role=analytics` case also asserted a refusal, contradicting the parser in the
same commit, which matches the key case-insensitively. Replaced with the cases
that are genuinely malformed, and a positive one for the cased key.
`-- role: analytics` fell through to the default role — the silent fallback the
strict parser exists to remove, for the spelling most likely to be typed. The
keyword now accepts an optional colon, attached or spaced, while a word that
merely starts with it (`rolebased`) is still not an attempt.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): clone a fork's pointer instead of failing after the copy
Forking a fork with cloning left an orphan database. The preflight resolves the
pointer and sees the governing entry, so both endpoints ran and filled the new
database; `apply_forked_datatable` then refused the inherited pointer and rolled
the fork back, stranding a registered `wm_fork_*` that no entry names and whose
name blocks the retry.
Refusing earlier would have been the smaller change, but forking a fork and
cloning worked before pointers existed, so it would trade an orphan for a
regression. Resolve what the pointer names and write the terminal entry the
clone needs: the whole `database` object rather than a patch of its
`resource_path`, since a pointer has none, and `reference` removed with it.
Also accepts `-- role=x` and `-- Role = x`, two more spellings that fell through
to the default role.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): refuse to roll back the catalog while roles exist
The down migration dropped the table and left every role behind: live Postgres
logins whose passwords only that table carried, so after a revert Windmill could
neither use, disable nor delete them, and re-applying could not recreate them
because the names were taken. Cleaning up here is not possible either — dropping
a role means reassigning what it owns in every instance database, and a
migration runs in one — so it now refuses while the catalog is non-empty and
says to delete the roles through instance settings, which does the cluster work.
Also enforces the instance-only invariant the resolved-pointer clone relies on
rather than only asserting it in a comment.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* refactor(datatables): settle clonability in one place, before anything is created
A clone is three stages a workspace apart — `create_pg_database`, then
`import_pg_database`, then `apply_forked_datatable` inside the fork transaction.
Only the third can roll back, and `CREATE DATABASE` is not transactional, so any
refusal that lives there strands a registered `wm_fork_*` that no entry names
and whose name blocks the retry.
That orphan has now been fixed three times, most recently reintroduced by a
guard added one commit ago. Patching each new refusal into the first endpoint is
not the fix; having two places that can refuse is. `ensure_datatable_is_clonable`
now answers every reason a copy can be refused and returns what it resolved, and
the stage that writes the entry only does the work.
Also takes an ACCESS EXCLUSIVE lock before the rollback guard counts, so a role
created concurrently cannot slip between the check and the drop.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): let a retried clone reclaim its own leftover database
A clone creates its target database one request before it copies into it, and
the fork that would name it is written a request after that. Any failure in
between — a pg_dump error, a bad restore, a dropped connection, the source's
roles changing mid-flow — left a registered `wm_fork_*` that no entry names,
and every retry then failed on its name. This predates data table roles.
`create_pg_database` now reclaims such a leftover before creating: only a
`wm_fork_*` database Windmill registered as a data table database and that no
data table or ducklake entry names, in any workspace, archived ones included.
The drop never terminates connections, so a clone still copying into it makes
the reclaim fail instead of being cut off. It is limited to callers who
administer the source — reaching it is not enough, since on a data table
without roles every member reaches it — and anyone else gets the refusal an
existing database always got.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* Revert "fix(datatables): let a retried clone reclaim its own leftover database"
This reverts commit 7dd3275a10.
The reclaim tied the caller to the source they administer, but not to the
database it dropped. Between another workspace's import and its final fork
request, that workspace's target is full, registered, unnamed and has no open
connection, so an admin of any instance data table could name it and have it
dropped and recreated empty. The victim's fork would then commit pointing at
the empty copy. Safe reclaim needs durable clone ownership and serialization
with the request that names the database; until then the leftover stays, as it
did before this PR.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* docs(datatables): record the stale clone database as a known limitation
A clone is three requests and `CREATE DATABASE` is not transactional, so a
failure after the first leaves a registered `wm_fork_*` behind, as it did
before data table roles. Accepted for this PR: it is harmless to data and goes
away once the clone is a single server-side operation.
The comment also records why the obvious fix is wrong: reclaiming the leftover
on retry, without durable clone ownership, can drop another workspace's fully
copied database between its import and its final fork request.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): bounce the streams reading a data table when it is deleted
Deleting a governing data table, or the workspace that holds it, only collected
the fork pointers it stranded, for the warning. A Postgres trigger or capture
already streaming through one of those pointers kept the replication connection
it opened while the pointer still resolved, so it went on dispatching the
governing database's rows after the fork lost access — until its connection
happened to restart. The governing workspace's own streams on a deleted entry
did the same.
Both deletion paths now bounce the affected listeners inside their own
transaction, through the helper a permission change already uses, so a
listener that reconnects re-resolves the entry and finds it gone. The helper is
split so a caller can pass the (workspace, local name) pairs it already holds.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep the fork schema baseline, and bounce streams on every removal
Three fixes from review.
`edit_datatable_config` took `forked_from` wholesale from the stored entry, so
the fork schema diff's save of an advanced baseline was silently discarded and
an applied change was offered again. Whether an entry carries a clone stamp is
still carried from the store, since that is what marks its database droppable,
but the baseline inside it is now taken from the request.
The stranded-pointer warning and the stream bounce ran over the optional
`deleted_datatables` hint, which the settings-sync CLI never sends, so removing
a governing data table through `wmill` bounced nothing. Removals are now derived
from the stored configuration against the saved one.
`delete_workspace` read the pointers to bounce before its transaction, so a fork
committing a pointer during the deletion was missed. The read now happens inside
the transaction, after the workspace row is deleted: a fork's insert key-share
locks that row through its parent foreign key, so it is either seen or fails on
the missing parent.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* refactor(datatables): keep Postgres triggers and data table roles apart
A replication stream reads every row of every table whatever the data table's
roles grant, and its listener checks access only when it connects. Rather than
chase every way access can change and bounce the streams each one affects, a
data table now carries one or the other:
- a Postgres trigger or capture cannot be created on, or connect to, a data
table under roles;
- roles cannot be turned on while an enabled trigger or a live capture reads
the data table, its own or a fork's through its pointer. The refusal names
each one to disable.
This removes the stream bounces on roles edits and on data table and workspace
deletion, and the trigger gate that admitted admins. The fork schema baseline
fix from the same review round is kept.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): refuse a Postgres trigger on a data table under roles when it is saved
Creating or editing a trigger that points at a data table under roles was
accepted, and its listener then retried the refused connection every 30
seconds forever. The save is now refused, and a trigger that reaches such a
data table anyway (re-enabled, or cloned into a fork) is disabled by its
listener with the reason, as a missing replication slot is.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): disable a data table role before deleting it
Deleting a role reassigns and drops what it owns in each registered
database on its own connection, and each of those passes commits as it
goes. A database failing part-way left the role enabled in the catalog and
able to log in, but already stripped in the databases reached before it.
The role is now disabled in its own commit first, so a failed delete
leaves a disabled role to retry.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): serialize roles going on with a stream starting
Turning roles on looked for enabled triggers and live captures once,
without a lock anything starting a stream also took. A trigger enabled in
that window could have its listener connect before roles committed, and a
healthy listener never checks again. Both transitions now serialize on one
advisory lock: roles going on hold it exclusive while they look, and
trigger create, edit and enable, and capture setup and ping hold it shared
while they commit. Either the look sees the stream, or the listener
connects after roles are committed and refuses.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): wait out live listeners, and resolve stored names containing `?`
Turning roles on counted a trigger as gone once disabled, and a capture
once its client stopped pinging, but the listener keeps its replication
connection until its next heartbeat notices. A trigger or capture whose
listener pinged in the last 15 seconds, the window a server holds a
listener for, now still counts as streaming.
Data table names could contain `?` before they were restricted, and such
entries are still stored. Splitting `?role=` off a reference misread them:
`a?b` became `a` with an unknown parameter, and the clone checks looked at
a different entry than the one copied. An entry stored under the whole
reference is now looked up first, in the Postgres executor, DuckDB ATTACH
and the clone checks. Agent workers cannot read the workspace and keep
the strict parse, which refuses such a name rather than misreading it.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): warn when a settings sync strands fork pointers
A settings save reported the fork pointers left resolving to nothing only
for the names in `deleted_datatables`, which `wmill sync push` never sends.
The save now works out what it removed from the locked entries, and the
CLI prints the stranded pointers it returns.
Also correct the replication helper's contract: no role or admin check
makes a replication connection safe, so a data table under roles is
refused outright rather than gated as an admin operation.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): refuse a save that drops a data table's roles through an undeclared rename
A data table's roles follow its entry only through a declared rename. A
settings sync sends the whole map and never declares one, so renaming a
data table under roles there read as a delete and a new entry on the same
database: the new entry carried no roles, and every caller connected as
admin. Such a save is now refused, naming both entries.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* fix(datatables): no entry without roles may newly reach a database under roles
The previous guard only caught a new name replacing an entry under roles.
A whole-map save could also repoint an existing entry without roles at
that database, or another workspace could point one there, and every
caller of that entry would connect as admin. The rule is now stated on
the saved entries: one that carries no roles and newly points at an
instance database any entry under roles uses, in this workspace or
another, is refused. A declared rename carries its roles and passes.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): move data table role catalog and resolution to the enterprise edition
Roles are an Enterprise Edition feature. The catalog, the Postgres logins,
CONNECT convergence, tenant evaluation and the role half of connection
resolution move to windmill-ee-private. Every public function keeps its path
and signature and forwards through datatable_roles_oss, which re-exports the
enterprise implementation or, without it, refuses.
Without the enterprise edition a data table under roles, or a caller naming a
role, is refused a connection rather than resolved as admin, and the reach and
admin-access checks refuse one under roles. A data table not under roles
resolves as before in every edition, and an instance database keeps the
CONNECT grants it was created with. The catalog lock, the stream lock, the
tenant cascades and the permissions stripping stay in OSS: they only restrict.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): move the data table permissions endpoints to the enterprise edition
The permissions read, save and usable-roles handlers move to
windmill-ee-private; the routes stay registered and, without the enterprise
edition, answer that data table roles are an Enterprise Edition feature.
ensure_governs_datatable and ensure_reaches_datatable keep their paths: the
first refuses, the second passes a data table not under roles.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): move the data table role catalog endpoints to the enterprise edition
The superadmin list, create, update and delete handlers move to
windmill-ee-private. The routes stay registered and, without the enterprise
edition, refuse after authentication.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* test(datatables): run the roles tests on the enterprise edition, refusals without it
Each test that exercises roles runs with private and enterprise. Two tests run
without them: every roles route answers the Enterprise refusal, and a data
table saved under roles, or a named role, is refused a connection while one
not under roles resolves as before.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* feat(datatables): gate the roles UI mount sites on an enterprise license
Both mount sites are still commented out; the gate travels with them.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* test(datatables): run the tenant matcher test on the enterprise edition
The matcher it covers is enterprise code now, so without the enterprise
edition the test hit the stub and failed the default windmill-common run. It
runs with private and enterprise, and a counterpart without them asserts that
no tenant list covers anyone, the wildcard and a workspace admin included.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BjfMkJyKzodxkobqGZ6Lqb
* chore: update ee-repo-ref to a1873dbb67f2302b85ff5362f8387b48eccdb607
This commit updates the EE repository reference after PR #783 was merged in windmill-ee-private.
Previous ee-repo-ref: 5c853e2c20eca6b748415fc0d6862a6ebfb5fec4
New ee-repo-ref: a1873dbb67f2302b85ff5362f8387b48eccdb607
Automated by sync-ee-ref workflow.
* fix(datatables): refuse roles while a same-workspace alias reaches the database
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): let CE migrations connect as an explicitly named admin
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): serialize roles going on with aliases saved from other workspaces
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* docs(datatables): note that legacy names with ? cannot be migrated
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): add an ACL editor for data table roles
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: take every pooled connection before the ACL apply locks
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: refresh grant options only after the ACL apply validates its plan
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: add only missing grant options before an ACL apply, never default privileges
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: run one data table ACL apply at a time per server before it connects
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: hold the ACL connection to the database that was authorized
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: build the ACL connection from the authorized data table entry
Resolving the settings again could land on a resource with the same
database name on another server, which the later entry checks never see.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: check ACL read reach against the entry it connects from
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* feat(datatables): Ducklake catalogs on the external instance cluster
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): never grant CREATEROLE to custom_instance_user on the external cluster
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* docs(datatables): state the authorization contract of external database usage lookups
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): drop a DuckDB data table secret once its ATTACH has used it
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* perf(datatables): resolve a workspace's data tables per pointer hop, not per entry
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): hold the parent's settings while a fork points at its data tables
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): refuse repointing the external cluster while it is in use, and keep verify-ca working for pg_dump
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): protect external databases pending fork cleanup, and describe Ducklake usage in the API
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): per-cluster data table role catalogs, with roles on the external instance cluster
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): write the external cluster setting under the lifecycle lock, and check fork targets are registered
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): register external fork catalogs under the lifecycle lock, and keep certificate verification in DuckDB attaches
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep certificate verification when DuckDB attaches an external data table
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep certificate verification when DuckDB attaches an external data table
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): refuse fork cleanup of an external database another workspace uses
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): refuse rolling back while external data tables are under roles, and type external_instance in the CLI
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): stop counting storage-only fork cleanup rows as uses of an external database
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): bind fork database copies to their workspace, and count every use before dropping one
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): authenticate instance database setup before writing its status, and keep a fork reservation across it
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): create external databases only on a cluster setup succeeded on, and document the registry reader
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep only the most recently used DuckDB root certificate files
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): migrate fork reservations on workspace rename, and lock the parent's data tables for the whole fork
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): take the fork data table lock once, before the external cluster's
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* docs(datatables): describe the external instance cluster and how to run one locally
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep fork reservations private, drop a cleaned-up entry with its database, and serialize cleanup with settings saves
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): hold the fork lock across a fork import, and carry the reservation inside the setup write
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): check the external cluster setting on its own transaction, and gate the registry probe
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): add an ACL editor for data table roles
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: take every pooled connection before the ACL apply locks
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: refresh grant options only after the ACL apply validates its plan
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: add only missing grant options before an ACL apply, never default privileges
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: run one data table ACL apply at a time per server before it connects
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: hold the ACL connection to the database that was authorized
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: build the ACL connection from the authorized data table entry
Resolving the settings again could land on a resource with the same
database name on another server, which the later entry checks never see.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* fix: check ACL read reach against the entry it connects from
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BRoYE5ZeAVvrDYdfhDAYXb
* chore: update ee-repo-ref to 7e338e4dabf91689bfd7fb0333c6534040b17b59
This commit updates the EE repository reference after PR #787 was merged in windmill-ee-private.
Previous ee-repo-ref: 0edd40979cf36bfba59323f3f6a0811ae1369cf5
New ee-repo-ref: 7e338e4dabf91689bfd7fb0333c6534040b17b59
Automated by sync-ee-ref workflow.
* fix(datatables): keep DuckDB root certificate files in the job directory
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* chore: drop the unused json import from the settings crate
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): drop the serde_json::json import left unused by the fork setup write
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): accept external_instance data tables in the settings form type
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): serialize fork database reservations, cleanup, setup and Ducklake saves on the database
- A fork copy is created and registered under its workspace's fork lock, and refused once the
workspace is archived; a rename re-migrates reservations under that lock after archiving.
- Ducklake saves lock every instance database they newly name, as data table saves do.
- Instance database setup holds the database's lock until its entry is written.
- Fork import also holds the database's lock across the restore.
- Cleanup re-reads the entry under its locks before dropping anything.
- Non-superadmins no longer see fork copies reserved for workspaces they are not in.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): state the authorization contract of the external cluster status and write check
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): lock the fork copy at finalization, and order cleanup's registry write after its settings row
- Fork finalization holds the copy's database lock from its availability check to the commit.
- Cleanup removes the registry entry in its own transaction, in a task of its own, instead of on a
second connection; a rename migrates reservations after its settings rewrites, so both take the
settings rows before the registry.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): hold the fork lock across a rename's settings copy
Fork cleanup of the old id could otherwise drop a copy the renamed workspace goes on using. Also
states the authorization contract of the instance database drop helpers.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): refuse moving the external cluster to another host or port while it holds databases
Every settings writer goes through the same check as removal: the login, TLS and maintenance
database may still change, the cluster may not.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): clone a data table under roles with its owners and grants (#11120)
Claude-Session: https://claude.ai/code/session_01UbrtwiYNfayrmqouBJHwGV
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix: open the raw app data table drawer when the workspace has none
Selecting the first data table of an empty list passed undefined to the name
check, which threw instead of opening the drawer on no data table.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): offer cloning a data table under roles where its grants can be replayed
The server clones such a data table and replays the source's owners and grants,
which only the Enterprise Edition does, so the fork wizard hid both clone
options everywhere instead of on a build that cannot replay them.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* docs: name the placeholder the empty raw app data drawer renders
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): replace a job directory file at the DuckDB root certificate path instead of trusting it
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* test: pin the enterprise refusal the role pickers read as 'not under roles'
The server's sentence and the frontend's copy of it were coupled by nothing,
so rewording either one turned every role picker on a community build into a
failed lookup.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): type Ducklake catalogs on the external instance cluster in the settings form
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): read a roles answer only for the workspace it was asked in
A fork and its parent each have their own roles on a data table of the same
name, so an answer stamped with the name alone settled the role from the
workspace the editor was acting on before.
Also derive the AI table creation flag from the data replaced into the editor:
data naming no data table left the flag on from before.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep an instance database a settings save is waiting to name
Cleanup for a database whose setup failed took the lock first, read no user,
and dropped it while a save blocked on that same lock was about to commit a
reference to it.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): check the workspace stamp in the default database selector too
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): read what a save racing instance-database cleanup committed
A transaction blocked on the lock may still roll back, so keeping the database
for it stranded one whose name then blocks every retry: it is let through and
its outcome read instead. The waiter query also matches this database's locks
only, since pg_locks spans the cluster.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): tell a waiting request apart from the workspaces using a database
Both callers render what cleanup returns as the workspaces that keep the
database, so a waiting request's pid read as one of them. Each now words that
case itself, and the give-up comment names where the kept name actually goes.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): take the cleanup lock on a connection the pool cannot reclaim
A session lock outlives the future holding it, so a cancellation between
taking it and releasing it handed a locked session back to the pool, where
every later settings save waits on it. Detached, the connection closes when it
is dropped and the server releases the lock with the session.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): close the cleanup connection on drop instead of detaching it
Detaching released the pool permit while the session stayed alive, so
concurrent cleanups waiting on their locks could open as many connections as
they liked. Closing on drop covers the same cancellation and keeps them
counted.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* chore: update ee-repo-ref to 179d2454a063ee818a9387a1eafdd354a217a16c
This commit updates the EE repository reference after PR #802 was merged in windmill-ee-private.
Previous ee-repo-ref: c2e43f5b5ff753d339b70e232fd17b6ffecb054d
New ee-repo-ref: 179d2454a063ee818a9387a1eafdd354a217a16c
Automated by sync-ee-ref workflow.
* chore: update ee-repo-ref to fd5b8af748f2c985b13e18d9ea30894f3bd7e9a3
This commit updates the EE repository reference after PR #798 was merged in windmill-ee-private.
Previous ee-repo-ref: 3145e422d61d580f0a82804f075285c112879da0
New ee-repo-ref: fd5b8af748f2c985b13e18d9ea30894f3bd7e9a3
Automated by sync-ee-ref workflow.
* fix(datatables): classify a fork import's target from the resolution that built its connection
A second read could see the entry flipped to a resource and skip the reservation check while the
connection already built still reached the instance cluster.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): run external database lifecycle on the caller's transaction, one lock order for fork cleanup
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): check a fork copy's reservation on the locked transaction's connection
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): make and drop fork copies of external data tables on the external cluster
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): refuse a fork whose external copy something already names
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): check an external fork copy's uses before removing its entry, so child fork pointers still count
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): migrate external cluster fork reservations on workspace rename
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): configure the external instance cluster and pick its databases from the UI
Instance settings gets an External Postgres tab: the cluster's connection, the setup run
with its report, and the databases Windmill created there. Data table and Ducklake settings
offer the external_instance kind, with a picker over those databases.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep the external cluster form out of the instance settings the page bulk-saves
The form seeded its key into the settings store after the page snapshotted them, so merely
opening the tab made the page send a setting the validator refuses, failing an admin's
unrelated save. The form is local state now, and only the setup writes the key.
The database picker also treats a superadmin-only listing as authoritative: a workspace
admin, who cannot list, no longer sees a saved database as missing.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(tests): app paths are validated, so a guest app cannot be renamed to one with a space
Path validation on apps landed after this test, which still expected a space to be accepted
and created its fixture on a ':' path. The scopable-path guard it exists for is kept by
planting that path on the row, which is now the only way an app can hold one.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): one Managed Postgres tab, and a switch for Windmill's own database
The instance settings tab covers both substrates Windmill administers: the external cluster,
which can now be disabled once nothing sits on it, and Windmill's own database, which an
operator can turn off so the cluster is the only one a workspace may newly name. A save that
names it then refuses, as the create endpoint does.
Workspace settings name them the way an admin meets them: Postgres Resource, and Managed
instance, qualified as Internal or External only while both are on offer.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): offer the external cluster in the add-data-table wizard, and give Ducklake its room back
The wizard gets the external cluster as a fourth substrate: pick a database it already holds
or name a new one, which the run creates before writing the entry, so Try again does not trip
on a database the last attempt made.
Ducklake's maintenance column moves into the settings popover next to the extra args, which
the wider catalog select had squeezed the name box out of.
A setting a component saves itself now also moves the page's baseline, or Discard would
restore what it replaced and a later save would send that stale value back.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): only a database this wizard run made makes its retry idempotent
A retry skipped the create whenever the name was registered, which let a run adopt a database
another superadmin had made and share their data without the warning the existing-database
branch shows. The run tracks what it created instead, and reports it so Discard can say the
database is still there. Creating one now refreshes the registry the next run's default name
and its validation read, and that default counts the external cluster's databases rather than
the instance's.
Row ownership carries the substrate: "instance" and "external_instance" can hold the same name,
and a row repointed between them while a run probes must not read as that run's own.
Also fixes the merge leftovers in the DuckDB executor's tests, which cargo check never compiles:
the new PgDatabase field and the attach helper's job directory.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): shorten the picked managed kind, and say what an empty database list means
The closed select has room for the qualifier, not the whole name, so a picked managed kind
reads "Managed (Internal)". An external entry gets the tooltip its internal counterpart has,
and a database picker with nothing in it says to type a name rather than "No items found".
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): keep the wizard's external-database bookkeeping optional and parked
The run deps gained a required field, which every existing caller of runSetup -- the sibling
test suite included -- does not pass. It defaults to empty instead, the parked payload carries
it across a Supabase redirect as it claims to, and a resumed run counts it as something left
behind. Two regressions pin the create: made on a first attempt, skipped only for a database
this run made.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): review an external-cluster database as one, not as a Postgres resource
The review step fell through to the resource branch for the new provider, so it announced a
connection already in the workspace for a database that does not exist yet.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): show the server's refusal instead of an object in the toast
Saving data table settings passed the whole error to the toast, which rendered the request
and response as JSON, and the instance-database wizard replaced it with "check console".
Both surface the message the API sent, through the helper that exists for it.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* chore: point at the EE commit dropping the unused import
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): define a role on the cluster its data table sits on
The permissions drawer created and listed roles without naming a cluster, so a role defined
from an external data table became a login on Windmill's own, and the refresh then replaced
the correct catalog with the internal one. The drawer passes the data table's cluster to both.
The wizard also read a database it had just created as a name collision, which blocked
returning to the failed attempt and finishing under the same name.
And the merge had left the CONNECT-grant pass and its log in both the caller and the callee.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat(datatables): manage the external cluster's role catalog, and name the cluster in the copy
The roles drawer offered one catalog, so the external cluster's roles could only be reached
through a data table sitting on it — and became unreachable once the last one was gone, while
the cluster could not be unset until they were dropped. Opened from the page it now offers the
clusters the instance has; a data table's own drawer still pins its cluster, and its copy names
that cluster rather than "the instance".
A DuckDB attach also decides whether to verify certificates the way every other Postgres
connection does, so a resource carrying a root certificate is no longer downgraded to require
here alone.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* fix(datatables): bind the roles list to the cluster it was read for
Switching catalogs left the previous cluster's rows on screen and applied whichever response
landed last, so a slower read could seat one cluster's logins under the other's heading while
every control acted on the wrong id — invisible where a name exists on both. The switch clears
the rows, a token discards a response the selection has moved past, and the controls stay inert
while a catalog is being read.
The drop confirmation also names the cluster whose databases it reaches.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* feat: show data tables as cards and enable the add wizard by default
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: offer managed vs resource in the data table wizard, with external setup hints
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: move the external database hint next to the wizard's primary action
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: open managed postgres settings in place, prefilled from the picked resource
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: preview data table usage in python, duckdb and typescript in the wizard review
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: lay a data table card's fields out on one row, with manage set apart
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* fix: hide data table grants while the data table is not under roles
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* fix: default a new data table to the workspace name, and frame the usage preview
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: warn when disabling the internal instance while data still sits on it
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: disable the unavailable cluster in the instance roles toggle
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: make the data table manage buttons accent
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* fix: stop resolving data tables on windmill's database once it is disabled
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: hint superadmins that typing in the add-role picker creates a role
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* style: border the assets page cards instead of elevating them
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: confirm data table deletions on save, and show no success when a save is called off
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* test: pin that instance data tables stop resolving once disabled
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* fix: give the import wizard real managed availability, and lock the roles catalog when no cluster is on offer
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: mark the managed database as recommended in the data table wizard
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
* feat: skip the data table wizard's first step when a resource is the only option
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
1181 lines
49 KiB
Svelte
1181 lines
49 KiB
Svelte
<script lang="ts">
|
|
import { ResourceService, WorkspaceService } from '$lib/gen'
|
|
import { ArrowLeft, Check, Database, Loader2, TriangleAlert, X } from 'lucide-svelte'
|
|
import { tick } from 'svelte'
|
|
import Alert from '$lib/components/common/alert/Alert.svelte'
|
|
import { Button } from '$lib/components/common'
|
|
import AddDataTableWizard from '$lib/components/workspaceSettings/AddDataTableWizard.svelte'
|
|
import { useManagedInstances } from '$lib/components/workspaceSettings/utils.svelte'
|
|
import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
|
|
import Portal from '$lib/components/Portal.svelte'
|
|
import { createAsyncConfirmationModal } from '$lib/components/common/confirmationModal/asyncConfirmationModal.svelte'
|
|
import { SettingService } from '$lib/gen'
|
|
import { resource } from 'runed'
|
|
import ResourceEditorDrawer from '$lib/components/ResourceEditorDrawer.svelte'
|
|
import IconedResourceType from '$lib/components/IconedResourceType.svelte'
|
|
import ImportSetupRow from '$lib/components/ImportSetupRow.svelte'
|
|
import AppConnectDrawer from '$lib/components/AppConnectDrawer.svelte'
|
|
import Modal2 from '$lib/components/common/modal/Modal2.svelte'
|
|
import Select from '$lib/components/select/Select.svelte'
|
|
import { applyRetarget, seesWholeWorkspace } from '$lib/importWizard/retargetDeployed'
|
|
import { OauthService } from '$lib/gen'
|
|
import { registryCcCapableFor } from '$lib/components/oauthRegistry'
|
|
import {
|
|
addResourceTypeDisplayName,
|
|
resourceTypeDisplayName
|
|
} from '$lib/components/resourceTypeDisplay'
|
|
import { loadResourceTypeDisplayName } from '$lib/components/displayNameLoaders'
|
|
import { applyOneMigration } from '$lib/components/workspaceSettings/projectInstall'
|
|
import { probeMigrationsApplied } from '$lib/importWizard/probe'
|
|
import {
|
|
projectReferencesResource,
|
|
retargetProjectExport,
|
|
type ProjectExport,
|
|
type ProjectMigration
|
|
} from '$lib/components/workspaceSettings/projectBundle'
|
|
import { superadmin, userStore } from '$lib/stores'
|
|
import { sendUserToast } from '$lib/toast'
|
|
import { escapeHtml } from '$lib/utils'
|
|
|
|
// The last step, and the only optional one: it exists when the project's data
|
|
// tables are not configured in the destination. The import has already run —
|
|
// everything here is the part it could not do, because a data table is a named
|
|
// database connection the workspace owns, not something an import can invent.
|
|
//
|
|
// Self-sufficient from `workspace` + `slug`: it re-fetches the export rather than
|
|
// reading the executor, so reloading the page on this step still works. The plan
|
|
// in the URL stays the whole state.
|
|
|
|
interface Props {
|
|
workspace: string
|
|
slug: string
|
|
/** The folder the import wrote into. The export names resources under the project's
|
|
* own slug and `installProject` retargets them, so reading the raw paths here would
|
|
* look for stubs that are not where they landed. */
|
|
folder?: string
|
|
/** Left with `outstanding` rows still unfilled, which the caller may want to count. */
|
|
onSkip: (outstanding: number) => void
|
|
/** Off where the surface already names the step, e.g. a dialog whose title is it. */
|
|
showHeading?: boolean
|
|
/** Fill the height given, actions pinned to the bottom. See ImportProjectStep. */
|
|
fillHeight?: boolean
|
|
/**
|
|
* Finished. `checked` is false where the export could not be read: the step then has no
|
|
* idea what is outstanding, so it offers Finish rather than blocking — and a caller
|
|
* counting outcomes must not read that as a step that came out clean.
|
|
*/
|
|
onFinish: (checked: boolean) => void
|
|
onBack?: () => void
|
|
}
|
|
|
|
let {
|
|
workspace,
|
|
slug,
|
|
folder,
|
|
onSkip,
|
|
onFinish,
|
|
onBack,
|
|
showHeading = true,
|
|
fillHeight = false
|
|
}: Props = $props()
|
|
|
|
type Row = {
|
|
name: string
|
|
migrations: ProjectMigration[]
|
|
status: 'unconfigured' | 'running' | 'done' | 'failed' | 'unknown'
|
|
error?: string
|
|
/** Plays the confirmation flash once, right after the run that configured it. */
|
|
justSaved: boolean
|
|
}
|
|
|
|
/** A resource the project shipped that needed filling in. */
|
|
type Blank = {
|
|
path: string
|
|
resourceType: string
|
|
/** Required fields the type declares and the value does not have yet. */
|
|
missing: string[]
|
|
/** Filled in since this step opened. The row stays — it is a checklist, and a
|
|
* line that vanishes when you complete it reads as something going wrong. */
|
|
done: boolean
|
|
/** Plays the confirmation flash once, right after the save that flipped it. */
|
|
justSaved: boolean
|
|
/**
|
|
* Something of another type already holds this path, named here. The import skipped it
|
|
* on the path alone, so this row exists to say the project did not get the resource it
|
|
* shipped — and to make sure nothing offers to write over what is there.
|
|
*/
|
|
occupiedBy?: string
|
|
/**
|
|
* The resource could not be read, so nothing here knows whether it needs filling. Kept
|
|
* on the checklist rather than dropped: a read that fails is not evidence the resource
|
|
* is absent, and removing the row reports "all set" over a credential nobody filled.
|
|
*/
|
|
unreadable?: boolean
|
|
/**
|
|
* The workspace resource this row was pointed at. The project's items reference it
|
|
* directly now, so this is what the row has to say instead of the path it used to name.
|
|
*/
|
|
reusedFrom?: string
|
|
/**
|
|
* The empty placeholder is still at this row's path, because the retarget could not
|
|
* account for every item that might read it. Worth saying: the workspace has a resource
|
|
* on it that looks unfinished and is not.
|
|
*/
|
|
stubKept?: boolean
|
|
}
|
|
|
|
let loading = $state(true)
|
|
let loadError = $state<string | undefined>(undefined)
|
|
let rows = $state<Row[]>([])
|
|
let blanks = $state<Blank[]>([])
|
|
let projectResources: { path: string; resource_type: string }[] = []
|
|
/**
|
|
* The subset of `projectResources` the checklist asks about: the ones something in the
|
|
* project actually points at. The rest are created and left alone — see
|
|
* `projectReferencesResource`. Kept apart from `projectResources` because the full list
|
|
* is still what a stub may not be replaced by.
|
|
*/
|
|
let askableResources: { path: string; resource_type: string }[] = []
|
|
let working = $state(false)
|
|
let resourceEditor: ResourceEditorDrawer | undefined = $state(undefined)
|
|
|
|
/** The folder the import wrote into, which is where every rewritable referrer lives. */
|
|
const targetFolder = $derived(folder?.trim() || slug)
|
|
|
|
/**
|
|
* Resources the workspace already has, by resource type — what a stub can be replaced
|
|
* by. Empty for a workspace this import created, which is why the choice is offered
|
|
* rather than imposed: with nothing to choose from the button goes straight to the
|
|
* editor, exactly as it did before.
|
|
*/
|
|
let candidates = $state<Record<string, string[]>>({})
|
|
/**
|
|
* How many candidates are worth reading back to find the unfilled ones. Past this a
|
|
* workspace holds too many resources of these types to be the case worth filtering —
|
|
* one project's stub offered as another's credential — and they are all offered rather
|
|
* than costing a request each.
|
|
*/
|
|
const CANDIDATE_READ_CAP = 40
|
|
/** The credential row whose choice dialog is open. */
|
|
let choosing = $state<Blank | undefined>(undefined)
|
|
let chosenPath = $state<string | undefined>(undefined)
|
|
let reusing = $state(false)
|
|
|
|
const pendingTables = $derived(rows.filter((r) => r.status !== 'done'))
|
|
// Split because the two say different things to the user: one data table was never
|
|
// created, the other exists and could not be read. Telling someone to set up what they
|
|
// have already set up is how a warning stops being believed.
|
|
// Grouped by what it costs the project, not by row status. A row whose migrations failed is
|
|
// configured, but its tables are as absent as one that was never created and the remedy is
|
|
// the same — so they share a message. An `unknown` row is the odd one: it is set up, and
|
|
// whether its tables are there is precisely what could not be established.
|
|
const missingTables = $derived(
|
|
rows.filter((r) => r.status === 'unconfigured' || r.status === 'failed')
|
|
)
|
|
const uncheckedTables = $derived(rows.filter((r) => r.status === 'unknown'))
|
|
/** Rows the user has not dealt with, of either kind. */
|
|
const outstanding = $derived(pendingTables.length + blanks.filter((b) => !b.done).length)
|
|
|
|
// The wizard needs the instance-database pool and a confirmation host; the settings
|
|
// page owns them there, so this step owns them here.
|
|
// Which resource types this instance has an OAuth client for. A resource whose type is
|
|
// in here can be connected instead of hand-filled, which for an OAuth type is the
|
|
// difference between clicking Connect and pasting a token that expires in an hour.
|
|
// Empty when no superadmin has configured any client — then every row falls back to
|
|
// the editor, which is the only thing that would work anyway.
|
|
const oauthConnects = resource(
|
|
() => workspace,
|
|
async () => {
|
|
try {
|
|
return (await OauthService.listOauthConnects()).map((c) => c.name)
|
|
} catch {
|
|
return []
|
|
}
|
|
}
|
|
)
|
|
const instanceConnects = $derived(new Set(oauthConnects.current ?? []))
|
|
/**
|
|
* Matches what the dialog itself decides (`AppConnectInner.open`: `manual = !inConnects &&
|
|
* !registryCcCapable()`). An instance client is the usual route, but a provider the
|
|
* registry marks client-credentials-capable is connectable without one, because those
|
|
* credentials are entered per resource rather than held by a superadmin. Test only the
|
|
* first half and Connect disappears on the eight such providers, where it would work.
|
|
*/
|
|
const canConnectType = (rt: string) => instanceConnects.has(rt) || registryCcCapableFor(rt)
|
|
|
|
// A row blocked by a resource of another type names that type, whose row nothing here reads.
|
|
$effect(() => {
|
|
for (const b of blanks) {
|
|
if (b.occupiedBy) void loadResourceTypeDisplayName(workspace, b.occupiedBy)
|
|
}
|
|
})
|
|
|
|
let appConnect: AppConnectDrawer | undefined = $state(undefined)
|
|
|
|
const customInstanceDbs = resource([() => workspace], SettingService.listCustomInstanceDbs)
|
|
const managed = useManagedInstances(() => !!$superadmin)
|
|
const confirmationModal = createAsyncConfirmationModal()
|
|
let wizardOpen = $state(false)
|
|
let wizard = $state<AddDataTableWizard | undefined>(undefined)
|
|
let wizardFor = $state<string | undefined>(undefined)
|
|
let configuredNames = $state<{ name: string; resourcePath: string | undefined }[]>([])
|
|
|
|
/**
|
|
* Which row the open dialog runs migrations for. Separate from `wizardFor`, which
|
|
* `afterWizard()` clears as soon as the run reports — while the dialog stays up offering
|
|
* "Try again" for exactly that row. Read by `onFinishAlso`, so it has to outlive the run
|
|
* rather than the opening.
|
|
*/
|
|
let retryTarget = $state<string | undefined>(undefined)
|
|
|
|
/**
|
|
* A dialog is being opened. `open()` resolves the destination membership before it shows
|
|
* anything, so the button stays clickable during that wait — and a second click starts a
|
|
* second lookup whose `reset()` lands on the dialog the first one opened, wiping fields
|
|
* the user has already filled.
|
|
*/
|
|
let opening = $state(false)
|
|
|
|
function openWizard(name: string) {
|
|
wizardFor = name
|
|
retryTarget = name
|
|
// `open()`, not `opened = true`: only the method runs the wizard's own reset, which
|
|
// is what applies `initialName` and clears whatever a previous run left behind.
|
|
// `wizardOpen` is deliberately not set here. `open()` sets it once it has resolved the
|
|
// destination's membership, and it is bound to the dialog's `opened` — so setting it
|
|
// now shows a live, clickable dialog while that lookup is still in flight, with the
|
|
// username unresolved. Setup reached in that window writes the credential path this
|
|
// whole chain exists to get right. `wizardFor` alone mounts the component, which is
|
|
// all `wizard?.open()` needs to exist.
|
|
opening = true
|
|
void tick()
|
|
.then(() => wizard?.open())
|
|
.finally(() => (opening = false))
|
|
}
|
|
|
|
function defaultInstanceDbName(): string {
|
|
const used = Object.keys(customInstanceDbs.current ?? {})
|
|
let n = 1
|
|
while (used.includes(`dt${n}`)) n++
|
|
return `dt${n}`
|
|
}
|
|
|
|
/**
|
|
* What a row's state actually is, asked of the destination rather than inferred.
|
|
*
|
|
* The data table existing is not the question — the wizard creates it and the migrations
|
|
* run afterwards, so a table can be there with none of the project's tables inside it.
|
|
* That gap is invisible in memory after a reload, which rebuilds every row from scratch;
|
|
* reading it as "done" would let the step say "You're all set" over a project whose apps
|
|
* all fail on open.
|
|
*
|
|
* `probeMigrationsApplied` answers `undefined` when it cannot tell — an unreadable schema
|
|
* (the data table's database is down, or its credentials have gone bad) or SQL naming no
|
|
* tables it can resolve. That is neither done nor missing, and claiming either goes beyond
|
|
* what the code knows: reading it as done is how this step ends up reporting "You're all
|
|
* set" over a project whose apps fail on open. `unknown` says what is true, and still
|
|
* counts as outstanding so nothing is finished on top of it.
|
|
*/
|
|
async function settle(
|
|
name: string,
|
|
ms: ProjectMigration[],
|
|
absent: boolean,
|
|
prev: Row | undefined
|
|
): Promise<Row['status']> {
|
|
if (absent) return 'unconfigured'
|
|
const applied = await probeMigrationsApplied(workspace, name, ms)
|
|
if (applied === true) return 'done'
|
|
if (applied === false) return prev?.status === 'failed' ? 'failed' : 'unconfigured'
|
|
return prev?.status === 'failed' ? 'failed' : 'unknown'
|
|
}
|
|
|
|
/** Which data tables the project needs that the destination does not have yet. */
|
|
async function load() {
|
|
loading = true
|
|
loadError = undefined
|
|
try {
|
|
const res = await fetch(
|
|
`/api/w/${encodeURIComponent(workspace)}/hub/projects/${encodeURIComponent(slug)}/export`
|
|
)
|
|
if (!res.ok) throw new Error(`the hub proxy answered ${res.status}`)
|
|
const exportData = (await res.json()) as ProjectExport
|
|
const enabled = (exportData.migrations ?? []).filter(
|
|
(m) => m.enabled && (m.sql ?? '').trim() !== ''
|
|
)
|
|
// Kept, not just counted: which data tables the destination has decides whether a
|
|
// row can retry its migrations or has to go back through the wizard, and after a
|
|
// reload this call is the only thing that knows. Drop it and such a row offers the
|
|
// wizard, which then refuses the name it created itself.
|
|
const tables = await WorkspaceService.listDataTables({ workspace })
|
|
configuredNames = tables.map((t) => ({ name: t.name, resourcePath: t.resource_path }))
|
|
const present = new Set(tables.map((d) => d.name))
|
|
const missing = [...new Set(enabled.map((m) => m.datatable_name))].filter(
|
|
(n) => !present.has(n)
|
|
)
|
|
const previous = new Map(rows.map((r) => [r.name, r]))
|
|
rows = await Promise.all(
|
|
[...new Set(enabled.map((m) => m.datatable_name))].map(async (name) => {
|
|
const ms = enabled.filter((m) => m.datatable_name === name)
|
|
const prev = previous.get(name)
|
|
const status = await settle(name, ms, missing.includes(name), prev)
|
|
return prev
|
|
? { ...prev, migrations: ms, status, error: status === 'done' ? undefined : prev.error }
|
|
: { name, migrations: ms, status, justSaved: false }
|
|
})
|
|
)
|
|
// Retargeted the same way the import was, so these are where the stubs actually
|
|
// landed. `retargetProjectExport` is a no-op when the folder is the slug, which is
|
|
// every new-workspace import.
|
|
const target = targetFolder
|
|
const retargeted = retargetProjectExport(exportData, exportData.project?.slug ?? slug, target)
|
|
// Contained for the same reason the import contains: a crafted export can name a
|
|
// path outside the folder, and offering that for editing would reach a resource
|
|
// this import was never allowed to create.
|
|
projectResources = (retargeted.resources ?? [])
|
|
.map((r) => ({ path: String(r.path), resource_type: String((r as any).resource_type) }))
|
|
.filter((r) => r.path.startsWith(`f/${target}/`))
|
|
// Asked against the export as published, not the retargeted copy: a path the project
|
|
// spells out in code is not rewritten by the retarget, so only the raw export has
|
|
// its references and its resource paths agreeing. `resourceCount` asks the same
|
|
// question the same way, and the step and the stepper have to give one answer.
|
|
// Paired by position, not by reconstructing the retargeted path: `retargetProjectExport`
|
|
// maps `resources` in order, and an external path the bundle pulled in lands at
|
|
// `f/<folder>/<name>` with a `_2` suffix on collision, which no slicing recovers.
|
|
const askable = new Set(
|
|
(retargeted.resources ?? [])
|
|
.map((r, i) => [String(r.path), (exportData.resources ?? [])[i]] as const)
|
|
.filter(([, raw]) => raw && projectReferencesResource(exportData, String(raw.path)))
|
|
.map(([path]) => path)
|
|
)
|
|
askableResources = projectResources.filter((r) => askable.has(r.path))
|
|
await refreshBlanks()
|
|
} catch (e: any) {
|
|
loadError = e?.body ?? e?.message ?? String(e)
|
|
} finally {
|
|
loading = false
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resources the import created but could not fill. Every shipped resource arrives
|
|
* as a stub — the hub never publishes resource values, they are credentials — so
|
|
* this is not "which ones are empty" but "which ones are *still* empty": a
|
|
* re-import leaves an already-filled resource alone.
|
|
*
|
|
* The type's schema names the required fields, so the row can say what is missing
|
|
* rather than just that something is. A type we cannot read still counts as blank
|
|
* when the value is empty; it just lists no field names.
|
|
*/
|
|
async function findBlankResources(
|
|
resources: { path: string; resource_type: string }[]
|
|
): Promise<Blank[]> {
|
|
const out: Blank[] = []
|
|
for (const r of resources) {
|
|
let value: any
|
|
let occupiedBy: string | undefined
|
|
try {
|
|
const found = await ResourceService.getResource({ workspace, path: r.path })
|
|
value = found?.value
|
|
// The presence probe matches on path, and a path says nothing about type. A
|
|
// resource of another kind sitting here is not this project's stub, however
|
|
// empty it looks — treating it as one offers to fill somebody else's resource.
|
|
if (found?.resource_type && found.resource_type !== r.resource_type) {
|
|
occupiedBy = found.resource_type
|
|
}
|
|
} catch (e: any) {
|
|
// A 404 is the import having failed to create it, which it reported itself.
|
|
// Any other failure is a read this could not complete, which says nothing about
|
|
// whether the resource is there or needs filling — so the row stays.
|
|
if (e?.status === 404) continue
|
|
out.push({
|
|
path: r.path,
|
|
resourceType: r.resource_type,
|
|
missing: [],
|
|
done: false,
|
|
justSaved: false,
|
|
unreadable: true
|
|
})
|
|
continue
|
|
}
|
|
const filled = new Set(
|
|
value && typeof value === 'object'
|
|
? Object.entries(value)
|
|
.filter(([, v]) => v !== undefined && v !== null && v !== '')
|
|
.map(([k]) => k)
|
|
: []
|
|
)
|
|
let required: string[] = []
|
|
// A type whose schema will not load leaves `required` empty, which reads as "nothing
|
|
// missing" — and a half-filled resource would drop off the checklist as done. The
|
|
// row is kept instead; it just cannot name which fields are short.
|
|
let requirementsUnknown = false
|
|
try {
|
|
const rt = await ResourceService.getResourceType({ workspace, path: r.resource_type })
|
|
addResourceTypeDisplayName(rt)
|
|
const schema = rt?.schema as { required?: string[] } | undefined
|
|
required = schema?.required ?? []
|
|
} catch {
|
|
requirementsUnknown = true
|
|
}
|
|
const missing = required.filter((k) => !filled.has(k))
|
|
// A conflicting occupant is always listed, however full its value looks: the row is
|
|
// what tells the user the project is missing a resource it shipped.
|
|
if (occupiedBy || requirementsUnknown || missing.length > 0 || filled.size === 0) {
|
|
out.push({
|
|
path: r.path,
|
|
resourceType: r.resource_type,
|
|
missing,
|
|
done: false,
|
|
justSaved: false,
|
|
occupiedBy
|
|
})
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
/**
|
|
* Re-read the resources and settle each row's state. Rows are never dropped once
|
|
* listed: the first pass decides what the checklist contains, and every pass after
|
|
* it only moves a row from outstanding to done.
|
|
*/
|
|
async function refreshBlanks(): Promise<void> {
|
|
const fresh = await findBlankResources(askableResources)
|
|
const stillBlank = new Map(fresh.map((b) => [b.path, b]))
|
|
if (blanks.length === 0) {
|
|
blanks = fresh
|
|
await loadCandidates()
|
|
return
|
|
}
|
|
blanks = blanks.map((b) => {
|
|
// A row pointed at another resource is settled once its own stub is gone: the
|
|
// project's items read the chosen resource and nothing is left at this path. A row
|
|
// whose stub was kept is not settled, and re-reading it is how filling that stub in
|
|
// finally closes the row.
|
|
if (b.reusedFrom && !b.stubKept) return b
|
|
const f = stillBlank.get(b.path)
|
|
// Every field the fresh read decides is taken from it, not merged selectively: these
|
|
// describe what is at the path *now*. Keeping a stale `unreadable` leaves a resource
|
|
// that has since come back blocked until a reload, and keeping a stale absence hides
|
|
// one that has just become unreadable.
|
|
if (f) {
|
|
return {
|
|
...b,
|
|
missing: f.missing,
|
|
unreadable: f.unreadable,
|
|
occupiedBy: f.occupiedBy,
|
|
done: false,
|
|
justSaved: false
|
|
}
|
|
}
|
|
// Gone from the blank list entirely: it was read, and it is filled. `stubKept` goes
|
|
// with it — the placeholder the items this run could not move read is a credential
|
|
// now, so there is nothing left to tell anyone to fill in.
|
|
return {
|
|
...b,
|
|
missing: [],
|
|
unreadable: undefined,
|
|
occupiedBy: undefined,
|
|
stubKept: undefined,
|
|
done: true,
|
|
justSaved: !b.done
|
|
}
|
|
})
|
|
// The flash is a one-shot; clear it so a later refresh does not replay it.
|
|
for (const b of blanks) {
|
|
if (!b.justSaved) continue
|
|
setTimeout(() => {
|
|
const row = blanks.find((x) => x.path === b.path)
|
|
if (row) row.justSaved = false
|
|
}, 1500)
|
|
}
|
|
await loadCandidates()
|
|
}
|
|
|
|
/**
|
|
* Which existing resources each outstanding row could be replaced by. Re-read on every
|
|
* refresh rather than once: a resource created from the editor here is a candidate for
|
|
* the rows below it.
|
|
*
|
|
* The project's own resources are never offered — one of this project's stubs standing
|
|
* in for another is a reference to something equally unfilled.
|
|
*/
|
|
async function loadCandidates(): Promise<void> {
|
|
const types = [...new Set(blanks.map((b) => b.resourceType))]
|
|
if (types.length === 0) {
|
|
candidates = {}
|
|
return
|
|
}
|
|
const own = new Set(projectResources.map((r) => r.path))
|
|
const next: Record<string, string[]> = Object.fromEntries(types.map((t) => [t, []]))
|
|
try {
|
|
// One call for every type at once — `resource_type` takes a comma-separated list —
|
|
// and every page of it: `perPage` is what bounds the answer, so without the loop a
|
|
// workspace past one page would have the rest of its resources silently hidden.
|
|
for (let page = 1; page <= 100; page++) {
|
|
const rows = await ResourceService.listResource({
|
|
workspace,
|
|
resourceType: types.join(','),
|
|
page,
|
|
perPage: 100
|
|
})
|
|
for (const r of rows) {
|
|
if (own.has(r.path)) continue
|
|
next[r.resource_type ?? '']?.push(r.path)
|
|
}
|
|
if (rows.length < 100) break
|
|
}
|
|
} catch {
|
|
// Offer nothing rather than a partial list: every row then behaves as it did before
|
|
// this choice existed, which is a working way to fill a credential.
|
|
candidates = {}
|
|
return
|
|
}
|
|
// An unfilled resource is never the answer to "which credential should this use" —
|
|
// another project's stub above all, which the path filter above cannot recognise.
|
|
const paths = Object.values(next).flat()
|
|
if (paths.length <= CANDIDATE_READ_CAP) {
|
|
const settled = await Promise.all(paths.map(async (p) => [p, await isUnfilled(p)] as const))
|
|
const unfilled = new Set(settled.filter(([, empty]) => empty).map(([p]) => p))
|
|
for (const t of Object.keys(next)) next[t] = next[t].filter((p) => !unfilled.has(p))
|
|
}
|
|
candidates = next
|
|
}
|
|
|
|
/**
|
|
* Whether a resource holds nothing. Same test the checklist uses to call one of the
|
|
* project's own resources blank, so a resource this drops is exactly one the wizard
|
|
* would have asked someone to fill in.
|
|
*/
|
|
async function isUnfilled(path: string): Promise<boolean> {
|
|
try {
|
|
const found = await ResourceService.getResource({ workspace, path })
|
|
const value = found?.value
|
|
if (!value || typeof value !== 'object') return true
|
|
return !Object.values(value).some((v) => v !== undefined && v !== null && v !== '')
|
|
} catch {
|
|
// A read that fails says nothing about the value, and offering it is what this did
|
|
// before the check existed.
|
|
return false
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The row's one action. A workspace that already has a resource of this type gets the
|
|
* choice first — reusing what is there is usually the answer, and entering the same
|
|
* credentials a second time is the thing worth avoiding. With nothing to choose from
|
|
* there is no choice to make, so it goes straight where it always went.
|
|
*/
|
|
function startFilling(b: Blank): void {
|
|
// A kept-stub row has already been pointed at a resource; what is left is the empty
|
|
// placeholder the items this run could not move still read. Reusing a second resource
|
|
// would move nothing — every rewritable referrer is off the stub — and would relabel
|
|
// the row after a retarget that did nothing.
|
|
if (b.done || b.stubKept || (candidates[b.resourceType] ?? []).length === 0) {
|
|
fillDirectly(b)
|
|
return
|
|
}
|
|
chosenPath = undefined
|
|
choosing = b
|
|
}
|
|
|
|
/** Connect where the instance can, hand-fill otherwise. */
|
|
function fillDirectly(b: Blank): void {
|
|
if (canConnectType(b.resourceType)) appConnect?.open(b.resourceType, b.path)
|
|
else resourceEditor?.initEdit(b.path)
|
|
}
|
|
|
|
/**
|
|
* The chooser's way out: close it and do what the button did before there was a choice.
|
|
* The row is read out of the state first — closing the dialog unmounts the block that
|
|
* would otherwise be holding it.
|
|
*/
|
|
function fillNewInstead(): void {
|
|
const b = choosing
|
|
choosing = undefined
|
|
if (b) fillDirectly(b)
|
|
}
|
|
|
|
/**
|
|
* Point the project at an existing resource: every imported item that referenced the stub
|
|
* is rewritten to the chosen path. Nothing is copied. The stub is deleted only when
|
|
* `applyRetarget` can account for every item that might read it, and kept otherwise — so
|
|
* the toast says how many items moved, and whether the placeholder is still there.
|
|
*/
|
|
async function reuseChosen(): Promise<void> {
|
|
const b = choosing
|
|
const target = chosenPath
|
|
if (!b || !target) return
|
|
reusing = true
|
|
working = true
|
|
try {
|
|
const outcome = await applyRetarget({
|
|
workspace,
|
|
folder: targetFolder,
|
|
from: b.path,
|
|
to: target,
|
|
// Asked of this workspace, not of whichever one the user record still describes:
|
|
// reloading on this step leaves `$userStore` pointing at the previous workspace.
|
|
seesWholeWorkspace: seesWholeWorkspace($userStore, !!$superadmin, workspace)
|
|
})
|
|
const moved = `${outcome.rewritten.length} item${outcome.rewritten.length === 1 ? '' : 's'}`
|
|
if (outcome.error) {
|
|
sendUserToast(
|
|
`Could not point the project at ${target}: ${outcome.error}. ${moved} had already been updated, and ${b.path} was kept.`,
|
|
true
|
|
)
|
|
return
|
|
}
|
|
choosing = undefined
|
|
const row = blanks.find((x) => x.path === b.path)
|
|
if (row) {
|
|
row.reusedFrom = target
|
|
row.stubKept = !outcome.stubDeleted
|
|
// Settled only when the stub is gone. A kept stub is empty and is still what
|
|
// every item the scan could not move reads, so the row stays outstanding and
|
|
// keeps its action: filling it in is the thing left to do.
|
|
row.done = outcome.stubDeleted
|
|
row.justSaved = outcome.stubDeleted
|
|
}
|
|
await refreshBlanks()
|
|
sendUserToast(
|
|
outcome.stubDeleted
|
|
? `The project now uses ${target} — ${moved} updated.`
|
|
: `The project now uses ${target} — ${moved} updated. ${b.path} was kept, because some items could not be checked.`
|
|
)
|
|
} catch (e: any) {
|
|
sendUserToast(
|
|
`Could not point the project at ${target}: ${e?.body ?? e?.message ?? String(e)}`,
|
|
true
|
|
)
|
|
} finally {
|
|
reusing = false
|
|
working = false
|
|
}
|
|
}
|
|
|
|
$effect(() => {
|
|
void load()
|
|
})
|
|
|
|
/**
|
|
* The data table now exists — run the migrations that were skipped for it during the
|
|
* import, which is the whole reason this step waits for the configuration.
|
|
*/
|
|
async function runMigrationsFor(name: string): Promise<void> {
|
|
const row = rows.find((r) => r.name === name)
|
|
// Thrown, not returned: this also runs as the wizard's appended step, which reads a
|
|
// resolved promise as "the migrations ran". Resolving for a name that matches no row
|
|
// would report success over SQL that never executed.
|
|
if (!row) throw new Error(`No data table named '${name}' in this project`)
|
|
working = true
|
|
row.status = 'running'
|
|
try {
|
|
for (const m of row.migrations) await applyOneMigration(workspace, slug, m)
|
|
row.status = 'done'
|
|
row.error = undefined
|
|
// One-shot, cleared by name rather than by reference: `load()` rebuilds the row
|
|
// objects, so the one holding the flag when it fires may not be this one.
|
|
row.justSaved = true
|
|
setTimeout(() => {
|
|
const current = rows.find((r) => r.name === name)
|
|
if (current) current.justSaved = false
|
|
}, 1500)
|
|
} catch (e: any) {
|
|
row.status = 'failed'
|
|
row.error = e?.body ?? e?.message ?? String(e)
|
|
sendUserToast(`Could not run the migrations for ${name}: ${row.error}`, true)
|
|
// Rethrown, because this also runs as the wizard's last checklist step
|
|
// (`onFinishAlso`). Swallowing it there makes the wizard report a clean finish
|
|
// over a failed migration, and close — leaving the data table name taken and no
|
|
// way back to retry it.
|
|
throw e
|
|
} finally {
|
|
working = false
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Leaving a credential unfilled costs the project the parts that read it. Leaving a
|
|
* data table unconfigured costs it everything: the apps query tables that do not
|
|
* exist, so they fail on open rather than degrading. Only the second is worth
|
|
* stopping for, and the wizard is the only place that can still run the migration —
|
|
* nothing in the workspace knows the project shipped one.
|
|
*/
|
|
async function skip(): Promise<void> {
|
|
if (pendingTables.length > 0) {
|
|
// Escaped: `confirmationModal.ask` renders `children` through `createRawSnippet`,
|
|
// so this string is HTML, and the name is a `datatable_name` straight out of the
|
|
// hub export. A hub is not ours — `hub_base_url` is an instance setting and the
|
|
// wizard can be pointed at any of them — so a name carrying an event-bearing
|
|
// element would otherwise run script in this authenticated origin.
|
|
// One block per outcome, the way the footer alert does it. A single sentence over a
|
|
// mixed list has to be wrong about half of it: an `unknown` data table is set up —
|
|
// only its schema could not be read — so naming it under "not set up" tells the user
|
|
// to do something they have already done.
|
|
const missing = missingTables
|
|
const unverified = uncheckedTables
|
|
const listOf = (rs: Row[]) => rs.map((r) => escapeHtml(r.name)).join(', ')
|
|
const blocks: string[] = []
|
|
if (missing.length > 0) {
|
|
const one = missing.length === 1
|
|
blocks.push(
|
|
`The tables ${one ? 'the data table' : 'the data tables'} <b>${listOf(missing)}</b> ` +
|
|
`${one ? 'holds' : 'hold'} do not exist, and this project's apps and flows read ` +
|
|
`them. Every one of those fails as soon as it opens.<br /><br />` +
|
|
`Setting ${one ? 'it' : 'them'} up later from workspace settings creates the ` +
|
|
`connection but not the tables — only this step runs the project's migration.`
|
|
)
|
|
}
|
|
if (unverified.length > 0) {
|
|
const one = unverified.length === 1
|
|
blocks.push(
|
|
`${one ? 'The data table' : 'The data tables'} <b>${listOf(unverified)}</b> ` +
|
|
`${one ? 'is' : 'are'} set up, but ${one ? 'its' : 'their'} schema could not be ` +
|
|
`read, so whether this project's tables exist is unknown. Its apps and flows will ` +
|
|
`fail wherever they query a table that is missing.`
|
|
)
|
|
}
|
|
const confirmed = await confirmationModal.ask({
|
|
title: missing.length > 0 ? 'The project will not run' : 'This has not been verified',
|
|
confirmationText: 'Skip anyway',
|
|
type: missing.length > 0 ? 'danger' : 'info',
|
|
children: blocks.join('<br /><br />')
|
|
})
|
|
if (!confirmed) return
|
|
}
|
|
onSkip(outstanding)
|
|
}
|
|
|
|
/**
|
|
* After the wizard closes. The migrations already ran inside its checklist, via
|
|
* `onFinishAlso`, so this only re-reads what exists now — including the case where
|
|
* the wizard was cancelled, or made a table under a different name than the row
|
|
* asked for, which leaves the row outstanding rather than falsely done.
|
|
*/
|
|
async function afterWizard(): Promise<void> {
|
|
const name = wizardFor
|
|
wizardFor = undefined
|
|
try {
|
|
const tables = await WorkspaceService.listDataTables({ workspace })
|
|
configuredNames = tables.map((t) => ({ name: t.name, resourcePath: t.resource_path }))
|
|
const present = new Set(tables.map((t) => t.name))
|
|
const row = name ? rows.find((r) => r.name === name) : undefined
|
|
if (row && row.status !== 'done' && row.status !== 'failed' && !present.has(name!)) {
|
|
row.status = 'unconfigured'
|
|
}
|
|
} catch {
|
|
// Nothing to correct with; the row keeps whatever the run left it saying.
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<div class="flex flex-col gap-4 {fillHeight ? 'flex-1' : ''}">
|
|
<div>
|
|
{#if showHeading}
|
|
<h2 class="text-sm font-semibold text-emphasis">Finish setting up</h2>
|
|
{/if}
|
|
<!-- Reads as what the user gets out of it, not as what the import failed to do:
|
|
the step is skippable, so it has to say why finishing is worth their time. -->
|
|
<p class="mt-0.5 text-xs text-secondary">
|
|
Your project is imported. For its apps and flows to actually run, they need a place to store
|
|
data and credentials for the services they use — the import can't supply those for you.
|
|
</p>
|
|
</div>
|
|
|
|
{#if loading}
|
|
<div class="flex items-center gap-2 text-xs text-secondary">
|
|
<Loader2 size={14} class="animate-spin" /> Checking what this project needs…
|
|
</div>
|
|
{:else if loadError}
|
|
<Alert type="warning" title="Could not check the project's data tables" size="xs">
|
|
{loadError}. You can finish and configure them later in Workspace settings → Data tables.
|
|
</Alert>
|
|
{:else}
|
|
{#if rows.length > 0}
|
|
<!-- Named and explained: the row underneath is a table called `main`, which
|
|
says nothing to someone meeting the concept for the first time. -->
|
|
<div class="flex flex-col gap-1">
|
|
<span class="text-xs font-semibold text-emphasis">
|
|
Data table{rows.length === 1 ? '' : 's'} to set up ({rows.length})
|
|
</span>
|
|
<p class="text-xs font-normal text-secondary">
|
|
Where apps and flows keep the data they read and write.
|
|
</p>
|
|
</div>
|
|
{/if}
|
|
<ul class="flex flex-col gap-1.5">
|
|
{#each rows as row (row.name)}
|
|
{@const sql = row.migrations
|
|
.map((m) => m.sql)
|
|
.filter(Boolean)
|
|
.join('\n\n')}
|
|
{@const hasTable = configuredNames.some((c) => c.name === row.name)}
|
|
<ImportSetupRow flash={row.justSaved}>
|
|
{#snippet icon()}
|
|
{#if row.status === 'done'}
|
|
<Check size={20} class="text-emerald-600" />
|
|
{:else if row.status === 'running'}
|
|
<Loader2 size={20} class="animate-spin text-accent" />
|
|
{:else if row.status === 'failed'}
|
|
<X size={20} class="text-red-500" />
|
|
{:else if row.status === 'unknown'}
|
|
<TriangleAlert size={20} class="text-yellow-600" />
|
|
{:else}
|
|
<Database size={20} class="text-secondary" />
|
|
{/if}
|
|
{/snippet}
|
|
{#snippet title()}
|
|
<span class="min-w-0 truncate font-mono text-emphasis">{row.name}</span>
|
|
{/snippet}
|
|
{#snippet detail()}
|
|
<span class="truncate text-secondary">
|
|
{#if row.status === 'done'}
|
|
{row.migrations.length} migration{row.migrations.length === 1 ? '' : 's'} run
|
|
{:else if row.status === 'running'}
|
|
running migrations…
|
|
{:else if row.status === 'failed'}
|
|
<span class="text-red-500">{row.error}</span>
|
|
{:else if row.status === 'unknown'}
|
|
set up, but its tables could not be read — the database may be unreachable
|
|
{:else}
|
|
not configured yet
|
|
{/if}
|
|
</span>
|
|
{/snippet}
|
|
{#snippet extra()}
|
|
<!-- The SQL, before anything runs it. Step 3 reviews the migrations it can
|
|
run there; the ones deferred to here were never shown, and "Set up"
|
|
executes them against whatever database the wizard is pointed at —
|
|
which can be one that already holds unrelated objects.
|
|
|
|
On an `unknown` row nothing here will run — its only action re-reads —
|
|
so the summary says what the SQL is rather than promising to run it. -->
|
|
{#if sql && row.status !== 'done'}
|
|
<details class="mt-1.5">
|
|
<summary class="cursor-pointer text-2xs text-secondary hover:text-primary">
|
|
{row.status === 'unknown'
|
|
? 'Show the SQL this project ships'
|
|
: 'Show the SQL this will run'}
|
|
</summary>
|
|
<pre
|
|
class="mt-1.5 max-h-52 overflow-auto whitespace-pre-wrap rounded border border-border-light bg-surface-secondary p-2 font-mono text-2xs text-secondary"
|
|
>{sql}</pre
|
|
>
|
|
</details>
|
|
{/if}
|
|
{/snippet}
|
|
{#snippet action()}
|
|
<!-- The wizard owns creating a data table: picking or provisioning the
|
|
database, writing the config, and reporting the connection. This step
|
|
only says which name it needs and runs the migrations afterwards. -->
|
|
{#if row.status === 'unknown'}
|
|
<!-- Never runs the SQL. `unknown` covers two different unknowns — the schema
|
|
could not be read, or the SQL names no table this can resolve — and the
|
|
second is arbitrary published SQL that may carry a non-idempotent INSERT
|
|
or ALTER. Applying it a second time on the chance it never applied once
|
|
is a worse outcome than saying so. Reading again is free and settles the
|
|
case that actually recovers: a database that was briefly unreachable. -->
|
|
<Button
|
|
variant="subtle"
|
|
unifiedSize="sm"
|
|
disabled={working || loading}
|
|
onClick={() => void load()}
|
|
>
|
|
Check again
|
|
</Button>
|
|
{:else if hasTable && row.status !== 'done' && row.status !== 'running'}
|
|
<!-- The data table is there and its tables are not, so the thing left
|
|
to do is run the migrations. Reopening the wizard would ask for a
|
|
name it now holds itself, which it rejects as taken — leaving no
|
|
way back to the step that actually failed.
|
|
|
|
Keyed on the data table existing rather than on the row saying
|
|
`failed`, because a reload rebuilds every row from scratch: the
|
|
same situation then reads as `unconfigured`, with nothing left in
|
|
memory to say a migration was ever attempted. -->
|
|
<Button
|
|
variant="accent"
|
|
unifiedSize="sm"
|
|
disabled={working}
|
|
onClick={() => void runMigrationsFor(row.name).catch(() => {})}
|
|
>
|
|
{row.status === 'failed' ? 'Run migrations again' : 'Run migrations'}
|
|
</Button>
|
|
{:else}
|
|
<!-- Everything the branches above do not claim: a configured row, one whose
|
|
migrations are running, and one whose data table does not exist yet. -->
|
|
<Button
|
|
variant={row.status === 'done' ? 'subtle' : 'accent'}
|
|
unifiedSize="sm"
|
|
disabled={working || opening}
|
|
onClick={() => openWizard(row.name)}
|
|
>
|
|
{#if row.status === 'done'}
|
|
Configured
|
|
{:else if row.status === 'running'}
|
|
Setting up…
|
|
{:else}
|
|
Set up
|
|
{/if}
|
|
</Button>
|
|
{/if}
|
|
{/snippet}
|
|
</ImportSetupRow>
|
|
{/each}
|
|
</ul>
|
|
|
|
{#if blanks.length > 0}
|
|
<div class="flex flex-col gap-2">
|
|
<span class="text-xs font-semibold text-emphasis"
|
|
>Credentials to fill ({blanks.length})</span
|
|
>
|
|
<ul class="flex flex-col gap-1.5">
|
|
{#each blanks as b (b.path)}
|
|
{@const blocked = !!b.occupiedBy || !!b.unreadable}
|
|
{@const canConnect = !b.done && !blocked && canConnectType(b.resourceType)}
|
|
<!-- Laid out like the resource type rows in the Add-a-resource drawer: the
|
|
integration's own icon, its product name, and the raw identifier demoted
|
|
beside it. The path only matters when two resources share a type, so it
|
|
stops being the thing the eye lands on. -->
|
|
<ImportSetupRow flash={b.justSaved}>
|
|
{#snippet icon()}
|
|
{#if b.done}
|
|
<Check size={20} class="text-emerald-600" />
|
|
{:else if blocked}
|
|
<TriangleAlert size={20} class="text-yellow-600" />
|
|
{:else}
|
|
<IconedResourceType name={b.resourceType} silent width="20px" height="20px" />
|
|
{/if}
|
|
{/snippet}
|
|
{#snippet title()}
|
|
<div class="flex min-w-0 flex-row items-baseline gap-2">
|
|
<span class="min-w-0 truncate text-emphasis">
|
|
{resourceTypeDisplayName(b.resourceType)}
|
|
</span>
|
|
<span class="min-w-0 truncate font-mono text-2xs font-normal text-hint">
|
|
{b.path}
|
|
</span>
|
|
</div>
|
|
{/snippet}
|
|
{#snippet detail()}
|
|
{#if b.reusedFrom}
|
|
<span class="truncate text-secondary">
|
|
now uses <span class="font-mono">{b.reusedFrom}</span>
|
|
</span>
|
|
{#if b.stubKept}
|
|
<!-- Not a footnote: some items were not moved and still read this path,
|
|
so the empty resource on it is a credential someone has to fill in. -->
|
|
<span class="truncate text-hint">
|
|
some items still read <span class="font-mono">{b.path}</span> — fill it in too
|
|
</span>
|
|
{/if}
|
|
{:else if b.occupiedBy}
|
|
<span class="truncate text-secondary">
|
|
a {resourceTypeDisplayName(b.occupiedBy)} resource already holds this path — the
|
|
project did not get this one
|
|
</span>
|
|
{:else if b.unreadable}
|
|
<span class="truncate text-secondary">
|
|
could not be read, so whether it needs filling is unknown
|
|
</span>
|
|
{:else if !b.done && b.missing.length > 0}
|
|
<span class="truncate text-secondary">
|
|
Missing {b.missing.join(', ')}
|
|
</span>
|
|
{/if}
|
|
{/snippet}
|
|
{#snippet action()}
|
|
<!-- Connect where the instance has a client for this type: asking for an
|
|
OAuth resource by hand means pasting an access token that dies within
|
|
the hour, since only a token Windmill obtained itself gets refreshed. -->
|
|
{#if blocked}
|
|
<!-- No action: every one here writes to the path, and this code does not
|
|
know what is at it — either something of another type, or a read that
|
|
failed. Opening the editor would invite exactly the overwrite these
|
|
rows exist to prevent. -->
|
|
<span class="whitespace-nowrap text-2xs text-hint">
|
|
{b.occupiedBy ? 'Resolve in the workspace' : 'Check the workspace'}
|
|
</span>
|
|
{:else if b.reusedFrom && !b.stubKept}
|
|
<!-- No action either: this row is done with, whether its own path was
|
|
deleted with the retarget or filled in afterwards. -->
|
|
<span class="whitespace-nowrap text-2xs text-hint">Reused</span>
|
|
{:else}
|
|
<Button
|
|
variant={b.done ? 'subtle' : 'accent'}
|
|
unifiedSize="sm"
|
|
disabled={working}
|
|
onClick={() => startFilling(b)}
|
|
>
|
|
{b.done ? 'Saved' : canConnect ? 'Connect' : 'Fill in'}
|
|
</Button>
|
|
{/if}
|
|
{/snippet}
|
|
</ImportSetupRow>
|
|
{/each}
|
|
</ul>
|
|
</div>
|
|
{/if}
|
|
|
|
<!-- Two things to say, and which one depends on what is left. A missing credential
|
|
degrades the project; a missing data table ends it, because every app queries tables
|
|
that do not exist — but that case is not stated here: Skip already asks to confirm
|
|
it, in the words the user is about to act on. Nor is it offered as skippable, which
|
|
would be telling the user something that is not true. -->
|
|
{#if outstanding === 0}
|
|
<Alert type="success" title="You're all set" size="xs">
|
|
Everything this project needs is configured. Finish, and it is ready to run.
|
|
</Alert>
|
|
{:else if pendingTables.length === 0}
|
|
<Alert type="info" title="You can skip this" size="xs" collapsible>
|
|
The project's apps and flows will fail wherever they read a credential that is still
|
|
missing. Everything else it imported works either way, and you can fill these in from the
|
|
workspace at any time.
|
|
</Alert>
|
|
{/if}
|
|
{/if}
|
|
|
|
<div
|
|
class="mt-2 flex items-center justify-between {fillHeight
|
|
? 'sticky bottom-0 mt-auto bg-surface pb-1 pt-3'
|
|
: ''}"
|
|
>
|
|
{#if onBack}
|
|
<Button
|
|
variant="subtle"
|
|
unifiedSize="sm"
|
|
startIcon={{ icon: ArrowLeft }}
|
|
disabled={working}
|
|
onClick={onBack}
|
|
>
|
|
Back
|
|
</Button>
|
|
{:else}
|
|
<span></span>
|
|
{/if}
|
|
<div class="flex items-center gap-2">
|
|
<!-- Every row carries its own action, so the footer only offers the way out —
|
|
twice, because leaving work undone is a different decision from having
|
|
finished it. Finish stays disabled until nothing is outstanding, and Skip
|
|
is the subtle escape beside it. A load that failed cannot tell what is
|
|
outstanding, so it offers Finish rather than blocking on an unknown — but a
|
|
load still *running* has the same empty lists as a step with nothing to do,
|
|
so Finish waits for it rather than reading that emptiness as "all done". -->
|
|
{#if outstanding > 0 && !loading && !loadError}
|
|
<Button variant="subtle" unifiedSize="sm" disabled={working} onClick={skip}>
|
|
Skip for now
|
|
</Button>
|
|
{/if}
|
|
<Button
|
|
variant="accent"
|
|
unifiedSize="sm"
|
|
disabled={working || loading || (outstanding > 0 && !loadError)}
|
|
onClick={() => onFinish(!loadError)}
|
|
>
|
|
Finish setup →
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{#if wizardOpen || wizardFor}
|
|
<AddDataTableWizard
|
|
bind:this={wizard}
|
|
bind:opened={wizardOpen}
|
|
initialName={wizardFor}
|
|
modalTarget="body"
|
|
{workspace}
|
|
finishAlso="run migrations"
|
|
onFinishAlso={() => runMigrationsFor(retryTarget ?? '')}
|
|
existingNames={configuredNames.map((c) => c.name)}
|
|
existingDataTables={configuredNames}
|
|
onDone={() => void afterWizard()}
|
|
{customInstanceDbs}
|
|
externalInstanceDbs={managed.externalDbs}
|
|
externalInstanceAvailable={managed.externalAvailable}
|
|
instanceAvailable={managed.instanceAvailable}
|
|
refreshManagedInstances={managed.refresh}
|
|
{confirmationModal}
|
|
{defaultInstanceDbName}
|
|
/>
|
|
{/if}
|
|
<!-- Portalled to the body, not left in place: this step renders inside the wizard page's
|
|
CenteredModal, which is its own stacking context, while the data table wizard it shares
|
|
this handle with portals to the body. In place, the confirmation's z-index is capped by
|
|
that context and the wizard paints over it — leaving its backdrop swallowing every click
|
|
with nothing visible to answer. -->
|
|
<Portal>
|
|
<ConfirmationModal {...confirmationModal.props} />
|
|
</Portal>
|
|
|
|
<!-- The destination is not the workspace the app is in until the run switches to it,
|
|
so the editor is told which one explicitly.
|
|
|
|
Saving re-reads only the resources, never `load()`: a credential cannot change which
|
|
data tables the project ships or which ones the workspace has, and `load()` raises
|
|
`loading`, which replaces both lists with the spinner — so every save looked like the
|
|
whole step had reloaded. -->
|
|
<ResourceEditorDrawer
|
|
bind:this={resourceEditor}
|
|
{workspace}
|
|
onSaved={() => void refreshBlanks()}
|
|
onRestored={() => void refreshBlanks()}
|
|
/>
|
|
|
|
<!-- `on:refresh` fires once the connection has been written into the stub — the same moment
|
|
a save is — so the rows settle the same way either route was taken. -->
|
|
<AppConnectDrawer bind:this={appConnect} {workspace} on:refresh={() => void refreshBlanks()} />
|
|
|
|
<!-- What "Fill in" opens when the workspace already has a resource of the row's type.
|
|
Portalled to the body for the reason the confirmation above is: this step renders inside
|
|
the wizard page's CenteredModal, which is its own stacking context. -->
|
|
<Modal2
|
|
title={choosing ? `Set up ${resourceTypeDisplayName(choosing.resourceType)}` : ''}
|
|
target="body"
|
|
fixedWidth="xs"
|
|
fixedHeight="adaptive"
|
|
formStyling
|
|
closeOnOutsideClick={!reusing}
|
|
bind:isOpen={
|
|
() => choosing !== undefined,
|
|
(v) => {
|
|
if (!v && !reusing) choosing = undefined
|
|
}
|
|
}
|
|
>
|
|
{#if choosing}
|
|
{@const forRow = choosing}
|
|
{@const existing = candidates[forRow.resourceType] ?? []}
|
|
<div class="flex w-full flex-col gap-4 text-xs">
|
|
<p class="text-secondary">
|
|
This workspace already has {existing.length}
|
|
{resourceTypeDisplayName(forRow.resourceType)}
|
|
{existing.length === 1 ? 'resource' : 'resources'}. Use one and this project's apps, flows
|
|
and triggers are pointed at it.
|
|
</p>
|
|
<Select
|
|
bind:value={chosenPath}
|
|
items={existing.map((p) => ({ value: p, label: p }))}
|
|
placeholder="Pick a resource"
|
|
disabled={reusing}
|
|
clearable
|
|
class="w-full"
|
|
/>
|
|
<div class="flex items-center justify-between gap-2">
|
|
<Button variant="subtle" unifiedSize="sm" disabled={reusing} onClick={fillNewInstead}>
|
|
{canConnectType(forRow.resourceType) ? 'Connect a new one' : 'Fill in a new one'}
|
|
</Button>
|
|
<Button
|
|
variant="accent"
|
|
unifiedSize="sm"
|
|
disabled={!chosenPath || reusing}
|
|
onClick={() => void reuseChosen()}
|
|
>
|
|
{reusing ? 'Pointing the project at it…' : 'Use this resource'}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
{/if}
|
|
</Modal2>
|