fix(intent): the slot picker is an additional page too, plus two repairs the #6624 merge left behind - #6629
Merged
Merged
Conversation
… longer double-registers its perspective Follow-up to the calendar change, closing the same hole for `view: slots`. `view: slots` was left replacing the layout on the argument that a picker is an authoring surface rather than a second way to browse. That does not survive contact with a booking document: the picker is how a booking is CREATED, the document page is how it is worked with afterwards, and an author needs both - exactly the choice #6547 was about. So the picker gets the calendar's treatment: `EdmIntentGenerator` emits `slotsView` instead of `layoutType: MANAGE_SLOTS`, `uiSlotsModels` keys on it, `slots.js` stops emitting the shared manage form (the layout owns the editor, so slot-click on a document master now lands on the DOCUMENT create page prefilled with the chosen datetime), the picker takes over /<Entity> while the layout browses at /<Entity>/list, and the two carry a Slots/List switch. `MANAGE_SLOTS` is gone from every consumer; like MANAGE_CALENDAR it was intent-only and never offered by the entity editor. It also fixes a defect the calendar commit introduced, which extending the rule to slots made obvious: `navigation.js`'s PERSPECTIVE_COLLECTIONS listed `uiCalendarModels`/`uiSlotsModels` alongside the LAYOUT collections. Now that a view entity keeps its layout it is a member of both, so its perspective was generated TWICE - the same rename path written twice and a duplicate application-perspectives contribution. The two view collections are dropped from that list; a view entity is always in exactly one layout collection. Covered by EdmIntentGeneratorTest (a slots document master keeps MANAGE_DOCUMENT and carries slotsView + the slot* metadata) and the emission oracle, whose fixture gained a slots document: the /Visit picker landing route, /Visit/list, /Visit/create resolving to the DOCUMENT editor, and both toggles. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
…ional-page views #6628 ported generateUtils.js to Java about an hour after #6624 merged, against the pre-#6624 logic: uiCalendarModels / uiSlotsModels / personalCalendarModels / personalListModels still keyed on MANAGE_CALENDAR / MANAGE_SLOTS, which EdmIntentGenerator no longer emits. Nothing is broken today - both paths are live and no consumer is switched, so the JS path executes - but the moment consumers flip, calendar and slots pages would silently stop being generated: an empty partition writes no files and raises no error. GenerationParityIT could not catch it either, because no parity fixture declares a view, so all four partitions can disagree while every fixture matches. Key the Java collections on calendarView / slotsView (and drop the calendar exclusion from personalListModels, matching the JS), and add a views.model fixture - one calendar entity, one slot-picker entity, both keeping their MANAGE layout - as a parity case. Confirmed it is a real guard: with the ModelGenerator change reverted the case fails naming the absent AppointmentSlotsPage.js and Appointment-slots.html; with it, both pipelines agree. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #6624 (merged), which made a calendar view an additional page. This closes the same hole for
view: slots— and repairs two things the merge sequence left behind.1. The slot picker is an additional page too
view: slotswas left replacing the layout, on the argument that a picker is an authoring surface rather than a second way to browse. That does not survive contact with a booking document: the picker is how a booking is created, the document page is how it is worked with afterwards, and an author needs both — exactly the choice #6547 was about.So the picker gets the calendar's treatment:
EdmIntentGeneratoremitsslotsViewinstead oflayoutType: MANAGE_SLOTS,uiSlotsModelskeys on it, andslots.jsstops emitting the shared manage form — the layout owns the editor, so slot-click on a document master now lands on the document create page prefilled with the chosen datetime. The picker owns/<Entity>, the layout browses at/<Entity>/list, and the two carry a Slots⇄List switch.MANAGE_SLOTSis gone from every consumer; likeMANAGE_CALENDARit was intent-only and never offered by the entity editor, so nothing hand-authored carries it.Nothing about a
view:replaces a layout any more.2. A view no longer double-registers its perspective
A defect #6624 introduced, which extending the rule made obvious:
navigation.js'sPERSPECTIVE_COLLECTIONSlisteduiCalendarModels/uiSlotsModelsalongside the layout collections. Once a view entity keeps its layout it is a member of both, so its perspective was generated twice — the same rename path written twice and a duplicateapplication-perspectivescontribution. Harmless on disk (identical content overwriting itself), but wrong. Both view collections are dropped from that list; a view entity is always in exactly one layout collection.3. The Java generation port had drifted out of parity — with no test to notice
#6628portedgenerateUtils.jsto Java (ModelGenerator) roughly an hour after #6624 merged, and the port was written against the pre-#6624 logic:uiCalendarModels/uiSlotsModels/personalCalendarModels/personalListModelsstill keyed onMANAGE_CALENDAR/MANAGE_SLOTS, whichEdmIntentGeneratorno longer emits.Nothing is broken on master today — per
GENERATION_UTILS_JAVA_PLAN.mdboth paths are live and no consumer is switched, and the JS path is what executes. But the moment PR 2 of that plan flips consumers, calendar and slots pages would silently stop being generated: an empty partition produces no files and no error.GenerationParityITcould not catch it, because no parity fixture declares a view — every existing fixture matches on both pipelines whatever these four partitions do. Fixed here:ModelGeneratorkeys oncalendarView/slotsView, andpersonalListModelsno longer excludes calendar roots (matching the JS).views.modelfixture — one calendar entity, one slot-picker entity, both keeping theirMANAGElayout — registered as a parity case. Verified it is a real guard: with theModelGeneratorfix reverted the case fails on the calendar/slots page files; with it, both pipelines agree.Verification
EdmIntentGeneratorTestgainsdocumentMasterWithASlotsViewKeepsTheDocumentLayoutAndAddsThePicker; unit suite green.IntentEmissionCoverageITfixture gains a slots document (Visit): the/Visitpicker landing route,/Visit/list,/Visit/createresolving to the document editor, and both toggles.GenerationParityITgreen with the new fixture.open/close/step; a free slot opens/Visit/create?StartsAt=…on the document editor; the saved record's edit page carriesVisit Items+ Add, the totals footer and Print — exactly what a slots entity used to lose;/Visit/listshows the document list with a Slots toggle. No console errors.