fix types to fit with instance without other wikidata softwares

codegouvfr · Jul 26, 2024 · 1e66422 · 1e66422
1 parent 5676443
commit 1e66422
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 79 deletions.
diff --git a/api/src/core/usecases/readWriteSillData/thunks.ts b/api/src/core/usecases/readWriteSillData/thunks.ts
@@ -494,14 +494,7 @@ export const thunks = {
 
                     assert(index !== -1, "Can't update instance, it doesn't exist");
 
-                    const {
-                        mainSoftwareSillId,
-                        organization,
-                        otherSoftwareWikidataIds,
-                        publicUrl,
-                        targetAudience,
-                        ...rest
-                    } = formData;
+                    const { mainSoftwareSillId, organization, publicUrl, targetAudience, ...rest } = formData;
 
                     assert<Equals<typeof rest, {}>>();
 

diff --git a/api/src/core/usecases/readWriteSillData/types.ts b/api/src/core/usecases/readWriteSillData/types.ts
@@ -157,5 +157,4 @@ export type InstanceFormData = {
     organization: string;
     targetAudience: string;
     publicUrl: string | undefined;
-    otherSoftwareWikidataIds: string[];
 };
diff --git a/api/src/rpc/router.ts b/api/src/rpc/router.ts
@@ -604,8 +604,7 @@ const zInstanceFormData = (() => {
         "mainSoftwareSillId": z.number(),
         "organization": z.string(),
         "targetAudience": z.string(),
-        "publicUrl": z.string().optional(),
-        "otherSoftwareWikidataIds": z.array(z.string())
+        "publicUrl": z.string().optional()
     });
 
     {

diff --git a/api/src/tools/test.helpers.ts b/api/src/tools/test.helpers.ts
@@ -60,6 +60,5 @@ export const createInstanceFormData = makeObjectFactory<InstanceFormData>({
     organization: "Default organization",
     targetAudience: "Default audience",
     mainSoftwareSillId: 1,
-    otherSoftwareWikidataIds: [],
     publicUrl: "https://example.com"
 });
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "test": "turbo test",
     "format": "turbo format",
     "format:check": "turbo format:check",
-    "fullcheck": "turbo typecheck format:check test"
+    "fullcheck": "turbo typecheck format:check lint test"
   },
   "devDependencies": {
     "turbo": "^1.12.5"

diff --git a/turbo.json b/turbo.json
@@ -14,6 +14,7 @@
     },
     "dev": {},
     "format:check": {},
-    "format": {}
+    "format": {},
+    "lint": {}
   }
 }
diff --git a/web/package.json b/web/package.json
@@ -7,6 +7,7 @@
         "build": "react-app-rewired build && rimraf build/keycloak-resources",
         "build-keycloak-theme": "yarn build && keycloakify",
         "storybook": "start-storybook -p 6006",
+        "lint": "eslint --ext .ts,.tsx,.js,.jsx src",
         "_format": "prettier '**/*.{ts,tsx,json,md}'",
         "format": "yarn _format --write",
         "format:check": "yarn _format --list-different",

diff --git a/web/public/index.html b/web/public/index.html
@@ -16,7 +16,7 @@
 	<link rel="shortcut icon" href="%PUBLIC_URL%/dsfr/favicon/favicon.ico?v=1.12.1" type="image/x-icon" />
 	<link rel="manifest" href="%PUBLIC_URL%/dsfr/favicon/manifest.webmanifest?v=1.12.1" crossorigin="use-credentials" />
 
-	<link rel="stylesheet" href="%PUBLIC_URL%/dsfr/utility/icons/icons.min.css?hash=cfdb5c1c" />
+	<link rel="stylesheet" href="%PUBLIC_URL%/dsfr/utility/icons/icons.min.css?hash=3375e412" />
 	<link rel="stylesheet" href="%PUBLIC_URL%/dsfr/dsfr.min.css?v=1.12.1" />
 
 	<%

