Merge branch 'main' into chore/update-dimesion-flags

Author: ayeshmcg

admin/backend/src/recreation-resources/dtos/recreation-resource-detail.dto.ts

@@ -380,6 +380,22 @@ export class RecreationResourceDetailDto extends BaseRecreationResourceDto {
   })
   project_established_date?: Date;
 
+  @ApiProperty({
+    description: 'Date of the last recreation inspection for the resource',
+    example: '2023-08-15',
+    required: false,
+    type: Date,
+  })
+  last_rec_inspection_date?: Date;
+
+  @ApiProperty({
+    description: 'Date of the last hazard tree assessment for the resource',
+    example: '2023-08-15',
+    required: false,
+    type: Date,
+  })
+  last_hzrd_tree_assess_date?: Date;
+
   @ApiProperty({
     description: 'Recreation control access code',
     example: 'G',

admin/backend/src/recreation-resources/recreation-resource.select.ts

@@ -105,6 +105,8 @@ const _recreationResourceSelect = {
   maintenance_standard_code: true,
   right_of_way: true,
   rec_status_code: true,
+  last_rec_inspection_date: true,
+  last_hzrd_tree_assess_date: true,
   recreation_maintenance_standard_code: {
     select: {
       description: true,

admin/backend/src/recreation-resources/utils/formatRecreationResourceDetailResults.ts

@@ -133,6 +133,8 @@ export function formatRecreationResourceDetailResults(
     site_point_geometry: spatialFeatures?.site_point_geometry ?? undefined,
     recreation_district: recreationDistrict,
     project_established_date: result.project_established_date ?? undefined,
+    last_rec_inspection_date: result.last_rec_inspection_date ?? undefined,
+    last_hzrd_tree_assess_date: result.last_hzrd_tree_assess_date ?? undefined,
     recreation_control_access_code: {
       recreation_control_access_code:
         recreation_control_access_code?.recreation_control_access_code ?? '',

admin/backend/src/resource-asset/dto/resource-asset-repair.dto.ts

@@ -21,6 +21,7 @@ export class BaseRecreationAssetRepairDto {
       'Remedial repair classification code (FK to recreation_remed_repair_code)',
     example: 'RC',
     maxLength: 2,
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -31,6 +32,7 @@ export class BaseRecreationAssetRepairDto {
   @ApiPropertyOptional({
     description: 'Estimated financial cost for repair',
     example: 450.0,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -41,6 +43,7 @@ export class BaseRecreationAssetRepairDto {
   @ApiPropertyOptional({
     description: 'Final actual cost incurred',
     example: 485.5,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -51,6 +54,7 @@ export class BaseRecreationAssetRepairDto {
   @ApiPropertyOptional({
     description: 'Date completed (YYYY-MM-DD)',
     example: '2026-08-10',
+    type: String,
     nullable: true,
   })
   @IsDateString()
@@ -61,6 +65,7 @@ export class BaseRecreationAssetRepairDto {
     description: 'Urgency/priority of repair',
     example: 'High',
     maxLength: 25,
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -72,6 +77,7 @@ export class BaseRecreationAssetRepairDto {
     description: 'Trail segment start reference',
     example: 'KM 0.5',
     maxLength: 50,
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -83,6 +89,7 @@ export class BaseRecreationAssetRepairDto {
     description: 'Trail segment end reference',
     example: 'KM 1.2',
     maxLength: 50,
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -133,24 +140,34 @@ export class RecreationAssetRepairDto extends BaseRecreationAssetRepairDto {
   @Type(() => Number)
   asset_id: number;
 
-  @ApiPropertyOptional({ description: 'Timestamp when record was created' })
+  @ApiPropertyOptional({
+    description: 'Timestamp when record was created',
+    type: String,
+    nullable: true,
+  })
   @IsOptional()
   created_at?: Date | string | null;
 
   @ApiPropertyOptional({
     description: 'User identifier who created the record',
+    type: String,
+    nullable: true,
   })
   @IsOptional()
   created_by?: string | null;
 
   @ApiPropertyOptional({
     description: 'Timestamp when record was last updated',
+    type: String,
+    nullable: true,
   })
   @IsOptional()
   updated_at?: Date | string | null;
 
   @ApiPropertyOptional({
     description: 'User identifier who last updated the record',
+    type: String,
+    nullable: true,
   })
   @IsOptional()
   updated_by?: string | null;

admin/backend/src/resource-asset/dto/resource-asset.dto.ts

@@ -25,6 +25,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'ID of the parent container asset',
     example: 100,
+    type: Number,
     nullable: true,
   })
   @IsInt()
@@ -35,6 +36,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Physical barcode or field tag',
     example: 'CS-012',
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -63,6 +65,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Optional display name',
     example: 'Campsite #12 Table',
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -73,6 +76,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Free-text note',
     example: 'Located near river',
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -82,6 +86,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Legacy aggregate structure reference ID',
     example: 'LEG-884',
+    type: String,
     nullable: true,
   })
   @IsString()
@@ -92,6 +97,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Total length in metres',
     example: 12.5,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -102,6 +108,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Total width in metres',
     example: 3.0,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -112,6 +119,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Total area in square metres',
     example: 37.5,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -122,6 +130,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Default monetary value',
     example: 1500.0,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -132,6 +141,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Actual monetary value',
     example: 1800.5,
+    type: Number,
     nullable: true,
   })
   @IsNumber()
@@ -142,6 +152,7 @@ export class BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Date the asset was installed (YYYY-MM-DD)',
     example: '2023-05-15',
+    type: String,
     nullable: true,
   })
   @IsDateString()
@@ -174,13 +185,15 @@ export class RecreationAssetDto extends BaseRecreationAssetDto {
 
   @ApiPropertyOptional({
     description: 'User identifier who last updated the record',
+    type: String,
     nullable: true,
   })
   @IsOptional()
   updated_by?: string | null;
 
   @ApiPropertyOptional({
     description: 'Timestamp when record was last updated',
+    type: String,
     nullable: true,
   })
   @IsOptional()
@@ -189,6 +202,7 @@ export class RecreationAssetDto extends BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Point geometry type code, if this asset has a location',
     example: 'PT',
+    type: String,
     nullable: true,
   })
   @IsOptional()
@@ -197,6 +211,7 @@ export class RecreationAssetDto extends BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Latitude in WGS84 (derived from recreation_asset_geom)',
     example: 49.94212,
+    type: Number,
     nullable: true,
   })
   @IsOptional()
@@ -205,6 +220,7 @@ export class RecreationAssetDto extends BaseRecreationAssetDto {
   @ApiPropertyOptional({
     description: 'Longitude in WGS84 (derived from recreation_asset_geom)',
     example: -123.03604,
+    type: Number,
     nullable: true,
   })
   @IsOptional()
@@ -258,7 +274,7 @@ export class FindAllAssetsQueryDto {
   @ApiPropertyOptional({ description: 'Number of items per page', default: 10 })
   @IsInt()
   @Min(1)
-  @Max(100)
+  @Max(500)
   @Type(() => Number)
   @IsOptional()
   limit?: number = 10;

admin/backend/src/resource-asset/resource-asset.controller.ts

@@ -25,6 +25,7 @@ import {
   ApiBearerAuth,
   ApiOperation,
   ApiParam,
+  ApiQuery,
   ApiResponse,
   ApiTags,
 } from '@nestjs/swagger';
@@ -103,12 +104,6 @@ export class RecreationAssetController {
     summary: 'Retrieve recreation assets with filtering and pagination',
     operationId: 'getPaginatedRecreationAssets',
   })
-  @ApiParam({
-    name: 'include_repair',
-    description: 'Include repair records',
-    type: Boolean,
-    required: false,
-  })
   @ApiResponse({
     status: HttpStatus.OK,
     type: PaginatedRecreationAssetDto,
@@ -185,7 +180,7 @@ export class RecreationAssetController {
     operationId: 'getRecreationAssetById',
   })
   @ApiParam({ name: 'id', description: 'Asset ID', type: Number })
-  @ApiParam({
+  @ApiQuery({
     name: 'include_repair',
     description: 'Include repair records',
     type: Boolean,

admin/backend/test/resource-asset/resource-asset.controller.spec.ts

@@ -302,7 +302,7 @@ describe('RecreationAssetController', () => {
   });
 
   describe('bulkCreateRepairs', () => {
-    it('should delegate to service.bulkUpsertRepairs with the bulk repair DTO', async () => {
+    it('should delegate to service.bulkInsertRepairs with the bulk repair DTO', async () => {
       const dto: RecreationAssetBulkRepairDto = {
         recreation_remed_repair_code: 'REPAIR_ALL',
         completed_date: '2026-08-13',

admin/backend/test/resource-asset/service/resource-asset.service.spec.ts

@@ -1249,7 +1249,6 @@ describe('RecreationAssetService', () => {
 
     it('should handle null completed_date during bulk upsert', async () => {
       prismaMock.recreation_asset.count.mockResolvedValue(1);
-      prismaMock.recreation_asset_repair.findFirst.mockResolvedValue(null);
 
       const dto = {
         recreation_remed_repair_code: 'BULK_REPAIR',

admin/frontend/src/components/help-icon/HelpIcon.tsx

@@ -1,10 +1,10 @@
-import { useSyncExternalStore } from 'react';
+import { ReactNode, useSyncExternalStore } from 'react';
 import { OverlayTrigger, Tooltip } from 'react-bootstrap';
 import './HelpIcon.scss';
 
 export interface HelpIconProps {
-  /** Tooltip text to display on click */
-  text: string;
+  /** Tooltip content to display on click */
+  text: ReactNode;
   /** Unique id used to link the tooltip (should be unique on the page) */
   id: string;
 }

admin/frontend/src/components/sidebar/Sidebar.scss

@@ -16,7 +16,7 @@
   background-color: $colorIceBlue;
 }
 
-.collapsed {
+.sidebar.collapsed {
   width: 72px;
 }