diff --git a/packages/webui/src/public/brand.js b/packages/webui/src/public/brand.js
index 9c729f475..02a8d9e9c 100644
--- a/packages/webui/src/public/brand.js
+++ b/packages/webui/src/public/brand.js
@@ -183,7 +183,9 @@
function breadcrumbs() {
draw();
// SP1: every page inside an organization says which one, after the dashboard: Dashboard / Acme / ...
- const box = $('breadcrumbs'), org = /^#\/orgs\/[^/?]+/.test(location.hash) ? window.MosaicOrg : null;
+ // #1873 settings slice 4: an organization's Settings page names it with ?org=, so it says which one too.
+ const page = /^#\/settings\/([^/?]+)/.exec(location.hash)?.[1], orgSettings = !!page && !!window.MosaicOrg?.orgPage?.(page) && /[?&]org=/.test(location.hash);
+ const box = $('breadcrumbs'), org = /^#\/orgs\/[^/?]+/.test(location.hash) || orgSettings ? window.MosaicOrg : null;
if (box && org?.id && !box.querySelector('[data-crumb-org]') && !/^#\/orgs\/[^/?]+\/organization(?:[/?]|$)/.test(location.hash)) box.insertAdjacentHTML('afterbegin', `Dashboard${escape(org.label)}`);
// SP7: a trail with nothing above the page only repeats the page's heading, so the heading names it once.
if (!box) return;
diff --git a/packages/webui/src/public/bus.js b/packages/webui/src/public/bus.js
index f7cb69ae7..5e4082fea 100644
--- a/packages/webui/src/public/bus.js
+++ b/packages/webui/src/public/bus.js
@@ -1329,7 +1329,7 @@
const cause=window.MosaicConsole?.catalogueCause?.(label,catalogue?.notices,catalogue?.reason)??null;
const words=!cause?'':cause.plain?` ${txt(cause.detail)}Technical details
${txt(cause.detail)}
`; const plain=cause?.plain?` ${txt(cause.plain)}`:''; - const setupLink=text=>`${text}`; + const setupLink=text=>`${text}`; if(!proxyOn)return `${lead}${plain} ${thinking}
${words}`; if(owner)readService(); const recheck=''; @@ -1478,21 +1478,36 @@ }); // Organizations is writable when the server allows org setup, which it does in organization mode where send is off. const readonlyPage = page => !['appearance','business','console','triage'].includes(page) && !(page === 'organizations' && orgSetup) && !canSend && !isTester; - const settingsPages = [['appearance','Appearance'],['business',window.MosaicOrg ? 'Organization' : 'Business'],['limits','Launch limits'],['organizations','Organizations'],['routing','Routing'],['agents','Agents'],['assistant','Assistant'],['tokens','Token use'],['model-proxy','Model setup'],['triage','Triage'],['console','Console'],['about','About']]; - function markSettingsDraft(page,dirty){const link=document.querySelector(`#settings-nav a[href="#/settings/${page}"]`), dot='unsaved changes';if(link && dirty && !link.querySelector('.settings-dot'))link.insertAdjacentHTML('beforeend',dot);const button=$('settings-disclosure');if(dirty && link?.getAttribute('aria-current')==='page' && button && !button.querySelector('.settings-dot'))button.querySelector('strong').insertAdjacentHTML('beforeend',dot);} + const settingsPages = [['appearance','Appearance'],['business',window.MosaicOrg ? 'Organization' : 'Business'],['limits','Launch limits'],['organizations','Organizations'],['routing','Routing'],['agents','Agents'],['assistant','Assistant'],['tokens','Token use'],['model-setup','Model setup'],['triage','Triage'],['console','Console'],['about','About']]; + function markSettingsDraft(page,dirty){const link=document.querySelector(`#settings-nav a[href^="#/settings/${page}"]`), dot='unsaved changes';if(link && dirty && !link.querySelector('.settings-dot'))link.insertAdjacentHTML('beforeend',dot);const button=$('settings-disclosure');if(dirty && link?.getAttribute('aria-current')==='page' && button && !button.querySelector('.settings-dot'))button.querySelector('strong').insertAdjacentHTML('beforeend',dot);} + // #1873 settings slice 4 (DESIGN.md section 2): four groups. You; Your models; All organizations; + // This organization, whose heading holds the organization picker. An organization's own pages carry + // ?org=${helper}
${readonlyPage(page)?'Read only. Saving requires signed-in send mode.
':''}${body}${helper}
${readonlyPage(page)?'Read only. Saving requires signed-in send mode.
':''}${body}${txt(n.binding)}` : n.refused ? `Could not be read: ${txt(n.refused)}` : 'None set';
- const contents={limits:()=>launchForm(s.launch),routing:()=>routesSection(routes,instances),agents:()=>agentsSection(instances)+agentLevels,assistant:()=>assistantSection(s.launch,names),tokens:()=>tokenLimits(limitRows,limitsRefused)+tokenUsage(usage),names:()=>testerNames(names,instances),about:()=>`${txt(s.address)||'unknown'}${txt(s.board)||'unknown'}${txt(s.address)||'unknown'}${txt(s.board)||'unknown'}This instance's own pages still work: Appearance, Model setup${triageOwner ? ', Triage' : ''} and Console.
This instance's own pages still work: Appearance, Model setup${triageOwner ? ', Triage' : ''} and Console.
You have an unsaved draft. Stay here or discard it and continue.
'; document.body.append(dialog); const close = () => { dialog.close(); dialog.remove(); }; - const stay = () => { const picker = document.getElementById('org-picker'); if (picker && current) picker.value = decodeURIComponent(current); close(); }; + const stay = () => { for (const picker of document.querySelectorAll('#org-picker, #org-pick')) if (current) picker.value = decodeURIComponent(current); close(); }; dialog.querySelector('[data-stay]').onclick = stay; dialog.querySelector('[data-discard]').onclick = () => { close(); discard(); skipGuard = true; location.hash = next; }; dialog.addEventListener('cancel', e => { e.preventDefault(); stay(); }); @@ -537,10 +556,12 @@ window.MosaicLocalTime = value => Number.isFinite(Date.parse(value)) ? new Date( // SP3: whether this address is a system page (no organization's), for the shell's theme scope. system: () => system(location.hash), switchTo: next => { const path = route().split('?')[0]; location.hash = `#/orgs/${encodeURIComponent(next)}${path === '/dashboard' || path === '/' ? '/organization' : route()}`; }, + // Slice 4: whether this Settings page is an organization's own (it carries ?org=). + orgPage: page => ORG_PAGES.has(page), }); Object.defineProperty(window, 'MosaicOrg', { configurable: true, enumerable: true, get: () => (current || !settled ? api : undefined) }); })(); -if (document.documentElement.hasAttribute('data-settings-proxy-document') && !location.hash) location.hash = '#/settings/model-proxy'; +if (document.documentElement.hasAttribute('data-settings-proxy-document') && !location.hash) location.hash = '#/settings/model-setup'; /* Browser-local sidebar density. No authority or project data is stored here. */ (() => { // #1873 SP1: the key follows the open organization, read again when it changes. diff --git a/packages/webui/src/public/triage-settings.js b/packages/webui/src/public/triage-settings.js index 6af4d58ce..6a63be4b8 100644 --- a/packages/webui/src/public/triage-settings.js +++ b/packages/webui/src/public/triage-settings.js @@ -55,7 +55,7 @@ + (d.harness && !hs.includes(d.harness) ? `` : '') + hs.map(h => ``).join(''); const status = data?.choices?.status; - const catalogue = status === 'ready' ? '' : `No organization can show your models right now, so no route can be saved. Open Model setup to see why each organization can't see your models.
`; + const catalogue = status === 'ready' ? '' : `No organization can show your models right now, so no route can be saved. Open Model setup to see why each organization can't see your models.
`; const conflictButton = conflict ? ' ' : ''; return `${catalogue}