@oceanum/oceanumlab 4.8.0 → 4.10.0

package/src/__tests__/shareNotebook.spec.ts

@@ -2,12 +2,12 @@ import type { INotebookContent } from '@jupyterlab/nbformat';
 
 import {
   buildSpecBody,
+  demoItemsFromSummaries,
   isShareableEmail,
   isSpecId,
   nameFromPath,
   notebookFromRecord,
   notebookFromUpload,
-  parseNotebookDemo,
   parseShareEmails,
   parseTimestamp,
   partitionSummaries,
@@ -219,98 +219,41 @@ describe('unlinkedNotebookFromRecord', () => {
   });
 });
 
-describe('parseNotebookDemo', () => {
-  const OTHER = '0b7d9f2e-1111-4a2b-8c3d-9e8f7a6b5c4d';
-  const demo = (sections: unknown, extra: object = {}): unknown => ({
-    kind: 'notebook-demo',
-    version: 1,
-    sections,
-    ...extra
-  });
-
-  let warn: jest.SpyInstance;
-  beforeEach(() => {
-    warn = jest.spyOn(console, 'warn').mockImplementation(() => undefined);
-  });
-  afterEach(() => {
-    warn.mockRestore();
-  });
-
-  it('keeps sections and items in record order', () => {
-    const sections = parseNotebookDemo(
-      demo(
-        [
-          {
-            title: 'Getting started',
-            items: [
-              { id: ID, title: 'Query', summary: 'One line' },
-              { id: OTHER, title: 'Plot', note: 'ignored' }
-            ]
-          },
-          { title: 'Waves', items: [{ id: OTHER, title: 'Spectra' }] }
-        ],
-        { owner: 'ignored' }
-      )
-    );
-    expect(sections).toEqual([
-      {
-        title: 'Getting started',
-        items: [
-          { id: ID, title: 'Query', summary: 'One line' },
-          { id: OTHER, title: 'Plot' }
-        ]
-      },
-      { title: 'Waves', items: [{ id: OTHER, title: 'Spectra' }] }
-    ]);
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('skips items without a record id or a title', () => {
-    const sections = parseNotebookDemo(
-      demo([
-        {
-          title: 'Mixed',
-          items: [
-            { id: '../eidos', title: 'Not a record id' },
-            { id: ID, title: '   ' },
-            { id: ID },
-            'not an item',
-            { id: OTHER, title: 'Kept', summary: 42 }
-          ]
-        }
-      ])
-    );
-    expect(sections).toEqual([
-      { title: 'Mixed', items: [{ id: OTHER, title: 'Kept' }] }
-    ]);
+describe('demoItemsFromSummaries', () => {
+  const A = '0b7d9f2e-1111-4a2b-8c3d-9e8f7a6b5c4d';
+  const B = '1c2d3e4f-2222-4a2b-8c3d-9e8f7a6b5c4d';
+  const C = '2d3e4f5a-3333-4a2b-8c3d-9e8f7a6b5c4d';
+  const summary = (id: string, name: string, description: string | null) => ({
+    id,
+    name,
+    description,
+    modified: '2026-09-25T10:00:00',
+    creator: null as string | null
   });
 
-  it('drops sections with no title or nothing left to list', () => {
-    const sections = parseNotebookDemo(
-      demo([
-        { title: 'Empty', items: [] },
-        { title: 'All invalid', items: [{ id: 'x', title: 'y' }] },
-        { title: '', items: [{ id: ID, title: 'Untitled section' }] },
-        { title: 'No items' }
-      ])
-    );
-    expect(sections).toEqual([]);
-    expect(warn).not.toHaveBeenCalled();
+  it('lists each spec by name, with its description as the summary', () => {
+    expect(
+      demoItemsFromSummaries([summary(A, '01_quickstart', 'A quick query')])
+    ).toEqual([{ id: A, title: '01_quickstart', summary: 'A quick query' }]);
   });
 
-  it('reads nothing from a record of another kind or version, and says so once', () => {
-    for (const spec of [
-      demo([], { kind: 'workspace' }),
-      demo([], { version: 2 }),
-      { kind: 'notebook-demo', version: 1, sections: {} },
-      null,
-      [],
-      'notebook-demo'
-    ]) {
-      warn.mockClear();
-      expect(parseNotebookDemo(spec)).toEqual([]);
-      expect(warn).toHaveBeenCalledTimes(1);
-    }
+  it('orders by name as people number them, ignoring case', () => {
+    const items = demoItemsFromSummaries([
+      summary(A, '10 Plot waves', null),
+      summary(B, 'spectra', null),
+      summary(C, '2 Query', null)
+    ]);
+    expect(items.map(item => item.title)).toEqual([
+      '2 Query',
+      '10 Plot waves',
+      'spectra'
+    ]);
+  });
+
+  it('names an unnamed spec, and leaves out a summary it does not have', () => {
+    expect(demoItemsFromSummaries([summary(A, '  ', null)])).toEqual([
+      { id: A, title: 'Untitled' }
+    ]);
   });
 });
 

package/src/__tests__/sharePlugin.spec.ts

@@ -14,6 +14,7 @@ import { Signal } from '@lumino/signaling';
 
 import type { IOceanumAuth, IOceanumUser } from '../auth/tokens';
 import type { ISpecRecord } from '../share/notebook';
+import { encodePayload, FRAGMENT_KEY } from '../share/fromDatamesh';
 import { CommandIDs, sharePlugin } from '../share/plugin';
 
 /** What every dialog answers. Accepting with no value is "chose nothing". */
@@ -100,6 +101,7 @@ const record = (id: string, name: string): ISpecRecord => ({
  */
 function store(stored: Record<string, INotebookContent> = {}) {
   const calls: string[] = [];
+  const urls: string[] = [];
   const bodies: Record<string, unknown>[] = [];
   const names: Record<string, string> = { [ID_A]: 'Alpha', [ID_B]: 'Beta' };
   const fetcher = async (
@@ -110,6 +112,7 @@ function store(stored: Record<string, INotebookContent> = {}) {
     const method = init?.method ?? 'GET';
     const id = url.split('/').pop() ?? '';
     calls.push(`${method} ${id}`);
+    urls.push(url);
     if (init?.body) {
       bodies.push(JSON.parse(String(init.body)));
     }
@@ -125,7 +128,7 @@ function store(stored: Record<string, INotebookContent> = {}) {
             }
     } as unknown as Response;
   };
-  return { calls, bodies, fetcher };
+  return { calls, urls, bodies, fetcher };
 }
 
 /** A notebook panel with just the surface the plugin touches. */
@@ -159,6 +162,8 @@ function panel(id: string, path: string, link?: string): NotebookPanel {
 interface IHarness {
   commands: CommandRegistry;
   calls: string[];
+  /** Every URL the plugin fetched, in order. */
+  urls: string[];
   bodies: Record<string, unknown>[];
   saved: string[];
   /** What each save wrote, by path. */
@@ -183,7 +188,7 @@ function activate(
   } = {}
 ): IHarness {
   const commands = new CommandRegistry();
-  const { calls, bodies, fetcher } = store(options.stored);
+  const { calls, urls, bodies, fetcher } = store(options.stored);
   const saved: string[] = [];
   const written: Record<string, unknown> = {};
   const opened: string[] = [];
@@ -303,6 +308,7 @@ function activate(
   return {
     commands,
     calls,
+    urls,
     bodies,
     saved,
     written,
@@ -493,6 +499,8 @@ describe('opening an example', () => {
 
     // Read, never written back: the example's record is Oceanum's.
     expect(harness.calls).toEqual([`GET ${ID_A}`]);
+    // An example is a Notebook Demo spec, not a notebook.
+    expect(harness.urls).toEqual([`${SPECS}/specs/notebook-demo/${ID_A}`]);
     const path = 'Oceanum/Query a datasource.ipynb';
     expect(harness.saved).toEqual([path]);
     expect(harness.opened).toEqual([path]);
@@ -662,3 +670,50 @@ describe('uploading a notebook', () => {
     expect(harness.commands.isEnabled(CommandIDs.upload)).toBe(false);
   });
 });
+
+describe('opening a Datamesh UI workspace from the address', () => {
+  const settle = () => new Promise(resolve => setTimeout(resolve, 0));
+  const payload = encodePayload({
+    v: 1,
+    name: 'Coast',
+    items: [{ datasource: 'era5_wind10m', variables: ['u10'] }]
+  });
+
+  afterEach(() => window.history.replaceState(null, '', '/'));
+
+  it('writes a new untrusted notebook to the Oceanum folder, opens it and clears the hash', async () => {
+    window.history.replaceState(
+      null,
+      '',
+      `/lab/#other=1&${FRAGMENT_KEY}=${payload}`
+    );
+    const harness = activate({ user: null, folder: { 'Coast.ipynb': {} } });
+    // Read at activation but left in the address until the notebook is written,
+    // so a sign-in redirect before then still carries it.
+    expect(window.location.hash).toContain(FRAGMENT_KEY);
+    await settle();
+    expect(window.location.hash).toBe('#other=1');
+
+    const path = 'Oceanum/Coast (1).ipynb';
+    expect(harness.saved).toEqual([path]);
+    expect(harness.opened).toEqual([path]);
+    const content = harness.written[path] as INotebookContent;
+    expect(content.metadata).not.toHaveProperty('oceanum');
+    expect(content.cells[2].source).toContain('datamesh.query(');
+    expect(harness.calls).toEqual([]);
+  });
+
+  it('writes nothing for a payload that is not valid', async () => {
+    window.history.replaceState(null, '', `/lab/#${FRAGMENT_KEY}=bad`);
+    const harness = activate();
+    await settle();
+    expect(window.location.hash).toBe('');
+    expect(harness.saved).toEqual([]);
+  });
+
+  it('does nothing without a payload', async () => {
+    const harness = activate();
+    await settle();
+    expect(harness.saved).toEqual([]);
+  });
+});

package/src/auth/tokens.ts

@@ -32,12 +32,6 @@ export interface IOceanumEnvironment {
    * absent) keeps JupyterLab's file management alongside the Oceanum commands.
    */
   readonly fileManagement?: 'local' | 'oceanum';
-  /**
-   * The spec store id of this deployment's Notebook Demo record, the curated list the
-   * Notebooks tab shows as Examples. Absent where a deployment has none, and never set
-   * by a JupyterLab server's sign-in.
-   */
-  readonly notebookDemo?: string;
 }
 
 /** Service base URLs for an environment, without trailing slashes. */