diff --git a/api/src/core/usecases/readWriteSillData/thunks.ts b/api/src/core/usecases/readWriteSillData/thunks.ts index 119f0add..9b648841 100644 --- 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>(); diff --git a/api/src/core/usecases/readWriteSillData/types.ts b/api/src/core/usecases/readWriteSillData/types.ts index a36c3247..a5ca9f91 100644 --- 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 index d9c2dab1..4c90e632 100644 --- 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 index 2df9aec2..109639e6 100644 --- a/api/src/tools/test.helpers.ts +++ b/api/src/tools/test.helpers.ts @@ -60,6 +60,5 @@ export const createInstanceFormData = makeObjectFactory({ organization: "Default organization", targetAudience: "Default audience", mainSoftwareSillId: 1, - otherSoftwareWikidataIds: [], publicUrl: "https://example.com" }); diff --git a/web/public/index.html b/web/public/index.html index 0f46e230..27a87e44 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -16,7 +16,7 @@ - + <% diff --git a/web/src/core/adapter/sillApiMock.ts b/web/src/core/adapter/sillApiMock.ts index 40a7a73d..19709f71 100644 --- 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 index 0647e991..3f628072 100644 --- a/web/src/core/usecases/instanceForm/selectors.ts +++ b/web/src/core/usecases/instanceForm/selectors.ts @@ -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,7 +46,6 @@ const initializationData = createSelector( case "update": return { "mainSoftwareSillId": preFillData.mainSoftwareSillId, - "otherSoftwares": preFillData.otherWikidataSoftwares, "organization": preFillData.organization, "publicUrl": preFillData.publicUrl, "targetAudience": preFillData.targetAudience @@ -56,7 +53,6 @@ const initializationData = createSelector( 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 index b3e9a064..54470f63 100644 --- 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 index f72b3bb8..906046f1 100644 --- a/web/src/core/usecases/instanceForm/thunks.ts +++ b/web/src/core/usecases/instanceForm/thunks.ts @@ -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 index 8c8ff7f3..fa319684 100644 --- a/web/src/ui/pages/instanceForm/InstanceForm.tsx +++ b/web/src/ui/pages/instanceForm/InstanceForm.tsx @@ -147,16 +147,14 @@ export default function InstanceForm(props: Props) { 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 index c943e60a..36982e96 100644 --- a/web/src/ui/pages/instanceForm/Step1.tsx +++ b/web/src/ui/pages/instanceForm/Step1.tsx @@ -14,12 +14,8 @@ 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; @@ -77,8 +73,7 @@ export function InstanceFormStep1(props: Step1Props) { assert(mainSoftware !== undefined); return mainSoftware; - })(), - "otherWikidataSoftwares": initialFormData.otherWikidataSoftwares + })() } }); @@ -101,8 +96,7 @@ export function InstanceFormStep1(props: Step1Props) { className={className} onSubmit={handleSubmit(data => onSubmit({ - "mainSoftwareSillId": data.mainSoftware.softwareSillId, - "otherWikidataSoftwares": data.otherWikidataSoftwares + "mainSoftwareSillId": data.mainSoftware.softwareSillId }) )} >