fix: complete InvesteMoz validation and error corrections

This commit is contained in:
2026-10-29 21:47:33 +02:00
parent 63147312e2
commit daf8623441
718 changed files with 127308 additions and 20959 deletions
+6 -6
View File
@@ -1,3 +1,4 @@
import { inputText } from '../../lib/input-text.ts';
import { Link, router, useForm } from '@inertiajs/react';
import { useEffect, useState } from 'react';
import { Frame, card, button } from '@/pages/investment/shared';
@@ -127,7 +128,7 @@ export default function Edit({
setPreview(null);
setSaved(false);
};
const value = (key: string) => String(form.data.draft[key] ?? '');
const value = (key: string) => inputText(form.data.draft[key] ?? '');
const select = (key: string, label: string, choices: Choice[]) => (
<Field label={label}>
<select
@@ -270,9 +271,8 @@ export default function Edit({
onSubmit={(e) => {
e.preventDefault();
setPreview(null);
record
? form.put(`/management/concursos/${record.id}`)
: form.post('/management/concursos');
if (record) form.put(`/management/concursos/${record.id}`);
else form.post('/management/concursos');
}}
>
<section className={`${card} grid gap-3 md:grid-cols-2`}>
@@ -781,7 +781,7 @@ export default function Edit({
</h3>
<p>
Motivo público:{' '}
{String(preview.payload.public_reason)}
{inputText(preview.payload.public_reason)}
</p>
<NoticeContent p={preview.payload} />
<button
@@ -792,7 +792,7 @@ export default function Edit({
{
act: preview.act,
hash: preview.hash,
reason: String(
reason: inputText(
preview.payload.public_reason,
),
},
+10 -8
View File
@@ -1,3 +1,4 @@
import { inputText } from '../../lib/input-text.ts';
import { Link, useForm } from '@inertiajs/react';
import { Frame, card, button } from '@/pages/investment/shared';
import { Field, control, states, type Publication } from './shared';
@@ -151,22 +152,23 @@ export default function Index({
className="underline"
href={`/concursos/${item.id}${query ? '?' + query : ''}`}
>
{String(item.publication.payload.title)}
{inputText(item.publication.payload.title)}
</Link>
</h2>
<p>
{String(item.publication.payload.organization_name)}{' '}
{inputText(
item.publication.payload.organization_name,
)}{' '}
· {states[item.state]}
</p>
<p>
Entrega:{' '}
{String(item.publication.payload.deadline).replace(
'T',
' ',
)}{' '}
· {String(item.publication.payload.timezone)}
{inputText(
item.publication.payload.deadline,
).replace('T', ' ')}{' '}
· {inputText(item.publication.payload.timezone)}
</p>
<p>{String(item.publication.payload.object)}</p>
<p>{inputText(item.publication.payload.object)}</p>
</article>
))}
</div>
+3 -1
View File
@@ -1,3 +1,4 @@
import { inputText } from '../../lib/input-text.ts';
import { Link } from '@inertiajs/react';
import { Frame, card, button } from '@/pages/investment/shared';
import { states, type Publication } from './shared';
@@ -54,7 +55,8 @@ export default function Manage({
{items.map((item) => (
<article key={item.id} className={`${card} my-3`}>
<h2 className="font-semibold">
{item.title ?? String(item.publication?.payload.title)}
{item.title ??
inputText(item.publication?.payload.title)}
</h2>
{watched ? (
<>
+26 -19
View File
@@ -1,3 +1,4 @@
import { inputText } from '../../lib/input-text.ts';
import type { ReactNode } from 'react';
export type Lot = { code: string; description: string; quantities: string };
@@ -108,10 +109,12 @@ export function NoticeContent({ p }: { p: Payload }) {
};
return (
<div className="space-y-5">
<h2 className="text-2xl font-semibold">{String(p.title ?? '')}</h2>
<h2 className="text-2xl font-semibold">
{inputText(p.title ?? '')}
</h2>
<p>
<strong>Entidade:</strong>{' '}
{String(p.organization_name ?? 'Por indicar')}
{inputText(p.organization_name ?? 'Por indicar')}
</p>
<p>
Regime:{' '}
@@ -122,28 +125,30 @@ export function NoticeContent({ p }: { p: Payload }) {
private: 'Concurso privado',
other: 'Outro regime documentado',
} as Record<string, string>
)[String(p.regime)] ?? 'Por indicar'}
)[inputText(p.regime)] ?? 'Por indicar'}
</p>
<section>
<h3 className="text-lg font-semibold">
Objecto e como participar
</h3>
<p className="whitespace-pre-wrap">{String(p.object ?? '')}</p>
<p className="whitespace-pre-wrap">
{inputText(p.object ?? '')}
</p>
<p className="my-2 rounded border p-3">
<strong>Entrega:</strong>{' '}
{String(p.deadline ?? 'Por indicar').replace('T', ' ')} ·{' '}
{String(p.timezone ?? '')}
{inputText(p.deadline ?? 'Por indicar').replace('T', ' ')} ·{' '}
{inputText(p.timezone ?? '')}
<br />
{String(p.delivery_channel ?? '')} ·{' '}
{String(p.delivery_address ?? '')}
{inputText(p.delivery_channel ?? '')} ·{' '}
{inputText(p.delivery_address ?? '')}
</p>
<p>
Sector: {String(p.sector_name ?? 'Por indicar')} ·
Localização: {String(p.territory_name ?? 'Por indicar')}
Sector: {inputText(p.sector_name ?? 'Por indicar')} ·
Localização: {inputText(p.territory_name ?? 'Por indicar')}
</p>
{p.project_name && (
<p>
Projecto relacionado: {String(p.project_name)}. Esta
Projecto relacionado: {inputText(p.project_name)}. Esta
relação não confirma execução ou contratação.
</p>
)}
@@ -156,9 +161,10 @@ export function NoticeContent({ p }: { p: Payload }) {
{p.deadline_previous && (
<p className="rounded border p-3">
<strong>Prorrogação:</strong> prazo anterior{' '}
{String(p.deadline_previous).replace('T', ' ')} (
{String(p.timezone_previous)}) → novo prazo{' '}
{String(p.deadline).replace('T', ' ')} ({String(p.timezone)}
{inputText(p.deadline_previous).replace('T', ' ')} (
{inputText(p.timezone_previous)}) → novo prazo{' '}
{inputText(p.deadline).replace('T', ' ')} (
{inputText(p.timezone)}
).
</p>
)}
@@ -180,14 +186,15 @@ export function NoticeContent({ p }: { p: Payload }) {
{links.includes(key) ? (
<a
className="underline"
href={String(p[key])}
href={inputText(p[key])}
rel="noopener noreferrer"
>
{String(p[key])}
{inputText(p[key])}
</a>
) : (
(
names[String(p[key])] ?? String(p[key])
names[inputText(p[key])] ??
inputText(p[key])
).replace(/^(\d{4}-\d{2}-\d{2})T/, '$1 ')
)}
</dd>
@@ -244,8 +251,8 @@ export function NoticeContent({ p }: { p: Payload }) {
<p className="rounded border p-3">
O InvesteMoz divulga este acto e não recebe propostas nesta
secção. Apresente a proposta no canal indicado nos documentos.
Esta divulgação não substitui os meios oficiais exigidos,
não comprova envio à UFSA ou ao financiador e não equivale à
Esta divulgação não substitui os meios oficiais exigidos, não
comprova envio à UFSA ou ao financiador e não equivale à
execução do investimento.
</p>
</div>
+3 -2
View File
@@ -1,3 +1,4 @@
import { inputText } from '../../lib/input-text.ts';
import { Head, Link, router, usePage } from '@inertiajs/react';
import { Frame, card, button } from '@/pages/investment/shared';
import { NoticeContent, states, acts, type Publication } from './shared';
@@ -18,10 +19,10 @@ export default function Show({
backUrl: string;
printMode: boolean;
}) {
const { auth } = usePage<{ auth: { user: unknown | null } }>().props;
const { auth } = usePage<{ auth: { user: unknown } }>().props;
return (
<Frame title="Concurso e anúncio">
<Head title={String(publication.payload.title)} />
<Head title={inputText(publication.payload.title)} />
<style>
{
'@media print { nav, header, aside, footer, [data-slot="sidebar"], .no-print {display:none!important} main {margin:0!important; width:100%!important} details {display:block} }'