Merge pull request #1027 from MTES-MCT/annee-vacances-draft

feat: add vacancy start year to drafts
MTES-MCT · Dec 6, 2024 · dbc1341 · dbc1341
2 parents ca957c7 + 7e706a2
commit dbc1341
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/frontend/src/components/RichEditor/variable-options.ts b/frontend/src/components/RichEditor/variable-options.ts
@@ -37,6 +37,10 @@ export const VARIABLE_OPTIONS: Variable[] = [
     label: 'Date de construction',
     value: '{{housing.buildingYear}}',
   },
+  {
+    label: 'Année de début de vacance',
+    value: '{{housing.vacancyStartYear}}',
+  },
   {
     label: 'DPE',
     value: '{{housing.energyConsumption}}',

diff --git a/packages/models/src/variable-options.ts b/packages/models/src/variable-options.ts
@@ -1,16 +1,4 @@
-export type VariableOption =
-  | '{{owner.fullName}}'
-  | '{{housing.rawAddress}}'
-  | '{{housing.localId}}'
-  | '{{housing.invariant}}'
-  | '{{housing.cadastralReference}}'
-  | '{{housing.housingKind}}'
-  | '{{housing.livingArea}}'
-  | '{{housing.roomsCount}}'
-  | '{{housing.buildingYear}}'
-  | '{{housing.energyConsumption}}';
-
-const VARIABLES_OPTIONS: VariableOption[] = [
+const VARIABLES_OPTIONS = [
   '{{owner.fullName}}',
   '{{housing.rawAddress}}',
   '{{housing.localId}}',
@@ -20,9 +8,12 @@ const VARIABLES_OPTIONS: VariableOption[] = [
   '{{housing.livingArea}}',
   '{{housing.roomsCount}}',
   '{{housing.buildingYear}}',
+  '{{housing.vacancyStartYear}}',
   '{{housing.energyConsumption}}',
 ];
 
+export type VariableOption = typeof VARIABLES_OPTIONS[number];
+
 export function isVariableOption(value: string): value is VariableOption {
   return VARIABLES_OPTIONS.find((option) => option === value) !== undefined;
 }
@@ -40,6 +31,7 @@ interface Replacement {
     livingArea?: number;
     roomsCount?: number;
     buildingYear?: number;
+    vacancyStartYear?: number;
     energyConsumption?: string;
   };
 }
@@ -76,6 +68,10 @@ export function replaceVariables(
       '{{housing.buildingYear}}',
       replacement.housing.buildingYear?.toString() ?? '',
     )
+    .replaceAll(
+      '{{housing.vacancyStartYear}}',
+      replacement.housing.vacancyStartYear?.toString() ?? '',
+    )
     .replaceAll(
       '{{housing.energyConsumption}}',
       replacement.housing.energyConsumption ?? '',