Re-positioning values from PR comments

openfoodfacts · Jan 22, 2024 · cb28796 · cb28796
1 parent 8c9e4e7
commit cb28796
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/docs/api/ref/schemas/knowledge_panels/elements/title_element.yaml b/docs/api/ref/schemas/knowledge_panels/elements/title_element.yaml
@@ -4,6 +4,12 @@ x-stoplight:
 type: object
 description: The title of a panel.
 properties:
+  name:
+    type: string
+    description: A short name of this panel, not including any actual values
+  value:
+    type: string
+    description: A simple summary value for the panel, e.g. a percentage, grade, number of, etc.
   title:
     type: string
   grade:

diff --git a/docs/api/ref/schemas/knowledge_panels/panel.yaml b/docs/api/ref/schemas/knowledge_panels/panel.yaml
@@ -13,12 +13,6 @@ properties:
   expand_for:
     type: string
     description: 'If set to "large", the content of the panel should be expanded on large screens, but it should still be possible to unexpand it.'
-  name:
-    type: string
-    description: A short name of this panel, not including any actual values
-  value:
-    type: string
-    description: A simple summary value for the panel, e.g. a percentage, grade, number of, etc.
   evaluation:
     type: string
     description: A simple assessment of the panel value, typically used to format fonts, et.c e.g. bad = red

diff --git a/templates/api/knowledge-panels/health/nutrition/nutrient_level.tt.json b/templates/api/knowledge-panels/health/nutrition/nutrient_level.tt.json
@@ -4,10 +4,10 @@
         "health"
     ],
     "size": "small",
-    "name": "[% panel.nutrient_name %]",
-    "value": "[% panel.nutrient_quantity_in_grams %]%",
     "evaluation": "[% panel.evaluation %]",
     "title_element": {
+        "name": "[% panel.nutrient_name %]",
+        "value": "[% panel.nutrient_quantity_in_grams %]%",
         "title": "[% panel.nutrient_in_quantity %] ([% panel.nutrient_quantity_in_grams %]%)",
         "icon_url": "[% static_subdomain %]/images/misc/[% panel.nutrient_level %].svg",
         "icon_size": "small",

diff --git a/tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json b/tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json
@@ -566,17 +566,17 @@
             ],
             "evaluation" : "bad",
             "level" : "info",
-            "name" : "Salt",
             "size" : "small",
             "title_element" : {
+               "name" : "Salt",
+               "value" : "120%",
                "icon_size" : "small",
                "icon_url" : "http://static.openfoodfacts.localhost/images/misc/high.svg",
                "title" : "Salt in high quantity (120%)"
             },
             "topics" : [
                "health"
-            ],
-            "value" : "120%"
+            ]
          },
          "nutriscore" : {
             "elements" : [