Merge branch 'main' into assetlinks-fix

.github/workflows/generate-doc.yml

@@ -86,7 +86,7 @@ jobs:
 
 
       - name: Deploy API documentation to Github Pages
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.2
         # we only deploy on push to main
         if: |
           github.event_name == 'push' && github.event.ref == 'refs/heads/main'

Dockerfile.frontend

@@ -25,7 +25,7 @@ ENV PATH /opt/product-opener/node_modules/.bin:$PATH
 COPY --chown=node:node html /opt/product-opener/html
 COPY --chown=node:node icons /opt/product-opener/icons
 COPY --chown=node:node scss /opt/product-opener/scss
-COPY --chown=node:node gulpfile.js /opt/product-opener/
+COPY --chown=node:node gulpfile.ts /opt/product-opener/
 COPY --chown=node:node .snyk /opt/product-opener/
 # https://github.com/openfoodfacts/openfoodfacts-server/pull/5544#issuecomment-914221199
 RUN find . -xtype l | xargs -I {} sh -c "origin=\$(readlink {} | tr '\\\\\\\\' '/') && ln -sf \$origin {}"

docker/dev.yml

@@ -62,7 +62,7 @@ services:
       - ./html:/opt/product-opener/html
       - ./icons:/opt/product-opener/icons
       - ./scss:/opt/product-opener/scss
-      - ./gulpfile.js:/opt/product-opener/gulpfile.js
+      - ./gulpfile.ts:/opt/product-opener/gulpfile.ts
   frontend:
     image: openfoodfacts-server/frontend:dev
     build:
@@ -75,7 +75,7 @@ services:
       - ./html:/opt/product-opener/html/
       - ./icons:/opt/product-opener/icons
       - ./scss:/opt/product-opener/scss
-      - ./gulpfile.js:/opt/product-opener/
+      - ./gulpfile.ts:/opt/product-opener/
       - ./snyk:/opt/product-opener/
     networks:
         default:

docs/api/ref/requestBodies/crop_a_photo.yaml

@@ -6,11 +6,13 @@ properties:
   code:
     type: string
     description: Barcode of the product.
-    example: '04963406'
+    example: "04963406"
+    required: true
   imgid:
     type: integer
     description: identifier of the image to select, it should be a number
     example: 2
+    required: true
   id:
     type: string
     description: |
@@ -23,6 +25,7 @@ properties:
       displayed on Product Opener for all languages (ex: on
       `https://fr.openfoodfacts.org`, unless `ingredients_fr` exists).
     example: front_en
+    required: true
   x1:
     type: integer
     example: 0
@@ -60,8 +63,4 @@ properties:
       ImageMagick.
     enum:
       - "true"
-      - "false"
-  required:
-    - code
-    - imgid
-    - id
+      - "false"

docs/api/ref/responses/get_product_by_barcode.yaml

@@ -8,7 +8,7 @@ allOf:
       product:
         type: object
         allOf:
-          - $ref: ../schemas/product.yaml#/Product
+          - $ref: ../schemas/product.yaml
 x-examples:
   example-1:
     code: '3017620422003'

docs/api/ref/schemas/agribalyse.yaml

@@ -0,0 +1,47 @@
+type: object
+properties:
+  agribalyse_food_code:
+    type: string
+  co2_agriculture:
+    type: number
+  co2_consumption:
+    type: integer
+  co2_distribution:
+    type: number
+  co2_packaging:
+    type: number
+  co2_processing:
+    type: number
+  co2_total:
+    type: number
+  co2_transportation:
+    type: number
+  code:
+    type: string
+  dqr:
+    type: string
+  ef_agriculture:
+    type: number
+  ef_consumption:
+    type: integer
+  ef_distribution:
+    type: number
+  ef_packaging:
+    type: number
+  ef_processing:
+    type: number
+  ef_total:
+    type: number
+  ef_transportation:
+    type: number
+  is_beverage:
+    type: integer
+  name_en:
+    type: string
+    description: |
+      This can be returned in many other languages
+      like name_fr (for french).
+  score:
+    type: integer
+  version:
+    type: string