feat(contenus): ajout d'une date #1458

maxgfr · 2024-08-19T07:41:43Z

fix #1453
fix SocialGouv/code-du-travail-numerique#6042

github-advanced-security · 2024-08-19T07:41:45Z

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

targets/frontend/src/pages/api/sitemap.ts

sonarcloud · 2024-08-21T12:39:52Z

Quality Gate passed

Issues
6 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

socket-security · 2024-08-21T12:39:53Z

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/@lerna/add@5.6.2	None	`0`	14 kB	jameshenry
npm/@lerna/bootstrap@5.6.2	environment	`0`	35.5 kB	jameshenry
npm/@lerna/changed@5.6.2	None	`0`	7.12 kB	jameshenry
npm/@lerna/clean@5.6.2	None	`0`	4.97 kB	jameshenry
npm/@lerna/cli@5.6.2	None	`0`	3.7 kB	jameshenry
npm/@lerna/command@5.6.2	None	`0`	13.9 kB	jameshenry
npm/@lerna/create@5.6.2	filesystem	`0`	27.5 kB	jameshenry
npm/@lerna/diff@5.6.2	None	`0`	6.14 kB	jameshenry
npm/@lerna/exec@5.6.2	environment	`0`	13.2 kB	jameshenry
npm/@lerna/import@5.6.2	filesystem	`0`	14.6 kB	jameshenry
npm/@lerna/info@5.6.2	None	`0`	3.52 kB	jameshenry
npm/@lerna/init@5.6.2	filesystem	`0`	9.09 kB	jameshenry
npm/husky@7.0.4	filesystem, shell	`0`	6.06 kB	typicode
npm/lerna@5.6.2	None	`0`	76.3 kB	jameshenry

View full report↗︎

github-actions · 2024-08-21T12:49:45Z

🎉 Deployment for commit 7780c80 :

Ingresses

🚀 https://www-cdtn-admin-linked-ajout-date.ovh.fabrique.social.gouv.fr/

Docker images

📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/export:sha-7780c80fedd36528585d2b1ce02c6a5d20ea4b66
📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/frontend:sha-7780c80fedd36528585d2b1ce02c6a5d20ea4b66
📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/hasura:sha-7780c80fedd36528585d2b1ce02c6a5d20ea4b66

Debug

Viczei · 2024-08-21T14:33:40Z

targets/frontend/src/modules/contribution/api/query.ts

@@ -8,6 +8,7 @@ export const getContributionAnswerById = gql`
 description
 content_type
 updatedAt: updated_at
+ display_date


Optionnel mais ca serais pas plus sympa en camelcase ?

Il serait même top de le mettre en camelCase directement dans Hasura :)

Ouaip, c'est ce que j'ai fait côté model et information, mais globalement, côté contribution, on a tout en snake_case, donc ça risque de tout mélanger. Il faudrait limite faire un ticket pour refacto toutes les contributions en camelCase

Et cela bien évidemment, directement côté Hasura

Viczei · 2024-08-21T14:35:17Z

.../default/1723964804960_alter_table_information_informations_add_column_display_date/down.sql

+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "information"."informations" add column "display_date" date
+-- null;


il faudrait mettre un down ici vu que le up alter le schéma

ouaip, mais bon, on l'a fait nul part.... puis après faut le tester, etc. est-ce worth it ?

Viczei · 2024-08-21T14:35:36Z

...ions/default/1723964851942_alter_table_contribution_answers_add_column_display_date/down.sql

+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "contribution"."answers" add column "display_date" date
+-- null;


Viczei · 2024-08-21T14:35:42Z

...a/migrations/default/1723964911747_alter_table_model_models_add_column_display_date/down.sql

+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "model"."models" add column "display_date" date
+-- null;


m-maillot · 2024-08-21T20:55:10Z

scripts/reset_from_dump.sh


-docker compose up --wait -d hasura elasticsearch
+docker compose up --wait -d hasura elasticsearch minio createbuckets


m-maillot · 2024-08-21T20:58:42Z

targets/frontend/src/components/forms/DatePicker/index.tsx

+ render={({ field: { onChange, value } }) => (
+ <DatePicker
+ label={label}
+ value={formatDate(value)}


Ca ne semble pas trop être ce que la doc préconise pour le formatage https://mui.com/x/react-date-pickers/adapters-locale/
Est ce qu'il ya une raison de ne pas faire avec la método de date-fns ?

J'utilise bien date-fns comme dans la documentation pour formater mon input.

Le paramètre d'entrée est une date, or nous notre input issue de la DB est un string. D'où le fait que je sois obligé de le formater afin de lui renvoyer une date.

Pour la sortie, c'est un peu la même, car le DatePicker renvoie (du fait que je l'ai initialisé avec adapter) une valeur en string de type dd/MM/yyyy. Or de notre côté, ce qu'on veut sauvegarder côté DB est de format dateen yyyy-MM-dd. Afin d'éviter de le formater plus haut, je le fais directement dans le onChange du composant. Ca simplifie la gestion du formattage à un niveau local :)

m-maillot · 2024-08-21T20:59:20Z

targets/frontend/src/modules/contribution/api/query.ts

@@ -8,6 +8,7 @@ export const getContributionAnswerById = gql`
 description
 content_type
 updatedAt: updated_at
+ display_date


Il serait même top de le mettre en camelCase directement dans Hasura :)

m-maillot · 2024-08-21T21:00:23Z

targets/frontend/src/modules/documents/api/documents.service.ts

