Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions apps/api/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
]
}
},
Expand Down Expand Up @@ -10491,7 +10493,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
],
"example": "saturated",
"description": "Target operational status. Hidden is not allowed; use close() to deactivate."
Expand Down Expand Up @@ -10617,7 +10621,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
],
"example": "active"
},
Expand Down Expand Up @@ -11021,7 +11027,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
],
"example": "active"
},
Expand Down Expand Up @@ -11271,7 +11279,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
],
"example": "active"
},
Expand Down Expand Up @@ -11506,7 +11516,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
],
"example": "active"
},
Expand Down Expand Up @@ -11746,7 +11758,9 @@
"active",
"saturated",
"paused",
"closed"
"closed",
"preparing",
"assisted"
],
"example": "active"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,11 @@ export class GetEmergencyMetrics {
needCounts[NeedStatus.Pending] + needCounts[NeedStatus.Validated];
const needClosed = needCounts[NeedStatus.Fulfilled];

const resourceTotal =
resourceCounts[PublicStatus.Hidden] +
resourceCounts[PublicStatus.Active] +
resourceCounts[PublicStatus.Saturated] +
resourceCounts[PublicStatus.Paused] +
resourceCounts[PublicStatus.Closed];
// Sum across every public status (robust to new statuses being added).
const resourceTotal = Object.values(resourceCounts).reduce(
(sum, n) => sum + (n ?? 0),
0,
);

return {
needs: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ export class DrizzleMetricsReader implements MetricsReader {
[PublicStatus.Saturated]: 0,
[PublicStatus.Paused]: 0,
[PublicStatus.Closed]: 0,
[PublicStatus.Preparing]: 0,
[PublicStatus.Assisted]: 0,
};
for (const row of rows) {
const status = row.publicStatus as PublicStatus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const VISIBLE = [
PublicStatus.Active,
PublicStatus.Saturated,
PublicStatus.Paused,
PublicStatus.Preparing,
PublicStatus.Assisted,
];

const PUBLICLY_VISIBLE_VERIFICATION = [
Expand Down
4 changes: 4 additions & 0 deletions apps/api/src/contexts/resources/domain/resource-enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ export enum PublicStatus {
Saturated = 'saturated',
Paused = 'paused',
Closed = 'closed',
/** En preparación: aún no operativo, pero públicamente visible. */
Preparing = 'preparing',
/** Alojamiento asistido / colectivo específico; públicamente visible. */
Assisted = 'assisted',
}
14 changes: 14 additions & 0 deletions apps/api/src/contexts/resources/domain/resource.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,20 @@ describe('Resource', () => {
expect(r.publicStatus).toBe(PublicStatus.Paused);
});

it('transitions Active → Preparing and stays publicly visible', () => {
const r = makePublished();
r.changePublicStatus(PublicStatus.Preparing);
expect(r.publicStatus).toBe(PublicStatus.Preparing);
expect(r.isPubliclyVisible()).toBe(true);
});

it('transitions Active → Assisted and stays publicly visible', () => {
const r = makePublished();
r.changePublicStatus(PublicStatus.Assisted);
expect(r.publicStatus).toBe(PublicStatus.Assisted);
expect(r.isPubliclyVisible()).toBe(true);
});

it('throws ResourceNotPublishedError when source is Hidden', () => {
const r = make();
expect(() => r.changePublicStatus(PublicStatus.Active)).toThrow(
Expand Down
4 changes: 3 additions & 1 deletion apps/api/src/contexts/resources/domain/resource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,9 @@ export class Resource {
return (
this._publicStatus === PublicStatus.Active ||
this._publicStatus === PublicStatus.Saturated ||
this._publicStatus === PublicStatus.Paused
this._publicStatus === PublicStatus.Paused ||
this._publicStatus === PublicStatus.Preparing ||
this._publicStatus === PublicStatus.Assisted
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const PUBLICLY_VISIBLE_STATUSES = [
PublicStatus.Active,
PublicStatus.Saturated,
PublicStatus.Paused,
PublicStatus.Preparing,
PublicStatus.Assisted,
];

/**
Expand Down Expand Up @@ -823,6 +825,8 @@ export class DrizzleResourceRepository implements ResourceRepository {
[PublicStatus.Saturated]: 0,
[PublicStatus.Paused]: 0,
[PublicStatus.Closed]: 0,
[PublicStatus.Preparing]: 0,
[PublicStatus.Assisted]: 0,
};
for (const row of rows) {
const status = row.publicStatus as PublicStatus;
Expand Down
7 changes: 4 additions & 3 deletions apps/api/src/contexts/resources/infrastructure/http/dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,14 @@ export class UpdateInventoryDto {

export class UpdateResourcePublicStatusDto {
@ApiProperty({
enum: ['active', 'saturated', 'paused', 'closed'],
enum: ['active', 'saturated', 'paused', 'closed', 'preparing', 'assisted'],
example: 'saturated',
description:
'Target operational status. Hidden is not allowed; use close() to deactivate.',
})
@IsEnum(['active', 'saturated', 'paused', 'closed'])
status!: 'active' | 'saturated' | 'paused' | 'closed';
@IsEnum(['active', 'saturated', 'paused', 'closed', 'preparing', 'assisted'])
status!:
'active' | 'saturated' | 'paused' | 'closed' | 'preparing' | 'assisted';
}

export class NearbyResourcesQueryDto {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,8 @@ export class ResourcesController {
saturated: PublicStatus.Saturated,
paused: PublicStatus.Paused,
closed: PublicStatus.Closed,
preparing: PublicStatus.Preparing,
assisted: PublicStatus.Assisted,
};
await this.updateStatus.execute({
resourceId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ export class InMemoryResourceRepository implements ResourceRepository {
[PublicStatus.Saturated]: 0,
[PublicStatus.Paused]: 0,
[PublicStatus.Closed]: 0,
[PublicStatus.Preparing]: 0,
[PublicStatus.Assisted]: 0,
};
for (const snap of this.store.values()) {
if (snap.emergencyId === emergencyId.value) {
Expand Down
12 changes: 11 additions & 1 deletion apps/web/src/app/admin/points/centro-presentation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,19 @@ const STATUS_KEYS: Record<string, keyof AdminMessages> = {
closed: 'centros_status_closed',
};

/**
* Operational states not (yet) present in the admin i18n bundle. Rendered with
* direct labels so the admin console shows them correctly meanwhile.
*/
const STATUS_LITERALS: Record<string, string> = {
preparing: 'En preparación',
assisted: 'Asistido',
};

export function statusLabel(status: string, ta: AdminMessages): string {
const key = STATUS_KEYS[status];
return key ? ta[key] : status;
if (key) return ta[key];
return STATUS_LITERALS[status] ?? status;
}

export const PUBLIC_STATUSES: ReadonlyArray<string> = [
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/components/atoms/status-light.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ const COLOR_MAP: Record<PublicStatus, string> = {
paused: 'bg-accent',
closed: 'bg-danger',
hidden: 'bg-muted',
preparing: 'bg-accent',
assisted: 'bg-muted',
};

const LABEL_KEY: Record<PublicStatus, keyof Messages['status_light']> = {
Expand All @@ -24,6 +26,8 @@ const LABEL_KEY: Record<PublicStatus, keyof Messages['status_light']> = {
paused: 'paused',
closed: 'closed',
hidden: 'hidden',
preparing: 'preparing',
assisted: 'assisted',
};

// `t` is optional — falls back to Spanish when omitted (used in coordinator pages).
Expand Down
9 changes: 8 additions & 1 deletion apps/web/src/components/organisms/emergency-map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ const ICONS: Record<MarkerColor, L.Icon> = {
};

// ── Types ─────────────────────────────────────────────────────────────────────
export type ResourcePublicStatus = 'active' | 'saturated' | 'paused' | 'closed' | 'hidden';
export type ResourcePublicStatus =
| 'active'
| 'saturated'
| 'paused'
| 'closed'
| 'hidden'
| 'preparing'
| 'assisted';

export interface MapPoint {
id: string;
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/components/organisms/resource-detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ export function ResourceDetail({
saturated: tc.public_status_saturated,
paused: tc.public_status_paused,
closed: tc.public_status_closed,
preparing: 'En preparación',
assisted: 'Asistido',
};

const [state, formAction, pending] = useActionState<ActionResult, FormData>(
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/i18n/messages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,8 @@ export const en = {
paused: 'Paused',
closed: 'Closed',
hidden: 'Hidden',
preparing: 'Preparing',
assisted: 'Assisted',
aria_prefix: 'Operational status:',
},

Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/i18n/messages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,8 @@ export const es = {
paused: 'En pausa',
closed: 'Cerrado',
hidden: 'Oculto',
preparing: 'En preparación',
assisted: 'Asistido',
aria_prefix: 'Estado operativo:',
},

Expand Down
14 changes: 7 additions & 7 deletions packages/api-client/src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3370,7 +3370,7 @@ export interface components {
* @example saturated
* @enum {string}
*/
status: "active" | "saturated" | "paused" | "closed";
status: "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
};
MyManagedResourceDto: {
/**
Expand Down Expand Up @@ -3426,7 +3426,7 @@ export interface components {
* @example active
* @enum {string}
*/
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed";
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
/** Format: uuid */
ownerOrganizationId: string | null;
/**
Expand Down Expand Up @@ -3624,7 +3624,7 @@ export interface components {
* @example active
* @enum {string}
*/
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed";
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
/** Format: uuid */
ownerOrganizationId: string | null;
/**
Expand Down Expand Up @@ -3758,7 +3758,7 @@ export interface components {
* @example active
* @enum {string}
*/
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed";
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
/** Format: uuid */
ownerOrganizationId: string | null;
/**
Expand Down Expand Up @@ -3883,7 +3883,7 @@ export interface components {
* @example active
* @enum {string}
*/
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed";
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
/** Format: uuid */
ownerOrganizationId: string | null;
/**
Expand Down Expand Up @@ -4009,7 +4009,7 @@ export interface components {
* @example active
* @enum {string}
*/
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed";
publicStatus: "hidden" | "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
/** Format: uuid */
ownerOrganizationId: string | null;
/**
Expand Down Expand Up @@ -8139,7 +8139,7 @@ export interface operations {
/** @description Filter by resource type */
type?: "collection_point" | "delivery_point" | "collection_and_delivery" | "warehouse" | "transport" | "supplier" | "venue";
/** @description Filter by operational status (includes hidden/closed — admin only) */
status?: "hidden" | "active" | "saturated" | "paused" | "closed";
status?: "hidden" | "active" | "saturated" | "paused" | "closed" | "preparing" | "assisted";
/** @description Filter by verification level */
verification?: "unverified" | "verified" | "official" | "rejected";
/** @description Full-text search matched against name, address and city (case-insensitive, max 100 chars) */
Expand Down
Loading