Merge pull request #2388 from betagouv/fix/cms_deploy

Fix: cms deploy + meilisearch
betagouv · Jan 29, 2024 · e1a86cc · e1a86cc
2 parents dd905c9 + 104f359
commit e1a86cc
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 107 deletions.
diff --git a/.github/workflows/deploy-cms.yml b/.github/workflows/deploy-cms.yml
@@ -19,7 +19,7 @@ jobs:
       value: ${{ steps.set_tag.outputs.value }}
     steps:
       - id: set_tag
-        run: echo "::set-output name=value::$(date +'%F.%H%M')"
+        run: echo "value=$(date +'%F.%H%M')" >> $GITHUB_OUTPUT
 
   build:
     needs: tag
@@ -33,26 +33,25 @@ jobs:
     secrets:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-
-  # TODO
-  # deploy:
-  #   name: Deploy
-  #   needs: [tag, build]
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Trigger Workflow
-  #       uses: actions/github-script@v6
-  #       env: 
-  #         TARGET_VERSION: ${{ needs.tag.outputs.value }}
-  #       with:
-  #         github-token: ${{ secrets.GA_PDC_TOKEN }}
-  #         script: |
-  #             github.rest.actions.createWorkflowDispatch({
-  #               owner: context.repo.owner,
-  #               repo: 'preuve-covoiturage-infra',
-  #               workflow_id: 'deploy.yml',
-  #               ref: 'main',
-  #               inputs: {
-  #                 cms_version: process.env.TARGET_VERSION,
-  #               },
-  #             })
+  deploy:
+    name: Deploy
+    needs: [tag, build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger Workflow
+        uses: actions/github-script@v6
+        env: 
+          TARGET_VERSION: ${{ needs.tag.outputs.value }}
+        with:
+          github-token: ${{ secrets.GA_PDC_TOKEN }}
+          script: |
+              github.rest.actions.createWorkflowDispatch({
+                owner: context.repo.owner,
+                repo: 'preuve-covoiturage-infra',
+                workflow_id: 'deploy.yml',
+                ref: 'main',
+                inputs: {
+                  version: process.env.TARGET_VERSION,
+                  image: 'strapi'
+                },
+              })
diff --git a/cms/config/admin.ts b/cms/config/admin.ts
@@ -11,7 +11,7 @@ export default ({ env }) => ({
     },
   },
   flags: {
-    nps: env.bool('FLAG_NPS', true),
+    nps: env.bool('FLAG_NPS', false),
     promoteEE: env.bool('FLAG_PROMOTE_EE', false),
   },
 });
diff --git a/cms/config/plugins.ts b/cms/config/plugins.ts
@@ -27,4 +27,10 @@ export default ({ env }) => ({
       },
     },
   },
-});
+  meilisearch: {
+    config: {
+      host: env('MEILISEARCH_HOST'),
+      apiKey: env('MEILISEARCH_MASTER_KEY'),
+    }
+  }
+});
diff --git a/cms/package-lock.json b/cms/package-lock.json
diff --git a/cms/package.json b/cms/package.json
@@ -17,6 +17,7 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "^5.3.4",
+    "strapi-plugin-meilisearch": "^0.10.0",
     "styled-components": "^5.3.3"
   },
   "strapi": {

diff --git a/cms/src/api/article/content-types/article/schema.json b/cms/src/api/article/content-types/article/schema.json
@@ -16,12 +16,6 @@
       "type": "string",
       "required": true
     },
-    "slug": {
-      "type": "string",
-      "required": true,
-      "unique": true,
-      "regex": "^([a-zA-Z-]*)$"
-    },
     "description": {
       "type": "text",
       "required": true
@@ -45,6 +39,10 @@
       "relation": "manyToOne",
       "target": "api::categorie.categorie",
       "inversedBy": "articles"
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "title"
     }
   }
 }
diff --git a/cms/src/api/categorie/content-types/categorie/schema.json b/cms/src/api/categorie/content-types/categorie/schema.json
@@ -16,16 +16,15 @@
       "type": "string",
       "required": true
     },
-    "slug": {
-      "type": "string",
-      "required": true,
-      "regex": "^([a-zA-Z-]*)$"
-    },
     "articles": {
       "type": "relation",
       "relation": "oneToMany",
       "target": "api::article.article",
       "mappedBy": "categorie"
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "label"
     }
   }
 }
diff --git a/cms/src/api/page/content-types/page/schema.json b/cms/src/api/page/content-types/page/schema.json
@@ -16,29 +16,49 @@
       "type": "string",
       "required": true
     },
-    "sections": {
+    "tags": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::tag.tag",
+      "inversedBy": "pages"
+    },
+    "hero": {
+      "type": "component",
+      "repeatable": false,
+      "component": "page.hero"
+    },
+    "block": {
+      "type": "component",
+      "repeatable": false,
+      "component": "page.block"
+    },
+    "content": {
+      "type": "richtext",
+      "required": false
+    },
+    "rows": {
       "type": "dynamiczone",
       "components": [
-        "page.hero",
-        "page.block",
-        "shared.button",
-        "page.content",
-        "page.row",
-        "page.list",
-        "page.resource"
+        "row.analyse",
+        "row.graph",
+        "row.indicator",
+        "row.map"
       ]
     },
-    "slug": {
-      "type": "string",
-      "regex": "^([a-zA-Z-]*)$",
-      "unique": true,
-      "required": true
-    },
-    "tags": {
+    "resources": {
       "type": "relation",
       "relation": "manyToMany",
-      "target": "api::tag.tag",
+      "target": "api::resource.resource",
       "inversedBy": "pages"
+    },
+    "list": {
+      "type": "component",
+      "repeatable": false,
+      "component": "page.list"
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "title"
     }
   }
 }
diff --git a/cms/src/api/resource/content-types/resource/schema.json b/cms/src/api/resource/content-types/resource/schema.json
@@ -16,19 +16,23 @@
       "type": "string",
       "required": true
     },
-    "slug": {
-      "type": "string",
-      "required": true,
-      "unique": true,
-      "regex": "^([a-zA-Z-]*)$"
-    },
     "content": {
       "type": "richtext",
       "required": true
     },
     "public_date": {
       "type": "date",
       "required": true
+    },
+    "pages": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::page.page",
+      "mappedBy": "resources"
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "title"
     }
   }
 }
diff --git a/cms/src/api/tag/content-types/tag/schema.json b/cms/src/api/tag/content-types/tag/schema.json
@@ -4,7 +4,8 @@
   "info": {
     "singularName": "tag",
     "pluralName": "tags",
-    "displayName": "Tag"
+    "displayName": "Tag",
+    "description": ""
   },
   "options": {
     "draftAndPublish": false
@@ -16,17 +17,15 @@
       "unique": false,
       "required": true
     },
-    "slug": {
-      "type": "string",
-      "regex": "^([a-zA-Z-]*)$",
-      "unique": true,
-      "required": true
-    },
     "pages": {
       "type": "relation",
       "relation": "manyToMany",
       "target": "api::page.page",
       "mappedBy": "tags"
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "label"
     }
   }
 }
diff --git a/cms/src/components/page/content.json b/cms/src/components/page/content.json
diff --git a/cms/src/components/page/resource.json b/cms/src/components/page/resource.json
diff --git a/cms/src/components/page/row.json b/cms/src/components/page/row.json