@@ -237,7 +52,7 @@ export class DocumentsService {
 cause: null,
 });
 }
- document = await this.mapInformationToDocument(information, document);
+ document = await mapInformationToDocument(information, document);


Très bonne idée d'extraire ces méthodes du fichier. Ca devenait un trop gros fichier

m-maillot · 2024-08-21T21:01:59Z

targets/frontend/src/pages/api/sitemap.ts

 }
 const source = getRouteBySource(doc.source);
 const priority =
- source === SOURCES.EDITORIAL_CONTENT ||
+ source === "information" ||


Pourquoi ne pas utiliser les constantes SOURCES.INFORMATION et SOURCE.MODELES ?

Car les valeurs sont différentes, en fait la valeur derrière la source est celle ci :
export type Document = { updated_at: string; slug: string; source: SourceRoute; document: any; };

SourceRoute sont les valeurs des keys SOURCES.INFORMATION, etc.

Donc les deux valeurs sont différentes, le type précédent était faux...

maxgfr added 5 commits August 14, 2024 11:47

fix: ajout des modif

1a984f8

Merge branch 'master' into linked-ajout-date

346bdaf

Merge branch 'master' into linked-ajout-date

c393bf5

fix: tests

cb1c42d

fix: code

a15cbdd

maxgfr requested review from m-maillot and Viczei August 19, 2024 07:41

github-advanced-security bot found potential problems Aug 19, 2024

View reviewed changes

targets/frontend/src/pages/api/sitemap.ts Fixed Show fixed Hide fixed

Merge branch 'master' into linked-ajout-date

2ffe308

maxgfr temporarily deployed to review-auto August 19, 2024 08:15 — with GitHub Actions Inactive

fix: hasura

5d5d6c3

maxgfr temporarily deployed to review-auto August 19, 2024 10:06 — with GitHub Actions Inactive

fix: hasura

44233f8

maxgfr had a problem deploying to review-auto August 19, 2024 15:53 — with GitHub Actions Error

fix: hasura

876e5c8

maxgfr had a problem deploying to review-auto August 19, 2024 15:54 — with GitHub Actions Failure

empty

6654574

maxgfr temporarily deployed to review-auto August 20, 2024 09:12 — with GitHub Actions Inactive

maxgfr marked this pull request as ready for review August 20, 2024 09:18

feat: add code

4acb1d3

maxgfr temporarily deployed to review-auto August 20, 2024 09:38 — with GitHub Actions Inactive

feat: add code

c55a52d

maxgfr had a problem deploying to review-auto August 20, 2024 10:47 — with GitHub Actions Failure

fix: date

0ebd282

maxgfr temporarily deployed to review-auto August 20, 2024 12:08 — with GitHub Actions Inactive

github-advanced-security bot found potential problems Aug 20, 2024

View reviewed changes

targets/frontend/src/pages/api/sitemap.ts Fixed Show fixed Hide fixed

fix: date

6f1c068

maxgfr temporarily deployed to review-auto August 20, 2024 12:44 — with GitHub Actions Inactive

github-advanced-security bot found potential problems Aug 20, 2024

View reviewed changes

targets/frontend/src/pages/api/sitemap.ts Dismissed Show dismissed Hide dismissed

fix: merge date

6926422

maxgfr had a problem deploying to review-auto August 21, 2024 09:36 — with GitHub Actions Failure

maxgfr added 2 commits August 21, 2024 11:45

Merge branch 'master' into linked-ajout-date

dd79a07

fix: build

d26ee40

maxgfr temporarily deployed to review-auto August 21, 2024 09:50 — with GitHub Actions Inactive

fix: tests

7780c80

maxgfr temporarily deployed to review-auto August 21, 2024 12:39 — with GitHub Actions Inactive

Viczei reviewed Aug 21, 2024

View reviewed changes

Viczei approved these changes Aug 21, 2024

View reviewed changes

m-maillot approved these changes Aug 21, 2024

View reviewed changes

maxgfr merged commit 05a90c9 into master Aug 22, 2024
29 checks passed

maxgfr deleted the linked-ajout-date branch August 22, 2024 07:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(contenus): ajout d'une date #1458

feat(contenus): ajout d'une date #1458

maxgfr commented Aug 19, 2024

github-advanced-security bot commented Aug 19, 2024

sonarcloud bot commented Aug 21, 2024

socket-security bot commented Aug 21, 2024

github-actions bot commented Aug 21, 2024

Viczei Aug 21, 2024

m-maillot Aug 21, 2024

maxgfr Aug 22, 2024

maxgfr Aug 22, 2024

Viczei Aug 21, 2024

maxgfr Aug 22, 2024

Viczei Aug 21, 2024

Viczei Aug 21, 2024

m-maillot Aug 21, 2024

m-maillot Aug 21, 2024

maxgfr Aug 22, 2024

m-maillot Aug 21, 2024

m-maillot Aug 21, 2024

m-maillot Aug 21, 2024

maxgfr Aug 22, 2024


		docker compose up --wait -d hasura elasticsearch
		docker compose up --wait -d hasura elasticsearch minio createbuckets

feat(contenus): ajout d'une date #1458

feat(contenus): ajout d'une date #1458

Conversation

maxgfr commented Aug 19, 2024

github-advanced-security bot commented Aug 19, 2024

sonarcloud bot commented Aug 21, 2024

Quality Gate passed

socket-security bot commented Aug 21, 2024

github-actions bot commented Aug 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment