From 2ce9c842a1e20c27708e7c68b6d5b8adcf4fa3ed Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 7 Apr 2022 17:48:20 +0200
Subject: [PATCH 01/16] refactor(type_de_champs): use typescript in type de
 champs editor

---
 .../TypesDeChampEditor/{Flash.js => Flash.ts} |  18 +-
 ...{OperationsQueue.js => OperationsQueue.ts} |  34 +++-
 ...criptionInput.jsx => DescriptionInput.tsx} |  18 +-
 .../{LibelleInput.jsx => LibelleInput.tsx}    |  18 +-
 ...{MandatoryInput.jsx => MandatoryInput.tsx} |  18 +-
 .../{MoveButton.jsx => MoveButton.tsx}        |  24 +--
 .../{TypeDeChamp.jsx => TypeDeChamp.tsx}      | 113 +++++++-----
 ...eOption.jsx => TypeDeChampCarteOption.tsx} |  18 +-
 .../components/TypeDeChampCarteOptions.jsx    |  21 ---
 .../components/TypeDeChampCarteOptions.tsx    |  19 ++
 ...ons.jsx => TypeDeChampDropDownOptions.tsx} |  19 +-
 ...Other.jsx => TypeDeChampDropDownOther.tsx} |  18 +-
 ...y.jsx => TypeDeChampDropDownSecondary.tsx} |  15 +-
 ....jsx => TypeDeChampPieceJustificative.tsx} |  62 ++++---
 ...s.jsx => TypeDeChampRepetitionOptions.tsx} |  20 +--
 ...sSelect.jsx => TypeDeChampTypesSelect.tsx} |  18 +-
 .../{TypeDeChamps.jsx => TypeDeChamps.tsx}    |  23 +--
 .../components/TypesDeChampEditor/index.jsx   |  46 -----
 .../components/TypesDeChampEditor/index.tsx   |  54 ++++++
 .../TypesDeChampEditor/operations.js          |  51 ------
 .../TypesDeChampEditor/operations.ts          |  71 ++++++++
 ...hampsReducer.js => typeDeChampsReducer.ts} | 169 ++++++++++++++----
 .../components/TypesDeChampEditor/types.ts    |  27 +++
 .../components/TypesDeChampEditor/utils.jsx   |  14 --
 .../components/TypesDeChampEditor/utils.tsx   |  16 ++
 ...e-upload-error.js => file-upload-error.ts} |  17 +-
 .../{progress-bar.js => progress-bar.ts}      |  55 +++---
 .../{uploader.js => uploader.ts}              |  39 ++--
 package.json                                  |   3 +-
 yarn.lock                                     |  13 +-
 30 files changed, 640 insertions(+), 411 deletions(-)
 rename app/javascript/components/TypesDeChampEditor/{Flash.js => Flash.ts} (61%)
 rename app/javascript/components/TypesDeChampEditor/{OperationsQueue.js => OperationsQueue.ts} (58%)
 rename app/javascript/components/TypesDeChampEditor/components/{DescriptionInput.jsx => DescriptionInput.tsx} (66%)
 rename app/javascript/components/TypesDeChampEditor/components/{LibelleInput.jsx => LibelleInput.tsx} (66%)
 rename app/javascript/components/TypesDeChampEditor/components/{MandatoryInput.jsx => MandatoryInput.tsx} (66%)
 rename app/javascript/components/TypesDeChampEditor/components/{MoveButton.jsx => MoveButton.tsx} (56%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChamp.jsx => TypeDeChamp.tsx} (77%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampCarteOption.jsx => TypeDeChampCarteOption.tsx} (58%)
 delete mode 100644 app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.jsx
 create mode 100644 app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.tsx
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampDropDownOptions.jsx => TypeDeChampDropDownOptions.tsx} (65%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampDropDownOther.jsx => TypeDeChampDropDownOther.tsx} (67%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampDropDownSecondary.jsx => TypeDeChampDropDownSecondary.tsx} (78%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampPieceJustificative.jsx => TypeDeChampPieceJustificative.tsx} (59%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampRepetitionOptions.jsx => TypeDeChampRepetitionOptions.tsx} (81%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChampTypesSelect.jsx => TypeDeChampTypesSelect.tsx} (64%)
 rename app/javascript/components/TypesDeChampEditor/components/{TypeDeChamps.jsx => TypeDeChamps.tsx} (86%)
 delete mode 100644 app/javascript/components/TypesDeChampEditor/index.jsx
 create mode 100644 app/javascript/components/TypesDeChampEditor/index.tsx
 delete mode 100644 app/javascript/components/TypesDeChampEditor/operations.js
 create mode 100644 app/javascript/components/TypesDeChampEditor/operations.ts
 rename app/javascript/components/TypesDeChampEditor/{typeDeChampsReducer.js => typeDeChampsReducer.ts} (55%)
 create mode 100644 app/javascript/components/TypesDeChampEditor/types.ts
 delete mode 100644 app/javascript/components/TypesDeChampEditor/utils.jsx
 create mode 100644 app/javascript/components/TypesDeChampEditor/utils.tsx
 rename app/javascript/shared/activestorage/{file-upload-error.js => file-upload-error.ts} (84%)
 rename app/javascript/shared/activestorage/{progress-bar.js => progress-bar.ts} (63%)
 rename app/javascript/shared/activestorage/{uploader.js => uploader.ts} (70%)

