feat: contribution zod #1056

Viczei · 2023-10-04T09:18:18Z

No description provided.

…s-dune-maj-des-données

* feat: zod validation page info * feat: implementation page info validation avec zod * feat: clean deepPartial * chore: clean --------- Co-authored-by: Victor Zeinstra <[email protected]>

…s-dune-maj-des-données

gitguardian · 2023-10-04T09:18:24Z

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request

GitGuardian id	Secret	Commit	Filename
8246187	Generic High Entropy Secret	`db42d1a`	.npmrc	View secret
8246187	Generic High Entropy Secret	`999b06d`	.npmrc	View secret

🛠 Guidelines to remediate hardcoded secrets

Understand the implications of revoking this secret by investigating where it is used in your code.
Replace and store your secrets safely. Learn here the best practices.
Revoke and rotate these secrets.
If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider

following these best practices for managing and storing secrets including API keys and other credentials
install secret detection on pre-commit to catch secret before it leaves your machine and ease remediation.

^{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!}

carolineBda · 2023-10-06T09:22:21Z

targets/frontend/src/components/contributions/answers/Answer.tsx

        </Box>
        <Box sx={{ width: "30%" }}>
-          {answer && (
+          {answer?.id && answer?.statuses && (


On peut avoir dans commentaire sans avoir des statuses non ?

En effet, il faut plutôt gérer le cas en dessous comme pour les comments :

<Comments answerId={answer.id} comments={answer.answerComments ?? []} statuses={answer.statuses ?? []} />

oui dans ce cas, il attend un tableau vide. La vérif check uniquement qu'il ne soit pas null ou undefined

carolineBda · 2023-10-06T09:23:56Z

targets/frontend/src/components/contributions/answers/Comments.tsx

@@ -30,7 +30,9 @@ function concatAndSort(
  })[] = [...comments, ...statuses];
  return all
    .map((notif) => {
-      notif.createdAtDate = new Date(notif.createdAt);
+      notif.createdAtDate = notif?.createdAt


c'est pas possible de ne pas avoir de createdAd. tu as eu le cas ?

pas dans les contrib, c'est vrai. Mais dans les pages info j'ai le cas ou l'on commence à créer une page et du coup il n'y a pas de createdAt encore généré. Je ne sais pas si plus tard, on aura ce cas ici. Je peux le remettre en obligatoire dans zod

Ah non je mélange avec le createdAt de answer. Dans tous les cas, je vais mettre tous nos createdAt en obligatoire dans les types contrib. Ca sera mieux en effet.

carolineBda · 2023-10-06T09:31:43Z

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

+
+const StyledFormHelperText = styled(FormHelperText)(({ theme }) => {
+  return {
+    color: theme.palette.error.main,


carolineBda · 2023-10-06T09:32:15Z

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

@@ -54,9 +56,20 @@ export const FormRadioGroup = ({
                />
              ))}
            </RadioGroup>
+            {error && error.message === "Required" ? (


Suggested change

{error && error.message === "Required" ? (

{error && error.message === "Required" ?? (

carolineBda · 2023-10-06T09:32:26Z

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

+              <StyledFormHelperText>
+                Un élément doit être sélectionner
+              </StyledFormHelperText>
+            ) : null}


Suggested change

) : null}

)}

m-maillot · 2023-10-06T09:39:55Z

targets/frontend/src/components/contributions/answers/Answer.tsx

        </Box>
        <Box sx={{ width: "30%" }}>
-          {answer && (
+          {answer?.id && answer?.statuses && (


En effet, il faut plutôt gérer le cas en dessous comme pour les comments :

<Comments answerId={answer.id} comments={answer.answerComments ?? []} statuses={answer.statuses ?? []} />

m-maillot · 2023-10-06T09:42:54Z

targets/frontend/src/components/contributions/answers/answer.mutation.ts

+      kaliReferences: data.id
+        ? formatKaliReferences(data.id, data.kaliReferences)
+        : [],


Comme on ne peut pas créer des réponses mais seulement en éditer, on doit toujours avoir un id aussi.

m-maillot · 2023-10-06T09:46:41Z

targets/frontend/src/components/contributions/questionList/QuestionList.tsx

+  const aggregatedRow = rows.flatMap(({ answers }) =>
+    answers?.length ? (answers as Answer[]) : []
+  );


Etrange, on ne peut pas avoir de question sans liste de réponse, pour on vérifie que c'est un tableau ici ?

m-maillot · 2023-10-06T09:47:31Z

targets/frontend/src/components/contributions/questionList/QuestionRow.tsx

@@ -22,7 +23,10 @@ export const QuestionRow = (props: { row: QueryQuestion }) => {
      <TableCell component="th" scope="row">
        <strong>{row.order}</strong> - {row.content}
      </TableCell>
-      <StatusRecap answers={row.answers} uniqKey={`${row.id}-statuses`} />
+      <StatusRecap
+        answers={row.answers as Answer[]}


Pourquoi devoir faire un as maintenant ? On perd en typage ici 🤔

m-maillot · 2023-10-06T09:49:09Z

targets/frontend/src/components/contributions/questions/EditQuestionAnswerList.tsx

@@ -37,15 +37,15 @@ export const EditQuestionAnswerList = ({
              {answers?.map((answer) => {
                return (
                  <TableRow
-                    key={answer.agreement.id}
+                    key={answer?.agreement?.id}


comment l'answer peut être undefined ici ?

m-maillot · 2023-10-06T09:54:50Z

targets/frontend/src/components/contributions/type.ts

+
+const answerRelationSchema = answerBaseSchema.extend({
+  agreement: agreementSchema.optional(),
+  statuses: z.array(answerStatusSchema).optional(),


On n'a pas une liste de status même vide ?

m-maillot · 2023-10-06T09:55:09Z

targets/frontend/src/components/contributions/type.ts

+  otherReferences: z.array(otherReferenceSchema),
+  cdtnReferences: z.array(cdtnReferenceSchema),
+  contentFichesSpDocument: documentSchema.nullable().optional(),
+  question: questionBaseSchema.optional(),


On a obligatoirement un question associée

m-maillot · 2023-10-06T09:55:22Z

targets/frontend/src/components/contributions/type.ts

+  cdtnReferences: z.array(cdtnReferenceSchema),
+  contentFichesSpDocument: documentSchema.nullable().optional(),
+  question: questionBaseSchema.optional(),
+  answerComments: z.array(commentsSchema).optional(),


Idem, mais la liste peut être vide non ?

m-maillot · 2023-10-06T09:55:42Z

targets/frontend/src/components/contributions/type.ts

+});
+
+export const questionRelationSchema = questionBaseSchema.extend({
+  answers: z.array(answerBaseSchema.deepPartial()).optional(),


Une question à obligatoriement une liste de réponse

sauf si on l'inclus pas dans le graphql

Je pense qu'il faut bien distinguer les typages de backend et les typages de frontend

m-maillot · 2023-10-06T11:27:29Z

targets/frontend/src/lib/references/recentKaliReferences.ts

+          _createdAt &&
+          createdAt &&


Oui, une référence ne peut pas avoir de createdAt null

* feat: contrib answer CC hover + CC search + delete question * fix: permettre accordéon dans accordéon * chore: review * chore: fix test --------- Co-authored-by: Victor Zeinstra <[email protected]>

sonarqubecloud · 2023-10-09T08:33:34Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
5 Code Smells

No Coverage information
0.0% Duplication

github-actions · 2023-10-09T08:41:34Z

🎉 Deployment for commit 3ac2d7a :

Ingresses

Docker images

📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/contributions:sha-3ac2d7aece02e04f356b0a0caea8cd2cc39e36f3
📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/export:sha-3ac2d7aece02e04f356b0a0caea8cd2cc39e36f3
📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/frontend:sha-3ac2d7aece02e04f356b0a0caea8cd2cc39e36f3
📦 docker pull harbor.fabrique.social.gouv.fr/cdtn/cdtn-admin/hasura:sha-3ac2d7aece02e04f356b0a0caea8cd2cc39e36f3

Debug

This reverts commit 6f8021f.

Victor Zeinstra and others added 25 commits September 6, 2023 17:01

feat: implementation du schéma de donnée page info

64ab3e6

feat: implementation des pages info

56754f4

Merge branch 'master' into 1007-admin-liste-des-contenus-modifiés-lor…

4727548

…s-dune-maj-des-données

fix: review

e528d27

refactor: implement page info refactor

a0c7f2c

feat: implementation page creation

c9bd5d1

feat: add upsert + publish

bf9759f

feat: publish

f6fd4f2

feat: publish + refactor to module

db42d1a

Merge branch 'master' into 1007-admin-liste-des-contenus-modifiés-lor…

99fec47

…s-dune-maj-des-données

chore: remove npmrc

999b06d

fix: publish dep

c147530

feat: page info validation (#1040)

8d89913

* feat: zod validation page info * feat: implementation page info validation avec zod * feat: clean deepPartial * chore: clean --------- Co-authored-by: Victor Zeinstra <[email protected]>

chore: clean

51c4b3b

chore: clean

0773a21

chore: use helper text for error

1eba143

feat: change url to regex check for files

b3cb31f

chore: add test

ebbab9f

chore: review

4779047

Merge branch 'master' into 1007-admin-liste-des-contenus-modifiés-lor…

e0d3642

…s-dune-maj-des-données

chore: yarn

be43588

Merge branch 'master' into 1007-admin-liste-des-contenus-modifiés-lor…

649035c

…s-dune-maj-des-données

refactor: use confirm modal

769df7c

chore: downgrade next

fda61bd

feat: ajout des validations au formulaire contribution

afd4c05

Viczei requested review from m-maillot, carolineBda and maxgfr October 4, 2023 09:18

Viczei self-assigned this Oct 4, 2023

carolineBda reviewed Oct 6, 2023

View reviewed changes

carolineBda approved these changes Oct 6, 2023

View reviewed changes

Viczei temporarily deployed to review-auto October 6, 2023 10:06 — with GitHub Actions Inactive

chore: review

13db745

m-maillot reviewed Oct 6, 2023

View reviewed changes

Viczei had a problem deploying to review-auto October 6, 2023 12:17 — with GitHub Actions Failure

Merge branch 'master' into feat/contribution-zod

d471a06

Viczei temporarily deployed to review-auto October 6, 2023 12:38 — with GitHub Actions Inactive

Viczei temporarily deployed to review-auto October 6, 2023 13:22 — with GitHub Actions Inactive

chore: review

96fc199

Viczei had a problem deploying to review-auto October 6, 2023 14:46 — with GitHub Actions Error

Viczei temporarily deployed to review-auto October 6, 2023 14:49 — with GitHub Actions Inactive

Victor Zeinstra and others added 3 commits October 6, 2023 16:50

chore: review

916c6b2

chore: review

a83570a

feat: contribution cc hover cc search delete question (#1057)

10864fa

* feat: contrib answer CC hover + CC search + delete question * fix: permettre accordéon dans accordéon * chore: review * chore: fix test --------- Co-authored-by: Victor Zeinstra <[email protected]>

m-maillot temporarily deployed to review-auto October 9, 2023 07:22 — with GitHub Actions Inactive

m-maillot approved these changes Oct 9, 2023

View reviewed changes

fix: url can be empty

3ac2d7a

m-maillot merged commit 6f8021f into master Oct 9, 2023

m-maillot deleted the feat/contribution-zod branch October 9, 2023 09:04

m-maillot added a commit that referenced this pull request Oct 9, 2023

Revert "feat: contribution zod (#1056)"

f4a94ef

This reverts commit 6f8021f.

m-maillot restored the feat/contribution-zod branch October 9, 2023 09:57

m-maillot temporarily deployed to review-auto October 9, 2023 09:57 — with GitHub Actions Inactive

m-maillot deleted the feat/contribution-zod branch October 9, 2023 10:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: contribution zod #1056

feat: contribution zod #1056

Viczei commented Oct 4, 2023

gitguardian bot commented Oct 4, 2023 •

edited

Loading

carolineBda Oct 6, 2023 •

edited

Loading

m-maillot Oct 6, 2023

Viczei Oct 6, 2023

carolineBda Oct 6, 2023

Viczei Oct 6, 2023

Viczei Oct 6, 2023

carolineBda Oct 6, 2023

carolineBda Oct 6, 2023

carolineBda Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

m-maillot Oct 6, 2023

Viczei Oct 6, 2023

Viczei Oct 6, 2023

m-maillot Oct 6, 2023

sonarqubecloud bot commented Oct 9, 2023

github-actions bot commented Oct 9, 2023

	{error && error.message === "Required" ? (
	{error && error.message === "Required" ?? (

feat: contribution zod #1056

feat: contribution zod #1056

Conversation

Viczei commented Oct 4, 2023

gitguardian bot commented Oct 4, 2023 • edited Loading

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

carolineBda Oct 6, 2023 • edited Loading

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

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

sonarqubecloud bot commented Oct 9, 2023

github-actions bot commented Oct 9, 2023

gitguardian bot commented Oct 4, 2023 •

edited

Loading

carolineBda Oct 6, 2023 •

edited

Loading