add choice 'not applicable' about RGAA normes (in this case value is …

…null)
codegouvfr · Jan 24, 2024 · 0c9808d · 0c9808d
1 parent 1297a67
commit 0c9808d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/core/ports/DbApi.ts b/src/core/ports/DbApi.ts
@@ -29,7 +29,7 @@ export namespace Db {
         };
         isStillInObservation: boolean;
         parentSoftwareWikidataId: string | undefined;
-        doRespectRgaa: boolean;
+        doRespectRgaa: boolean | null;
         isFromFrenchPublicService: boolean;
         isPresentInSupportContract: boolean;
         similarSoftwareWikidataIds: string[];

diff --git a/src/core/usecases/readWriteSillData/selectors.ts b/src/core/usecases/readWriteSillData/selectors.ts
@@ -155,7 +155,7 @@ const softwares = createSelector(compiledData, similarSoftwarePartition, (compil
             "dereferencing": o.dereferencing,
             "categories": o.categories,
             "prerogatives": {
-                "doRespectRgaa": o.doRespectRgaa ?? false,
+                "doRespectRgaa": o.doRespectRgaa,
                 "isFromFrenchPublicServices": o.isFromFrenchPublicService,
                 "isPresentInSupportContract": o.isPresentInSupportContract
             },

diff --git a/src/core/usecases/readWriteSillData/types.ts b/src/core/usecases/readWriteSillData/types.ts
@@ -31,7 +31,7 @@ export type Software = {
           }
         | undefined;
     categories: string[];
-    prerogatives: Record<Prerogative, boolean>;
+    prerogatives: Prerogatives;
     userAndReferentCountByOrganization: Record<string, { userCount: number; referentCount: number }>;
     authors: {
         authorName: string;
@@ -104,7 +104,12 @@ export namespace SoftwareType {
     };
 }
 
-export type Prerogative = "isPresentInSupportContract" | "isFromFrenchPublicServices" | "doRespectRgaa";
+type Prerogatives = {
+    isPresentInSupportContract: boolean;
+    isFromFrenchPublicServices: boolean;
+    doRespectRgaa: boolean | null;
+};
+export type Prerogative = keyof Prerogatives;
 
 export type Os = "windows" | "linux" | "mac" | "android" | "ios";
 
@@ -121,7 +126,7 @@ export type SoftwareFormData = {
     similarSoftwareWikidataIds: string[];
     softwareLogoUrl: string | undefined;
     softwareKeywords: string[];
-    doRespectRgaa: boolean;
+    doRespectRgaa: boolean | null;
 };
 
 export type DeclarationFormData = DeclarationFormData.User | DeclarationFormData.Referent;

diff --git a/src/rpc/router.ts b/src/rpc/router.ts
@@ -544,7 +544,7 @@ const zSoftwareFormData = (() => {
         "similarSoftwareWikidataIds": z.array(z.string()),
         "softwareLogoUrl": z.string().optional(),
         "softwareKeywords": z.array(z.string()),
-        "doRespectRgaa": z.boolean()
+        "doRespectRgaa": z.boolean().or(z.null())
     });
 
     {