diff --git a/app/javascript/components/TypesDeChampEditor/Flash.js b/app/javascript/components/TypesDeChampEditor/Flash.ts
similarity index 61%
rename from app/javascript/components/TypesDeChampEditor/Flash.js
rename to app/javascript/components/TypesDeChampEditor/Flash.ts
index 945c6efd8..302c88c9f 100644
--- a/app/javascript/components/TypesDeChampEditor/Flash.js
+++ b/app/javascript/components/TypesDeChampEditor/Flash.ts
@@ -1,6 +1,14 @@
-export default class Flash {
-  constructor(isAnnotation) {
-    this.element = document.querySelector('#flash_messages');
+import invariant from 'tiny-invariant';
+
+export class Flash {
+  element: HTMLDivElement;
+  isAnnotation: boolean;
+  timeout?: number;
+
+  constructor(isAnnotation: boolean) {
+    const element = document.querySelector<HTMLDivElement>('#flash_messages');
+    invariant(element, 'Flash element is required');
+    this.element = element;
     this.isAnnotation = isAnnotation;
   }
   success() {
@@ -10,13 +18,13 @@ export default class Flash {
       this.add('Formulaire enregistré.');
     }
   }
-  error(message) {
+  error(message: string) {
     this.add(message, true);
   }
   clear() {
     this.element.innerHTML = '';
   }
-  add(message, isError) {
+  add(message: string, isError = false) {
     const html = `<div id="flash_message" class="center">
       <div class="alert alert-fixed ${
         isError ? 'alert-danger' : 'alert-success'
diff --git a/app/javascript/components/TypesDeChampEditor/OperationsQueue.js b/app/javascript/components/TypesDeChampEditor/OperationsQueue.ts
similarity index 58%
rename from app/javascript/components/TypesDeChampEditor/OperationsQueue.js
rename to app/javascript/components/TypesDeChampEditor/OperationsQueue.ts
index 46069491d..0da09cebc 100644
--- a/app/javascript/components/TypesDeChampEditor/OperationsQueue.js
+++ b/app/javascript/components/TypesDeChampEditor/OperationsQueue.ts
@@ -1,9 +1,21 @@
 import { getJSON } from '@utils';
+import invariant from 'tiny-invariant';
 
-export default class OperationsQueue {
-  constructor(baseUrl) {
+type Operation = {
+  path: string;
+  method: string;
+  payload: unknown;
+  resolve: (value: unknown) => void;
+  reject: () => void;
+};
+
+export class OperationsQueue {
+  queue: Operation[];
+  isRunning = false;
+  baseUrl: string;
+
+  constructor(baseUrl: string) {
     this.queue = [];
-    this.isRunning = false;
     this.baseUrl = baseUrl;
   }
 
@@ -11,6 +23,7 @@ export default class OperationsQueue {
     if (this.queue.length > 0) {
       this.isRunning = true;
       const operation = this.queue.shift();
+      invariant(operation, 'Operation is required');
       await this.exec(operation);
       this.run();
     } else {
@@ -18,7 +31,7 @@ export default class OperationsQueue {
     }
   }
 
-  enqueue(operation) {
+  enqueue(operation: Omit<Operation, 'resolve' | 'reject'>) {
     return new Promise((resolve, reject) => {
       this.queue.push({ ...operation, resolve, reject });
       if (!this.isRunning) {
@@ -27,7 +40,7 @@ export default class OperationsQueue {
     });
   }
 
-  async exec(operation) {
+  async exec(operation: Operation) {
     const { path, method, payload, resolve, reject } = operation;
     const url = `${this.baseUrl}${path}`;
 
@@ -35,12 +48,19 @@ export default class OperationsQueue {
       const data = await getJSON(url, payload, method);
       resolve(data);
     } catch (e) {
-      handleError(e, reject);
+      handleError(e as OperationError, reject);
     }
   }
 }
 
-async function handleError({ response, message }, reject) {
+class OperationError extends Error {
+  response?: Response;
+}
+
+async function handleError(
+  { response, message }: OperationError,
+  reject: (error: string) => void
+) {
   if (response) {
     try {
       const {
diff --git a/app/javascript/components/TypesDeChampEditor/components/DescriptionInput.jsx b/app/javascript/components/TypesDeChampEditor/components/DescriptionInput.tsx
similarity index 66%
rename from app/javascript/components/TypesDeChampEditor/components/DescriptionInput.jsx
rename to app/javascript/components/TypesDeChampEditor/components/DescriptionInput.tsx
index 2d17f752c..a87da30b7 100644
--- a/app/javascript/components/TypesDeChampEditor/components/DescriptionInput.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/DescriptionInput.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function DescriptionInput({ isVisible, handler }) {
+import type { Handler } from '../types';
+
+export function DescriptionInput({
+  isVisible,
+  handler
+}: {
+  isVisible: boolean;
+  handler: Handler<HTMLTextAreaElement>;
+}) {
   if (isVisible) {
     return (
       <div className="cell">
@@ -20,10 +27,3 @@ function DescriptionInput({ isVisible, handler }) {
   }
   return null;
 }
-
-DescriptionInput.propTypes = {
-  isVisible: PropTypes.bool,
-  handler: PropTypes.object
-};
-
-export default DescriptionInput;
diff --git a/app/javascript/components/TypesDeChampEditor/components/LibelleInput.jsx b/app/javascript/components/TypesDeChampEditor/components/LibelleInput.tsx
similarity index 66%
rename from app/javascript/components/TypesDeChampEditor/components/LibelleInput.jsx
rename to app/javascript/components/TypesDeChampEditor/components/LibelleInput.tsx
index f1ca7c07c..c7490cec6 100644
--- a/app/javascript/components/TypesDeChampEditor/components/LibelleInput.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/LibelleInput.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function LibelleInput({ isVisible, handler }) {
+import type { Handler } from '../types';
+
+export function LibelleInput({
+  isVisible,
+  handler
+}: {
+  isVisible: boolean;
+  handler: Handler<HTMLInputElement>;
+}) {
   if (isVisible) {
     return (
       <div className="cell libelle">
@@ -19,10 +26,3 @@ function LibelleInput({ isVisible, handler }) {
   }
   return null;
 }
-
-LibelleInput.propTypes = {
-  handler: PropTypes.object,
-  isVisible: PropTypes.bool
-};
-
-export default LibelleInput;
diff --git a/app/javascript/components/TypesDeChampEditor/components/MandatoryInput.jsx b/app/javascript/components/TypesDeChampEditor/components/MandatoryInput.tsx
similarity index 66%
rename from app/javascript/components/TypesDeChampEditor/components/MandatoryInput.jsx
rename to app/javascript/components/TypesDeChampEditor/components/MandatoryInput.tsx
index 436a23345..9a13cc161 100644
--- a/app/javascript/components/TypesDeChampEditor/components/MandatoryInput.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/MandatoryInput.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function MandatoryInput({ isVisible, handler }) {
+import type { Handler } from '../types';
+
+export function MandatoryInput({
+  isVisible,
+  handler
+}: {
+  isVisible: boolean;
+  handler: Handler<HTMLInputElement>;
+}) {
   if (isVisible) {
     return (
       <div className="cell">
@@ -19,10 +26,3 @@ function MandatoryInput({ isVisible, handler }) {
   }
   return null;
 }
-
-MandatoryInput.propTypes = {
-  handler: PropTypes.object,
-  isVisible: PropTypes.bool
-};
-
-export default MandatoryInput;
diff --git a/app/javascript/components/TypesDeChampEditor/components/MoveButton.jsx b/app/javascript/components/TypesDeChampEditor/components/MoveButton.tsx
similarity index 56%
rename from app/javascript/components/TypesDeChampEditor/components/MoveButton.jsx
rename to app/javascript/components/TypesDeChampEditor/components/MoveButton.tsx
index c8ec442f9..15796767a 100644
--- a/app/javascript/components/TypesDeChampEditor/components/MoveButton.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/MoveButton.tsx
@@ -1,8 +1,17 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { MouseEventHandler } from 'react';
 import { ArrowDownIcon, ArrowUpIcon } from '@heroicons/react/solid';
 
-function MoveButton({ isEnabled, icon, title, onClick }) {
+export function MoveButton({
+  isEnabled,
+  icon,
+  title,
+  onClick
+}: {
+  isEnabled: boolean;
+  icon: string;
+  title: string;
+  onClick: MouseEventHandler<HTMLButtonElement>;
+}) {
   return (
     <button
       className="button small move"
@@ -18,12 +27,3 @@ function MoveButton({ isEnabled, icon, title, onClick }) {
     </button>
   );
 }
-
-MoveButton.propTypes = {
-  isEnabled: PropTypes.bool,
-  icon: PropTypes.string,
-  title: PropTypes.string,
-  onClick: PropTypes.func
-};
-
-export default MoveButton;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChamp.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChamp.tsx
similarity index 77%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChamp.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChamp.tsx
index 68a83fc9c..4fd8c31c7 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChamp.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChamp.tsx
@@ -1,24 +1,40 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { sortableElement, sortableHandle } from 'react-sortable-hoc';
+import React, { Dispatch } from 'react';
+import { SortableElement, SortableHandle } from 'react-sortable-hoc';
 import { useInView } from 'react-intersection-observer';
 import { TrashIcon } from '@heroicons/react/outline';
 
-import DescriptionInput from './DescriptionInput';
-import LibelleInput from './LibelleInput';
-import MandatoryInput from './MandatoryInput';
-import MoveButton from './MoveButton';
-import TypeDeChampCarteOption from './TypeDeChampCarteOption';
-import TypeDeChampCarteOptions from './TypeDeChampCarteOptions';
-import TypeDeChampDropDownOptions from './TypeDeChampDropDownOptions';
-import TypeDeChampDropDownOther from './TypeDeChampDropDownOther';
-import TypeDeChampPieceJustificative from './TypeDeChampPieceJustificative';
-import TypeDeChampRepetitionOptions from './TypeDeChampRepetitionOptions';
-import TypeDeChampTypesSelect from './TypeDeChampTypesSelect';
-import TypeDeChampDropDownSecondary from './TypeDeChampDropDownSecondary';
+import type { Action, TypeDeChamp, State, Handler } from '../types';
+import { DescriptionInput } from './DescriptionInput';
+import { LibelleInput } from './LibelleInput';
+import { MandatoryInput } from './MandatoryInput';
+import { MoveButton } from './MoveButton';
+import { TypeDeChampCarteOption } from './TypeDeChampCarteOption';
+import { TypeDeChampCarteOptions } from './TypeDeChampCarteOptions';
+import { TypeDeChampDropDownOptions } from './TypeDeChampDropDownOptions';
+import { TypeDeChampDropDownOther } from './TypeDeChampDropDownOther';
+import { TypeDeChampPieceJustificative } from './TypeDeChampPieceJustificative';
+import { TypeDeChampRepetitionOptions } from './TypeDeChampRepetitionOptions';
+import { TypeDeChampTypesSelect } from './TypeDeChampTypesSelect';
+import { TypeDeChampDropDownSecondary } from './TypeDeChampDropDownSecondary';
 
-const TypeDeChamp = sortableElement(
-  ({ typeDeChamp, dispatch, idx: index, isFirstItem, isLastItem, state }) => {
+type TypeDeChampProps = {
+  typeDeChamp: TypeDeChamp;
+  dispatch: Dispatch<Action>;
+  idx: number;
+  isFirstItem: boolean;
+  isLastItem: boolean;
+  state: State;
+};
+
+export const TypeDeChampComponent = SortableElement<TypeDeChampProps>(
+  ({
+    typeDeChamp,
+    dispatch,
+    idx: index,
+    isFirstItem,
+    isLastItem,
+    state
+  }: TypeDeChampProps) => {
     const isDropDown = [
       'drop_down_list',
       'multiple_drop_down_list',
@@ -175,23 +191,25 @@ const TypeDeChamp = sortableElement(
   }
 );
 
-TypeDeChamp.propTypes = {
-  dispatch: PropTypes.func,
-  idx: PropTypes.number,
-  isFirstItem: PropTypes.bool,
-  isLastItem: PropTypes.bool,
-  state: PropTypes.object,
-  typeDeChamp: PropTypes.object
-};
-
-const DragHandle = sortableHandle(() => (
+const DragHandle = SortableHandle(() => (
   <div
     className="handle small icon-only icon move-handle"
     title="Déplacer le champ vers le haut ou vers le bas"
   />
 ));
 
-function createUpdateHandler(dispatch, typeDeChamp, field, index, prefix) {
+type HandlerInputElement =
+  | HTMLInputElement
+  | HTMLTextAreaElement
+  | HTMLSelectElement;
+
+function createUpdateHandler(
+  dispatch: Dispatch<Action>,
+  typeDeChamp: TypeDeChamp,
+  field: keyof TypeDeChamp,
+  index: number,
+  prefix?: string
+): Handler<HandlerInputElement> {
   return {
     id: `${prefix ? `${prefix}-` : ''}champ-${index}-${field}`,
     name: field,
@@ -209,25 +227,22 @@ function createUpdateHandler(dispatch, typeDeChamp, field, index, prefix) {
   };
 }
 
-function getValue(obj, path) {
-  const [, optionsPath] = path.split('.');
-  if (optionsPath) {
-    return (obj.editable_options || {})[optionsPath];
-  }
-  return obj[path];
-}
-
-function createUpdateHandlers(dispatch, typeDeChamp, index, prefix) {
+function createUpdateHandlers(
+  dispatch: Dispatch<Action>,
+  typeDeChamp: TypeDeChamp,
+  index: number,
+  prefix?: string
+) {
   return FIELDS.reduce((handlers, field) => {
     handlers[field] = createUpdateHandler(
       dispatch,
       typeDeChamp,
-      field,
+      field as keyof TypeDeChamp,
       index,
       prefix
     );
     return handlers;
-  }, {});
+  }, {} as Record<string, Handler<HandlerInputElement>>);
 }
 
 const OPTIONS_FIELDS = {
@@ -242,7 +257,7 @@ const OPTIONS_FIELDS = {
   'options.natura_2000': 'Natura 2000',
   'options.zones_humides': 'Zones humides d’importance internationale',
   'options.znieff': 'ZNIEFF'
-};
+} as const;
 
 export const FIELDS = [
   'description',
@@ -257,10 +272,20 @@ export const FIELDS = [
   'drop_down_secondary_libelle',
   'drop_down_secondary_description',
   ...Object.keys(OPTIONS_FIELDS)
-];
+] as const;
 
-function readValue(input) {
-  return input.type === 'checkbox' ? input.checked : input.value;
+function getValue(obj: TypeDeChamp, path: string) {
+  const [, optionsPath] = path.split('.');
+  if (optionsPath) {
+    return (obj.editable_options || {})[optionsPath];
+  }
+  return obj[path as keyof TypeDeChamp] as string;
+}
+
+function readValue(input: HandlerInputElement) {
+  return input.type === 'checkbox' && 'checked' in input
+    ? input.checked
+    : input.value;
 }
 
 const EXCLUDE_FROM_REPETITION = [
@@ -269,5 +294,3 @@ const EXCLUDE_FROM_REPETITION = [
   'repetition',
   'siret'
 ];
-
-export default TypeDeChamp;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOption.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOption.tsx
similarity index 58%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOption.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOption.tsx
index 8de18874f..167fa7903 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOption.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOption.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function TypeDeChampCarteOption({ label, handler }) {
+import type { Handler } from '../types';
+
+export function TypeDeChampCarteOption({
+  label,
+  handler
+}: {
+  label: string;
+  handler: Handler<HTMLInputElement>;
+}) {
   return (
     <label htmlFor={handler.id}>
       <input
@@ -16,10 +23,3 @@ function TypeDeChampCarteOption({ label, handler }) {
     </label>
   );
 }
-
-TypeDeChampCarteOption.propTypes = {
-  label: PropTypes.string,
-  handler: PropTypes.object
-};
-
-export default TypeDeChampCarteOption;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.jsx
deleted file mode 100644
index 61fd463fd..000000000
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-function TypeDeChampCarteOptions({ isVisible, children }) {
-  if (isVisible) {
-    return (
-      <div className="cell">
-        <label>Utilisation de la cartographie</label>
-        <div className="carte-options">{children}</div>
-      </div>
-    );
-  }
-  return null;
-}
-
-TypeDeChampCarteOptions.propTypes = {
-  isVisible: PropTypes.bool,
-  children: PropTypes.node
-};
-
-export default TypeDeChampCarteOptions;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.tsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.tsx
new file mode 100644
index 000000000..ceca4792d
--- /dev/null
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampCarteOptions.tsx
@@ -0,0 +1,19 @@
+import React, { ReactNode } from 'react';
+
+export function TypeDeChampCarteOptions({
+  isVisible,
+  children
+}: {
+  isVisible: boolean;
+  children: ReactNode;
+}) {
+  if (isVisible) {
+    return (
+      <div className="cell">
+        <label>Utilisation de la cartographie</label>
+        <div className="carte-options">{children}</div>
+      </div>
+    );
+  }
+  return null;
+}
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOptions.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOptions.tsx
similarity index 65%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOptions.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOptions.tsx
index 148e179ba..bc9a950bf 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOptions.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOptions.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function TypeDeChampDropDownOptions({ isVisible, handler }) {
+import type { Handler } from '../types';
+
+export function TypeDeChampDropDownOptions({
+  isVisible,
+  handler
+}: {
+  isVisible: boolean;
+  handler: Handler<HTMLTextAreaElement>;
+}) {
   if (isVisible) {
     return (
       <div className="cell">
@@ -21,11 +28,3 @@ function TypeDeChampDropDownOptions({ isVisible, handler }) {
   }
   return null;
 }
-
-TypeDeChampDropDownOptions.propTypes = {
-  isVisible: PropTypes.bool,
-  value: PropTypes.string,
-  handler: PropTypes.object
-};
-
-export default TypeDeChampDropDownOptions;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOther.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOther.tsx
similarity index 67%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOther.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOther.tsx
index 85bcda3c0..fd341e4d2 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOther.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownOther.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function TypeDeChampDropDownOther({ isVisible, handler }) {
+import type { Handler } from '../types';
+
+export function TypeDeChampDropDownOther({
+  isVisible,
+  handler
+}: {
+  isVisible: boolean;
+  handler: Handler<HTMLInputElement>;
+}) {
   if (isVisible) {
     return (
       <div className="cell">
@@ -21,10 +28,3 @@ function TypeDeChampDropDownOther({ isVisible, handler }) {
   }
   return null;
 }
-
-TypeDeChampDropDownOther.propTypes = {
-  isVisible: PropTypes.bool,
-  handler: PropTypes.object
-};
-
-export default TypeDeChampDropDownOther;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownSecondary.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownSecondary.tsx
similarity index 78%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownSecondary.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownSecondary.tsx
index 6f1ee62f8..7d7db72fb 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownSecondary.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampDropDownSecondary.tsx
@@ -1,10 +1,15 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-export default function TypeDeChampDropDownSecondary({
+import type { Handler } from '../types';
+
+export function TypeDeChampDropDownSecondary({
   isVisible,
   libelleHandler,
   descriptionHandler
+}: {
+  isVisible: boolean;
+  libelleHandler: Handler<HTMLInputElement>;
+  descriptionHandler: Handler<HTMLTextAreaElement>;
 }) {
   if (isVisible) {
     return (
@@ -33,9 +38,3 @@ export default function TypeDeChampDropDownSecondary({
   }
   return null;
 }
-
-TypeDeChampDropDownSecondary.propTypes = {
-  isVisible: PropTypes.bool,
-  libelleHandler: PropTypes.object,
-  descriptionHandler: PropTypes.object
-};
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.tsx
similarity index 59%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.tsx
index 0289bce4d..1fe1e7e49 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.tsx
@@ -1,13 +1,20 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Uploader from '../../../shared/activestorage/uploader';
+import React, { ChangeEvent } from 'react';
 
-function TypeDeChampPieceJustificative({
+import Uploader from '../../../shared/activestorage/uploader';
+import type { Handler } from '../types';
+
+export function TypeDeChampPieceJustificative({
   isVisible,
   url,
   filename,
   handler,
   directUploadUrl
+}: {
+  isVisible: boolean;
+  url?: string;
+  filename?: string;
+  handler: Handler<HTMLInputElement>;
+  directUploadUrl: string;
 }) {
   if (isVisible) {
     const hasFile = !!filename;
@@ -28,15 +35,15 @@ function TypeDeChampPieceJustificative({
   return null;
 }
 
-TypeDeChampPieceJustificative.propTypes = {
-  isVisible: PropTypes.bool,
-  url: PropTypes.string,
-  filename: PropTypes.string,
-  handler: PropTypes.object,
-  directUploadUrl: PropTypes.string
-};
-
-function FileInformation({ isVisible, url, filename }) {
+function FileInformation({
+  isVisible,
+  url,
+  filename
+}: {
+  isVisible: boolean;
+  url?: string;
+  filename?: string;
+}) {
   if (isVisible) {
     return (
       <>
@@ -50,32 +57,29 @@ function FileInformation({ isVisible, url, filename }) {
   return null;
 }
 
-FileInformation.propTypes = {
-  isVisible: PropTypes.bool,
-  url: PropTypes.string,
-  filename: PropTypes.string
-};
-
-function onFileChange(handler, directUploadUrl) {
+function onFileChange(
+  handler: Handler<HTMLInputElement>,
+  directUploadUrl: string
+): (event: ChangeEvent<HTMLInputElement>) => void {
   return async ({ target }) => {
-    const file = target.files[0];
+    const file = (target.files ?? [])[0];
     if (file) {
       const signedId = await uploadFile(target, file, directUploadUrl);
       handler.onChange({
-        target: {
-          value: signedId
-        }
-      });
+        target: { value: signedId }
+      } as ChangeEvent<HTMLInputElement>);
     }
   };
 }
 
-function uploadFile(input, file, directUploadUrl) {
+function uploadFile(
+  input: HTMLInputElement,
+  file: File,
+  directUploadUrl: string
+) {
   const controller = new Uploader(input, file, directUploadUrl);
   return controller.start().then((signedId) => {
-    input.value = null;
+    input.value = '';
     return signedId;
   });
 }
-
-export default TypeDeChampPieceJustificative;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.tsx
similarity index 81%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.tsx
index 1b8497ff3..154ce2a71 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.tsx
@@ -1,15 +1,19 @@
 import React, { useReducer } from 'react';
-import PropTypes from 'prop-types';
 import { PlusIcon } from '@heroicons/react/outline';
 
 import { SortableContainer, addChampLabel } from '../utils';
-import TypeDeChamp from './TypeDeChamp';
+import { TypeDeChampComponent } from './TypeDeChamp';
 import typeDeChampsReducer from '../typeDeChampsReducer';
+import type { State, TypeDeChamp } from '../types';
 
-function TypeDeChampRepetitionOptions({
+export function TypeDeChampRepetitionOptions({
   isVisible,
   state: parentState,
   typeDeChamp
+}: {
+  isVisible: boolean;
+  state: State;
+  typeDeChamp: TypeDeChamp;
 }) {
   const [state, dispatch] = useReducer(typeDeChampsReducer, parentState);
 
@@ -23,7 +27,7 @@ function TypeDeChampRepetitionOptions({
           useDragHandle
         >
           {state.typeDeChamps.map((typeDeChamp, index) => (
-            <TypeDeChamp
+            <TypeDeChampComponent
               dispatch={dispatch}
               idx={index}
               index={index}
@@ -54,11 +58,3 @@ function TypeDeChampRepetitionOptions({
   }
   return null;
 }
-
-TypeDeChampRepetitionOptions.propTypes = {
-  isVisible: PropTypes.bool,
-  state: PropTypes.object,
-  typeDeChamp: PropTypes.object
-};
-
-export default TypeDeChampRepetitionOptions;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampTypesSelect.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampTypesSelect.tsx
similarity index 64%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChampTypesSelect.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChampTypesSelect.tsx
index 1c53a220e..010ec76ac 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChampTypesSelect.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChampTypesSelect.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-function TypeDeChampTypesSelect({ handler, options }) {
+import type { Handler } from '../types';
+
+export function TypeDeChampTypesSelect({
+  handler,
+  options
+}: {
+  handler: Handler<HTMLSelectElement>;
+  options: [label: string, type: string][];
+}) {
   return (
     <div className="cell">
       <select
@@ -20,10 +27,3 @@ function TypeDeChampTypesSelect({ handler, options }) {
     </div>
   );
 }
-
-TypeDeChampTypesSelect.propTypes = {
-  handler: PropTypes.object,
-  options: PropTypes.array
-};
-
-export default TypeDeChampTypesSelect;
diff --git a/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx b/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.tsx
similarity index 86%
rename from app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx
rename to app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.tsx
index ccd3305d5..8c5bf85ab 100644
--- a/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.jsx
+++ b/app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.tsx
@@ -1,12 +1,20 @@
 import React, { useReducer } from 'react';
-import PropTypes from 'prop-types';
 import { PlusIcon, ArrowCircleDownIcon } from '@heroicons/react/outline';
 
 import { SortableContainer, addChampLabel } from '../utils';
-import TypeDeChamp from './TypeDeChamp';
+import { TypeDeChampComponent } from './TypeDeChamp';
 import typeDeChampsReducer from '../typeDeChampsReducer';
+import type { TypeDeChamp, State } from '../types';
 
-function TypeDeChamps({ state: rootState, typeDeChamps }) {
+type TypeDeChampsProps = {
+  state: State;
+  typeDeChamps: TypeDeChamp[];
+};
+
+export function TypeDeChamps({
+  state: rootState,
+  typeDeChamps
+}: TypeDeChampsProps) {
   const [state, dispatch] = useReducer(typeDeChampsReducer, {
     ...rootState,
     typeDeChamps
@@ -24,7 +32,7 @@ function TypeDeChamps({ state: rootState, typeDeChamps }) {
         useDragHandle
       >
         {state.typeDeChamps.map((typeDeChamp, index) => (
-          <TypeDeChamp
+          <TypeDeChampComponent
             dispatch={dispatch}
             idx={index}
             index={index}
@@ -67,10 +75,3 @@ function TypeDeChamps({ state: rootState, typeDeChamps }) {
     </div>
   );
 }
-
-TypeDeChamps.propTypes = {
-  state: PropTypes.object,
-  typeDeChamps: PropTypes.array
-};
-
-export default TypeDeChamps;
diff --git a/app/javascript/components/TypesDeChampEditor/index.jsx b/app/javascript/components/TypesDeChampEditor/index.jsx
deleted file mode 100644
index 3b2347b96..000000000
--- a/app/javascript/components/TypesDeChampEditor/index.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import Flash from './Flash';
-import OperationsQueue from './OperationsQueue';
-import TypeDeChamps from './components/TypeDeChamps';
-
-class TypesDeChampEditor extends Component {
-  constructor(props) {
-    super(props);
-    const defaultTypeDeChampAttributes = {
-      type_champ: 'text',
-      types_de_champ: [],
-      private: props.isAnnotation,
-      libelle: `${
-        props.isAnnotation ? 'Nouvelle annotation' : 'Nouveau champ'
-      } ${props.typeDeChampsTypes[0][0]}`
-    };
-    this.state = {
-      flash: new Flash(props.isAnnotation),
-      queue: new OperationsQueue(props.baseUrl),
-      defaultTypeDeChampAttributes,
-      typeDeChampsTypes: props.typeDeChampsTypes,
-      directUploadUrl: props.directUploadUrl,
-      isAnnotation: props.isAnnotation,
-      continuerUrl: props.continuerUrl
-    };
-  }
-
-  render() {
-    return (
-      <TypeDeChamps state={this.state} typeDeChamps={this.props.typeDeChamps} />
-    );
-  }
-}
-
-TypesDeChampEditor.propTypes = {
-  baseUrl: PropTypes.string,
-  continuerUrl: PropTypes.string,
-  directUploadUrl: PropTypes.string,
-  isAnnotation: PropTypes.bool,
-  typeDeChamps: PropTypes.array,
-  typeDeChampsTypes: PropTypes.array
-};
-
-export default TypesDeChampEditor;
diff --git a/app/javascript/components/TypesDeChampEditor/index.tsx b/app/javascript/components/TypesDeChampEditor/index.tsx
new file mode 100644
index 000000000..8b2ab794a
--- /dev/null
+++ b/app/javascript/components/TypesDeChampEditor/index.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+
+import { Flash } from './Flash';
+import { OperationsQueue } from './OperationsQueue';
+import { TypeDeChamps } from './components/TypeDeChamps';
+import { TypeDeChamp } from './types';
+
+type TypesDeChampEditorProps = {
+  baseUrl: string;
+  continuerUrl: string;
+  directUploadUrl: string;
+  isAnnotation: boolean;
+  typeDeChamps: TypeDeChamp[];
+  typeDeChampsTypes: [label: string, type: string][];
+};
+
+export type State = Omit<TypesDeChampEditorProps, 'baseUrl'> & {
+  flash: Flash;
+  queue: OperationsQueue;
+  defaultTypeDeChampAttributes: Pick<
+    TypeDeChamp,
+    | 'type_champ'
+    | 'types_de_champ'
+    | 'libelle'
+    | 'private'
+    | 'parent_id'
+    | 'mandatory'
+  >;
+  prefix?: string;
+};
+
+export default function TypesDeChampEditor(props: TypesDeChampEditorProps) {
+  const defaultTypeDeChampAttributes: Omit<TypeDeChamp, 'id'> = {
+    type_champ: 'text',
+    types_de_champ: [],
+    mandatory: false,
+    private: props.isAnnotation,
+    libelle: `${props.isAnnotation ? 'Nouvelle annotation' : 'Nouveau champ'} ${
+      props.typeDeChampsTypes[0][0]
+    }`
+  };
+  const state: State = {
+    flash: new Flash(props.isAnnotation),
+    queue: new OperationsQueue(props.baseUrl),
+    defaultTypeDeChampAttributes,
+    typeDeChamps: [],
+    typeDeChampsTypes: props.typeDeChampsTypes,
+    directUploadUrl: props.directUploadUrl,
+    isAnnotation: props.isAnnotation,
+    continuerUrl: props.continuerUrl
+  };
+
+  return <TypeDeChamps state={state} typeDeChamps={props.typeDeChamps} />;
+}
diff --git a/app/javascript/components/TypesDeChampEditor/operations.js b/app/javascript/components/TypesDeChampEditor/operations.js
deleted file mode 100644
index a2a04116c..000000000
--- a/app/javascript/components/TypesDeChampEditor/operations.js
+++ /dev/null
@@ -1,51 +0,0 @@
-export function createTypeDeChampOperation(typeDeChamp, queue) {
-  return queue
-    .enqueue({
-      path: '',
-      method: 'post',
-      payload: { type_de_champ: typeDeChamp }
-    })
-    .then((data) => {
-      handleResponseData(typeDeChamp, data);
-    });
-}
-
-export function destroyTypeDeChampOperation(typeDeChamp, queue) {
-  return queue.enqueue({
-    path: `/${typeDeChamp.id}`,
-    method: 'delete',
-    payload: {}
-  });
-}
-
-export function moveTypeDeChampOperation(typeDeChamp, index, queue) {
-  return queue.enqueue({
-    path: `/${typeDeChamp.id}/move`,
-    method: 'patch',
-    payload: { position: index }
-  });
-}
-
-export function updateTypeDeChampOperation(typeDeChamp, queue) {
-  return queue
-    .enqueue({
-      path: `/${typeDeChamp.id}`,
-      method: 'patch',
-      payload: { type_de_champ: typeDeChamp }
-    })
-    .then((data) => {
-      handleResponseData(typeDeChamp, data);
-    });
-}
-
-function handleResponseData(typeDeChamp, { type_de_champ }) {
-  for (let field of RESPONSE_FIELDS) {
-    typeDeChamp[field] = type_de_champ[field];
-  }
-}
-
-const RESPONSE_FIELDS = [
-  'id',
-  'piece_justificative_template_filename',
-  'piece_justificative_template_url'
-];
diff --git a/app/javascript/components/TypesDeChampEditor/operations.ts b/app/javascript/components/TypesDeChampEditor/operations.ts
new file mode 100644
index 000000000..3fbcdff18
--- /dev/null
+++ b/app/javascript/components/TypesDeChampEditor/operations.ts
@@ -0,0 +1,71 @@
+import type { TypeDeChamp, OperationsQueue } from './types';
+
+export function createTypeDeChampOperation(
+  typeDeChamp: Omit<TypeDeChamp, 'id'>,
+  queue: OperationsQueue
+) {
+  return queue
+    .enqueue({
+      path: '',
+      method: 'post',
+      payload: { type_de_champ: typeDeChamp }
+    })
+    .then((data) => {
+      handleResponseData(typeDeChamp, data as ResponseData);
+    });
+}
+
+export function destroyTypeDeChampOperation(
+  typeDeChamp: TypeDeChamp,
+  queue: OperationsQueue
+) {
+  return queue.enqueue({
+    path: `/${typeDeChamp.id}`,
+    method: 'delete',
+    payload: {}
+  });
+}
+
+export function moveTypeDeChampOperation(
+  typeDeChamp: TypeDeChamp,
+  index: number,
+  queue: OperationsQueue
+) {
+  return queue.enqueue({
+    path: `/${typeDeChamp.id}/move`,
+    method: 'patch',
+    payload: { position: index }
+  });
+}
+
+export function updateTypeDeChampOperation(
+  typeDeChamp: TypeDeChamp,
+  queue: OperationsQueue
+) {
+  return queue
+    .enqueue({
+      path: `/${typeDeChamp.id}`,
+      method: 'patch',
+      payload: { type_de_champ: typeDeChamp }
+    })
+    .then((data) => {
+      handleResponseData(typeDeChamp, data as ResponseData);
+    });
+}
+
+type ResponseData = { type_de_champ: Record<string, string> };
+
+function handleResponseData(
+  typeDeChamp: Partial<TypeDeChamp>,
+  { type_de_champ }: ResponseData
+) {
+  for (const field of RESPONSE_FIELDS) {
+    typeDeChamp[field] = type_de_champ[field];
+  }
+}
+
+const RESPONSE_FIELDS = [
+  'id',
+  'piece_justificative_template_filename',
+  'piece_justificative_template_url'
+] as const;
diff --git a/app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.js b/app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.ts
similarity index 55%
rename from app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.js
rename to app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.ts
index 81125b54a..283dddc86 100644
--- a/app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.js
+++ b/app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.ts
@@ -5,36 +5,103 @@ import {
   moveTypeDeChampOperation,
   updateTypeDeChampOperation
 } from './operations';
+import type { TypeDeChamp, State, Flash, OperationsQueue } from './types';
 
-export default function typeDeChampsReducer(state, { type, params, done }) {
-  switch (type) {
+type AddNewTypeDeChampAction = {
+  type: 'addNewTypeDeChamp';
+  done: () => void;
+};
+
+type AddNewRepetitionTypeDeChampAction = {
+  type: 'addNewRepetitionTypeDeChamp';
+  params: { typeDeChamp: TypeDeChamp };
+  done: () => void;
+};
+
+type UpdateTypeDeChampAction = {
+  type: 'updateTypeDeChamp';
+  params: {
+    typeDeChamp: TypeDeChamp;
+    field: keyof TypeDeChamp;
+    value: string | boolean;
+  };
+  done: () => void;
+};
+
+type RemoveTypeDeChampAction = {
+  type: 'removeTypeDeChamp';
+  params: { typeDeChamp: TypeDeChamp };
+};
+
+type MoveTypeDeChampUpAction = {
+  type: 'moveTypeDeChampUp';
+  params: { typeDeChamp: TypeDeChamp };
+};
+
+type MoveTypeDeChampDownAction = {
+  type: 'moveTypeDeChampDown';
+  params: { typeDeChamp: TypeDeChamp };
+};
+
+type OnSortTypeDeChampsAction = {
+  type: 'onSortTypeDeChamps';
+  params: { oldIndex: number; newIndex: number };
+};
+
+type RefreshAction = {
+  type: 'refresh';
+};
+
+export type Action =
+  | AddNewTypeDeChampAction
+  | AddNewRepetitionTypeDeChampAction
+  | UpdateTypeDeChampAction
+  | RemoveTypeDeChampAction
+  | MoveTypeDeChampUpAction
+  | MoveTypeDeChampDownAction
+  | OnSortTypeDeChampsAction
+  | RefreshAction;
+
+export default function typeDeChampsReducer(
+  state: State,
+  action: Action
+): State {
+  switch (action.type) {
     case 'addNewTypeDeChamp':
-      return addNewTypeDeChamp(state, state.typeDeChamps, done);
+      return addNewTypeDeChamp(state, state.typeDeChamps, action.done);
     case 'addNewRepetitionTypeDeChamp':
       return addNewRepetitionTypeDeChamp(
         state,
         state.typeDeChamps,
-        params.typeDeChamp,
-        done
+        action.params,
+        action.done
       );
     case 'updateTypeDeChamp':
-      return updateTypeDeChamp(state, state.typeDeChamps, params, done);
+      return updateTypeDeChamp(
+        state,
+        state.typeDeChamps,
+        action.params,
+        action.done
+      );
     case 'removeTypeDeChamp':
-      return removeTypeDeChamp(state, state.typeDeChamps, params);
+      return removeTypeDeChamp(state, state.typeDeChamps, action.params);
     case 'moveTypeDeChampUp':
-      return moveTypeDeChampUp(state, state.typeDeChamps, params);
+      return moveTypeDeChampUp(state, state.typeDeChamps, action.params);
     case 'moveTypeDeChampDown':
-      return moveTypeDeChampDown(state, state.typeDeChamps, params);
+      return moveTypeDeChampDown(state, state.typeDeChamps, action.params);
     case 'onSortTypeDeChamps':
-      return onSortTypeDeChamps(state, state.typeDeChamps, params);
+      return onSortTypeDeChamps(state, state.typeDeChamps, action.params);
     case 'refresh':
       return { ...state, typeDeChamps: [...state.typeDeChamps] };
-    default:
-      throw new Error(`Unknown action "${type}"`);
   }
 }
 
-function addTypeDeChamp(state, typeDeChamps, insertAfter, done) {
+function addTypeDeChamp(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  insertAfter: { index: number; target: HTMLDivElement } | null,
+  done: () => void
+) {
   const typeDeChamp = {
     ...state.defaultTypeDeChampAttributes
   };
@@ -44,7 +111,7 @@ function addTypeDeChamp(state, typeDeChamps, insertAfter, done) {
       if (insertAfter) {
         // Move the champ to the correct position server-side
         await moveTypeDeChampOperation(
-          typeDeChamp,
+          typeDeChamp as TypeDeChamp,
           insertAfter.index,
           state.queue
         );
@@ -52,7 +119,7 @@ function addTypeDeChamp(state, typeDeChamps, insertAfter, done) {
       state.flash.success();
       done();
       if (insertAfter) {
-        insertAfter.target.nextElementSibling.scrollIntoView({
+        insertAfter.target.nextElementSibling?.scrollIntoView({
           behavior: 'smooth',
           block: 'start',
           inline: 'nearest'
@@ -61,7 +128,10 @@ function addTypeDeChamp(state, typeDeChamps, insertAfter, done) {
     })
     .catch((message) => state.flash.error(message));
 
-  let newTypeDeChamps = [...typeDeChamps, typeDeChamp];
+  let newTypeDeChamps: TypeDeChamp[] = [
+    ...typeDeChamps,
+    typeDeChamp as TypeDeChamp
+  ];
   if (insertAfter) {
     // Move the champ to the correct position client-side
     newTypeDeChamps = arrayMove(
@@ -77,11 +147,20 @@ function addTypeDeChamp(state, typeDeChamps, insertAfter, done) {
   };
 }
 
-function addNewTypeDeChamp(state, typeDeChamps, done) {
+function addNewTypeDeChamp(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  done: () => void
+) {
   return addTypeDeChamp(state, typeDeChamps, findItemToInsertAfter(), done);
 }
 
-function addNewRepetitionTypeDeChamp(state, typeDeChamps, typeDeChamp, done) {
+function addNewRepetitionTypeDeChamp(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  { typeDeChamp }: AddNewRepetitionTypeDeChampAction['params'],
+  done: () => void
+) {
   return addTypeDeChamp(
     {
       ...state,
@@ -97,10 +176,10 @@ function addNewRepetitionTypeDeChamp(state, typeDeChamps, typeDeChamp, done) {
 }
 
 function updateTypeDeChamp(
-  state,
-  typeDeChamps,
-  { typeDeChamp, field, value },
-  done
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  { typeDeChamp, field, value }: UpdateTypeDeChampAction['params'],
+  done: () => void
 ) {
   if (field == 'type_champ' && !typeDeChamp.drop_down_list_value) {
     switch (value) {
@@ -117,9 +196,9 @@ function updateTypeDeChamp(
   if (field.startsWith('options.')) {
     const [, optionsField] = field.split('.');
     typeDeChamp.editable_options = typeDeChamp.editable_options || {};
-    typeDeChamp.editable_options[optionsField] = value;
+    typeDeChamp.editable_options[optionsField] = value as string;
   } else {
-    typeDeChamp[field] = value;
+    Object.assign(typeDeChamp, { [field]: value });
   }
 
   getUpdateHandler(typeDeChamp, state)(done);
@@ -130,7 +209,11 @@ function updateTypeDeChamp(
   };
 }
 
-function removeTypeDeChamp(state, typeDeChamps, { typeDeChamp }) {
+function removeTypeDeChamp(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  { typeDeChamp }: RemoveTypeDeChampAction['params']
+) {
   destroyTypeDeChampOperation(typeDeChamp, state.queue)
     .then(() => state.flash.success())
     .catch((message) => state.flash.error(message));
@@ -141,7 +224,11 @@ function removeTypeDeChamp(state, typeDeChamps, { typeDeChamp }) {
   };
 }
 
-function moveTypeDeChampUp(state, typeDeChamps, { typeDeChamp }) {
+function moveTypeDeChampUp(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  { typeDeChamp }: MoveTypeDeChampUpAction['params']
+) {
   const oldIndex = typeDeChamps.indexOf(typeDeChamp);
   const newIndex = oldIndex - 1;
 
@@ -155,7 +242,11 @@ function moveTypeDeChampUp(state, typeDeChamps, { typeDeChamp }) {
   };
 }
 
-function moveTypeDeChampDown(state, typeDeChamps, { typeDeChamp }) {
+function moveTypeDeChampDown(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  { typeDeChamp }: MoveTypeDeChampDownAction['params']
+) {
   const oldIndex = typeDeChamps.indexOf(typeDeChamp);
   const newIndex = oldIndex + 1;
 
@@ -169,7 +260,11 @@ function moveTypeDeChampDown(state, typeDeChamps, { typeDeChamp }) {
   };
 }
 
-function onSortTypeDeChamps(state, typeDeChamps, { oldIndex, newIndex }) {
+function onSortTypeDeChamps(
+  state: State,
+  typeDeChamps: TypeDeChamp[],
+  { oldIndex, newIndex }: OnSortTypeDeChampsAction['params']
+) {
   moveTypeDeChampOperation(typeDeChamps[oldIndex], newIndex, state.queue)
     .then(() => state.flash.success())
     .catch((message) => state.flash.error(message));
@@ -180,24 +275,27 @@ function onSortTypeDeChamps(state, typeDeChamps, { oldIndex, newIndex }) {
   };
 }
 
-function arrayRemove(array, item) {
+function arrayRemove<T>(array: T[], item: T) {
   array = Array.from(array);
   array.splice(array.indexOf(item), 1);
   return array;
 }
 
-function arrayMove(array, from, to) {
+function arrayMove<T>(array: T[], from: number, to: number) {
   array = Array.from(array);
   array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
   return array;
 }
 
 const updateHandlers = new WeakMap();
-function getUpdateHandler(typeDeChamp, { queue, flash }) {
+function getUpdateHandler(
+  typeDeChamp: TypeDeChamp,
+  { queue, flash }: { queue: OperationsQueue; flash: Flash }
+) {
   let handler = updateHandlers.get(typeDeChamp);
   if (!handler) {
     handler = debounce(
-      (done) =>
+      (done: () => void) =>
         updateTypeDeChampOperation(typeDeChamp, queue)
           .then(() => {
             flash.success();
@@ -217,7 +315,7 @@ function findItemToInsertAfter() {
   if (target) {
     return {
       target,
-      index: parseInt(target.dataset.index) + 1
+      index: parseInt(target.dataset.index ?? '0') + 1
     };
   } else {
     return null;
@@ -225,11 +323,12 @@ function findItemToInsertAfter() {
 }
 
 function getLastVisibleTypeDeChamp() {
-  const typeDeChamps = document.querySelectorAll('[data-in-view]');
+  const typeDeChamps =
+    document.querySelectorAll<HTMLDivElement>('[data-in-view]');
   const target = typeDeChamps[typeDeChamps.length - 1];
 
   if (target) {
-    const parentTarget = target.closest('[data-repetition]');
+    const parentTarget = target.closest<HTMLDivElement>('[data-repetition]');
     if (parentTarget) {
       return parentTarget;
     }
diff --git a/app/javascript/components/TypesDeChampEditor/types.ts b/app/javascript/components/TypesDeChampEditor/types.ts
new file mode 100644
index 000000000..e0ca1bc16
--- /dev/null
+++ b/app/javascript/components/TypesDeChampEditor/types.ts
@@ -0,0 +1,27 @@
+import type { ChangeEventHandler } from 'react';
+
+export type { Flash } from './Flash';
+export type { OperationsQueue } from './OperationsQueue';
+export type { State } from '.';
+export { Action } from './typeDeChampsReducer';
+
+export type TypeDeChamp = {
+  id: string;
+  libelle: string;
+  type_champ: string;
+  private: boolean;
+  mandatory: boolean;
+  types_de_champ: TypeDeChamp[];
+  parent_id?: string;
+  piece_justificative_template_filename?: string;
+  piece_justificative_template_url?: string;
+  drop_down_list_value?: string;
+  editable_options?: Record<string, string>;
+};
+
+export type Handler<Element extends HTMLElement> = {
+  id: string;
+  name: string;
+  value: string;
+  onChange: ChangeEventHandler<Element>;
+};
diff --git a/app/javascript/components/TypesDeChampEditor/utils.jsx b/app/javascript/components/TypesDeChampEditor/utils.jsx
deleted file mode 100644
index f2f5932ad..000000000
--- a/app/javascript/components/TypesDeChampEditor/utils.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { sortableContainer } from 'react-sortable-hoc';
-
-export const SortableContainer = sortableContainer(({ children }) => {
-  return <ul>{children}</ul>;
-});
-
-export function addChampLabel(isAnnotation) {
-  if (isAnnotation) {
-    return 'Ajouter une annotation';
-  } else {
-    return 'Ajouter un champ';
-  }
-}
diff --git a/app/javascript/components/TypesDeChampEditor/utils.tsx b/app/javascript/components/TypesDeChampEditor/utils.tsx
new file mode 100644
index 000000000..46cf0c97d
--- /dev/null
+++ b/app/javascript/components/TypesDeChampEditor/utils.tsx
@@ -0,0 +1,16 @@
+import React, { ReactNode } from 'react';
+import { SortableContainer as SortableContainerWrapper } from 'react-sortable-hoc';
+
+export const SortableContainer = SortableContainerWrapper(
+  ({ children }: { children: ReactNode }) => {
+    return <ul>{children}</ul>;
+  }
+);
+
+export function addChampLabel(isAnnotation: boolean) {
+  if (isAnnotation) {
+    return 'Ajouter une annotation';
+  } else {
+    return 'Ajouter un champ';
+  }
+}
diff --git a/app/javascript/shared/activestorage/file-upload-error.js b/app/javascript/shared/activestorage/file-upload-error.ts
similarity index 84%
rename from app/javascript/shared/activestorage/file-upload-error.js
rename to app/javascript/shared/activestorage/file-upload-error.ts
index ef4aa5ded..7265ee67e 100644
--- a/app/javascript/shared/activestorage/file-upload-error.js
+++ b/app/javascript/shared/activestorage/file-upload-error.ts
@@ -18,7 +18,10 @@ export const FAILURE_CONNECTIVITY = 'file-upload-failure-connectivity';
   Represent an error during a file upload.
   */
 export default class FileUploadError extends Error {
-  constructor(message, status, code) {
+  status?: number;
+  code?: string;
+
+  constructor(message: string, status: number | undefined, code?: string) {
     super(message);
 
     this.name = 'FileUploadError';
@@ -27,9 +30,9 @@ export default class FileUploadError extends Error {
 
     // Prevent the constructor stacktrace from being included.
     // (it messes up with Sentry issues grouping)
-    if (Error.captureStackTrace) {
+    if ('captureStackTrace' in Error) {
       // V8-only
-      Error.captureStackTrace(this, this.constructor);
+      //Error.captureStackTrace(this, this.constructor);
     } else {
       this.stack = new Error().stack;
     }
@@ -40,7 +43,7 @@ export default class FileUploadError extends Error {
     See FAILURE_* constants for values.
     */
   get failureReason() {
-    let isNetworkError = this.code && this.code != ERROR_CODE_READ;
+    const isNetworkError = this.code && this.code != ERROR_CODE_READ;
 
     if (isNetworkError && this.status != 0) {
       return FAILURE_SERVER;
@@ -60,9 +63,9 @@ export default class FileUploadError extends Error {
 // 2. Create each kind of error on a different line
 //   (so that Sentry knows they are different kind of errors, from
 //   the line they were created.)
-export function errorFromDirectUploadMessage(message) {
-  let matches = message.match(/ Status: ([0-9]{1,3})/);
-  let status = matches ? parseInt(matches[1], 10) : undefined;
+export function errorFromDirectUploadMessage(message: string) {
+  const matches = message.match(/ Status: ([0-9]{1,3})/);
+  const status = matches ? parseInt(matches[1], 10) : undefined;
 
   // prettier-ignore
   if (message.includes('Error reading')) {
diff --git a/app/javascript/shared/activestorage/progress-bar.js b/app/javascript/shared/activestorage/progress-bar.ts
similarity index 63%
rename from app/javascript/shared/activestorage/progress-bar.js
rename to app/javascript/shared/activestorage/progress-bar.ts
index 5c9d6625c..7541ffae4 100644
--- a/app/javascript/shared/activestorage/progress-bar.js
+++ b/app/javascript/shared/activestorage/progress-bar.ts
@@ -15,13 +15,13 @@ const COMPLETE_CLASS = 'direct-upload--complete';
   be found.
   */
 export default class ProgressBar {
-  static init(input, id, file) {
+  static init(input: HTMLInputElement, id: string, file: File) {
     clearErrors(input);
     const html = this.render(id, file.name);
     input.insertAdjacentHTML('beforebegin', html);
   }
 
-  static start(id) {
+  static start(id: string) {
     const element = getDirectUploadElement(id);
     if (element) {
       element.classList.remove(PENDING_CLASS);
@@ -29,15 +29,15 @@ export default class ProgressBar {
     }
   }
 
-  static progress(id, progress) {
+  static progress(id: string, progress: number) {
     const element = getDirectUploadProgressElement(id);
     if (element) {
       element.style.width = `${progress}%`;
-      element.setAttribute('aria-valuenow', progress);
+      element.setAttribute('aria-valuenow', `${progress}`);
     }
   }
 
-  static error(id, error) {
+  static error(id: string, error: string) {
     const element = getDirectUploadElement(id);
     if (element) {
       element.classList.add(ERROR_CLASS);
@@ -45,60 +45,63 @@ export default class ProgressBar {
     }
   }
 
-  static end(id) {
+  static end(id: string) {
     const element = getDirectUploadElement(id);
     if (element) {
       element.classList.add(COMPLETE_CLASS);
     }
   }
 
-  static render(id, filename) {
+  static render(id: string, filename: string) {
     return `<div id="direct-upload-${id}" class="direct-upload ${PENDING_CLASS}" data-direct-upload-id="${id}">
       <div role="progressbar" aria-valuemin="0" aria-valuemax="100" class="direct-upload__progress" style="width: 0%"></div>
       <span class="direct-upload__filename">${filename}</span>
     </div>`;
   }
 
-  constructor(input, id, file) {
-    this.constructor.init(input, id, file);
+  id: string;
+
+  constructor(input: HTMLInputElement, id: string, file: File) {
+    ProgressBar.init(input, id, file);
     this.id = id;
   }
 
   start() {
-    this.constructor.start(this.id);
+    ProgressBar.start(this.id);
   }
 
-  progress(progress) {
-    this.constructor.progress(this.id, progress);
+  progress(progress: number) {
+    ProgressBar.progress(this.id, progress);
   }
 
-  error(error) {
-    this.constructor.error(this.id, error);
+  error(error: string) {
+    ProgressBar.error(this.id, error);
   }
 
   end() {
-    this.constructor.end(this.id);
+    ProgressBar.end(this.id);
   }
 
   destroy() {
     const element = getDirectUploadElement(this.id);
+    element?.remove();
+  }
+}
+
+function clearErrors(input: HTMLInputElement) {
+  const errorElements =
+    input.parentElement?.querySelectorAll(`.${ERROR_CLASS}`) ?? [];
+  for (const element of errorElements) {
     element.remove();
   }
 }
 
-function clearErrors(input) {
-  const errorElements = input.parentElement.querySelectorAll(`.${ERROR_CLASS}`);
-  for (let element of errorElements) {
-    element.remove();
-  }
+function getDirectUploadElement(id: string) {
+  return document.querySelector<HTMLDivElement>(`#direct-upload-${id}`);
 }
 
-function getDirectUploadElement(id) {
-  return document.getElementById(`direct-upload-${id}`);
-}
-
-function getDirectUploadProgressElement(id) {
-  return document.querySelector(
+function getDirectUploadProgressElement(id: string) {
+  return document.querySelector<HTMLDivElement>(
     `#direct-upload-${id} .direct-upload__progress`
   );
 }
diff --git a/app/javascript/shared/activestorage/uploader.js b/app/javascript/shared/activestorage/uploader.ts
similarity index 70%
rename from app/javascript/shared/activestorage/uploader.js
rename to app/javascript/shared/activestorage/uploader.ts
index d1454acd6..abbe6ac80 100644
--- a/app/javascript/shared/activestorage/uploader.js
+++ b/app/javascript/shared/activestorage/uploader.ts
@@ -11,9 +11,18 @@ import FileUploadError, {
   used to track lifecycle and progress of an upload.
   */
 export default class Uploader {
-  constructor(input, file, directUploadUrl, autoAttachUrl) {
+  directUpload: DirectUpload;
+  progressBar: ProgressBar;
+  autoAttachUrl?: string;
+
+  constructor(
+    input: HTMLInputElement,
+    file: File,
+    directUploadUrl: string,
+    autoAttachUrl?: string
+  ) {
     this.directUpload = new DirectUpload(file, directUploadUrl, this);
-    this.progressBar = new ProgressBar(input, this.directUpload.id, file);
+    this.progressBar = new ProgressBar(input, this.directUpload.id + '', file);
     this.autoAttachUrl = autoAttachUrl;
   }
 
@@ -26,10 +35,10 @@ export default class Uploader {
     this.progressBar.start();
 
     try {
-      let blobSignedId = await this._upload();
+      const blobSignedId = await this._upload();
 
       if (this.autoAttachUrl) {
-        await this._attach(blobSignedId);
+        await this._attach(blobSignedId, this.autoAttachUrl);
         // On response, the attachment HTML fragment will replace the progress bar.
       } else {
         this.progressBar.end();
@@ -38,7 +47,7 @@ export default class Uploader {
 
       return blobSignedId;
     } catch (error) {
-      this.progressBar.error(error.message);
+      this.progressBar.error((error as Error).message);
       throw error;
     }
   }
@@ -47,11 +56,11 @@ export default class Uploader {
     Upload the file using the DirectUpload instance, and return the blob signed_id.
     Throws a FileUploadError on failure.
     */
-  async _upload() {
+  async _upload(): Promise<string> {
     return new Promise((resolve, reject) => {
       this.directUpload.create((errorMsg, attributes) => {
         if (errorMsg) {
-          let error = errorFromDirectUploadMessage(errorMsg);
+          const error = errorFromDirectUploadMessage(errorMsg.message);
           reject(error);
         } else {
           resolve(attributes.signed_id);
@@ -65,9 +74,9 @@ export default class Uploader {
     Throws a FileUploadError on failure (containing the first validation
     error message, if any).
     */
-  async _attach(blobSignedId) {
+  async _attach(blobSignedId: string, autoAttachUrl: string) {
     const attachmentRequest = {
-      url: this.autoAttachUrl,
+      url: autoAttachUrl,
       type: 'PUT',
       data: `blob_signed_id=${blobSignedId}`
     };
@@ -75,23 +84,27 @@ export default class Uploader {
     try {
       await ajax(attachmentRequest);
     } catch (e) {
-      let message = e.response && e.response.errors && e.response.errors[0];
+      const error = e as {
+        response?: { errors: string[] };
+        xhr?: XMLHttpRequest;
+      };
+      const message = error.response?.errors && error.response.errors[0];
       throw new FileUploadError(
         message || 'Error attaching file.',
-        e.xhr.status,
+        error.xhr?.status,
         ERROR_CODE_ATTACH
       );
     }
   }
 
-  uploadRequestDidProgress(event) {
+  uploadRequestDidProgress(event: ProgressEvent) {
     const progress = (event.loaded / event.total) * 100;
     if (progress) {
       this.progressBar.progress(progress);
     }
   }
 
-  directUploadWillStoreFileWithXHR(xhr) {
+  directUploadWillStoreFileWithXHR(xhr: XMLHttpRequest) {
     xhr.upload.addEventListener('progress', (event) =>
       this.uploadRequestDidProgress(event)
     );
diff --git a/package.json b/package.json
index 6a18d8d21..aac8b6af3 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "react-intersection-observer": "^8.31.0",
     "react-popper": "^2.2.5",
     "react-query": "^3.34.19",
-    "react-sortable-hoc": "^1.11.0",
+    "react-sortable-hoc": "^2.0.0",
     "tiny-invariant": "^1.2.0",
     "trix": "^1.2.3",
     "use-debounce": "^5.2.0",
@@ -49,6 +49,7 @@
     "@types/geojson": "^7946.0.8",
     "@types/is-hotkey": "^0.1.7",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",
+    "@types/rails__activestorage": "^7.0.1",
     "@types/rails__ujs": "^6.0.1",
     "@types/react": "^17.0.43",
     "@types/react-dom": "^17.0.14",
diff --git a/yarn.lock b/yarn.lock
index 199844fa2..31c831f23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2459,6 +2459,11 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
   integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
 
+"@types/rails__activestorage@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@types/rails__activestorage/-/rails__activestorage-7.0.1.tgz#7e60320fdb376d34051733e3f8f0df0a8ff24077"
+  integrity sha512-H8mjwqFNweMfvgg8U+rdsonqjouETdqZxEOfzARiA4ag8jtLHFhjfAgFF6gWMnzVpXgQPrJw1boiknx9rV23Eg==
+
 "@types/rails__ujs@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@types/rails__ujs/-/rails__ujs-6.0.1.tgz#83c5aa1dad88ca869de05a9523eff58041ab307a"
@@ -11294,10 +11299,10 @@ react-query@^3.34.19:
     broadcast-channel "^3.4.1"
     match-sorter "^6.0.2"
 
-react-sortable-hoc@^1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/react-sortable-hoc/-/react-sortable-hoc-1.11.0.tgz#fe4022362bbafc4b836f5104b9676608a40a278f"
-  integrity sha512-v1CDCvdfoR3zLGNp6qsBa4J1BWMEVH25+UKxF/RvQRh+mrB+emqtVHMgZ+WreUiKJoEaiwYoScaueIKhMVBHUg==
+react-sortable-hoc@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz#f6780d8aa4b922a21f3e754af542f032677078b7"
+  integrity sha512-JZUw7hBsAHXK7PTyErJyI7SopSBFRcFHDjWW5SWjcugY0i6iH7f+eJkY8cJmGMlZ1C9xz1J3Vjz0plFpavVeRg==
   dependencies:
     "@babel/runtime" "^7.2.0"
     invariant "^2.2.4"

From 9938586d96c3bbef2034a9e71a19877b6af29f1a Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Mon, 11 Apr 2022 13:11:04 +0200
Subject: [PATCH 02/16] check state

---
 .../agent_connect/agent_controller.rb         | 18 ++++++++++-
 app/services/agent_connect_service.rb         |  8 +++--
 .../agent_connect/agent_controller_spec.rb    | 31 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/app/controllers/agent_connect/agent_controller.rb b/app/controllers/agent_connect/agent_controller.rb
index c550284e4..234d63328 100644
--- a/app/controllers/agent_connect/agent_controller.rb
+++ b/app/controllers/agent_connect/agent_controller.rb
@@ -1,12 +1,19 @@
 # doc: https://github.com/france-connect/Documentation-AgentConnect
 class AgentConnect::AgentController < ApplicationController
   before_action :redirect_to_login_if_fc_aborted, only: [:callback]
+  before_action :check_state, only: [:callback]
+
+  STATE_COOKIE_NAME = :agentConnect_state
 
   def index
   end
 
   def login
-    redirect_to AgentConnectService.authorization_uri
+    uri, state = AgentConnectService.authorization_uri
+
+    cookies.encrypted[STATE_COOKIE_NAME] = state
+
+    redirect_to uri
   end
 
   def callback
@@ -50,4 +57,13 @@ class AgentConnect::AgentController < ApplicationController
     flash.alert = t('errors.messages.france_connect.connexion')
     redirect_to(new_user_session_path)
   end
+
+  def check_state
+    if cookies.encrypted[STATE_COOKIE_NAME] != params[:state]
+      flash.alert = t('errors.messages.france_connect.connexion')
+      redirect_to(new_user_session_path)
+    else
+      cookies.encrypted[STATE_COOKIE_NAME] = nil
+    end
+  end
 end
diff --git a/app/services/agent_connect_service.rb b/app/services/agent_connect_service.rb
index beefe3b99..f261856d7 100644
--- a/app/services/agent_connect_service.rb
+++ b/app/services/agent_connect_service.rb
@@ -6,12 +6,16 @@ class AgentConnectService
   def self.authorization_uri
     client = AgentConnectClient.new
 
-    client.authorization_uri(
+    state = SecureRandom.hex(16)
+
+    uri = client.authorization_uri(
       scope: [:openid, :email],
-      state: SecureRandom.hex(16),
+      state: state,
       nonce: SecureRandom.hex(16),
       acr_values: 'eidas1'
     )
+
+    [uri, state]
   end
 
   def self.user_info(code)
diff --git a/spec/controllers/agent_connect/agent_controller_spec.rb b/spec/controllers/agent_connect/agent_controller_spec.rb
index 2ed41acdb..1cac99997 100644
--- a/spec/controllers/agent_connect/agent_controller_spec.rb
+++ b/spec/controllers/agent_connect/agent_controller_spec.rb
@@ -1,10 +1,20 @@
 describe AgentConnect::AgentController, type: :controller do
+  describe '#login' do
+    before { get :login }
+
+    it { expect(state_cookie).not_to be_nil }
+  end
+
   describe '#callback' do
     let(:email) { 'i@email.com' }
-    subject { get :callback, params: { code: code } }
+    let(:original_state) { 'original_state' }
+    subject { get :callback, params: { code: code, state: state } }
+
+    before { cookies.encrypted[controller.class::STATE_COOKIE_NAME] = original_state }
 
     context 'when the callback code is correct' do
       let(:code) { 'correct' }
+      let(:state) { original_state }
       let(:user_info) { { 'sub' => 'sub', 'email' => ' I@email.com' } }
 
       context 'and user_info returns some info' do
@@ -26,6 +36,7 @@ describe AgentConnect::AgentController, type: :controller do
             expect(last_user.confirmed_at).to be_present
             expect(last_user.instructeur.agent_connect_id).to eq('sub')
             expect(response).to redirect_to(instructeur_procedures_path)
+            expect(state_cookie).to be_nil
           end
         end
 
@@ -77,8 +88,22 @@ describe AgentConnect::AgentController, type: :controller do
       end
     end
 
+    context 'when the callback state is not the original' do
+      let(:code) { 'correct' }
+      let(:state) { 'another state' }
+
+      before { subject }
+
+      it 'aborts the processus' do
+        expect { subject }.to change { User.count }.by(0).and change { Instructeur.count }.by(0)
+
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+
     context 'when the callback code is blank' do
       let(:code) { '' }
+      let(:state) { original_state }
 
       it 'aborts the processus' do
         expect { subject }.to change { User.count }.by(0).and change { Instructeur.count }.by(0)
@@ -87,4 +112,8 @@ describe AgentConnect::AgentController, type: :controller do
       end
     end
   end
+
+  def state_cookie
+    cookies.encrypted[controller.class::STATE_COOKIE_NAME]
+  end
 end

From 1dcfb2509fd893a993f8b02b44dbbb6d51e9fbca Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Mon, 11 Apr 2022 13:11:54 +0200
Subject: [PATCH 03/16] check nonce

---
 .../agent_connect/agent_controller.rb         |  7 +++--
 app/services/agent_connect_service.rb         | 28 ++++++++++++++++---
 .../agent_connect/agent_controller_spec.rb    | 18 ++++++++++--
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/app/controllers/agent_connect/agent_controller.rb b/app/controllers/agent_connect/agent_controller.rb
index 234d63328..18a781235 100644
--- a/app/controllers/agent_connect/agent_controller.rb
+++ b/app/controllers/agent_connect/agent_controller.rb
@@ -4,20 +4,23 @@ class AgentConnect::AgentController < ApplicationController
   before_action :check_state, only: [:callback]
 
   STATE_COOKIE_NAME = :agentConnect_state
+  NONCE_COOKIE_NAME = :agentConnect_nonce
 
   def index
   end
 
   def login
-    uri, state = AgentConnectService.authorization_uri
+    uri, state, nonce = AgentConnectService.authorization_uri
 
     cookies.encrypted[STATE_COOKIE_NAME] = state
+    cookies.encrypted[NONCE_COOKIE_NAME] = nonce
 
     redirect_to uri
   end
 
   def callback
-    user_info = AgentConnectService.user_info(params[:code])
+    user_info = AgentConnectService.user_info(params[:code], cookies.encrypted[NONCE_COOKIE_NAME])
+    cookies.encrypted[NONCE_COOKIE_NAME] = nil
 
     instructeur = Instructeur.find_by(agent_connect_id: user_info['sub'])
 
diff --git a/app/services/agent_connect_service.rb b/app/services/agent_connect_service.rb
index f261856d7..33cddb735 100644
--- a/app/services/agent_connect_service.rb
+++ b/app/services/agent_connect_service.rb
@@ -1,4 +1,6 @@
 class AgentConnectService
+  include OpenIDConnect
+
   def self.enabled?
     ENV.fetch("AGENT_CONNECT_ENABLED", "enabled") == "enabled"
   end
@@ -7,22 +9,40 @@ class AgentConnectService
     client = AgentConnectClient.new
 
     state = SecureRandom.hex(16)
+    nonce = SecureRandom.hex(16)
 
     uri = client.authorization_uri(
       scope: [:openid, :email],
       state: state,
-      nonce: SecureRandom.hex(16),
+      nonce: nonce,
       acr_values: 'eidas1'
     )
 
-    [uri, state]
+    [uri, state, nonce]
   end
 
-  def self.user_info(code)
+  def self.user_info(code, nonce)
     client = AgentConnectClient.new(code)
 
-    client.access_token!(client_auth_method: :secret)
+    access_token = client.access_token!(client_auth_method: :secret)
+
+    discover = find_discover
+    id_token = ResponseObject::IdToken.decode(access_token.id_token, discover.jwks)
+
+    id_token.verify!(
+      client_id: AGENT_CONNECT[:identifier],
+      issuer: discover.issuer,
+      nonce: nonce
+    )
+
+    access_token
       .userinfo!
       .raw_attributes
   end
+
+  private
+
+  def self.find_discover
+    Discovery::Provider::Config.discover!("#{AGENT_CONNECT_BASE_URL}/api/v2")
+  end
 end
diff --git a/spec/controllers/agent_connect/agent_controller_spec.rb b/spec/controllers/agent_connect/agent_controller_spec.rb
index 1cac99997..ff88d764c 100644
--- a/spec/controllers/agent_connect/agent_controller_spec.rb
+++ b/spec/controllers/agent_connect/agent_controller_spec.rb
@@ -2,15 +2,22 @@ describe AgentConnect::AgentController, type: :controller do
   describe '#login' do
     before { get :login }
 
-    it { expect(state_cookie).not_to be_nil }
+    it do
+      expect(state_cookie).not_to be_nil
+      expect(nonce_cookie).not_to be_nil
+    end
   end
 
   describe '#callback' do
     let(:email) { 'i@email.com' }
     let(:original_state) { 'original_state' }
+    let(:nonce) { 'nonce' }
     subject { get :callback, params: { code: code, state: state } }
 
-    before { cookies.encrypted[controller.class::STATE_COOKIE_NAME] = original_state }
+    before do
+      cookies.encrypted[controller.class::STATE_COOKIE_NAME] = original_state
+      cookies.encrypted[controller.class::NONCE_COOKIE_NAME] = nonce
+    end
 
     context 'when the callback code is correct' do
       let(:code) { 'correct' }
@@ -19,7 +26,7 @@ describe AgentConnect::AgentController, type: :controller do
 
       context 'and user_info returns some info' do
         before do
-          expect(AgentConnectService).to receive(:user_info).and_return(user_info)
+          expect(AgentConnectService).to receive(:user_info).with(code, nonce).and_return(user_info)
         end
 
         context 'and the instructeur does not have an account yet' do
@@ -37,6 +44,7 @@ describe AgentConnect::AgentController, type: :controller do
             expect(last_user.instructeur.agent_connect_id).to eq('sub')
             expect(response).to redirect_to(instructeur_procedures_path)
             expect(state_cookie).to be_nil
+            expect(nonce_cookie).to be_nil
           end
         end
 
@@ -116,4 +124,8 @@ describe AgentConnect::AgentController, type: :controller do
   def state_cookie
     cookies.encrypted[controller.class::STATE_COOKIE_NAME]
   end
+
+  def nonce_cookie
+    cookies.encrypted[controller.class::NONCE_COOKIE_NAME]
+  end
 end

From 29dacb4686bbf0497f27a73c2024f4af688099f2 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Mon, 11 Apr 2022 14:33:40 +0200
Subject: [PATCH 04/16] remove env dependence in spec

---
 .../agent_connect/agent_controller_spec.rb         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/agent_connect/agent_controller_spec.rb b/spec/controllers/agent_connect/agent_controller_spec.rb
index ff88d764c..79bea11d2 100644
--- a/spec/controllers/agent_connect/agent_controller_spec.rb
+++ b/spec/controllers/agent_connect/agent_controller_spec.rb
@@ -1,10 +1,18 @@
 describe AgentConnect::AgentController, type: :controller do
   describe '#login' do
-    before { get :login }
+    let(:uri) { 'https://agent-connect.fr' }
+    let(:state) { 'state' }
+    let(:nonce) { 'nonce' }
+
+    before do
+      expect(AgentConnectService).to receive(:authorization_uri).and_return([uri, state, nonce])
+      get :login
+    end
 
     it do
-      expect(state_cookie).not_to be_nil
-      expect(nonce_cookie).not_to be_nil
+      expect(state_cookie).to eq(state)
+      expect(nonce_cookie).to eq(nonce)
+      expect(response).to redirect_to(uri)
     end
   end
 

From e83f5fe47533b23fae3a882adb18eb624085ac76 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 6 Apr 2022 15:52:46 +0200
Subject: [PATCH 05/16] fix(user.merge): when merging old_user having an
 instructeur with dossier_operation_logs containing the
 old_user.instructeur_id, should be able to merge to new instructeur

feat(user.merge): when user have an instructeur having dossier_opertions_logs containing instructeur_id
---
 app/models/dossier_operation_log.rb                          | 1 -
 ...emove_column_instructeur_id_from_dossier_operation_log.rb | 5 +++++
 db/schema.rb                                                 | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb

diff --git a/app/models/dossier_operation_log.rb b/app/models/dossier_operation_log.rb
index 9a348680f..ac29ae529 100644
--- a/app/models/dossier_operation_log.rb
+++ b/app/models/dossier_operation_log.rb
@@ -12,7 +12,6 @@
 #  updated_at          :datetime         not null
 #  bill_signature_id   :bigint
 #  dossier_id          :bigint
-#  instructeur_id      :bigint
 #
 class DossierOperationLog < ApplicationRecord
   enum operation: {
diff --git a/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb b/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb
new file mode 100644
index 000000000..5cb117776
--- /dev/null
+++ b/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb
@@ -0,0 +1,5 @@
+class RemoveColumnInstructeurIdFromDossierOperationLog < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured { remove_column :dossier_operation_logs, :instructeur_id }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d59c95dd9..c9dddb756 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -267,13 +267,11 @@ ActiveRecord::Schema.define(version: 2022_04_07_081538) do
     t.text "digest"
     t.bigint "dossier_id"
     t.datetime "executed_at"
-    t.bigint "instructeur_id"
     t.datetime "keep_until"
     t.string "operation", null: false
     t.datetime "updated_at", null: false
     t.index ["bill_signature_id"], name: "index_dossier_operation_logs_on_bill_signature_id"
     t.index ["dossier_id"], name: "index_dossier_operation_logs_on_dossier_id"
-    t.index ["instructeur_id"], name: "index_dossier_operation_logs_on_instructeur_id"
     t.index ["keep_until"], name: "index_dossier_operation_logs_on_keep_until"
   end
 
@@ -872,7 +870,6 @@ ActiveRecord::Schema.define(version: 2022_04_07_081538) do
   add_foreign_key "commentaires", "dossiers"
   add_foreign_key "commentaires", "experts"
   add_foreign_key "dossier_operation_logs", "bill_signatures"
-  add_foreign_key "dossier_operation_logs", "instructeurs"
   add_foreign_key "dossier_transfer_logs", "dossiers"
   add_foreign_key "dossiers", "dossier_transfers"
   add_foreign_key "dossiers", "groupe_instructeurs"

From 5955b1af05a5fa2dc328fb3cd582221c1ce2a28a Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Tue, 12 Apr 2022 11:32:45 +0200
Subject: [PATCH 06/16] update Nokogiri

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b91f5e62a..4485809aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -431,7 +431,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     open4 (1.3.4)

From 4d3412daf5a5bad2c2e17ca6bf1668abc410585d Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Thu, 7 Apr 2022 15:23:18 +0200
Subject: [PATCH 07/16] batch it

---
 app/lib/active_storage/downloadable_file.rb   |  5 ++-
 app/services/pieces_justificatives_service.rb | 36 +++++++++++--------
 .../pieces_justificatives_service_spec.rb     |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/lib/active_storage/downloadable_file.rb b/app/lib/active_storage/downloadable_file.rb
index 3f38007be..ac1cb2a8d 100644
--- a/app/lib/active_storage/downloadable_file.rb
+++ b/app/lib/active_storage/downloadable_file.rb
@@ -1,8 +1,7 @@
 class ActiveStorage::DownloadableFile
   def self.create_list_from_dossiers(dossiers, for_expert = false)
-    dossiers
-      .map { |d| pj_and_path(d.id, PiecesJustificativesService.generate_dossier_export(d)) } +
-    PiecesJustificativesService.liste_documents(dossiers, for_expert)
+    PiecesJustificativesService.generate_dossier_export(dossiers) +
+      PiecesJustificativesService.liste_documents(dossiers, for_expert)
   end
 
   private
diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index 0bc94b5ad..967c4fb88 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -107,21 +107,29 @@ class PiecesJustificativesService
     end
   end
 
-  def self.generate_dossier_export(dossier)
-    pdf = ApplicationController
-      .render(template: 'dossiers/show', formats: [:pdf],
-              assigns: {
-                include_infos_administration: true,
-                dossier: dossier
-              })
+  def self.generate_dossier_export(dossiers)
+    pdfs = []
 
-    FakeAttachment.new(
-      file: StringIO.new(pdf),
-      filename: "export-#{dossier.id}.pdf",
-      name: 'pdf_export_for_instructeur',
-      id: dossier.id,
-      created_at: dossier.updated_at
-    )
+    dossiers.find_each do |dossier|
+      pdf = ApplicationController
+        .render(template: 'dossiers/show', formats: [:pdf],
+                assigns: {
+                  include_infos_administration: true,
+                  dossier: dossier
+                })
+
+      a = FakeAttachment.new(
+        file: StringIO.new(pdf),
+        filename: "export-#{dossier.id}.pdf",
+        name: 'pdf_export_for_instructeur',
+        id: dossier.id,
+        created_at: dossier.updated_at
+      )
+
+      pdfs << ActiveStorage::DownloadableFile.pj_and_path(dossier.id, a)
+    end
+
+    pdfs
   end
 
   private
diff --git a/spec/services/pieces_justificatives_service_spec.rb b/spec/services/pieces_justificatives_service_spec.rb
index 8d0ca2e56..a768a0c63 100644
--- a/spec/services/pieces_justificatives_service_spec.rb
+++ b/spec/services/pieces_justificatives_service_spec.rb
@@ -160,7 +160,7 @@ describe PiecesJustificativesService do
   describe '.generate_dossier_export' do
     let(:dossier) { create(:dossier) }
 
-    subject { PiecesJustificativesService.generate_dossier_export(dossier) }
+    subject { PiecesJustificativesService.generate_dossier_export(Dossier.where(id: dossier.id)) }
 
     it "doesn't update dossier" do
       expect { subject }.not_to change { dossier.updated_at }

From 2c195e3ce24152a26f54bcd25068e61f14ea1c43 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Wed, 6 Apr 2022 00:20:52 +0200
Subject: [PATCH 08/16] extract procedure

---
 app/services/pieces_justificatives_service.rb | 7 ++++++-
 app/views/dossiers/show.pdf.prawn             | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index 967c4fb88..6a6dd7818 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -108,14 +108,19 @@ class PiecesJustificativesService
   end
 
   def self.generate_dossier_export(dossiers)
+    return [] if dossiers.empty?
+
     pdfs = []
 
+    procedure = dossiers.first.procedure
+
     dossiers.find_each do |dossier|
       pdf = ApplicationController
         .render(template: 'dossiers/show', formats: [:pdf],
                 assigns: {
                   include_infos_administration: true,
-                  dossier: dossier
+                  dossier: dossier,
+                  procedure: procedure
                 })
 
       a = FakeAttachment.new(
diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn
index b3b86eba6..6b7ea71b6 100644
--- a/app/views/dossiers/show.pdf.prawn
+++ b/app/views/dossiers/show.pdf.prawn
@@ -205,6 +205,7 @@ def add_etats_dossier(pdf, dossier)
 end
 
 prawn_document(page_size: "A4") do |pdf|
+  @procedure ||= @dossier.procedure
   pdf.font_families.update( 'marianne' => {
     normal: Rails.root.join('lib/prawn/fonts/marianne/marianne-regular.ttf' ),
     bold: Rails.root.join('lib/prawn/fonts/marianne/marianne-bold.ttf' ),
@@ -216,8 +217,8 @@ prawn_document(page_size: "A4") do |pdf|
   end
 
   format_in_2_columns(pdf, 'Dossier Nº', @dossier.id.to_s)
-  format_in_2_columns(pdf, 'Démarche', @dossier.procedure.libelle)
-  format_in_2_columns(pdf, 'Organisme', @dossier.procedure.organisation_name)
+  format_in_2_columns(pdf, 'Démarche', @procedure.libelle)
+  format_in_2_columns(pdf, 'Organisme', @procedure.organisation_name)
 
   add_etat_dossier(pdf, @dossier)
 

From 4c0b1573833b25fdcd0d52b534422d8148862732 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Thu, 7 Apr 2022 15:13:34 +0200
Subject: [PATCH 09/16] includes stuff

---
 app/services/pieces_justificatives_service.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index 6a6dd7818..cac0734d4 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -114,7 +114,11 @@ class PiecesJustificativesService
 
     procedure = dossiers.first.procedure
 
-    dossiers.find_each do |dossier|
+    dossiers
+      .includes(:champs, :champs_private, :commentaires, :individual,
+                :traitement, :etablissement,
+                user: :france_connect_information, avis: :expert)
+      .find_each do |dossier|
       pdf = ApplicationController
         .render(template: 'dossiers/show', formats: [:pdf],
                 assigns: {

From 2269585188f0c6552394e5f6b3644e6c679e3217 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Thu, 7 Apr 2022 15:26:24 +0200
Subject: [PATCH 10/16] preload all tdc once for all

---
 app/services/pieces_justificatives_service.rb |  8 +++++++-
 app/views/dossiers/show.pdf.prawn             | 16 ++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index cac0734d4..72b9e9fc8 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -113,6 +113,11 @@ class PiecesJustificativesService
     pdfs = []
 
     procedure = dossiers.first.procedure
+    tdc_by_id = TypeDeChamp
+      .joins(:revisions)
+      .where(revisions: { id: procedure.revisions })
+      .to_a
+      .group_by(&:id)
 
     dossiers
       .includes(:champs, :champs_private, :commentaires, :individual,
@@ -124,7 +129,8 @@ class PiecesJustificativesService
                 assigns: {
                   include_infos_administration: true,
                   dossier: dossier,
-                  procedure: procedure
+                  procedure: procedure,
+                  tdc_by_id: tdc_by_id
                 })
 
       a = FakeAttachment.new(
diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn
index 6b7ea71b6..153b194f6 100644
--- a/app/views/dossiers/show.pdf.prawn
+++ b/app/views/dossiers/show.pdf.prawn
@@ -130,28 +130,30 @@ def add_identite_etablissement(pdf, etablissement)
 end
 
 def add_single_champ(pdf, champ)
+  tdc = @tdc_by_id[champ.type_de_champ_id].first
+
   case champ.type
   when 'Champs::PieceJustificativeChamp', 'Champs::TitreIdentiteChamp'
     return
   when 'Champs::HeaderSectionChamp'
-    add_section_title(pdf, champ.libelle)
+    add_section_title(pdf, tdc.libelle)
   when 'Champs::ExplicationChamp'
-    format_in_2_lines(pdf, champ.libelle, champ.description)
+    format_in_2_lines(pdf, tdc.libelle, tdc.description)
   when 'Champs::CarteChamp'
-    format_in_2_lines(pdf, champ.libelle, champ.to_feature_collection.to_json)
+    format_in_2_lines(pdf, tdc.libelle, champ.to_feature_collection.to_json)
   when 'Champs::SiretChamp'
     pdf.font 'marianne', style: :bold do
-      pdf.text champ.libelle
+      pdf.text tdc.libelle
     end
     if champ.etablissement.present?
       add_identite_etablissement(pdf, champ.etablissement)
     end
   when 'Champs::NumberChamp'
     value = champ.to_s.empty? ? 'Non communiqué' : number_with_delimiter(champ.to_s)
-    format_in_2_lines(pdf, champ.libelle, value)
+    format_in_2_lines(pdf, tdc.libelle, value)
   else
     value = champ.to_s.empty? ? 'Non communiqué' : champ.to_s
-    format_in_2_lines(pdf, champ.libelle, value)
+    format_in_2_lines(pdf, tdc.libelle, value)
   end
 end
 
@@ -206,6 +208,8 @@ end
 
 prawn_document(page_size: "A4") do |pdf|
   @procedure ||= @dossier.procedure
+  @tdc_by_id ||= @dossier.champs.map(&:type_de_champ).group_by(&:id)
+
   pdf.font_families.update( 'marianne' => {
     normal: Rails.root.join('lib/prawn/fonts/marianne/marianne-regular.ttf' ),
     bold: Rails.root.join('lib/prawn/fonts/marianne/marianne-bold.ttf' ),

From ba688a477a13d8e9cde5a6bb6d44604a9efbc3e0 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Wed, 6 Apr 2022 00:49:59 +0200
Subject: [PATCH 11/16] small refactor

---
 app/models/dossier.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index e32aa99db..aa18b21d0 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -485,8 +485,9 @@ class Dossier < ApplicationRecord
   end
 
   def motivation
-    return nil if !termine?
-    traitement&.motivation || read_attribute(:motivation)
+    if termine?
+      traitement&.motivation || read_attribute(:motivation)
+    end
   end
 
   def update_search_terms

From af27af79002b1c4565fa72424efe20dcf1fe80ba Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Mon, 28 Mar 2022 15:10:37 +0200
Subject: [PATCH 12/16] ! instances : prawn does not like svg

win 10% on pdf generation
---
 Gemfile                                   |   1 -
 Gemfile.lock                              |   4 ----
 app/assets/images/header/logo-ds-wide.png | Bin 0 -> 18553 bytes
 app/views/dossiers/dossier_vide.pdf.prawn |   2 +-
 app/views/dossiers/show.pdf.prawn         |   2 +-
 config/env.example.optional               |   2 +-
 config/initializers/images.rb             |   2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 app/assets/images/header/logo-ds-wide.png

diff --git a/Gemfile b/Gemfile
index e210be466..24f8c36c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,6 @@ gem 'openid_connect'
 gem 'pg'
 gem 'phonelib'
 gem 'prawn-rails' # PDF Generation
-gem 'prawn-svg'
 gem 'premailer-rails'
 gem 'puma' # Use Puma as the app server
 gem 'pundit'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4485809aa..0faaa9859 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -459,9 +459,6 @@ GEM
       prawn
       prawn-table
       rails (>= 3.1.0)
-    prawn-svg (0.31.0)
-      css_parser (~> 1.6)
-      prawn (>= 0.11.1, < 3)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     premailer (1.14.2)
@@ -840,7 +837,6 @@ DEPENDENCIES
   pg
   phonelib
   prawn-rails
-  prawn-svg
   premailer-rails
   pry-byebug
   puma
diff --git a/app/assets/images/header/logo-ds-wide.png b/app/assets/images/header/logo-ds-wide.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0ac0f35319574a377870e6f6150bf2d21b2e8d9
GIT binary patch
literal 18553
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

literal 0
HcmV?d00001

diff --git a/app/views/dossiers/dossier_vide.pdf.prawn b/app/views/dossiers/dossier_vide.pdf.prawn
index 5678ee1b0..f941d0537 100644
--- a/app/views/dossiers/dossier_vide.pdf.prawn
+++ b/app/views/dossiers/dossier_vide.pdf.prawn
@@ -181,7 +181,7 @@ prawn_document(page_size: "A4") do |pdf|
       italic: Rails.root.join('lib/prawn/fonts/marianne/marianne-thin.ttf' ),
   })
   pdf.font 'marianne'
-  pdf.svg IO.read(DOSSIER_PDF_EXPORT_LOGO_SRC), width: 300, position: :center
+  pdf.image DOSSIER_PDF_EXPORT_LOGO_SRC, width: 300, position: :center
   pdf.move_down(40)
 
   render_in_2_columns(pdf, 'Démarche', @dossier.procedure.libelle)
diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn
index 153b194f6..182d60fc0 100644
--- a/app/views/dossiers/show.pdf.prawn
+++ b/app/views/dossiers/show.pdf.prawn
@@ -217,7 +217,7 @@ prawn_document(page_size: "A4") do |pdf|
   pdf.font 'marianne'
 
   pdf.pad_bottom(40) do
-    pdf.svg IO.read(DOSSIER_PDF_EXPORT_LOGO_SRC), width: 300, position: :center
+    pdf.image DOSSIER_PDF_EXPORT_LOGO_SRC, width: 300, position: :center
   end
 
   format_in_2_columns(pdf, 'Dossier Nº', @dossier.id.to_s)
diff --git a/config/env.example.optional b/config/env.example.optional
index 51b05c16d..8cee6a933 100644
--- a/config/env.example.optional
+++ b/config/env.example.optional
@@ -69,7 +69,7 @@ DS_ENV="staging"
 # PROCEDURE_DEFAULT_LOGO_SRC="republique-francaise-logo.svg"
 
 # Instance customization: PDF export logo ---> to be put in "app/assets/images"
-# DOSSIER_PDF_EXPORT_LOGO_SRC="app/assets/images/header/logo-ds-wide.svg"
+# DOSSIER_PDF_EXPORT_LOGO_SRC="app/assets/images/header/logo-ds-wide.png"
 
 # Instance customization: watermark for identity documents
 # WATERMARK_FILE=""
diff --git a/config/initializers/images.rb b/config/initializers/images.rb
index c488aa279..161c9fc24 100644
--- a/config/initializers/images.rb
+++ b/config/initializers/images.rb
@@ -17,4 +17,4 @@ MAILER_FOOTER_LOGO_SRC = ENV.fetch("MAILER_FOOTER_LOGO_SRC", "mailer/instructeur
 PROCEDURE_DEFAULT_LOGO_SRC = ENV.fetch("PROCEDURE_DEFAULT_LOGO_SRC", "republique-francaise-logo.svg")
 
 # Logo in PDF export of a "Dossier"
-DOSSIER_PDF_EXPORT_LOGO_SRC = ENV.fetch("DOSSIER_PDF_EXPORT_LOGO_SRC", "app/assets/images/header/logo-ds-wide.svg")
+DOSSIER_PDF_EXPORT_LOGO_SRC = ENV.fetch("DOSSIER_PDF_EXPORT_LOGO_SRC", "app/assets/images/header/logo-ds-wide.png")

From 4bbe2db66892a32d16256484cd8ea2b0aaeff74a Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Fri, 8 Apr 2022 14:45:51 +0200
Subject: [PATCH 13/16] only export safe pj

---
 app/services/pieces_justificatives_service.rb |  9 ++++
 .../pieces_justificatives_service_spec.rb     | 54 ++++++++++++++++---
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index 72b9e9fc8..7b8472563 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -165,6 +165,7 @@ class PiecesJustificativesService
     ActiveStorage::Attachment
       .includes(:blob)
       .where(record_type: "Champ", record_id: champ_id_dossier_id.keys)
+      .filter { |a| safe_attachment(a) }
       .map do |a|
         dossier_id = champ_id_dossier_id[a.record_id]
         ActiveStorage::DownloadableFile.pj_and_path(dossier_id, a)
@@ -181,6 +182,7 @@ class PiecesJustificativesService
     ActiveStorage::Attachment
       .includes(:blob)
       .where(record_type: "Commentaire", record_id: commentaire_id_dossier_id.keys)
+      .filter { |a| safe_attachment(a) }
       .map do |a|
         dossier_id = commentaire_id_dossier_id[a.record_id]
         ActiveStorage::DownloadableFile.pj_and_path(dossier_id, a)
@@ -212,6 +214,7 @@ class PiecesJustificativesService
     ActiveStorage::Attachment
       .includes(:blob)
       .where(record_type: "Dossier", name: "justificatif_motivation", record_id: dossiers)
+      .filter { |a| safe_attachment(a) }
       .map do |a|
         dossier_id = a.record_id
         ActiveStorage::DownloadableFile.pj_and_path(dossier_id, a)
@@ -262,4 +265,10 @@ class PiecesJustificativesService
       .where(record_type: "BillSignature", record_id: bill_ids)
       .map { |bill| ActiveStorage::DownloadableFile.bill_and_path(bill) }
   end
+
+  def self.safe_attachment(attachment)
+    attachment
+      .blob
+      .metadata[:virus_scan_result] == ActiveStorage::VirusScanner::SAFE
+  end
 end
diff --git a/spec/services/pieces_justificatives_service_spec.rb b/spec/services/pieces_justificatives_service_spec.rb
index a768a0c63..a262d6817 100644
--- a/spec/services/pieces_justificatives_service_spec.rb
+++ b/spec/services/pieces_justificatives_service_spec.rb
@@ -23,6 +23,16 @@ describe PiecesJustificativesService do
       it { expect(subject).to match_array([pj_champ.call(dossier).piece_justificative_file.attachment]) }
     end
 
+    context 'with a pj not safe on a champ' do
+      let(:procedure) { create(:procedure, :with_piece_justificative) }
+      let(:dossier) { create(:dossier, procedure: procedure) }
+      let(:pj_champ) { -> (d) { d.champs.find { |c| c.type == 'Champs::PieceJustificativeChamp' } } }
+
+      before { attach_file_to_champ(pj_champ.call(dossier), safe = false) }
+
+      it { expect(subject).to be_empty }
+    end
+
     context 'with a private pj champ' do
       let(:procedure) { create(:procedure) }
       let(:dossier) { create(:dossier, procedure: procedure) }
@@ -64,12 +74,26 @@ describe PiecesJustificativesService do
       let(:dossier) { create(:dossier) }
       let(:witness) { create(:dossier) }
 
-      let!(:commentaire) { create(:commentaire, :with_file, dossier: dossier) }
-      let!(:witness_commentaire) { create(:commentaire, :with_file, dossier: witness) }
+      let!(:commentaire) { create(:commentaire, dossier: dossier) }
+      let!(:witness_commentaire) { create(:commentaire, dossier: witness) }
+
+      before do
+        attach_file(commentaire.piece_jointe)
+        attach_file(witness_commentaire.piece_jointe)
+      end
 
       it { expect(subject).to match_array(dossier.commentaires.first.piece_jointe.attachment) }
     end
 
+    context 'with a pj not safe on a commentaire' do
+      let(:dossier) { create(:dossier) }
+      let!(:commentaire) { create(:commentaire, dossier: dossier) }
+
+      before { attach_file(commentaire.piece_jointe, safe = false) }
+
+      it { expect(subject).to be_empty }
+    end
+
     context 'with a motivation' do
       let(:dossier) { create(:dossier, :with_justificatif) }
       let!(:witness) { create(:dossier, :with_justificatif) }
@@ -77,6 +101,14 @@ describe PiecesJustificativesService do
       it { expect(subject).to match_array(dossier.justificatif_motivation.attachment) }
     end
 
+    context 'with a motivation not safe' do
+      let(:dossier) { create(:dossier) }
+
+      before { attach_file(dossier.justificatif_motivation, safe = false) }
+
+      it { expect(subject).to be_empty }
+    end
+
     context 'with an attestation' do
       let(:dossier) { create(:dossier, :with_attestation) }
       let!(:witness) { create(:dossier, :with_attestation) }
@@ -167,12 +199,20 @@ describe PiecesJustificativesService do
     end
   end
 
-  def attach_file_to_champ(champ)
-    attach_file(champ.piece_justificative_file)
+  def attach_file_to_champ(champ, safe = true)
+    attach_file(champ.piece_justificative_file, safe)
   end
 
-  def attach_file(attachable)
-    attachable
-      .attach(io: StringIO.new("toto"), filename: "toto.png", content_type: "image/png")
+  def attach_file(attachable, safe = true)
+    to_be_attached = {
+      io: StringIO.new("toto"),
+      filename: "toto.png", content_type: "image/png"
+    }
+
+    if safe
+      to_be_attached[:metadata] = { virus_scan_result: ActiveStorage::VirusScanner::SAFE }
+    end
+
+    attachable.attach(to_be_attached)
   end
 end

From 579578cf0c4280c3e178b3bce41520884788e089 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Fri, 8 Apr 2022 15:27:35 +0200
Subject: [PATCH 14/16] fix system spec

---
 spec/system/experts/expert_spec.rb           | 20 +++++++++++++++++---
 spec/system/instructeurs/instruction_spec.rb | 15 ++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/spec/system/experts/expert_spec.rb b/spec/system/experts/expert_spec.rb
index 92837c9d8..39fb5b406 100644
--- a/spec/system/experts/expert_spec.rb
+++ b/spec/system/experts/expert_spec.rb
@@ -90,8 +90,22 @@ describe 'Inviting an expert:' do
       let(:commentaire) { create(:commentaire, instructeur: instructeur, dossier: dossier) }
 
       before do
-        champ.piece_justificative_file.attach(io: File.open(path), filename: "piece_justificative_0.pdf", content_type: "application/pdf")
-        dossier.champs_private << create(:champ_piece_justificative, :with_piece_justificative_file, private: true, dossier: dossier)
+        champ
+          .piece_justificative_file
+          .attach(io: File.open(path),
+                  filename: "piece_justificative_0.pdf",
+                  content_type: "application/pdf",
+                  metadata: { virus_scan_result: ActiveStorage::VirusScanner::SAFE })
+
+        dossier.champs_private << create(:champ_piece_justificative, private: true, dossier: dossier)
+
+        dossier.champs_private
+          .first
+          .piece_justificative_file
+          .attach(io: File.open(path),
+                  filename: "piece_justificative_0.pdf",
+                  content_type: "application/pdf",
+                  metadata: { virus_scan_result: ActiveStorage::VirusScanner::SAFE })
       end
 
       scenario 'An Expert can download an archive containing attachments without any private champ, bill signature and operations logs' do
@@ -102,7 +116,7 @@ describe 'Inviting an expert:' do
         click_on '1 avis à donner'
         click_on avis.dossier.user.email
 
-        find(:css, '.attached').click
+        find(:css, '[aria-controls=print-pj-menu]').click
         click_on 'Télécharger le dossier et toutes ses pièces jointes'
         # For some reason, clicking the download link does not trigger the download in the headless browser ;
         # So we need to go to the download link directly
diff --git a/spec/system/instructeurs/instruction_spec.rb b/spec/system/instructeurs/instruction_spec.rb
index 9af7c53aa..a2651b4ac 100644
--- a/spec/system/instructeurs/instruction_spec.rb
+++ b/spec/system/instructeurs/instruction_spec.rb
@@ -194,14 +194,18 @@ describe 'Instructing a dossier:', js: true do
 
     before do
       dossier.passer_en_instruction!(instructeur: instructeur)
-      champ.piece_justificative_file.attach(io: File.open(path), filename: "piece_justificative_0.pdf", content_type: "application/pdf")
+      champ.piece_justificative_file
+        .attach(io: File.open(path),
+                filename: "piece_justificative_0.pdf",
+                content_type: "application/pdf",
+                metadata: { virus_scan_result: ActiveStorage::VirusScanner::SAFE })
 
       log_in(instructeur.email, password)
       visit instructeur_dossier_path(procedure, dossier)
     end
 
     scenario 'A instructeur can download an archive containing a single attachment' do
-      find(:css, '.attached').click
+      find(:css, '[aria-controls=print-pj-menu]').click
       click_on 'Télécharger le dossier et toutes ses pièces jointes'
       # For some reason, clicking the download link does not trigger the download in the headless browser ;
       # So we need to go to the download link directly
@@ -219,7 +223,12 @@ describe 'Instructing a dossier:', js: true do
     end
 
     scenario 'A instructeur can download an archive containing several identical attachments' do
-      commentaire.piece_jointe.attach(io: File.open(path), filename: "piece_justificative_0.pdf", content_type: "application/pdf")
+      commentaire
+        .piece_jointe
+        .attach(io: File.open(path),
+                filename: "piece_justificative_0.pdf",
+                content_type: "application/pdf",
+                metadata: { virus_scan_result: ActiveStorage::VirusScanner::SAFE })
 
       visit telecharger_pjs_instructeur_dossier_path(procedure, dossier)
       DownloadHelpers.wait_for_download

From 53de567b59f913624f5f98f9cefadab14982db81 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Tue, 12 Apr 2022 11:59:39 +0200
Subject: [PATCH 15/16] revert fix(user.merge) : waiting for ignore column
 instructeur_id in ruby code

---
 app/models/dossier_operation_log.rb                          | 1 +
 ...emove_column_instructeur_id_from_dossier_operation_log.rb | 5 -----
 db/schema.rb                                                 | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb

diff --git a/app/models/dossier_operation_log.rb b/app/models/dossier_operation_log.rb
index ac29ae529..9a348680f 100644
--- a/app/models/dossier_operation_log.rb
+++ b/app/models/dossier_operation_log.rb
@@ -12,6 +12,7 @@
 #  updated_at          :datetime         not null
 #  bill_signature_id   :bigint
 #  dossier_id          :bigint
+#  instructeur_id      :bigint
 #
 class DossierOperationLog < ApplicationRecord
   enum operation: {
diff --git a/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb b/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb
deleted file mode 100644
index 5cb117776..000000000
--- a/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveColumnInstructeurIdFromDossierOperationLog < ActiveRecord::Migration[6.1]
-  def change
-    safety_assured { remove_column :dossier_operation_logs, :instructeur_id }
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index c9dddb756..d59c95dd9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -267,11 +267,13 @@ ActiveRecord::Schema.define(version: 2022_04_07_081538) do
     t.text "digest"
     t.bigint "dossier_id"
     t.datetime "executed_at"
+    t.bigint "instructeur_id"
     t.datetime "keep_until"
     t.string "operation", null: false
     t.datetime "updated_at", null: false
     t.index ["bill_signature_id"], name: "index_dossier_operation_logs_on_bill_signature_id"
     t.index ["dossier_id"], name: "index_dossier_operation_logs_on_dossier_id"
+    t.index ["instructeur_id"], name: "index_dossier_operation_logs_on_instructeur_id"
     t.index ["keep_until"], name: "index_dossier_operation_logs_on_keep_until"
   end
 
@@ -870,6 +872,7 @@ ActiveRecord::Schema.define(version: 2022_04_07_081538) do
   add_foreign_key "commentaires", "dossiers"
   add_foreign_key "commentaires", "experts"
   add_foreign_key "dossier_operation_logs", "bill_signatures"
+  add_foreign_key "dossier_operation_logs", "instructeurs"
   add_foreign_key "dossier_transfer_logs", "dossiers"
   add_foreign_key "dossiers", "dossier_transfers"
   add_foreign_key "dossiers", "groupe_instructeurs"

From b6bb9552e6cf57f526192a7607a7901e3c70b436 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Mon, 11 Apr 2022 22:35:51 +0200
Subject: [PATCH 16/16] fix(graphql): detect custom champs in fragment
 definitions

---
 app/graphql/api/v2/context.rb | 32 ++++++++++++++++++---------
 spec/graphql/dossier_spec.rb  | 41 +++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/app/graphql/api/v2/context.rb b/app/graphql/api/v2/context.rb
index 080170698..26151a80e 100644
--- a/app/graphql/api/v2/context.rb
+++ b/app/graphql/api/v2/context.rb
@@ -1,13 +1,14 @@
 class API::V2::Context < GraphQL::Query::Context
-  def has_fragment?(name)
-    if self["has_fragment_#{name}"]
-      true
-    else
-      visitor = HasFragment.new(self.query.selected_operation, name)
+  # This method is used to check if a given fragment is used in the given query.
+  # We need that in order to maintain backward compatibility for Types de Champ
+  # that we extended in later iterations of our schema.
+  def has_fragment?(fragment_name)
+    self[:has_fragment] ||= Hash.new do |hash, fragment_name|
+      visitor = HasFragment.new(query.document, fragment_name)
       visitor.visit
-      self["has_fragment_#{name}"] = visitor.found
-      self["has_fragment_#{name}"]
+      hash[fragment_name] = visitor.found
     end
+    self[:has_fragment][fragment_name]
   end
 
   def internal_use?
@@ -36,17 +37,28 @@ class API::V2::Context < GraphQL::Query::Context
     self[:authorized][demarche.id]
   end
 
+  # This is a query AST visitor that we use to check
+  # if a fragment with a given name is used in the given document.
+  # We check for both inline and standalone fragments.
   class HasFragment < GraphQL::Language::Visitor
-    def initialize(document, name)
+    def initialize(document, fragment_name)
       super(document)
-      @name = name.to_s
+      @fragment_name = fragment_name.to_s
       @found = false
     end
 
     attr_reader :found
 
     def on_inline_fragment(node, parent)
-      if node.type.name == @name
+      if node.type.name == @fragment_name
+        @found = true
+      end
+
+      super
+    end
+
+    def on_fragment_definition(node, parent)
+      if node.type.name == @fragment_name
         @found = true
       end
 
diff --git a/spec/graphql/dossier_spec.rb b/spec/graphql/dossier_spec.rb
index d4e3b14a9..7ff4cc1c3 100644
--- a/spec/graphql/dossier_spec.rb
+++ b/spec/graphql/dossier_spec.rb
@@ -26,6 +26,16 @@ RSpec.describe Types::DossierType, type: :graphql do
     end
   end
 
+  describe 'dossier with champs' do
+    let(:procedure) { create(:procedure, :published, :with_commune, :with_address) }
+    let(:dossier) { create(:dossier, :accepte, :with_populated_champs, procedure: procedure) }
+    let(:query) { DOSSIER_WITH_CHAMPS_QUERY }
+    let(:variables) { { number: dossier.id } }
+
+    it { expect(data[:dossier][:champs][0][:__typename]).to eq "CommuneChamp" }
+    it { expect(data[:dossier][:champs][1][:__typename]).to eq "AddressChamp" }
+  end
+
   DOSSIER_QUERY = <<-GRAPHQL
   query($number: Int!) {
     dossier(number: $number) {
@@ -48,4 +58,35 @@ RSpec.describe Types::DossierType, type: :graphql do
     }
   }
   GRAPHQL
+
+  DOSSIER_WITH_CHAMPS_QUERY = <<-GRAPHQL
+  query($number: Int!) {
+    dossier(number: $number) {
+      id
+      number
+      champs {
+        id
+        label
+        __typename
+        ...CommuneChampFragment
+        ... on AddressChamp {
+          address {
+            ...AddressFragment
+          }
+        }
+      }
+    }
+  }
+  fragment CommuneChampFragment on CommuneChamp {
+    commune {
+      ...CommuneFragment
+    }
+  }
+  fragment CommuneFragment on Commune {
+    code
+  }
+  fragment AddressFragment on Address {
+    cityName
+  }
+  GRAPHQL
 end