Improve admin field names and generation-safe dialog lifecycle

This commit is contained in:
Joseph Doherty
2026-11-13 21:15:58 -05:00
parent 06b1743051
commit 169149f1eb
82 changed files with 15839 additions and 73 deletions
@@ -0,0 +1,28 @@
"""Focused native adapter regressions; detached DOM fixtures, no application services."""
from pathlib import Path
import json
from playwright.sync_api import sync_playwright
source=Path('src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/wwwroot/js/dialog-focus.js').read_text();out=[]
with sync_playwright() as p:
b=p.chromium.launch(channel='chromium')
for state in ['normal','disabled','hidden','unfocusable','disconnected','existing-heading-tabindex']:
page=b.new_page();page.set_content('<main><h1>Stable title</h1><button id="trigger">Open</button><button id="next">Next</button></main><section id="dialog" tabindex="-1"><button data-initial-focus>Cancel</button><button>Delete</button></section>');page.add_script_tag(content=source)
if state=='unfocusable':page.evaluate('()=>{const e=document.createElement("span");e.id="trigger";e.tabIndex=0;document.querySelector("#trigger").replaceWith(e)}')
if state=='existing-heading-tabindex':page.locator('h1').evaluate('e=>e.setAttribute("tabindex","2")')
page.locator('#trigger').focus();page.evaluate('window.receiver={invokeMethodAsync:()=>Promise.resolve()};otDialog.activate("dialog",receiver,1,false)')
safe=page.locator('[data-initial-focus]').evaluate('e=>e===document.activeElement')
for _ in range(5):page.keyboard.press('Tab')
contained=page.locator('#dialog').evaluate('e=>e.contains(document.activeElement)')
if state in ['disabled','hidden']:page.locator('#trigger').evaluate('(e,s)=>e[s]=true',state)
if state=='unfocusable':page.locator('#trigger').evaluate('e=>e.removeAttribute("tabindex")')
if state in ['disconnected','existing-heading-tabindex']:page.locator('#trigger').evaluate('e=>e.remove()')
page.locator('#dialog').evaluate('e=>e.remove()');page.wait_for_function('!document.body.classList.contains("modal-open")')
record=page.evaluate('({trigger:document.activeElement===document.querySelector("#trigger"),heading:document.activeElement===document.querySelector("h1"),inert:!!document.querySelector("[inert]"),bodyLocked:document.body.classList.contains("modal-open")})');page.locator('#next').focus();record['headingTabindexAfterBlur']=page.locator('h1').get_attribute('tabindex');record.update(state=state,initialSafe=safe,nativeTabContained=contained);record['passed']=safe and contained and not record['inert'] and not record['bodyLocked'] and (record['trigger'] if state=='normal' else record['heading']) and record['headingTabindexAfterBlur']==('2' if state=='existing-heading-tabindex' else None);out.append(record);page.close()
page=b.new_page();page.set_content('<main><h1>Stable title</h1><button id="trigger">Open</button></main><section id="one" tabindex="-1"><button>Cancel</button></section><section id="two" tabindex="-1"><button>Cancel</button></section>');page.add_script_tag(content=source);page.locator('#trigger').focus();page.evaluate('window.calls=0;window.receiver={invokeMethodAsync:()=>{calls++;return Promise.resolve()}}');record=page.evaluate('({first:otDialog.activate("one",receiver,1,true),second:otDialog.activate("two",receiver,1,false)})');page.keyboard.press('Escape');record['busyCalls']=page.evaluate('calls');page.evaluate('otDialog.update("one",1,false)');page.keyboard.press('Escape');page.wait_for_function('calls===1');record['readyCalls']=page.evaluate('calls');page.evaluate('otDialog.deactivate("two")');record['firstStillLocked']=page.evaluate('document.body.classList.contains("modal-open")');page.evaluate('otDialog.deactivate("one")');record['restored']=page.evaluate('!document.querySelector("[inert]") && document.activeElement===document.querySelector("#trigger")');record['state']='single-active-and-busy';record['passed']=record['first'] and not record['second'] and record['busyCalls']==0 and record['readyCalls']==1 and record['firstStillLocked'] and record['restored'];out.append(record);page.close()
for mode in ['h2','landmark']:
page=b.new_page();heading='<h2>Stable page section</h2>' if mode=='h2' else ''
page.set_content('<main>'+heading+'<button id="trigger">Open</button><button id="next">Next</button></main><section id="dialog" role="dialog" tabindex="-1"><h2>Closing dialog title</h2><button>Cancel</button></section>');page.add_script_tag(content=source);page.locator('#trigger').focus();page.evaluate('window.receiver={invokeMethodAsync:()=>Promise.resolve()};otDialog.activate("dialog",receiver,1,false)');page.locator('#trigger').evaluate('e=>e.disabled=true');page.evaluate('otDialog.deactivate("dialog")');record=page.evaluate('({tag:document.activeElement.tagName,insideClosingDialog:!!document.activeElement.closest("[role=dialog]"),text:document.activeElement.textContent})');record.update(state='closing-heading-'+mode);record['passed']=not record['insideClosingDialog'] and record['tag']==('H2' if mode=='h2' else 'MAIN');out.append(record);page.close()
page=b.new_page();page.set_content('<main><h1>Stable page</h1><button id="trigger">Open</button></main><aside inert id="prior">Already unavailable</aside><section id="dialog" tabindex="-1"><button>Cancel</button></section>');page.add_script_tag(content=source);page.evaluate('document.body.classList.add("modal-open");window.receiver={invokeMethodAsync:()=>Promise.resolve()}');page.locator('#trigger').focus();page.evaluate('otDialog.activate("dialog",receiver,1,false);otDialog.deactivate("dialog")');record=page.evaluate('({priorInert:document.querySelector("#prior").inert,mainInert:document.querySelector("main").inert,priorModalOpen:document.body.classList.contains("modal-open"),trigger:document.activeElement===document.querySelector("#trigger")})');record.update(state='restore-existing-inert-body');record['passed']=record['priorInert'] and not record['mainInert'] and record['priorModalOpen'] and record['trigger'];out.append(record);page.close();b.close()
Path('docs/ui-consistency/evidence/ot01-03/native-dialog.json').write_text(json.dumps(out,indent=2));print({'cases':len(out),'passed':sum(r['passed'] for r in out)})
raise SystemExit(0 if all(r["passed"] for r in out) else 1)
@@ -0,0 +1,8 @@
"""Actual ModalFrame transport/fallback with its trigger removed; no service operation."""
from pathlib import Path
from playwright.sync_api import sync_playwright
import urllib.request,re,json,hashlib
origin=re.search(r'Now listening on: (http://127.0.0.1:\d+)',Path('/tmp/ot-pilot-host.log').read_text()).group(1)
source=Path('src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/wwwroot/js/dialog-focus.js').read_bytes();delivered=urllib.request.urlopen(origin+'/_content/ZB.MOM.WW.OtOpcUa.AdminUI/js/dialog-focus.js').read()
with sync_playwright() as p:
b=p.chromium.launch(channel='chromium');page=b.new_page(viewport={'width':390,'height':1000});page.goto(origin,wait_until='networkidle');page.locator('#open-confirm').click();page.get_by_role('dialog',name='Delete synthetic driver',exact=True).wait_for();page.wait_for_function('document.querySelector("[role=dialog]").contains(document.activeElement)');page.locator('#open-confirm').evaluate('e=>e.remove()');page.keyboard.press('Escape');page.get_by_role('dialog').wait_for(state='detached');page.wait_for_function('document.activeElement===document.querySelector("main h1")');r=page.evaluate('({heading:document.activeElement===document.querySelector("main h1"),inert:!!document.querySelector("[inert]"),locked:document.body.classList.contains("modal-open")})');r['servedJsMatchesSource']=source==delivered;r['servedJsSha256']=hashlib.sha256(delivered).hexdigest();r['passed']=r['heading'] and not r['inert'] and not r['locked'] and r['servedJsMatchesSource'];Path('docs/ui-consistency/evidence/ot01-03/actual-removed-trigger.json').write_text(json.dumps(r,indent=2));print(r);b.close();raise SystemExit(0 if r['passed'] else 1)
@@ -0,0 +1,16 @@
"""Real Raw virtualized rendering and bounded ScriptLog width; no real service calls."""
import json,re,sys
from pathlib import Path
from playwright.sync_api import sync_playwright
sys.path.insert(0,'/Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/components/ui-theme/validation/theme-1.0.0/canary')
from browser_zoom import zoom_browser,set_browser_zoom
origin=re.search(r'Now listening on: (http://127.0.0.1:\d+)',Path('/tmp/ot-pilot-host.log').read_text()).group(1);out=[];folder=Path('docs/ui-consistency/evidence/ot01-03/browser');folder.mkdir(exist_ok=True)
with sync_playwright() as p:
with zoom_browser(p) as (context,worker):
for zoom in [1,2]:
page=context.new_page();page.set_viewport_size({'width':390,'height':1000});page.goto(origin+'/?sample=log',wait_until='networkidle');set_browser_zoom(worker,page,zoom);target=page.get_by_role('textbox',name='Script ID',exact=True);page.locator('label[for="'+target.get_attribute('id')+'"]').click();record=page.evaluate('({width:innerWidth,document:document.documentElement.scrollWidth,dpr:devicePixelRatio})');record.update(kind='script-filter',zoom=zoom,focus=target.evaluate('e=>e===document.activeElement'));record['passed']=record['document']==record['width'] and record['focus'];out.append(record);Path('docs/ui-consistency/evidence/ot01-03/raw-filter-progress.json').write_text(json.dumps(out,indent=2));page.screenshot(path=str(folder/f'log-focused-390-zoom{zoom}.png'));page.close()
for width in [1440,390]:
page=context.new_page();page.set_viewport_size({'width':width,'height':1000});errors=[];page.on('pageerror',lambda e:errors.append(str(e)));page.goto(origin+'/raw-pilot',wait_until='networkidle');set_browser_zoom(worker,page,1);first=page.get_by_role('checkbox',name='Synthetic tag 000',exact=True);first.wait_for();rendered=page.get_by_role('checkbox').count();description=first.get_attribute('aria-labelledby');first.check();page.wait_for_function('document.querySelector("#selection-count").textContent.includes("1 selected")');page.get_by_role('button',name='Collapse Synthetic device',exact=True).click();page.wait_for_function('!document.querySelector("#raw-scroller input[type=checkbox]")');page.get_by_role('button',name='Expand Synthetic device',exact=True).click();first.wait_for();selectedStill=first.is_checked();page.locator('#raw-scroller').evaluate('e=>e.scrollTop=e.scrollHeight');more=page.get_by_role('button',name='Show 300 more (300 not shown) under Synthetic device',exact=True);more.wait_for();page.wait_for_timeout(500);bounds=more.bounding_box();page.mouse.click(bounds['x']+bounds['width']/2,bounds['y']+bounds['height']/2);page.locator('#raw-scroller').evaluate('e=>e.scrollTop=e.scrollHeight');page.get_by_role('checkbox',name='Synthetic tag 799',exact=True).wait_for();record={'kind':'raw-virtualized','requestedWidth':width,'initialRenderedCheckboxes':rendered,'estimatedScrollHeight':page.locator('#raw-scroller').evaluate('e=>e.scrollHeight'),'finalRenderedCheckboxes':page.get_by_role('checkbox').count(),'descriptionId':description,'selectedAfterCollapseExpand':selectedStill,'layout':page.evaluate('({width:innerWidth,document:document.documentElement.scrollWidth})'),'errors':errors};record['passed']=0<rendered<150 and record['finalRenderedCheckboxes']<150 and record['estimatedScrollHeight']<50000 and bool(description) and selectedStill and not errors and record['layout']['width']==record['layout']['document'];out.append(record);Path('docs/ui-consistency/evidence/ot01-03/raw-filter-progress.json').write_text(json.dumps(out,indent=2));page.screenshot(path=str(folder/f'raw-{width}.png'));page.close()
Path('docs/ui-consistency/evidence/ot01-03/raw-and-filter-confirmation.json').write_text(json.dumps(out,indent=2));print(json.dumps({'cases':len(out),'passed':sum(r['passed'] for r in out),'records':out},indent=2))
raise SystemExit(0 if all(r["passed"] for r in out) else 1)
@@ -0,0 +1,29 @@
"""Bounded actual OT field/tree/confirmation pilot, synthetic loopback host only."""
import json,re,sys
from pathlib import Path
from playwright.sync_api import sync_playwright
sys.path.insert(0,'/Users/dohertj2/.codex/worktrees/scada-ui-consistency/scadaproj/components/ui-theme/validation/theme-1.0.0/canary')
from browser_zoom import zoom_browser,set_browser_zoom
origin=re.search(r'Now listening on: (http://127.0.0.1:\d+)',Path('/tmp/ot-pilot-host.log').read_text()).group(1)
OUT=Path('docs/ui-consistency/evidence/ot01-03/browser');OUT.mkdir(parents=True,exist_ok=True)
results=[]
with sync_playwright() as p:
with zoom_browser(p) as (context,worker):
for width,zoom in [(1440,1),(390,1),(1440,2)]:
page=context.new_page();page.set_viewport_size({'width':width,'height':1000});errors=[];page.on('pageerror',lambda e:errors.append(str(e)));page.goto(origin,wait_until='networkidle');set_browser_zoom(worker,page,zoom)
ids=page.locator('label').filter(has_text='Run timeout').evaluate_all('els=>els.map(e=>e.htmlFor)');page.locator('#standalone label').first.click()
record={'kind':'fields/modal/tree','width':width,'zoom':zoom,'checks':{'threeUniqueTimeoutAssociations':len(ids)==3 and len(set(ids))==3,'labelFocus':page.locator('#standalone input[type=number]').first.evaluate('e=>e===document.activeElement')}}
button=page.get_by_role('button',name='Expand Synthetic area',exact=True);button.click();page.get_by_role('button',name='Collapse Synthetic area',exact=True).wait_for();record['checks']['treeExpansionNameState']=True
page.locator('#show-toasts').click();dismiss=page.get_by_role('button',name='Dismiss Local information',exact=True);dismiss.wait_for();dismiss.click();dismiss.wait_for(state='detached');warning=page.get_by_role('button',name='Dismiss Local warning',exact=True);warning.wait_for();record['checks']['targetedToastDismiss']=page.get_by_role('button',name='Dismiss Local information',exact=True).count()==0;warning.click();warning.wait_for(state='detached')
page.locator('#open-confirm').click();dialog=page.get_by_role('dialog',name='Delete synthetic driver',exact=True);dialog.wait_for();page.wait_for_function('document.querySelector("[role=dialog]").contains(document.activeElement)');record['checks']['initialSafeFocus']=page.get_by_role('button',name='Cancel',exact=True).evaluate('e=>e===document.activeElement')
for _ in range(5):page.keyboard.press('Tab')
record['checks']['nativeTabContained']=dialog.evaluate('e=>e.contains(document.activeElement)');page.keyboard.press('Escape');dialog.wait_for(state='detached');page.wait_for_function('document.activeElement===document.querySelector("#open-confirm")');record['checks']['escapeReturnsFocus']=True
page.locator('#open-confirm').click();page.get_by_role('button',name='Delete',exact=True).click();page.wait_for_function('document.querySelector(".modal-footer .btn-danger").disabled');page.keyboard.press('Escape');record['checks']['busyCannotClose']=page.get_by_role('dialog').count()==1 and page.get_by_role('dialog').locator('.btn-close').is_disabled();page.get_by_role('dialog').wait_for(state='detached');record['checks']['localCompletion']='completed' in page.locator('#local-outcome').inner_text()
page.locator('#open-two').click();page.wait_for_timeout(350);record['checks']['singleActiveRejectsSecond']=page.get_by_role('dialog').count()==1 and page.get_by_role('dialog',name='Second synthetic dialog',exact=True).count()==0;page.keyboard.press('Escape');page.get_by_role('dialog').wait_for(state='detached')
page.locator('#open-driver').click();name=page.get_by_role('textbox',name='Driver name',exact=True);name.wait_for();nameId=name.get_attribute('id');page.locator('label[for="'+nameId+'"]').click();record['checks']['driverNameFocus']=name.evaluate('e=>e===document.activeElement');page.get_by_role('button',name='Close',exact=True).click();page.locator('.modal-dialog').wait_for(state='detached')
record['layout']=page.evaluate('({width:innerWidth,document:document.documentElement.scrollWidth,dpr:devicePixelRatio})');record['checks']['noDocumentOverflow']=record['layout']['width']==record['layout']['document'];record['errors']=errors;record['passed']=all(record['checks'].values()) and not errors;page.screenshot(path=str(OUT/f'fields-{width}-zoom{zoom}.png'),full_page=False);results.append(record);(OUT/'results.json').write_text(json.dumps(results,indent=2));page.close()
for sample,name in [('log','Script ID'),('uns','Filter loaded UNS names')]:
page=context.new_page();page.set_viewport_size({'width':390,'height':1000});page.goto(origin+'/?sample='+sample,wait_until='networkidle');target=page.get_by_role('textbox',name=name,exact=True);target.wait_for();controlId=target.get_attribute('id');page.locator('label[for="'+controlId+'"]').click();record={'kind':'filter','sample':sample,'focused':target.evaluate('e=>e===document.activeElement'),'layout':page.evaluate('({width:innerWidth,document:document.documentElement.scrollWidth})')};record['passed']=record['focused'] and record['layout']['width']==record['layout']['document'];results.append(record);page.screenshot(path=str(OUT/f'{sample}-390.png'),full_page=False);page.close()
(OUT/'results.json').write_text(json.dumps(results,indent=2));print(json.dumps({'origin':origin,'cases':len(results),'passed':sum(r['passed'] for r in results),'failures':[r for r in results if not r['passed']]},indent=2))
raise SystemExit(0 if all(r["passed"] for r in results) else 1)