diff --git a/web/src/core/adapter/sillApiMock.ts b/web/src/core/adapter/sillApiMock.ts
@@ -37,7 +37,6 @@ export const sillApi: SillApi = {
                     "id": 0,
                     "mainSoftwareSillId": 9,
                     "organization": "CNRS",
-                    "otherWikidataSoftwares": [],
                     "publicUrl": "https://videos.ahp-numerique.fr/",
                     "targetAudience": `Plateforme vidéos des Archives Henri-Poincaré (laboratoire du CNRS, de l'Université de Lorraine et de 
                 l'Université de Strasbourg). Vous y trouverez des vidéos de philosophie et d'histoire des sciences et des techniques.`

diff --git a/web/src/core/usecases/instanceForm/selectors.ts b/web/src/core/usecases/instanceForm/selectors.ts
@@ -1,6 +1,6 @@
 import type { State as RootState } from "core/bootstrap";
 import { createSelector } from "redux-clean-architecture";
-import { name, type WikidataEntry } from "./state";
+import { name } from "./state";
 import { assert } from "tsafe/assert";
 
 const readyState = (rootState: RootState) => {
@@ -23,7 +23,6 @@ const initializationData = createSelector(
         | undefined
         | {
               mainSoftwareSillId: number | undefined;
-              otherSoftwares: WikidataEntry[];
               organization: string | undefined;
               publicUrl: string | undefined;
               targetAudience: string | undefined;
@@ -37,7 +36,6 @@ const initializationData = createSelector(
         if (preFillData === undefined) {
             return {
                 "mainSoftwareSillId": undefined,
-                "otherSoftwares": [],
                 "organization": undefined,
                 "publicUrl": undefined,
                 "targetAudience": undefined
@@ -48,15 +46,13 @@ const initializationData = createSelector(
             case "update":
                 return {
                     "mainSoftwareSillId": preFillData.mainSoftwareSillId,
-                    "otherSoftwares": preFillData.otherWikidataSoftwares,
                     "organization": preFillData.organization,
                     "publicUrl": preFillData.publicUrl,
                     "targetAudience": preFillData.targetAudience
                 };
             case "navigated from software form":
                 return {
                     "mainSoftwareSillId": preFillData.justRegisteredSoftwareSillId,
-                    "otherSoftwares": [],
                     "organization": undefined,
                     "publicUrl": undefined,
                     "targetAudience": undefined

diff --git a/web/src/core/usecases/instanceForm/state.ts b/web/src/core/usecases/instanceForm/state.ts
@@ -27,7 +27,6 @@ namespace State {
                   type: "update";
                   instanceId: number;
                   mainSoftwareSillId: number;
-                  otherWikidataSoftwares: WikidataEntry[];
                   organization: string;
                   publicUrl: string | undefined;
                   targetAudience: string;
@@ -41,7 +40,6 @@ namespace State {
         step1Data:
             | {
                   mainSoftwareSillId: number;
-                  otherWikidataSoftwares: WikidataEntry[];
               }
             | undefined;
         isSubmitting: boolean;

diff --git a/web/src/core/usecases/instanceForm/thunks.ts b/web/src/core/usecases/instanceForm/thunks.ts
@@ -1,7 +1,7 @@
 import type { Thunks } from "core/bootstrap";
 import { assert } from "tsafe/assert";
 import type { ApiTypes } from "api";
-import { name, actions, type WikidataEntry } from "./state";
+import { name, actions } from "./state";
 
 export const thunks = {
     "initialize":
@@ -59,7 +59,6 @@ export const thunks = {
                                 "type": "update",
                                 "instanceId": instance.id,
                                 "mainSoftwareSillId": instance.mainSoftwareSillId,
-                                "otherWikidataSoftwares": instance.otherWikidataSoftwares,
                                 "organization": instance.organization,
                                 "publicUrl": instance.publicUrl,
                                 "targetAudience": instance.targetAudience
@@ -115,21 +114,15 @@ export const thunks = {
             dispatch(actions.cleared());
         },
     "completeStep1":
-        (props: {
-            mainSoftwareSillId: number;
-            otherWikidataSoftwares: WikidataEntry[];
-        }) =>
+        (props: { mainSoftwareSillId: number }) =>
         (...args) => {
-            const { mainSoftwareSillId, otherWikidataSoftwares } = props;
+            const { mainSoftwareSillId } = props;
 
             const [dispatch] = args;
 
             dispatch(
                 actions.step1Completed({
-                    "step1Data": {
-                        mainSoftwareSillId,
-                        otherWikidataSoftwares
-                    }
+                    "step1Data": { mainSoftwareSillId }
                 })
             );
         },
@@ -155,9 +148,6 @@ export const thunks = {
             const formData: ApiTypes.InstanceFormData = {
                 "mainSoftwareSillId": step1Data.mainSoftwareSillId,
                 organization,
-                "otherSoftwareWikidataIds": step1Data.otherWikidataSoftwares.map(
-                    ({ externalId }) => externalId
-                ),
                 publicUrl,
                 targetAudience
             };

diff --git a/web/src/ui/pages/instanceForm/InstanceForm.tsx b/web/src/ui/pages/instanceForm/InstanceForm.tsx
@@ -18,7 +18,6 @@ import { declareComponentKeys } from "i18nifty";
 import { Stepper } from "@codegouvfr/react-dsfr/Stepper";
 import { ActionsFooter } from "ui/shared/ActionsFooter";
 import type { PageRoute } from "./route";
-import { useLang } from "ui/i18n";
 import { LoadingFallback } from "ui/shared/LoadingFallback";
 
 export type Props = {
@@ -34,10 +33,7 @@ export default function InstanceForm(props: Props) {
 
     const { evtInstanceForm } = useCore().evts;
 
-    const {
-        instanceForm,
-        softwareForm: { getExternalSoftwareOptions }
-    } = useCore().functions;
+    const { instanceForm } = useCore().functions;
 
     const {
         isReady,
@@ -106,8 +102,6 @@ export default function InstanceForm(props: Props) {
 
     const evtActionSubmitStep = useConst(() => Evt.create());
 
-    const { lang } = useLang();
-
     if (!isReady) {
         return <LoadingFallback className={className} showAfterMs={150} />;
     }
@@ -147,16 +141,11 @@ export default function InstanceForm(props: Props) {
                 <InstanceFormStep1
                     className={cx(classes.step, classes.step1)}
                     initialFormData={{
-                        "mainSoftwareSillId": initializationData.mainSoftwareSillId,
-                        "otherWikidataSoftwares": initializationData.otherSoftwares
+                        "mainSoftwareSillId": initializationData.mainSoftwareSillId
                     }}
-                    getLibreSoftwareWikidataOptions={queryString =>
-                        getExternalSoftwareOptions({ queryString, "language": lang })
-                    }
-                    onSubmit={({ mainSoftwareSillId, otherWikidataSoftwares }) =>
+                    onSubmit={({ mainSoftwareSillId }) =>
                         instanceForm.completeStep1({
-                            mainSoftwareSillId,
-                            otherWikidataSoftwares
+                            mainSoftwareSillId
                         })
                     }
                     allSillSoftwares={allSillSoftwares}

diff --git a/web/src/ui/pages/instanceForm/Step1.tsx b/web/src/ui/pages/instanceForm/Step1.tsx
@@ -1,53 +1,34 @@
 import { fr } from "@codegouvfr/react-dsfr";
-import type { useCore } from "core";
 import type { WikidataEntry } from "core/usecases/instanceForm";
 import type { NonPostableEvt } from "evt";
 import { useEvt } from "evt/hooks";
 import { declareComponentKeys } from "i18nifty";
 import { useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { assert } from "tsafe/assert";
-import { useResolveLocalizedString, useTranslation } from "ui/i18n";
+import { useTranslation } from "ui/i18n";
 import { AutocompleteInput } from "ui/shared/AutocompleteInput";
 
 export type Step1Props = {
     className?: string;
     initialFormData: {
         mainSoftwareSillId: number | undefined;
-        otherWikidataSoftwares: WikidataEntry[];
     };
-    onSubmit: (formData: {
-        mainSoftwareSillId: number;
-        otherWikidataSoftwares: WikidataEntry[];
-    }) => void;
+    onSubmit: (formData: { mainSoftwareSillId: number }) => void;
     allSillSoftwares: {
         softwareName: string;
         softwareSillId: number;
         softwareDescription: string;
     }[];
     evtActionSubmit: NonPostableEvt<void>;
-    getLibreSoftwareWikidataOptions: (
-        queryString: string
-    ) => ReturnType<
-        ReturnType<
-            typeof useCore
-        >["functions"]["softwareForm"]["getExternalSoftwareOptions"]
-    >;
 };
 
 export function InstanceFormStep1(props: Step1Props) {
-    const {
-        className,
-        initialFormData,
-        onSubmit,
-        evtActionSubmit,
-        getLibreSoftwareWikidataOptions,
-        allSillSoftwares
-    } = props;
+    const { className, initialFormData, onSubmit, evtActionSubmit, allSillSoftwares } =
+        props;
 
     const { t } = useTranslation({ InstanceFormStep1 });
     const { t: tCommon } = useTranslation({ "App": null });
-    const { resolveLocalizedString } = useResolveLocalizedString();
 
     const {
         handleSubmit,
@@ -77,8 +58,7 @@ export function InstanceFormStep1(props: Step1Props) {
                 assert(mainSoftware !== undefined);
 
                 return mainSoftware;
-            })(),
-            "otherWikidataSoftwares": initialFormData.otherWikidataSoftwares
+            })()
         }
     });
 
@@ -101,8 +81,7 @@ export function InstanceFormStep1(props: Step1Props) {
             className={className}
             onSubmit={handleSubmit(data =>
                 onSubmit({
-                    "mainSoftwareSillId": data.mainSoftware.softwareSillId,
-                    "otherWikidataSoftwares": data.otherWikidataSoftwares
+                    "mainSoftwareSillId": data.mainSoftware.softwareSillId
                 })
             )}
         >