Merge branch 'dev' into 'master'

Dev

See merge request web-et-numerique/llle_project/backoffice-client!52

.gitlab/issue_templates/default.md

+/title [Scope] Description
+
+### Résumé du problème
+
+_Donnez une description briève du problème._
+
+### Les étapes pour reproduire le bug
+
+_Listez les étapes qui vous permettent de reproduire ce bug, cette étape est très importante._
+
+### Décrivez le comportement du _bug_ ?
+
+### Quel serez le comportement _attendu_ ?
+
+### Logs et/ou screenshots
+
+### Possible fixes
+
+/label ~"type::bug"

.gitlab/merge_request_templates/default.md

+| :triangular_flag_on_post: Give your MR the same name that the desired squash commit. In doubt, check the conventional commit [doc](https://www.conventionalcommits.org/en/v1.0.0/).|
+| --- |
+
+## What does this MR do and why?
+
+_Describe in detail what your merge request does and why._
+
+| :warning: Keep an up to date checklist based on your icescrum tasks during all the draft phase of the MR to help any other developer who would take the job after you to finish it.|
+| --- |
+
+## Screenshots or screen recordings
+
+_These are strongly recommended to assist reviewers and reduce the time to merge your change._
+
+
+## How to set up and validate locally (or on alpha)
+
+_List all steps to set up and validate the changes on local environment._
+
+## MR acceptance checklist
+_To be completed by the chosen reviewer._
+
+<!---
+Using checklists improves quality in software engineering and other jobs such as with surgeons and airline pilots.
+More reading on checklists can be found in the "Checklist Manifesto": http://atulgawande.com/book/the-checklist-manifesto/
+
+"It is common to misconceive how checklists function in complex lines of work. They are not comprehensive how-to guides, whether for building a skyscraper or getting a plane out of trouble. They are quick and simple tools aimed to buttress the skills of expert professionals." - Gawande, Atul. The Checklist Manifesto
+--->
+
+
+### Quality
+
+* [ ] Confirmed
+
+1. For the code that this change impacts, I believe that the automated tests validate functionality that is highly important to users.  If the existing automated tests do not cover this functionality, I have added the necessary additional tests or I have added an issue to describe the automation testing gap and linked it to this MR.
+1. I have made sure that the sonar quality coverage is up to standards.
+1. I have considered the impact of this change on the front-end, back-end, and database portions of the system where appropriate and applied.
+1. I have tested this MR in all supported browsers or determined that this testing is not needed.
+1. I have confirmed that this change is backwards compatible across updates (migrate up needs a migrate down), or I have decided that this does not apply.
+
+### Performance, reliability and availability
+
+* [ ] Confirmed
+
+1. I am confident that this MR does not harm performance, or I have asked a reviewer to help assess the performance impact.
+1. I have considered the scalability risk based on future predicted growth.
+
+### Documentation
+
+* [ ] Confirmed
+
+1. The MR is named after the desired squash commit to feed the changelog linked to the current milestone.
+1. I have added/updated documentation (also updated if the changes feature a deprecation) or I have decided that documentation changes are not needed for this MR.
+
+### Security
+
+* [ ] Confirmed
+
+1. I have confirmed that if this MR does not contains any sensitive informations hidden in the changes.
+
+### Deployment
+
+* [ ] Confirmed
+
+1. When featured on a self-data project release, i have made sure my app version in the manifest and package.json is incremented and any relative changes to the permissions are clearly written and transmitted to Cozy.

Dockerfile

@@ -2,10 +2,11 @@
 FROM node:14-alpine as build-stage
 
 WORKDIR /app
-COPY package*.json /app/
-RUN npm install
+COPY package.json /app/
+COPY yarn.lock /app/
+RUN yarn install
 COPY ./ /app/
-RUN npm run build
+RUN yarn build
 
 # Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
 FROM nginx:1.16

docker-compose.local.yml

@@ -33,8 +33,7 @@ services:
   backend:
     image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server:dev
     depends_on:
-      database-agent:
-        condition: service_healthy
+      - 'database-agent'
     restart: unless-stopped
     volumes:
       - /etc/localtime:/etc/localtime:ro

renovate.json

+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>systemes-dinformation/renovate/renovate-config"
+  ]
+}

src/components/MailSuject/mailSubject.tsx

@@ -24,7 +24,7 @@ const MailSubject: React.FC<MailSubjectProps> = ({
   }
   return (
     <div className="mailSubject">
-      <h2>Objet de la newsletter</h2>
+      <h2>Objet de la newsletter (Optionnel)</h2>
       <p className="title">Objet</p>
       <input
         type="text"

src/components/MonthlyInfo/MonthlyInfo.tsx

@@ -33,7 +33,7 @@ const MonthlyInfo: React.FC<MonthlyInfoProps> = ({
 }: MonthlyInfoProps) => {
   return (
     <div className="monthlyInfo">
-      <h2>Informations du mois</h2>
+      <h2>Informations du mois (Optionnel)</h2>
       <div>
         <p className="title">Image</p>
         <ImagePicker imageURL={imageURL} handleChange={handleChange} />

src/components/MonthlyNews/MonthlyNews.tsx

@@ -29,7 +29,7 @@ const MonthlyNews: React.FC<MonthlyNewsProps> = ({
   }
   return (
     <div className="monthlyNews">
-      <h2>Nouveautés du mois</h2>
+      <h2>Nouveautés du mois (Optionnel)</h2>
       <p className="title">Titre</p>
       <input
         type="text"