feat(admin-ui): /admin/tables per-connector tabs + Keboola materialized parity + form cleanup + Manage access deep link
Replaces the single mixed Jinja-branched form at /admin/tables with a per-connector tab interface and brings Keboola to capability parity with BigQuery. Tab structure: - BigQuery tab: Register modal with two-question radio model (Q1 Live | Synced × Q2 Whole | Custom SQL), Discover datasets / List tables / Use-table-as-base autocomplete buttons, table-vs-view auto-detection hint, per-tab listing filter - Keboola tab: same two-question radio (Q2 only — no Live mode for Keboola), Custom SQL textarea against kbc."bucket"."table" for materialized rows - Jira tab: read-only listing (Jira is webhook-driven; no Register form) - Active tab persists in window.location.hash so refresh keeps the operator in place Form cleanup (within tabs): - Drops the misleading 'Sync Strategy' dropdown — runtime never read it (only profiler.is_partitioned() consumes the value for parquet-layout detection); kept in DB for back-compat (Pydantic deprecated) - Adds Sync Schedule input to Keboola Register/Edit (was missing — scheduler honored per-table cron via is_table_due() for every source but the Keboola UI had no surface) - Hides Primary Key under <details>Advanced with clarifying hint that it's catalog-metadata only (Agnes does not perform upsert/dedup; every sync is a full overwrite) - Drops the Strategy column from the registry listing (every Keboola row defaulted to full_refresh after Strategy was hidden — column was noise) - Removes the legacy out-of-tab #registerModal + the legacy global Discovery panel; each tab now owns its own header + Register button + listing div Edit modal: - BigQuery Edit modal physically relocated into <section id="tab-content-bigquery"> (mirrors Phase E Register placement) - Keboola Edit modal mirrors Register (same Q2 radio, Discover/List buttons via parameterized helpers) - openEditModal(table) dispatches by source_type to the right modal — fixes a quiet bug where Phase F's openEditKeboolaModal was never wired up and Keboola edits silently used the legacy modal Per-row Manage access deep link: - Each row in the per-tab listing has a lock-icon button between Edit and Delete that navigates to /admin/access#table:<table_id> - admin_access.html bootstrap reads window.location.hash and pre-fills the resource filter, mirroring the existing ?group=<id> deep-link pattern Tests: - test_admin_tables_tab_ui.py — tab nav, hash persistence, register-button-per-tab, listing partition by source_type, Manage access deep link - test_admin_tables_ui_materialized.py — two-question radio (BQ + Keboola), Discover/List/Use-as-base buttons, Edit modal parity, Jira read-only
This commit is contained in:
ZdenekSrotyr
parent
85d3810535
commit
c63f54d643
4 changed files with 2158 additions and 509 deletions
|
|
@ -806,6 +806,9 @@ document.getElementById("resources-filter").addEventListener("input", e => {
|
|||
});
|
||||
|
||||
// Pre-select a group via ?group=<id> deep-link from /admin/groups/{id}.
|
||||
// Pre-filter to a table via #table:<id> deep-link from /admin/tables's
|
||||
// per-row Manage access button — drops the table_id into the resource
|
||||
// filter so the operator sees just that row once they pick a group.
|
||||
async function bootstrap() {
|
||||
await loadOverview();
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
|
|
@ -813,6 +816,22 @@ async function bootstrap() {
|
|||
if (target && state.groups.some(g => g.id === target)) {
|
||||
selectGroup(target);
|
||||
}
|
||||
// Hash-based deep link, e.g. #table:in.c-sales.orders → pre-fill the
|
||||
// resource filter with the table_id. The filter is name-substring based
|
||||
// and tables come through with the table_id as their `name`, so this
|
||||
// narrows the visible items to just the clicked row across all groups.
|
||||
const hash = window.location.hash || "";
|
||||
if (hash.startsWith("#table:")) {
|
||||
const tableId = decodeURIComponent(hash.slice("#table:".length));
|
||||
if (tableId) {
|
||||
const filterEl = document.getElementById("resources-filter");
|
||||
if (filterEl) {
|
||||
filterEl.value = tableId;
|
||||
state.filter = tableId;
|
||||
renderResources();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
bootstrap();
|
||||
</script>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
178
tests/test_admin_tables_tab_ui.py
Normal file
178
tests/test_admin_tables_tab_ui.py
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
"""UI tests for the per-connector tab layout."""
|
||||
import pytest
|
||||
|
||||
|
||||
def _auth(token):
|
||||
return {"Authorization": f"Bearer {token}"}
|
||||
|
||||
|
||||
def test_admin_tables_renders_tab_nav(seeded_app):
|
||||
"""Page has tab nav with at least the source types configured for
|
||||
the instance plus Jira (always shown when any Jira rows exist)."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
assert r.status_code == 200
|
||||
html = r.text
|
||||
assert 'role="tablist"' in html or 'class="tab-nav"' in html
|
||||
assert 'data-tab="bigquery"' in html or 'id="tab-bigquery"' in html
|
||||
assert 'data-tab="keboola"' in html or 'id="tab-keboola"' in html
|
||||
|
||||
|
||||
def test_admin_tables_active_tab_matches_instance_type(seeded_app, monkeypatch):
|
||||
"""When data_source.type='bigquery', the BigQuery tab is the
|
||||
initially-active one. Operator can still switch to Keboola tab if
|
||||
they want to register a secondary source."""
|
||||
fake_cfg = {"data_source": {"type": "bigquery", "bigquery": {"project": "p"}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg, raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
try:
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
# The BQ tab content is the visible one initially.
|
||||
# Either a class="active" on the BQ tab button, or aria-selected="true".
|
||||
assert (
|
||||
'data-tab="bigquery" class="tab active"' in html
|
||||
or 'data-tab="bigquery" aria-selected="true"' in html
|
||||
)
|
||||
finally:
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_admin_tables_each_tab_has_register_button(seeded_app):
|
||||
"""Each writable source tab has its own Register button. Jira is
|
||||
read-only (no Register)."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
# Each Register button is scoped to its tab — id distinguishes.
|
||||
# We check presence of the registration trigger elements.
|
||||
assert 'id="bqRegisterBtn"' in html or 'data-register-source="bigquery"' in html
|
||||
assert 'id="kbRegisterBtn"' in html or 'data-register-source="keboola"' in html
|
||||
# No Jira register button (Jira is webhook-driven).
|
||||
assert 'data-register-source="jira"' not in html
|
||||
|
||||
|
||||
def test_admin_tables_listing_per_tab(seeded_app):
|
||||
"""The registry table is rendered per tab — each tab has its own
|
||||
<tbody> filtered by source_type. Listing JS reads tables from the
|
||||
catalog API and routes each row into the matching tab's <tbody>."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
assert 'id="bqTableListing"' in html
|
||||
assert 'id="kbTableListing"' in html
|
||||
assert 'id="jiraTableListing"' in html
|
||||
|
||||
|
||||
def test_jira_tab_is_read_only(seeded_app):
|
||||
"""Phase G: Jira tables are populated by webhooks, not by admin
|
||||
registration. Tab shows the listing + a hint pointing to docs;
|
||||
no Register button."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
jira_tab = html[html.index('id="tab-content-jira"'):]
|
||||
jira_tab = jira_tab[:jira_tab.index('</section>')]
|
||||
# No Register button.
|
||||
assert 'data-register-source="jira"' not in jira_tab
|
||||
assert 'jiraRegisterBtn' not in jira_tab
|
||||
# Hint pointing to docs (webhook-driven model).
|
||||
assert "webhook" in jira_tab.lower()
|
||||
# Listing div present.
|
||||
assert 'id="jiraTableListing"' in jira_tab
|
||||
|
||||
|
||||
def test_admin_tables_tab_persists_in_url_hash(seeded_app):
|
||||
"""Tab switching updates window.location.hash so refresh keeps the
|
||||
operator on the right tab. Verify the JS hooks for it are present."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
assert "location.hash" in html or "history.replaceState" in html
|
||||
# And initial-tab pickup from hash on load.
|
||||
assert "window.location.hash" in html or "getActiveTabFromHash" in html
|
||||
|
||||
|
||||
def test_listing_partitions_rows_by_source_type(seeded_app):
|
||||
"""When the operator has registered tables across all three sources,
|
||||
each tab's listing shows only the rows matching its source_type.
|
||||
JS-driven so we test by inspecting the JS branching logic indirectly:
|
||||
the renderer function takes a source filter and emits rows accordingly."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
auth = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
c.post("/api/admin/register-table", headers=auth, json={
|
||||
"name": "kb_table", "source_type": "keboola", "bucket": "in.c-x",
|
||||
"source_table": "y", "query_mode": "local",
|
||||
})
|
||||
c.post("/api/admin/register-table", headers=auth, json={
|
||||
"name": "bq_table", "source_type": "bigquery",
|
||||
"query_mode": "materialized", "source_query": "SELECT 1",
|
||||
})
|
||||
|
||||
r = c.get("/admin/tables", headers=auth)
|
||||
html = r.text
|
||||
# The renderer function is dispatched per tab. The test verifies the
|
||||
# JS code paths exist (we don't run JS in tests, just confirm the
|
||||
# template provides the wiring).
|
||||
assert "renderRegistryListing" in html or "loadRegistry" in html
|
||||
# Each tab listing div is the renderer target.
|
||||
assert "document.getElementById('bqTableListing')" in html
|
||||
assert "document.getElementById('kbTableListing')" in html
|
||||
assert "document.getElementById('jiraTableListing')" in html
|
||||
|
||||
|
||||
def test_registry_listing_renders_manage_access_button(seeded_app):
|
||||
"""Phase O: each row in the per-tab listing has a Manage access button
|
||||
that links to /admin/access scoped to the table_id."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
auth = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
# Register a table so the listing has at least one row to render.
|
||||
c.post(
|
||||
"/api/admin/register-table",
|
||||
headers=auth,
|
||||
json={
|
||||
"name": "test_orders",
|
||||
"source_type": "keboola",
|
||||
"bucket": "in.c-sales",
|
||||
"source_table": "orders",
|
||||
"query_mode": "local",
|
||||
},
|
||||
)
|
||||
|
||||
r = c.get("/admin/tables", headers=auth)
|
||||
body = r.text
|
||||
# The manageAccess() helper exists in the JS.
|
||||
assert "function manageAccess(" in body or "manageAccess =" in body
|
||||
# It targets the access page (the renderer ships the call site).
|
||||
assert "/admin/access" in body
|
||||
# Renderer emits the per-row Manage access button.
|
||||
assert 'title="Manage access"' in body
|
||||
assert "manageAccess(" in body
|
||||
|
||||
|
||||
def test_admin_access_supports_deep_link_for_table(seeded_app):
|
||||
"""Phase O: /admin/access page reads a deep link from the URL on load
|
||||
so /admin/tables's per-row Manage access button lands the operator
|
||||
on a pre-filtered view of the picked table."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/access", headers={"Authorization": f"Bearer {token}"})
|
||||
body = r.text
|
||||
# The page reads window.location.hash on load and dispatches by prefix.
|
||||
assert "location.hash" in body and "table:" in body, \
|
||||
"/admin/access must read the deep-link from URL on load"
|
||||
371
tests/test_admin_tables_ui_materialized.py
Normal file
371
tests/test_admin_tables_ui_materialized.py
Normal file
|
|
@ -0,0 +1,371 @@
|
|||
"""`/admin/tables` register modal exposes the BQ Type selector + Custom SQL.
|
||||
|
||||
The backend supports `query_mode='materialized'` since v0.25.0. The Jinja
|
||||
template at `app/web/templates/admin_tables.html` exposes it via an
|
||||
operator-facing **Type** selector (Table / View / Custom SQL Query) that
|
||||
maps to query_mode in the payload (Table+View → remote, Query → materialized).
|
||||
|
||||
Structural-only test (no headless browser): loads the template through the
|
||||
running app and asserts the expected element ids + attributes are present
|
||||
in the rendered HTML for a `data_source_type='bigquery'` deployment.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
|
||||
def _auth(token):
|
||||
return {"Authorization": f"Bearer {token}"}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def bq_instance(monkeypatch):
|
||||
"""Force `data_source.type='bigquery'` so /admin/tables renders the BQ
|
||||
branch of the register modal."""
|
||||
fake_cfg = {
|
||||
"data_source": {
|
||||
"type": "bigquery",
|
||||
"bigquery": {"project": "my-test-project", "location": "us"},
|
||||
},
|
||||
}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg,
|
||||
raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
yield fake_cfg
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_admin_tables_renders_two_question_radio_form(seeded_app, bq_instance):
|
||||
"""Q1 = how should analysts access this data? (live / synced).
|
||||
Q2 = (only when synced) what to sync? (whole / custom).
|
||||
Replaces the earlier flat 4-option dropdown that mixed source-kind +
|
||||
distribution-mode into one selector — both UX reviewers (info-arch +
|
||||
analyst persona) flagged the conflation as the core confusion."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
assert r.status_code == 200, r.text
|
||||
html = r.text
|
||||
|
||||
# Q1 radio group.
|
||||
assert 'name="bqAccessMode"' in html
|
||||
assert 'value="live"' in html
|
||||
assert 'value="synced"' in html
|
||||
assert "onBqAccessModeChange" in html
|
||||
|
||||
# Q2 radio group (conditional on Q1).
|
||||
assert 'name="bqSyncMode"' in html
|
||||
assert 'value="whole"' in html
|
||||
assert 'value="custom"' in html
|
||||
assert "onBqSyncModeChange" in html
|
||||
|
||||
# Custom-SQL textarea + "Use table as base" prefill button.
|
||||
assert 'id="bqSourceQuery"' in html
|
||||
assert "prefillFromTable" in html
|
||||
assert "bq-source-custom" in html
|
||||
|
||||
# Table/dataset inputs reused across live + synced/whole.
|
||||
assert 'id="bqDataset"' in html
|
||||
assert 'id="bqSourceTable"' in html
|
||||
assert "bq-source-table" in html
|
||||
assert "bq-access-synced" in html
|
||||
|
||||
# Discover + List tables buttons.
|
||||
assert "discoverBqDatasets" in html
|
||||
assert "discoverBqTables" in html
|
||||
|
||||
# No leftover jargon labels from the prior Type-selector iterations.
|
||||
assert "Direct query" not in html
|
||||
assert "Sync to parquet" not in html
|
||||
|
||||
# Vendor-agnostic — no internal issue refs in operator-facing UI text.
|
||||
assert "Milestone 2" not in html
|
||||
assert "issue #108" not in html
|
||||
|
||||
# Phase E: form fields are inside the BQ tab content area.
|
||||
bq_tab_content = html[html.index('id="tab-content-bigquery"'):]
|
||||
bq_tab_end = bq_tab_content.index('</section>')
|
||||
bq_section = bq_tab_content[:bq_tab_end]
|
||||
assert 'name="bqAccessMode"' in bq_section
|
||||
assert 'id="bqDataset"' in bq_section
|
||||
assert 'id="bqSourceQuery"' in bq_section
|
||||
|
||||
|
||||
def test_edit_modal_has_bq_parity_fields(seeded_app, bq_instance):
|
||||
"""Edit modal mirrors Register's two-question radio model (Q1 access
|
||||
mode: live/synced; Q2 sync mode: whole/custom). Pre-fix Edit had only
|
||||
sync_strategy+primary_key+description+folder — missing all BQ-specific
|
||||
edit surface. Operator now can flip access mode, change dataset/table,
|
||||
rewrite SQL, and tweak the schedule without dropping & re-adding."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
assert r.status_code == 200, r.text
|
||||
html = r.text
|
||||
|
||||
# Edit Q1 + Q2 radios.
|
||||
assert 'name="editBqAccessMode"' in html
|
||||
assert 'name="editBqSyncMode"' in html
|
||||
assert "onEditBqAccessModeChange" in html
|
||||
assert "onEditBqSyncModeChange" in html
|
||||
|
||||
# BQ-specific edit fields.
|
||||
assert 'id="editBqDataset"' in html
|
||||
assert 'id="editBqSourceTable"' in html
|
||||
assert 'id="editBqSourceQuery"' in html
|
||||
assert 'id="editBqSyncSchedule"' in html
|
||||
|
||||
# Visibility classes for adaptive show/hide on access/sync mode switch.
|
||||
assert "bq-edit-access-synced" in html
|
||||
assert "bq-edit-source-table" in html
|
||||
assert "bq-edit-source-custom" in html
|
||||
|
||||
# Mode-switch warning surface (filled by JS when operator flips access
|
||||
# mode mid-edit).
|
||||
assert 'id="editBqModeWarning"' in html
|
||||
|
||||
# Source-type badge so the JS branch knows whether to render BQ vs
|
||||
# Keboola fields without a second round-trip.
|
||||
assert 'id="editSourceTypeBadge"' in html
|
||||
|
||||
# No leftover Type-selector remnants.
|
||||
assert 'id="editBqEntityType"' not in html
|
||||
assert "onEditBqTypeChange" not in html
|
||||
|
||||
# Edit modal has the same Discover / List tables / Use-as-base buttons
|
||||
# as Register so the operator can re-pick the source from autocomplete
|
||||
# without dropping the row.
|
||||
assert "discoverBqDatasets('editBqDatasetList')" in html
|
||||
assert "discoverBqTables('editBqDataset', 'editBqTableList')" in html
|
||||
assert "prefillFromTable('editBqSourceQuery')" in html
|
||||
assert 'id="editBqDatasetList"' in html
|
||||
assert 'id="editBqTableList"' in html
|
||||
assert 'list="editBqDatasetList"' in html
|
||||
assert 'list="editBqTableList"' in html
|
||||
|
||||
|
||||
def test_keboola_register_form_has_two_question_radio(seeded_app, monkeypatch):
|
||||
"""Phase F: Keboola tab Register form mirrors BQ's two-question
|
||||
radio model, but Q1 (access mode) is forced to 'synced' (no Live
|
||||
mode for Keboola), so visually only Q2 (sync mode = whole | custom)
|
||||
is exposed.
|
||||
|
||||
Q2.whole → query_mode='materialized' with auto SELECT * FROM kbc.bucket.table
|
||||
Q2.custom → query_mode='materialized' with admin SELECT
|
||||
Both create materialized rows; the legacy 'local' mode is no longer
|
||||
user-selectable (it would be exactly equivalent to whole)."""
|
||||
fake_cfg = {"data_source": {"type": "keboola", "keboola": {}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg, raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
try:
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
kb_tab = html[html.index('id="tab-content-keboola"'):]
|
||||
kb_tab = kb_tab[:kb_tab.index('</section>')]
|
||||
|
||||
# Q2 radio — Whole vs Custom.
|
||||
assert 'name="kbSyncMode"' in kb_tab
|
||||
assert 'value="whole"' in kb_tab
|
||||
assert 'value="custom"' in kb_tab
|
||||
|
||||
# Bucket + source-table inputs reused for whole mode.
|
||||
assert 'id="kbBucket"' in kb_tab
|
||||
assert 'id="kbSourceTable"' in kb_tab
|
||||
# Custom-SQL textarea + Use-table-as-base prefill button.
|
||||
assert 'id="kbSourceQuery"' in kb_tab
|
||||
assert 'kbPrefillFromTable' in html or "prefillFromKeboolaTable('kbSourceQuery')" in html
|
||||
|
||||
# Sync Schedule input — was missing from old Keboola form.
|
||||
assert 'id="kbSyncSchedule"' in kb_tab
|
||||
|
||||
# Sync Strategy dropdown — gone from new Keboola form.
|
||||
assert 'id="kbStrategy"' not in kb_tab
|
||||
|
||||
# Primary Key — under <details>Advanced.
|
||||
assert 'id="kbPrimaryKey"' in kb_tab
|
||||
assert "<details" in kb_tab
|
||||
assert ">Advanced" in kb_tab
|
||||
|
||||
# Discover datasets / List tables buttons.
|
||||
assert 'kbDiscoverBuckets' in html or "discoverKeboolaBuckets(" in html
|
||||
assert 'kbListTables' in html or "discoverKeboolaTables(" in html
|
||||
finally:
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_keboola_register_payload_maps_to_materialized(seeded_app, monkeypatch):
|
||||
"""The form's whole-table mode posts query_mode='materialized' with
|
||||
a synthetic SELECT * SQL — same pattern as BQ Synced/Whole."""
|
||||
fake_cfg = {"data_source": {"type": "keboola", "keboola": {}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg, raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
try:
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
auth = {"Authorization": f"Bearer {token}"}
|
||||
r = c.post(
|
||||
"/api/admin/register-table",
|
||||
headers=auth,
|
||||
json={
|
||||
"name": "orders",
|
||||
"source_type": "keboola",
|
||||
"query_mode": "materialized",
|
||||
"source_query": 'SELECT * FROM kbc."in.c-sales"."orders"',
|
||||
"sync_schedule": "every 6h",
|
||||
},
|
||||
)
|
||||
assert r.status_code == 201, r.text
|
||||
finally:
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_keboola_edit_modal_parity(seeded_app, monkeypatch):
|
||||
"""Phase F2: Edit modal mirrors Register's two-question structure
|
||||
for Keboola rows."""
|
||||
fake_cfg = {"data_source": {"type": "keboola", "keboola": {}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg, raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
try:
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
# Q2 radio in edit.
|
||||
assert 'name="editKbSyncMode"' in html
|
||||
assert 'id="editKbBucket"' in html
|
||||
assert 'id="editKbSourceTable"' in html
|
||||
assert 'id="editKbSourceQuery"' in html
|
||||
assert 'id="editKbSyncSchedule"' in html
|
||||
# Discover/List/Use-as-base buttons mirror Register.
|
||||
assert "discoverKeboolaBuckets('editKbBucketList')" in html
|
||||
assert "discoverKeboolaTables('editKbBucket', 'editKbTableList')" in html
|
||||
assert "prefillFromKeboolaTable('editKbSourceQuery')" in html
|
||||
# Strategy gone, PK under details.
|
||||
assert 'id="editKbStrategy"' not in html
|
||||
assert 'id="editKbPrimaryKey"' in html
|
||||
finally:
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_bq_edit_modal_inside_tab_content_bigquery(seeded_app, bq_instance):
|
||||
"""C2: BQ Edit modal physically lives inside <section id='tab-content-bigquery'>
|
||||
so the modal+form share the tab's DOM scope. Mirror of Phase E's BQ Register
|
||||
modal placement."""
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
bq_section_start = html.index('id="tab-content-bigquery"')
|
||||
bq_section_end = html.index('</section>', bq_section_start)
|
||||
bq_section = html[bq_section_start:bq_section_end]
|
||||
assert 'id="editBqModal"' in bq_section
|
||||
assert 'id="editBqDataset"' in bq_section
|
||||
assert 'id="editBqSourceQuery"' in bq_section
|
||||
# Old shared #editModal either gone or only carries non-BQ fields.
|
||||
if 'id="editModal"' in html:
|
||||
edit_modal_start = html.index('id="editModal"')
|
||||
# rough lookahead: scan until the next modal-overlay sibling or </body>
|
||||
edit_modal_end = html.index('id="toast"', edit_modal_start) \
|
||||
if 'id="toast"' in html[edit_modal_start:] else len(html)
|
||||
edit_modal = html[edit_modal_start:edit_modal_end]
|
||||
assert 'id="editBqDataset"' not in edit_modal # BQ fields aren't here anymore
|
||||
|
||||
|
||||
def test_keboola_discover_buttons_hidden_on_bigquery_instance(seeded_app, monkeypatch):
|
||||
"""C1: Discover/List/Use-as-base buttons in the Keboola tab are
|
||||
UI-hidden when the instance's data_source.type isn't keboola, because
|
||||
/api/admin/discover-tables routes by instance type and would return
|
||||
BQ data on a BQ instance."""
|
||||
fake_cfg = {"data_source": {"type": "bigquery", "bigquery": {"project": "p"}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg, raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
try:
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
# Inputs stay (manual entry works).
|
||||
assert 'id="kbBucket"' in html
|
||||
assert 'id="kbSourceTable"' in html
|
||||
# Buttons hidden.
|
||||
assert "discoverKeboolaBuckets" not in html
|
||||
assert "discoverKeboolaTables" not in html
|
||||
assert "prefillFromKeboolaTable" not in html
|
||||
finally:
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_keboola_discover_buttons_visible_on_keboola_instance(seeded_app, monkeypatch):
|
||||
"""Inverse — buttons render on a Keboola-typed instance."""
|
||||
fake_cfg = {"data_source": {"type": "keboola", "keboola": {}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg, raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
try:
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
html = r.text
|
||||
assert "discoverKeboolaBuckets" in html
|
||||
assert "discoverKeboolaTables" in html
|
||||
assert "prefillFromKeboolaTable" in html
|
||||
finally:
|
||||
reset_cache()
|
||||
|
||||
|
||||
def test_admin_tables_keboola_branch_unchanged(seeded_app, monkeypatch):
|
||||
"""Phase E: the BQ form is always rendered (inside #tab-content-bigquery)
|
||||
regardless of data_source.type. On a Keboola instance the BQ tab is
|
||||
just hidden by default; the operator can still click into it. The
|
||||
legacy Type-selector remnant (#bqEntityType) must stay gone."""
|
||||
fake_cfg = {"data_source": {"type": "keboola", "keboola": {}}}
|
||||
monkeypatch.setattr(
|
||||
"app.instance_config.load_instance_config",
|
||||
lambda: fake_cfg,
|
||||
raising=False,
|
||||
)
|
||||
from app.instance_config import reset_cache
|
||||
reset_cache()
|
||||
|
||||
c = seeded_app["client"]
|
||||
token = seeded_app["admin_token"]
|
||||
try:
|
||||
r = c.get("/admin/tables", headers=_auth(token))
|
||||
assert r.status_code == 200, r.text
|
||||
html = r.text
|
||||
# Legacy Type-selector remnant must stay gone.
|
||||
assert 'id="bqEntityType"' not in html
|
||||
# BQ form now always rendered inside #tab-content-bigquery.
|
||||
assert 'id="bqSourceQuery"' in html
|
||||
# C3: legacy #registerModal removed; the Phase F Keboola modal
|
||||
# at #registerKeboolaModal owns the Keboola flow now.
|
||||
assert 'id="registerModal"' not in html
|
||||
assert 'id="kbBucket"' in html
|
||||
assert 'id="kbViewName"' in html
|
||||
finally:
|
||||
reset_cache()
|
||||
Loading…
Reference in a new issue