Merge branch 'dev' into 'master'

Dev

See merge request la-fabrique-numerique/biocarburants!235

api-schema.yaml

@@ -4,6 +4,39 @@ info:
   version: 1.0.0
   description: Carbure
 paths:
+  /api/entities/{company_id}/enable/:
+    post:
+      operationId: entities_enable_create
+      parameters:
+        - in: path
+          name: company_id
+          schema:
+            type: integer
+          description: The id of the company that is being enabled
+          required: true
+        - in: query
+          name: entity_id
+          schema:
+            type: integer
+          description: The id of the admin entity enabling the company
+          required: true
+      tags:
+        - entities
+      security:
+        - cookieAuth: []
+        - basicAuth: []
+      responses:
+        "200":
+          content:
+            application/json:
+              schema: {}
+          description: ""
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ErrorResponse"
+          description: ""
   /api/saf/clients/:
     get:
       operationId: saf_clients_list
@@ -24,6 +57,12 @@ paths:
           description: A page number within the paginated result set.
           schema:
             type: integer
+        - name: page_size
+          required: false
+          in: query
+          description: Number of results to return per page.
+          schema:
+            type: integer
         - name: search
           required: false
           in: query
@@ -230,6 +269,12 @@ paths:
           description: A page number within the paginated result set.
           schema:
             type: integer
+        - name: page_size
+          required: false
+          in: query
+          description: Number of results to return per page.
+          schema:
+            type: integer
         - in: query
           name: periods
           schema:
@@ -773,6 +818,12 @@ paths:
           description: A page number within the paginated result set.
           schema:
             type: integer
+        - name: page_size
+          required: false
+          in: query
+          description: Number of results to return per page.
+          schema:
+            type: integer
         - in: query
           name: periods
           schema:

front/i18next-parser.config.js

@@ -1,9 +1,9 @@
-module.exports = {
+export default {
   input: ["./src/**/*.{ts,tsx}", "!./src/**/__test__/**"],
   output: "public/locales/$LOCALE/$NAMESPACE.json",
   locales: ["fr", "en"],
   keySeparator: false,
   namespaceSeparator: false,
   verbose: true,
-  defaultValue: (locale, namespace, key,  value) => key
+  defaultValue: (locale, namespace, key, value) => key,
 }