Merge pull request #328 from timkpaine/tkp/hf2

Small hotfix for config names and legacy initial render

Author: timkpaine

csp_gateway/server/demo/config/demo_spaday.yaml

@@ -0,0 +1,15 @@
+# @package _global_
+defaults:
+  - /gateway: omnibus
+  - _self_
+
+# csp-gateway-start --config-dir=csp_gateway/server/demo +config=omnibus_legacy
+#
+# Same as the `omnibus` config, but serves the legacy Perspective/React UI instead of the
+# default spaday-based UI. Requires the bundled Javascript build.
+
+port: 8000
+
+gateway:
+  settings:
+    UI_PROVIDER: default

csp_gateway/server/demo/config/omnibus_legacy.yaml

@@ -43,9 +43,8 @@ def test_start_load():
     }
 
 
-def test_spaday_demo_configs_load():
-    """The shipped spaday demo configs compose into a Gateway (guards demo_spaday / omnibus_spaday)."""
+def test_legacy_demo_config_loads():
+    """The shipped legacy-UI demo config composes into a Gateway (guards omnibus_legacy)."""
     demo_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../server/demo"))
-    for name in ("demo_spaday", "omnibus_spaday"):
-        g = csp_gateway.server.config.load_gateway(overwrite=True, config_dir=demo_dir, overrides=[f"+config={name}"])
-        assert isinstance(g, Gateway), name
+    g = csp_gateway.server.config.load_gateway(overwrite=True, config_dir=demo_dir, overrides=["+config=omnibus_legacy"])
+    assert isinstance(g, Gateway)

csp_gateway/server/demo/config/omnibus_spaday.yaml

@@ -65,6 +65,14 @@ export const Workspace = forwardRef(function Workspace(
           await flushWorkspace(ws);
           await ws.restoreWorkspace(themedLayout);
           await flushWorkspace(ws);
+          // Perspective 5.2: restoring a layout with no `active` (sidebar closed) onto an
+          // already-closed viewer force-toggles settings as a no-op, but still flips the
+          // persisted settings flag and host `settings` attribute first — so the datagrid
+          // shows per-column Edit buttons and the next settings click is eaten. A bare
+          // toggleConfig() flips the stale flag back without opening the sidebar.
+          if (!themedLayout.active && ws.hasAttribute("settings")) {
+            await ws.toggleConfig();
+          }
           if (syncUrl && generation === restoreGenerationRef.current) {
             await setUrlLayout(themedLayout);
           }