fix(investor): simplify preparation flow, profile requests and scoped zone search
tests / ci (push) Canceled after 0s

This commit is contained in:
2026-10-28 21:26:59 +02:00
parent 54d1b2a543
commit 502e3ec4d5
23 changed files with 573 additions and 101 deletions
@@ -141,6 +141,7 @@ export default function OpportunityDraft({
canEditDraft?: boolean;
}>().props;
const proactiveEntryUrl=usePage().url;
const uniquePromoterContext=profileAccess?.contexts.length===1?profileAccess.contexts[0]:undefined;
const [data, setData] = useState<Values>({
...values,
...(!record && !values.proactive && new URLSearchParams(proactiveEntryUrl.split('?')[1]??'').get('analysis')==='proactive' ? {proactive:newProactive()} : {}),
@@ -150,10 +151,10 @@ export default function OpportunityDraft({
? (profileOrganization ?? null)
: profileAccess?.internalPromoter
? null
: (profileAccess?.contexts[0]?.organization_id ?? null),
: (uniquePromoterContext?.organization_id ?? null),
opportunity_category:
values.opportunity_category ??
profileAccess?.contexts[0]?.type ??
uniquePromoterContext?.type ??
'',
}
: {}),
@@ -173,10 +174,11 @@ export default function OpportunityDraft({
const unavailable = Boolean(
record?.deleted_at || record?.status === 'archived',
);
const hasCanonicalPreparation = profileMode && canonicalOptions && Boolean(data.opportunity_category) && !data.proactive;
const archiveAvailable = Boolean(usePage().props.opportunityManagement);
const set = (key: string, value: string) =>
setData((d) => ({ ...d, [key]: value }));
async function send(action: 'save' | 'delete' | 'archive' | 'restore') {
async function send(action: 'save' | 'delete' | 'archive' | 'restore', resourcesGroup?: string) {
if (busy) return;
setBusy(true);
setErrors({});
@@ -224,8 +226,10 @@ export default function OpportunityDraft({
}
setMessage(result.message);
if (result.etag) setToken(result.etag);
if (!record) router.visit(`${basePath}/${result.id}/edit`);
if (resourcesGroup) router.visit(`${basePath}/${record?.id ?? result.id}/resources?return_group=${encodeURIComponent(resourcesGroup)}`);
else if (!record) router.visit(`${basePath}/${result.id}/edit${window.location.hash.startsWith('#fill-') ? window.location.hash : ''}`);
else if (action !== 'save') router.reload();
else if (profileMode) router.reload({only:['canonicalResponse','etag','history','workflowState','profileContext']});
} catch {
setMessage(
'Resposta indisponível. Os dados foram preservados; confira o registo no servidor antes de repetir.',
@@ -237,10 +241,8 @@ export default function OpportunityDraft({
document.querySelector<HTMLSelectElement>(
'[data-association-index][aria-invalid="true"]',
);
(
invalidAssociation ??
document.getElementById('opportunity-result')
)?.focus();
if (invalidAssociation) invalidAssociation.focus();
else document.getElementById('opportunity-result')?.focus({preventScroll:true});
});
}
}
@@ -252,9 +254,7 @@ export default function OpportunityDraft({
: 'Nova oportunidade'
}
>
<Link href={basePath}>
{profileMode ? 'Minhas oportunidades' : 'Voltar à gestão'}
</Link>
{!profileMode && <Link href={basePath}>Voltar à gestão</Link>}
{promotionHref && <Link className="ml-3 underline" href={promotionHref}>Divulgação promocional — Em preparação</Link>}
{!!profileContext?.corridor_agribusiness && (
<section className="my-4 space-y-2 rounded border p-4">
@@ -273,11 +273,11 @@ export default function OpportunityDraft({
</Link>
)}
{profileMode && (
<section
aria-label="Âmbito desta entrega"
<details
aria-label="Disponibilidade por modalidade"
className="rounded border p-3"
>
<h2>Âmbito desta entrega</h2>
<summary className="cursor-pointer font-medium">Modalidades disponíveis e condições de submissão</summary>
<p>
Seis categorias base: projeto de investimento,
imobiliário, fundiário, venda de negócio, parceria e
@@ -306,7 +306,7 @@ export default function OpportunityDraft({
certifica a viabilidade, a titularidade ou a decisão
externa de cada caso.
</p>
</section>
</details>
)}
{profileMode && record && (
<ClassificationReview id={record.id} refreshToken={token} />
@@ -336,8 +336,8 @@ export default function OpportunityDraft({
}));
}}
>
{profileAccess?.internalPromoter && (
<option value="">
{(profileAccess?.internalPromoter || !uniquePromoterContext) && (
<option value="|">
Selecionar o promotor real da oportunidade
</option>
)}
@@ -823,7 +823,7 @@ export default function OpportunityDraft({
)}
{!readOnly && (
<>
<Field
{!hasCanonicalPreparation && <Field
label="Motivo da alteração"
error={errors.reason}
>
@@ -834,8 +834,8 @@ export default function OpportunityDraft({
minLength={20}
maxLength={1000}
/>
</Field>
{!unavailable && (
</Field>}
{!unavailable && !hasCanonicalPreparation && (
<button className={button} disabled={busy}>
Guardar rascunho
</button>
@@ -893,7 +893,7 @@ export default function OpportunityDraft({
</>
)}
</form>
{record && (
{record && (!profileMode || readOnly || unavailable || !canonicalOptions || !data.opportunity_category) && (
<Link
href={
resourcesInstalled
@@ -911,10 +911,10 @@ export default function OpportunityDraft({
Associações territoriais e produtivas existentes
</Link>
)}
{profileMode && canonicalOptions && (
{profileMode && canonicalOptions && Boolean(data.opportunity_category) && (
<section>
{record && !readOnly && !unavailable && (
<OpportunityContactForm
<details><summary className="cursor-pointer font-medium">Acrescentar um contacto à oportunidade</summary><OpportunityContactForm
id={record.id}
etag={token ?? ''}
organization={
@@ -940,7 +940,7 @@ export default function OpportunityDraft({
},
}));
}}
/>
/></details>
)}
<OpportunityCanonicalFields
value={
@@ -962,6 +962,7 @@ export default function OpportunityDraft({
],
}}
errors={errors}
missingPaths={canonicalResponse?.completion.missing_paths}
category={valueText(data.opportunity_category ?? '')}
organization={
(data.organization_id ?? null) as string | null
@@ -969,16 +970,23 @@ export default function OpportunityDraft({
actorId={auth.user.id}
sectors={sectors}
disabled={busy || readOnly || unavailable}
onOpenResources={!readOnly && !unavailable && resourcesInstalled ? (group) => void send('save',group) : undefined}
/>
{!readOnly && !unavailable && (
{!readOnly && !unavailable && hasCanonicalPreparation && (
<div className="sticky bottom-0 space-y-3 rounded border bg-background p-4 shadow-sm">
<Field label="O que alterou nesta preparação" error={errors.reason}>
<textarea className={control} value={reason} onChange={(event) => setReason(event.target.value)} minLength={20} maxLength={1000} />
</Field>
<button
type="button"
className={button}
disabled={busy}
onClick={() => void send('save')}
>
Guardar contrato no rascunho
Guardar preparação
</button>
<p className="text-sm">Pode guardar incompleto e continuar mais tarde em Minhas oportunidades.</p>
</div>
)}
{Object.entries(errors)
.filter(([key]) => key.startsWith('canonical'))
@@ -179,6 +179,8 @@ export default function OpportunityResources({
readOnly?: boolean;
countries?: { code: string; name: string }[];
}>().props;
const returnGroup = new URLSearchParams(usePage().url.split('?')[1] ?? '').get('return_group');
const returnHash = ['territory', 'evidence'].includes(returnGroup ?? '') ? `#fill-${returnGroup}` : '#fill-evidence';
const [kind, setKind] = useState<Kind>('locations');
const [editing, setEditing] = useState<Resource | null>(null);
const [payload, setPayload] = useState<Payload>({ country_code: 'MZ' });
@@ -307,7 +309,7 @@ export default function OpportunityResources({
!!opportunity.deleted_at || opportunity.status === 'archived';
return (
<Management title="Imagens, documentos e localizações">
<Link href={`${basePath}/${opportunity.id}/edit`}>
<Link href={`${basePath}/${opportunity.id}/edit${returnHash}`}>
Regressar ao rascunho #{opportunity.id}
</Link>
<p>