integrate global logistics staff user into seeder

refactor pricing data seeder to fold surcharge types into rates
update route meta subtitle to remove surcharge types
enhance RuleEngineFormDialog to support conditional field visibility
 remove surcharge types from URL constants and related services
add cargo leaf options query for bulk cargo type selection
update RuleEngineResourcePage to utilize cargo leaf options
modify resources configuration to remove surcharge types
implement migration to fold surcharge types into rates
create utility to derive legacy rate types from new rate structure

apps/edr-freight-api/src/modules/rule-engine/dto/create-rate.dto.ts

@@ -1,29 +1,46 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import { IsDateString, IsIn, IsNumber, IsOptional, IsString, IsUUID, MaxLength, Min } from 'class-validator';
-import { RATE_TYPES, RATE_UNITS } from '../entities/rate.entity';
+import {
+  RATE_APPLIES_TO,
+  RATE_TRIGGERS,
+  RATE_UNITS,
+} from '../entities/rate.entity';
 
 const TRADE_DIRECTIONS = ['IMPORT', 'EXPORT', 'BOTH'] as const;
 const CURRENCIES = ['USD'] as const;
 
 export class CreateRateDto {
-  @ApiProperty({ enum: RATE_TYPES, description: 'Rate type identifier' })
-  @IsIn([...RATE_TYPES])
-  rateType!: string;
+  @ApiProperty({ enum: RATE_APPLIES_TO, description: 'Friendly category the rate applies to' })
+  @IsIn([...RATE_APPLIES_TO])
+  appliesTo!: string;
 
-  @ApiPropertyOptional({ description: 'FK to container_types.id — null for non-container rates' })
+  @ApiProperty({
+    enum: RATE_TRIGGERS,
+    description: 'What makes this rate apply. ALWAYS = base freight; anything else is a surcharge.',
+  })
+  @IsIn([...RATE_TRIGGERS])
+  trigger!: string;
+
+  @ApiPropertyOptional({ description: 'FK to container_types.id — set for container/intercity-container rates' })
   @IsOptional()
   @IsUUID()
   containerTypeId?: string;
 
+  @ApiPropertyOptional({ description: 'FK to cargo_types.id (bulk leaf commodity) — set for bulk/intercity-bulk rates' })
+  @IsOptional()
+  @IsUUID()
+  cargoTypeId?: string;
+
   @ApiPropertyOptional({ enum: TRADE_DIRECTIONS, description: 'Trade direction. Null = direction-agnostic' })
   @IsOptional()
   @IsIn([...TRADE_DIRECTIONS])
   tradeDirection?: string;
 
-  @ApiProperty({ enum: CURRENCIES })
+  @ApiPropertyOptional({ enum: CURRENCIES })
+  @IsOptional()
   @IsIn([...CURRENCIES])
-  currency!: string;
+  currency?: string;
 
   @ApiProperty({ description: 'Numeric rate value', minimum: 0 })
   @IsNumber()

apps/edr-freight-api/src/modules/rule-engine/dto/create-surcharge-type.dto.ts

@@ -1,30 +0,0 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { IsBoolean, IsIn, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
-
-const TRIGGER_CONDITIONS = [
-  'CARGO_FLAG_HAZARDOUS',
-  'CARGO_FLAG_REEFER',
-  'VGM_EXCEEDS_LIMIT',
-  'SHIPPING_LINE_MAPPED',
-  'CONSOLIDATION_ENABLED',
-] as const;
-
-export class CreateSurchargeTypeDto {
-  @ApiProperty({ description: 'Human-readable label', maxLength: 100 })
-  @IsString()
-  @MaxLength(100)
-  label!: string;
-
-  @ApiProperty({ enum: TRIGGER_CONDITIONS, description: 'Condition that auto-fires this surcharge' })
-  @IsIn([...TRIGGER_CONDITIONS])
-  triggerCondition!: string;
-
-  @ApiProperty({ description: 'FK to rates.id — the LIVE rate used to price this surcharge' })
-  @IsUUID()
-  rateId!: string;
-
-  @ApiPropertyOptional({ default: true })
-  @IsOptional()
-  @IsBoolean()
-  isActive?: boolean;
-}

apps/edr-freight-api/src/modules/rule-engine/dto/update-surcharge-type.dto.ts

@@ -1,4 +0,0 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateSurchargeTypeDto } from './create-surcharge-type.dto';
-
-export class UpdateSurchargeTypeDto extends PartialType(CreateSurchargeTypeDto) {}