fix(kali ref): fix kali ref on contributions (#1026)

SocialGouv · Sep 25, 2023 · 19d20c0 · 19d20c0
1 parent 37c3093
commit 19d20c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/targets/frontend/src/components/contributions/answers/Answer.tsx b/targets/frontend/src/components/contributions/answers/Answer.tsx
@@ -221,7 +221,7 @@ export const ContributionsAnswer = ({
               {answer && !isCodeDuTravail(answer) && (
                 <KaliReferenceInput
                   name="kaliReferences"
-                  idcc={answer.agreement.id}
+                  agreement={answer.agreement}
                   control={control}
                   disabled={isNotEditable(answer)}
                 />

diff --git a/targets/frontend/src/components/contributions/answers/answer.query.ts b/targets/frontend/src/components/contributions/answers/answer.query.ts
@@ -23,6 +23,7 @@ query contribution_answer($id: uuid) {
     agreement {
       id
       name
+      kaliId: kali_id
     }
     answerComments: answer_comments {
       id

diff --git a/targets/frontend/src/components/contributions/answers/references/KaliReferenceInput.tsx b/targets/frontend/src/components/contributions/answers/references/KaliReferenceInput.tsx
@@ -12,7 +12,7 @@ import {
 import { FormTextField } from "../../../forms";
 import DeleteIcon from "@mui/icons-material/Delete";
 import { useContributionSearchKaliReferenceQuery } from "./kaliReferencesSearch.query";
-import { Answer, KaliArticle } from "../../type";
+import { Agreement, Answer, KaliArticle } from "../../type";
 import { Result } from "./ReferenceInput";
 import { SimpleLink } from "../../../utils/SimpleLink";
 
@@ -79,14 +79,14 @@ const KaliReferenceSearch = ({
 
 type Props = {
   name: string;
-  idcc: string;
+  agreement: Agreement;
   control: Control<any>;
   disabled?: boolean;
 };
 
 export const KaliReferenceInput = ({
   name,
-  idcc,
+  agreement,
   control,
   disabled = false,
 }: Props): ReactElement | null => {
@@ -97,7 +97,7 @@ export const KaliReferenceInput = ({
 
   return (
     <TitleBox
-      title={`Références liées à la convention collective ${idcc}`}
+      title={`Références liées à la convention collective ${agreement.id}`}
       disabled={disabled}
     >
       <Stack spacing={2} mt={4}>
@@ -120,7 +120,7 @@ export const KaliReferenceInput = ({
               <Grid item xs={7}>
                 <SimpleLink
                   target="_blank"
-                  href={`https://www.legifrance.gouv.fr/conv_coll/id/${ref.kaliArticle.cid}/?idConteneur=KALICONT000005635550`}
+                  href={`https://www.legifrance.gouv.fr/conv_coll/id/${ref.kaliArticle.cid}/?idConteneur=${agreement.kaliId}`}
                 >
                   {ref.kaliArticle.path}
                 </SimpleLink>
@@ -138,7 +138,7 @@ export const KaliReferenceInput = ({
         {!disabled && (
           <KaliReferenceSearch
             fetcher={useContributionSearchKaliReferenceQuery}
-            idcc={idcc}
+            idcc={agreement.id}
             onAdd={(value) => {
               if (value) {
                 append({ kaliArticle: value });

diff --git a/targets/frontend/src/components/contributions/type.ts b/targets/frontend/src/components/contributions/type.ts
@@ -4,6 +4,7 @@ import { SourceRoute } from "@socialgouv/cdtn-sources";
 export type Agreement = {
   id: string;
   name: string;
+  kaliId: string;
 };
 
 export type Status =

diff --git a/targets/hasura/metadata/databases/default/tables/public_agreements.yaml b/targets/hasura/metadata/databases/default/tables/public_agreements.yaml
@@ -6,6 +6,7 @@ select_permissions:
     permission:
       columns:
         - id
+        - kali_id
         - name
       filter: {}
       allow_aggregations: true