bert.hausmans
5c689f42a0
Routing wiring (Phase D of WS-3 PR-B1):
- apps/app/src/plugins/1.router/guards.ts: add a single early-return
carve-out before the org-selection redirect — `if (to.meta.context
=== 'portal') return`. Per ARCH-CONSOLIDATION-2026-04 §4.3,
meta.context is the canonical contract; PR-B2 evolves the guards
from this key to full context-aware logic (post-login landing,
context-switcher, role checks).
- apps/app/env.d.ts: extend RouteMeta with the new layout names
('OrganizerLayout' | 'PortalLayout' | 'PublicLayout'), context,
requiresAuth, requiresToken, navMode, navTitle.
- apps/app/typed-router.d.ts: regenerated by unplugin-vue-router to
pick up portal/* and register/* route names.
- Page meta finalisation: portal pages have layout: 'PortalLayout',
context: 'portal', preserving original requiresAuth + nav fields;
register pages have layout: 'PublicLayout' + public: true (the
apps/app guard convention for public routes, since meta.public is
what the existing guard recognises).
Form-types restructure (boundaries cleanup):
- apps/app/src/composables/forms/types/formBuilder.ts → src/types/forms/
- apps/app/src/composables/forms/utils/{formValidation,validators}.ts
→ src/utils/forms/
- All `@/composables/forms/{types,utils}/*` imports rewritten across
pages, components, composables, tests.
- This avoids a `types → composables` boundaries violation at
src/types/formSchema.ts which re-exports primitives from the
inlined form-schema. types/formSchema.ts now imports from
@/types/forms/formBuilder which is in the same boundaries zone.
Lint cleanup for moved portal sources (apps/portal had no
.eslintrc.cjs; the migrated code now has to pass apps/app's stricter
config):
- axios.isAxiosError → named import { isAxiosError }
(ClaimenTab, RoosterTab, profiel.vue)
- void schemaQuery.refetch() → schemaQuery.refetch()
(register/[public_token].vue)
- if-then-else collapsed to single boolean return (formatFieldValue)
- :delay-on-touch-only="true" → delay-on-touch-only shorthand
(FieldSectionPriority)
- ml-2 class → ms-2 (FieldAvailabilityPicker)
- multi-statement-per-line splits in profiel.vue + spec files
- unused emailConfigured ref removed (profiel.vue)
- one-component-per-file disabled with TODO TECH-WS3-PORTAL-LINT-CLEANUP
ref (FieldOptionsLocale.spec.ts — multi-Wrapper test pattern)
- restored `import Draggable from 'vuedraggable'` after lint:fix
removed it (template-only usage; the import IS needed)
- camelcase param renamed in FieldOptionsLocale harness factory
- typecheck nudge: spec state.data typed via PublicFormSectionOption[] /
PublicFormTimeSlot[] aliases instead of Record<string, unknown>
- PortalLayout.vue: explicit `import { useRoute, useRouter }` so the
vitest mock can intercept (the trimmed AutoImport set doesn't pull
vue-router's auto-imports)
Vitest: 23 / 162 passing. Lint: 0 errors / 0 new warnings (only the
pre-existing boundaries v5→v6 deprecation warnings remain). Typecheck:
clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
37 lines
1.5 KiB
TypeScript
37 lines
1.5 KiB
TypeScript
import type { InjectionKey, Ref } from 'vue'
|
|
import { computed, inject, provide } from 'vue'
|
|
|
|
// Page-level provide/inject for the public form token. Sibling-endpoint
|
|
// fetches (time-slots, sections) read it instead of receiving it as a
|
|
// prop through FieldRenderer, which would couple every renderer to every
|
|
// new sibling resource.
|
|
export const PUBLIC_FORM_TOKEN_KEY: InjectionKey<Ref<string>> = Symbol('PublicFormToken')
|
|
|
|
export function providePublicFormToken(token: Ref<string>): void {
|
|
provide(PUBLIC_FORM_TOKEN_KEY, token)
|
|
}
|
|
|
|
export function usePublicFormToken(): Ref<string> {
|
|
const token = inject(PUBLIC_FORM_TOKEN_KEY)
|
|
if (!token)
|
|
throw new Error('usePublicFormToken: no token provided. Did you forget providePublicFormToken in the page?')
|
|
|
|
return token
|
|
}
|
|
|
|
// Page-level provide/inject for the active form locale. Used by
|
|
// option-bearing field renderers (FieldRadio / FieldSelect /
|
|
// FieldMultiselect / FieldCheckboxList) to resolve per-option
|
|
// translations[locale] over the default option label (WS-5d §17.6).
|
|
// Falls back to 'nl' (Crewli's default schema locale) when no provider
|
|
// is on the tree — keeps standalone component tests light.
|
|
export const PUBLIC_FORM_LOCALE_KEY: InjectionKey<Ref<string>> = Symbol('PublicFormLocale')
|
|
|
|
export function providePublicFormLocale(locale: Ref<string>): void {
|
|
provide(PUBLIC_FORM_LOCALE_KEY, locale)
|
|
}
|
|
|
|
export function usePublicFormLocale(): Ref<string> {
|
|
return inject(PUBLIC_FORM_LOCALE_KEY, computed(() => 'nl'))
|
|
}
|