Security config (3.1): - config/session.ts: cookie.secure now follows app.inProduction instead of being hardcoded to false - config/shield.ts: enable CSP with baseline directives compatible with Vite dev server and Inertia (self + @viteDevUrl/@viteHmrUrl) Frontend typing (3.2): - Replace 'any' props with concrete types (Computer, Component, ComponentType, ComputerState) across computers/*.vue and components/*.vue, using the existing inertia/pages/types/UITypes.ts definitions - Fix UITypes.ts: export ComponentType/ComputerState, switch from interface to type (interfaces are never assignable to Inertia's ComponentProps index signature), drop the stale componentTypeId/componentStateId fields that didn't match the actual Lucid schema (real field is typeId, no component state exists) - Add an asPageProp() boundary cast in the two controllers: Lucid's serialize() returns a loosely typed ModelObject that isn't structurally assignable to the concrete page prop shapes (and the inertia/** tree is excluded from the backend tsconfig, so real types can't be imported directly across that boundary) UTF-8 mojibake fixes (3.3): - Repair broken accented characters (├®/├á/├┤ -> é/à/ô, Ôé¼ -> €) left over from a bad encoding during the GWT->Inertia migration, across ComponentEditor.vue, ComputerComponentsTable.vue, SimpleGallery.vue, TableComponent.vue, isAdminMode.ts and the custom directives Misc cleanup (3.5): - computer.ts: replace console.warn with the app logger (includes computerId) when .cost is accessed without preloading components
104 lines
3.7 KiB
TypeScript
104 lines
3.7 KiB
TypeScript
import type { HttpContext } from '@adonisjs/core/http'
|
|
import { DateTime } from 'luxon'
|
|
import { storeComponentValidator } from '#validators/Components/store'
|
|
import { updateComponentValidator } from '#validators/Components/update'
|
|
import Component from '#models/component'
|
|
import ComponentType from '#models/component_type'
|
|
|
|
/**
|
|
* Lucid's `serialize()` returns a loosely typed `ModelObject`
|
|
* (`{ [key: string]: any }`). It is not structurally assignable to the
|
|
* concrete prop shapes declared by the Vue pages (see
|
|
* `inertia/pages/types/UITypes.ts`), which live in a separate TypeScript
|
|
* project (the `inertia/**` tree is excluded from the backend tsconfig).
|
|
* Since the controller fully controls which columns/relations are
|
|
* preloaded and serialized, this cast documents that the runtime shape
|
|
* matches what the page expects at this boundary.
|
|
*/
|
|
function asPageProp<T>(value: unknown): T {
|
|
return value as T
|
|
}
|
|
|
|
export default class ComponentsController {
|
|
async index({ inertia, auth }: HttpContext) {
|
|
const user = await auth.authenticate()
|
|
const components = await Component.query().preload('type').where('userId', user.id)
|
|
return inertia.render('components/index', {
|
|
components: asPageProp(components.map((c) => c.serialize())),
|
|
})
|
|
}
|
|
|
|
async create({ inertia }: HttpContext) {
|
|
const types = await ComponentType.all()
|
|
return inertia.render('components/create', {
|
|
types: asPageProp(types.map((t) => t.serialize())),
|
|
})
|
|
}
|
|
|
|
async store({ request, response, auth }: HttpContext) {
|
|
const user = await auth.authenticate()
|
|
const { quantity, ...componentData } = await request.validateUsing(storeComponentValidator)
|
|
await ComponentType.findOrFail(componentData.typeId)
|
|
for (let i = 0; i < quantity; i++) {
|
|
await Component.create({
|
|
...componentData,
|
|
purchaseDate: DateTime.fromFormat(componentData.purchaseDate, 'yyyy-MM-dd'),
|
|
userId: user.id,
|
|
})
|
|
}
|
|
response.redirect('/components')
|
|
}
|
|
|
|
async show({ params, auth, inertia }: HttpContext) {
|
|
const user = await auth.authenticate()
|
|
const componentId = params.id
|
|
const component = await Component.query()
|
|
.preload('type')
|
|
.where('userId', user.id)
|
|
.andWhere('id', componentId)
|
|
.firstOrFail()
|
|
return inertia.render('components/show', { component: asPageProp(component.serialize()) })
|
|
}
|
|
|
|
async edit({ params, auth, inertia }: HttpContext) {
|
|
const user = await auth.authenticate()
|
|
const types = await ComponentType.all()
|
|
const componentId = params.id
|
|
const component = await Component.query()
|
|
.preload('type')
|
|
.where('userId', user.id)
|
|
.andWhere('id', componentId)
|
|
.firstOrFail()
|
|
return inertia.render('components/edit', {
|
|
component: asPageProp(component.serialize()),
|
|
types: asPageProp(types.map((t) => t.serialize())),
|
|
})
|
|
}
|
|
|
|
async update({ params, auth, request, response }: HttpContext) {
|
|
const user = await auth.authenticate()
|
|
const componentData = await request.validateUsing(updateComponentValidator)
|
|
const component = await Component.query()
|
|
.where('userId', user.id)
|
|
.andWhere('id', params.id)
|
|
.firstOrFail()
|
|
component.merge({
|
|
...componentData,
|
|
purchaseDate: DateTime.fromFormat(componentData.purchaseDate, 'yyyy-MM-dd'),
|
|
})
|
|
await component.save()
|
|
return response.redirect('/components')
|
|
}
|
|
|
|
async destroy({ params, auth, response }: HttpContext) {
|
|
const user = await auth.authenticate()
|
|
const componentId = params.id
|
|
const component = await Component.query()
|
|
.where('userId', user.id)
|
|
.andWhere('id', componentId)
|
|
.firstOrFail()
|
|
await component.delete()
|
|
return response.redirect('/components')
|
|
}
|
|
}
|