diff --git a/api/scripts/load-git-repo-in-pg.ts b/api/scripts/load-git-repo-in-pg.ts index 6a931dee..3fc586f4 100644 --- a/api/scripts/load-git-repo-in-pg.ts +++ b/api/scripts/load-git-repo-in-pg.ts @@ -65,7 +65,6 @@ const insertSoftwares = async ( dereferencing: row.dereferencing ? JSON.stringify(row.dereferencing) : null, softwareType: JSON.stringify(row.softwareType), workshopUrls: JSON.stringify(row.workshopUrls), - testUrls: JSON.stringify(row.testUrls), categories: JSON.stringify(row.categories), keywords: JSON.stringify(row.keywords) })) diff --git a/api/src/core/adapters/compileData.ts b/api/src/core/adapters/compileData.ts index 9f780d5b..7bc125c0 100644 --- a/api/src/core/adapters/compileData.ts +++ b/api/src/core/adapters/compileData.ts @@ -268,10 +268,8 @@ export function createCompileData(params: { comptoirDuLibreId, license, softwareType, - catalogNumeriqueGouvFrId, versionMin, workshopUrls, - testUrls, categories, generalInfoMd, addedByAgentEmail, @@ -293,10 +291,8 @@ export function createCompileData(params: { isPresentInSupportContract, license, softwareType, - catalogNumeriqueGouvFrId, versionMin, workshopUrls, - testUrls, categories, generalInfoMd, addedByAgentEmail, diff --git a/api/src/core/adapters/dbApi/kysely/createGetCompiledData.ts b/api/src/core/adapters/dbApi/kysely/createGetCompiledData.ts index f3cbf48d..bf4fd0dd 100644 --- a/api/src/core/adapters/dbApi/kysely/createGetCompiledData.ts +++ b/api/src/core/adapters/dbApi/kysely/createGetCompiledData.ts @@ -37,7 +37,6 @@ export const createGetCompiledData = (db: Kysely) => async (): Promise .select([ "s.id", "s.addedByAgentId", - "s.catalogNumeriqueGouvFrId", "s.categories", "s.dereferencing", "s.description", @@ -54,7 +53,6 @@ export const createGetCompiledData = (db: Kysely) => async (): Promise "s.name", "s.referencedSinceTime", "s.softwareType", - "s.testUrls", "s.updateTime", "s.versionMin", "s.workshopUrls", diff --git a/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts b/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts index 8217c1b8..12d4fa88 100644 --- a/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts +++ b/api/src/core/adapters/dbApi/kysely/createPgSoftwareRepository.ts @@ -63,9 +63,7 @@ export const createPgSoftwareRepository = (db: Kysely): SoftwareReposi externalDataOrigin: externalDataOrigin, comptoirDuLibreId: comptoirDuLibreId, softwareType: JSON.stringify(softwareType), - catalogNumeriqueGouvFrId: undefined, workshopUrls: JSON.stringify([]), - testUrls: JSON.stringify([]), categories: JSON.stringify([]), generalInfoMd: undefined, addedByAgentId: agentId, @@ -141,9 +139,7 @@ export const createPgSoftwareRepository = (db: Kysely): SoftwareReposi externalId: externalId, comptoirDuLibreId: comptoirDuLibreId, softwareType: JSON.stringify(softwareType), - catalogNumeriqueGouvFrId: undefined, workshopUrls: JSON.stringify([]), - testUrls: JSON.stringify([]), categories: JSON.stringify([]), generalInfoMd: undefined, addedByAgentId: agentId, @@ -159,7 +155,6 @@ export const createPgSoftwareRepository = (db: Kysely): SoftwareReposi .then((result): Software | undefined => { if (!result) return; const { - testUrls, serviceProviders, parentExternalData, updateTime, @@ -189,7 +184,6 @@ export const createPgSoftwareRepository = (db: Kysely): SoftwareReposi software.comptoirDuLibreSoftware?.external_resources.repository, documentationUrl: softwareExternalData?.documentationUrl, comptoirDuLibreServiceProviderCount: software.comptoirDuLibreSoftware?.providers.length ?? 0, - testUrl: testUrls[0]?.url, parentWikidataSoftware: parentExternalData, keywords: software?.keywords ?? softwareExternalData?.keywords ?? [], programmingLanguages: softwareExternalData?.programmingLanguages ?? [], @@ -245,7 +239,6 @@ export const createPgSoftwareRepository = (db: Kysely): SoftwareReposi return softwares.map( ({ - testUrls, serviceProviders, parentExternalData, updateTime, @@ -292,7 +285,6 @@ export const createPgSoftwareRepository = (db: Kysely): SoftwareReposi documentationUrl: softwareExternalData?.documentationUrl ?? undefined, comptoirDuLibreServiceProviderCount: software.comptoirDuLibreSoftware?.providers.length ?? 0, - testUrl: testUrls[0]?.url, parentWikidataSoftware: parentExternalData ?? undefined, applicationCategories: software.categories.concat( softwareExternalData?.applicationCategories ?? [] @@ -385,7 +377,6 @@ const makeGetSoftwareBuilder = (db: Kysely) => "s.description as softwareDescription", "cs.serviceProviders", "cs.latestVersion", - "s.testUrls", "s.referencedSinceTime as addedTime", "s.updateTime", "s.lastExtraDataFetchAt", @@ -538,7 +529,6 @@ const makeGetSoftwareById = .then((result): Software | undefined => { if (!result) return; const { - testUrls, serviceProviders, parentExternalData, updateTime, @@ -568,7 +558,6 @@ const makeGetSoftwareById = software.comptoirDuLibreSoftware?.external_resources.repository, documentationUrl: softwareExternalData?.documentationUrl, comptoirDuLibreServiceProviderCount: software.comptoirDuLibreSoftware?.providers.length ?? 0, - testUrl: testUrls[0]?.url, parentWikidataSoftware: parentExternalData, programmingLanguages: softwareExternalData?.programmingLanguages ?? [], referencePublications: softwareExternalData?.referencePublications, diff --git a/api/src/core/adapters/dbApi/kysely/kysely.database.ts b/api/src/core/adapters/dbApi/kysely/kysely.database.ts index fcdb45cd..8cd91a78 100644 --- a/api/src/core/adapters/dbApi/kysely/kysely.database.ts +++ b/api/src/core/adapters/dbApi/kysely/kysely.database.ts @@ -130,15 +130,8 @@ type SoftwaresTable = { comptoirDuLibreId: number | null; license: string; softwareType: JSONColumnType; - catalogNumeriqueGouvFrId: string | null; versionMin: string | null; workshopUrls: JSONColumnType; - testUrls: JSONColumnType< - { - description: string; - url: string; - }[] - >; categories: JSONColumnType; generalInfoMd: string | null; addedByAgentId: number; diff --git a/api/src/core/adapters/dbApi/kysely/migrations/1740125749274_remove-depreciated-fields.ts b/api/src/core/adapters/dbApi/kysely/migrations/1740125749274_remove-depreciated-fields.ts new file mode 100644 index 00000000..3e1efcad --- /dev/null +++ b/api/src/core/adapters/dbApi/kysely/migrations/1740125749274_remove-depreciated-fields.ts @@ -0,0 +1,13 @@ +import { Kysely } from "kysely"; + +export async function up(db: Kysely): Promise { + await db.schema.alterTable("softwares").dropColumn("catalogNumeriqueGouvFrId").dropColumn("testUrls").execute(); +} + +export async function down(db: Kysely): Promise { + await db.schema + .alterTable("softwares") + .addColumn("testUrls", "jsonb") + .addColumn("catalogNumeriqueGouvFrId", "text") + .execute(); +} diff --git a/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts b/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts index ab46789a..fd269d63 100644 --- a/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts +++ b/api/src/core/adapters/dbApi/kysely/pgDbApi.integration.test.ts @@ -228,7 +228,6 @@ describe("pgDbApi", () => { }, type: "desktop/mobile" }, - testUrl: undefined, userAndReferentCountByOrganization: { [insertedAgent.organization]: { userCount: 1, diff --git a/api/src/core/adapters/fetchExternalData.test.ts b/api/src/core/adapters/fetchExternalData.test.ts index 1ceb6f86..97eecb02 100644 --- a/api/src/core/adapters/fetchExternalData.test.ts +++ b/api/src/core/adapters/fetchExternalData.test.ts @@ -40,8 +40,7 @@ const insertApacheWithCorrectId = async (db: Kysely, agentId: number) "comptoirDuLibreId", name, description, license, "versionMin", "isPresentInSupportContract", "isFromFrenchPublicService", "logoUrl", keywords, "doRespectRgaa", "isStillInObservation", - "parentSoftwareWikidataId", "catalogNumeriqueGouvFrId", "workshopUrls", - "testUrls", categories, "generalInfoMd", "addedByAgentId", + "parentSoftwareWikidataId", "workshopUrls", categories, "generalInfoMd", "addedByAgentId", dereferencing, "referencedSinceTime", "updateTime") VALUES (${apacheSoftwareId}, '{"os": {"ios": false, "mac": false, "linux": true, "android": false, "windows": false}, "type": "desktop/mobile"}', @@ -49,7 +48,7 @@ const insertApacheWithCorrectId = async (db: Kysely, agentId: number) 'Serveur Web & Reverse Proxy', 'Apache-2.0', '212', true, false, 'https://sill.code.gouv.fr/logo/apache-http.png', '["serveur", "http", "web", "server", "apache"]', false, false, - null, null, '[]', '[]', '[]', null, ${agentId}, null, + null, '[]', '[]', null, ${agentId}, null, 1728462232094, 1728462232094); `.execute(db); @@ -66,8 +65,7 @@ const insertAcceleroWithCorrectId = async (db: Kysely, agentId: number keywords, "doRespectRgaa", "isStillInObservation", "parentSoftwareWikidataId", - "catalogNumeriqueGouvFrId", - "workshopUrls", "testUrls", categories, + "workshopUrls", categories, "generalInfoMd", "addedByAgentId", dereferencing, "referencedSinceTime", "updateTime") @@ -76,7 +74,7 @@ const insertAcceleroWithCorrectId = async (db: Kysely, agentId: number 'Outil et/ou plugin de génération de tout ou partie du code', 'EPL-2.0', '3.7.8', false, false, null, '["modélisation", "génération", "code", "modeling", "code generation"]', - false, false, null, null, '[]', '[]', + false, false, null, '[]', '["Other Development Tools"]', null, ${agentId}, null, 1514764800000, 1514764800000); diff --git a/api/src/core/ports/CompileData.ts b/api/src/core/ports/CompileData.ts index 7f765d75..ffed376c 100644 --- a/api/src/core/ports/CompileData.ts +++ b/api/src/core/ports/CompileData.ts @@ -48,10 +48,8 @@ export namespace CompiledData { | "isPresentInSupportContract" | "license" | "softwareType" - | "catalogNumeriqueGouvFrId" | "versionMin" | "workshopUrls" - | "testUrls" | "categories" | "generalInfoMd" | "logoUrl" @@ -112,7 +110,6 @@ export function compiledDataPrivateToPublic(compiledData: CompiledData<"private" users, instances, annuaireCnllServiceProviders, - catalogNumeriqueGouvFrId, categories, comptoirDuLibreSoftware, dereferencing, @@ -129,7 +126,6 @@ export function compiledDataPrivateToPublic(compiledData: CompiledData<"private" name, referencedSinceTime, softwareType, - testUrls, latestVersion, updateTime, versionMin, @@ -143,7 +139,6 @@ export function compiledDataPrivateToPublic(compiledData: CompiledData<"private" return { serviceProviders, annuaireCnllServiceProviders, - catalogNumeriqueGouvFrId, categories, comptoirDuLibreSoftware, dereferencing, @@ -160,7 +155,6 @@ export function compiledDataPrivateToPublic(compiledData: CompiledData<"private" name, referencedSinceTime, softwareType, - testUrls, latestVersion, updateTime, versionMin, diff --git a/api/src/core/ports/DbApi.ts b/api/src/core/ports/DbApi.ts index 80aaab7a..2d1880f9 100644 --- a/api/src/core/ports/DbApi.ts +++ b/api/src/core/ports/DbApi.ts @@ -44,13 +44,8 @@ export namespace Db { softwareType: SoftwareType; //Lien vers catalogue.numerique.gouv.fr /* cspell: disable-next-line */ - catalogNumeriqueGouvFrId: string | undefined; versionMin: string | undefined; workshopUrls: string[]; - testUrls: { - description: string; - url: string; - }[]; categories: string[]; generalInfoMd: string | undefined; addedByAgentEmail: string; diff --git a/api/src/core/usecases/readWriteSillData/types.ts b/api/src/core/usecases/readWriteSillData/types.ts index 3c45dc26..652c7eb7 100644 --- a/api/src/core/usecases/readWriteSillData/types.ts +++ b/api/src/core/usecases/readWriteSillData/types.ts @@ -25,7 +25,6 @@ export type Software = { publicationTime?: number; } | undefined; - testUrl: string | undefined; addedTime: number; updateTime: number; dereferencing: diff --git a/api/src/rpc/routes.e2e.test.ts b/api/src/rpc/routes.e2e.test.ts index 4dad4169..43ec533e 100644 --- a/api/src/rpc/routes.e2e.test.ts +++ b/api/src/rpc/routes.e2e.test.ts @@ -131,7 +131,6 @@ describe("RPC e2e tests", () => { "name": softwareFormData.softwareName, "softwareType": softwareFormData.softwareType, "versionMin": softwareFormData.softwareMinimalVersion ?? undefined, - "testUrls": [], "workshopUrls": [], "categories": [], "isStillInObservation": false, diff --git a/web/src/core/adapter/sillApiMock.ts b/web/src/core/adapter/sillApiMock.ts index d43574d4..cbd979df 100644 --- a/web/src/core/adapter/sillApiMock.ts +++ b/web/src/core/adapter/sillApiMock.ts @@ -91,7 +91,6 @@ export const sillApi: SillApi = { parentWikidataSoftware: undefined, softwareType: formData.softwareType, similarSoftwares: [], - testUrl: undefined, addedTime: Date.now(), updateTime: Date.now(), applicationCategories: [], @@ -146,7 +145,6 @@ export const sillApi: SillApi = { parentWikidataSoftware: undefined, softwareType: formData.softwareType, similarSoftwares: [], - testUrl: undefined, addedTime: Date.now(), updateTime: Date.now(), applicationCategories: [], @@ -315,7 +313,6 @@ const softwares = [ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras feugiat, ex sit amet pretium blandit, tortor eros dapibus sem, ultricies tempor nunc magna in dolor. Curabitur non tincidunt ex. Nulla facilisi. Integer vestibulum ultricies risus eu blandit. Duis accumsan dolor sit amet arcu semper ultrices. Cras tincidunt commodo mauris quis iaculis. Morbi iaculis massa sit amet nunc porttitor malesuada. Sed venenatis congue dolor eu posuere. Praesent nec pulvinar massa. Ut id diam congue, elementum nulla in, varius mi.", latestVersion: undefined, parentWikidataSoftware: undefined, - testUrl: undefined, addedTime: 1670416144, updateTime: 1674739365178, dereferencing: undefined, @@ -376,7 +373,6 @@ const softwares = [ publicationTime: 1670503742 }, parentWikidataSoftware: undefined, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -444,7 +440,6 @@ const softwares = [ publicationTime: 1667911742 }, parentWikidataSoftware: undefined, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -506,7 +501,6 @@ const softwares = [ ios: true } }, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -562,7 +556,6 @@ const softwares = [ softwareType: { type: "stack" }, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -639,7 +632,6 @@ const softwares = [ isInSill: false } ], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -685,7 +677,6 @@ const softwares = [ semVer: "Dernière stable", publicationTime: 1633524542 }, - testUrl: undefined, softwareType: { type: "desktop/mobile", os: { @@ -761,7 +752,6 @@ const softwares = [ publicationTime: 1633524542 }, parentWikidataSoftware: undefined, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -822,7 +812,6 @@ const softwares = [ publicationTime: 1633524542 }, parentWikidataSoftware: undefined, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -873,7 +862,6 @@ const softwares = [ softwareType: { type: "cloud" }, - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -924,7 +912,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -971,7 +958,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -1018,7 +1004,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -1065,7 +1050,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -1112,7 +1096,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -1159,7 +1142,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -1206,7 +1188,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, @@ -1253,7 +1234,6 @@ const softwares = [ } }, similarSoftwares: [], - testUrl: undefined, addedTime: 1674739365178, updateTime: 1674739365178, dereferencing: undefined, diff --git a/web/src/core/usecases/softwareCatalog/selectors.ts b/web/src/core/usecases/softwareCatalog/selectors.ts index 3101278b..9857daec 100644 --- a/web/src/core/usecases/softwareCatalog/selectors.ts +++ b/web/src/core/usecases/softwareCatalog/selectors.ts @@ -521,8 +521,7 @@ const prerogativeFilterOptions = createSelector( .reduce((prev, curr) => [...prev, ...curr], []) ) ), - "isInstallableOnUserComputer" as const, - "isTestable" as const + "isInstallableOnUserComputer" as const ].map(prerogative => [prerogative, id(0)] as const) ); @@ -570,7 +569,7 @@ const prerogativeFilterOptions = createSelector( }); } - tmpSoftwares.forEach(({ prerogatives, softwareType, testUrl }) => { + tmpSoftwares.forEach(({ prerogatives, softwareType }) => { objectKeys(prerogatives) .filter(prerogative => prerogatives[prerogative]) .forEach(prerogative => { @@ -585,38 +584,31 @@ const prerogativeFilterOptions = createSelector( ); }); - (["isInstallableOnUserComputer", "isTestable"] as const).forEach( - prerogativeName => { - switch (prerogativeName) { - case "isInstallableOnUserComputer": - if (softwareType.type !== "desktop/mobile") { - return; - } - break; - case "isTestable": - if (testUrl === undefined) { - return; - } - break; - } + (["isInstallableOnUserComputer"] as const).forEach(prerogativeName => { + switch (prerogativeName) { + case "isInstallableOnUserComputer": + if (softwareType.type !== "desktop/mobile") { + return; + } + break; + } - const currentCount = - softwareCountInCurrentFilterByPrerogative.get(prerogativeName); + const currentCount = + softwareCountInCurrentFilterByPrerogative.get(prerogativeName); - assert(currentCount !== undefined); + assert(currentCount !== undefined); - softwareCountInCurrentFilterByPrerogative.set( - prerogativeName, - currentCount + 1 - ); - } - ); + softwareCountInCurrentFilterByPrerogative.set( + prerogativeName, + currentCount + 1 + ); + }); }); /** prettier-ignore */ - return Array.from(softwareCountInCurrentFilterByPrerogative.entries()) - .map(([prerogative, softwareCount]) => ({ prerogative, softwareCount })) - .filter(({ prerogative }) => prerogative !== "isTestable"); //NOTE: remove when we reintroduce Onyxia SILL + return Array.from(softwareCountInCurrentFilterByPrerogative.entries()).map( + ([prerogative, softwareCount]) => ({ prerogative, softwareCount }) + ); } ); @@ -827,8 +819,7 @@ function filterByPrerogative(params: { internalSoftware: software, positions: undefined }).prerogatives, - ...software.prerogatives, - isTestable: software.testUrl !== undefined + ...software.prerogatives })[prerogative] ); } @@ -865,7 +856,6 @@ function apiSoftwareToInternalSoftware(params: { softwareDescription, latestVersion, parentWikidataSoftware, - testUrl, addedTime, updateTime, applicationCategories, @@ -928,7 +918,6 @@ function apiSoftwareToInternalSoftware(params: { userCount: Object.values(userAndReferentCountByOrganization) .map(({ userCount }) => userCount) .reduce((prev, curr) => prev + curr, 0), - testUrl, addedTime, updateTime, applicationCategories, @@ -981,7 +970,6 @@ function internalSoftwareToExternalSoftware(params: { latestVersion, referentCount, userCount, - testUrl, addedTime, updateTime, applicationCategories, @@ -1009,7 +997,6 @@ function internalSoftwareToExternalSoftware(params: { latestVersion, referentCount, userCount, - testUrl, prerogatives: { isFromFrenchPublicServices, isPresentInSupportContract, @@ -1019,8 +1006,7 @@ function internalSoftwareToExternalSoftware(params: { (softwareType.os.windows || softwareType.os.linux || softwareType.os.mac), isAvailableAsMobileApp: softwareType.type === "desktop/mobile" && - (softwareType.os.android || softwareType.os.ios), - isTestable: testUrl !== undefined + (softwareType.os.android || softwareType.os.ios) }, parentSoftware, searchHighlight: diff --git a/web/src/core/usecases/softwareCatalog/state.ts b/web/src/core/usecases/softwareCatalog/state.ts index 72ff365d..33c0b8e4 100644 --- a/web/src/core/usecases/softwareCatalog/state.ts +++ b/web/src/core/usecases/softwareCatalog/state.ts @@ -57,7 +57,6 @@ export namespace State { doRespectRgaa: boolean | null; isInstallableOnUserComputer: boolean; isAvailableAsMobileApp: boolean; - isTestable: boolean; }; export type Prerogative = keyof Prerogatives; @@ -80,7 +79,6 @@ export namespace State { | { isInSill: false; url: string } )) | undefined; - testUrl: string | undefined; userDeclaration: | { isUser: boolean; @@ -108,7 +106,7 @@ export namespace State { organizations: string[]; prerogatives: OmitFromExisting< Prerogatives, - "isInstallableOnUserComputer" | "isTestable" | "isAvailableAsMobileApp" + "isInstallableOnUserComputer" | "isAvailableAsMobileApp" >; softwareType: ApiTypes.SoftwareType; search: string; diff --git a/web/src/core/usecases/softwareCatalog/thunks.ts b/web/src/core/usecases/softwareCatalog/thunks.ts index 9d27de50..292173a4 100644 --- a/web/src/core/usecases/softwareCatalog/thunks.ts +++ b/web/src/core/usecases/softwareCatalog/thunks.ts @@ -220,7 +220,6 @@ function apiSoftwareToInternalSoftware(params: { softwareDescription, latestVersion, parentWikidataSoftware, - testUrl, addedTime, updateTime, applicationCategories, @@ -300,7 +299,6 @@ function apiSoftwareToInternalSoftware(params: { userCount: Object.values(userAndReferentCountByOrganization) .map(({ userCount }) => userCount) .reduce((prev, curr) => prev + curr, 0), - testUrl, addedTime, updateTime, applicationCategories, diff --git a/web/src/core/usecases/softwareDetails/state.ts b/web/src/core/usecases/softwareDetails/state.ts index fc4847ef..7fc57ec1 100644 --- a/web/src/core/usecases/softwareDetails/state.ts +++ b/web/src/core/usecases/softwareDetails/state.ts @@ -74,7 +74,6 @@ export namespace State { prerogatives: Record; userCount: number; referentCount: number; - testUrl: string | undefined; instances: | { id: number; diff --git a/web/src/core/usecases/softwareDetails/thunks.ts b/web/src/core/usecases/softwareDetails/thunks.ts index 25c13fa9..66d023a0 100644 --- a/web/src/core/usecases/softwareDetails/thunks.ts +++ b/web/src/core/usecases/softwareDetails/thunks.ts @@ -178,7 +178,6 @@ function apiSoftwareToSoftware(params: { softwareDescription, latestVersion, parentWikidataSoftware: parentWikidataSoftware_api, - testUrl, addedTime, dereferencing, prerogatives, @@ -320,7 +319,6 @@ function apiSoftwareToSoftware(params: { }), license, prerogatives: { - isTestable: testUrl !== undefined, isInstallableOnUserComputer: softwareType.type === "stack" ? undefined @@ -333,7 +331,6 @@ function apiSoftwareToSoftware(params: { doRespectRgaa: prerogatives.doRespectRgaa ?? undefined }, comptoirDuLibreServiceProviderCount, - testUrl, versionMin, programmingLanguages, keywords, diff --git a/web/src/stories/pages/softwareCatalog/SoftwareCatalogCard.stories.tsx b/web/src/stories/pages/softwareCatalog/SoftwareCatalogCard.stories.tsx index 92563668..a28daa28 100644 --- a/web/src/stories/pages/softwareCatalog/SoftwareCatalogCard.stories.tsx +++ b/web/src/stories/pages/softwareCatalog/SoftwareCatalogCard.stories.tsx @@ -33,7 +33,6 @@ export const VueDefault = getStory({ semVer: "25.0.2", publicationTime: 1669985280 }, - testUrl: undefined, prerogatives: { isFromFrenchPublicServices: true, isPresentInSupportContract: true, @@ -66,7 +65,6 @@ export const VueTooLongDescription = getStory({ semVer: "25.0.2", publicationTime: 1669985280 }, - testUrl: undefined, prerogatives: { isFromFrenchPublicServices: true, isPresentInSupportContract: true, diff --git a/web/src/ui/i18n/sill_en.json b/web/src/ui/i18n/sill_en.json index e8391303..523c9415 100644 --- a/web/src/ui/i18n/sill_en.json +++ b/web/src/ui/i18n/sill_en.json @@ -190,7 +190,6 @@ "isFromFrenchPublicServices": "Is from French public services", "doRespectRgaa": "Is compliant with RGAA rules", "isPresentInSupportContract": "Comes with possible support", - "isTestable": "Is testable", "organization filter hint": "Only show software that have at least one referent from a given organization", "linux": "GNU/Linux", "mac": "MacOS", diff --git a/web/src/ui/i18n/sill_fr.json b/web/src/ui/i18n/sill_fr.json index 5a38be10..f0f5abc7 100644 --- a/web/src/ui/i18n/sill_fr.json +++ b/web/src/ui/i18n/sill_fr.json @@ -192,7 +192,6 @@ "isFromFrenchPublicServices": "Développé par le service public", "doRespectRgaa": "Respecte les normes RGAA", "isPresentInSupportContract": "Présent dans le marché de support", - "isTestable": "Est essayable", "organization filter hint": "Afficher uniquement les logiciels ayant au mois référent dans une organisation donnée", "linux": "GNU/Linux", "mac": "MacOS", diff --git a/web/src/ui/pages/softwareCatalog/SoftwareCatalogCard.tsx b/web/src/ui/pages/softwareCatalog/SoftwareCatalogCard.tsx index 5be90b6b..977145e8 100644 --- a/web/src/ui/pages/softwareCatalog/SoftwareCatalogCard.tsx +++ b/web/src/ui/pages/softwareCatalog/SoftwareCatalogCard.tsx @@ -31,7 +31,6 @@ export type Props = { referentCount: number; softwareUsersAndReferentsLink: Link; declareFormLink: Link; - testUrl?: string; softwareDetailsLink: Link; searchHighlight: | { @@ -60,7 +59,6 @@ export const SoftwareCatalogCard = memo((props: Props) => { softwareUsersAndReferentsLink, softwareDetailsLink, declareFormLink, - testUrl, searchHighlight, userDeclaration, ...rest diff --git a/web/src/ui/pages/softwareCatalog/SoftwareCatalogSearch.tsx b/web/src/ui/pages/softwareCatalog/SoftwareCatalogSearch.tsx index 7f049b80..12f716b7 100644 --- a/web/src/ui/pages/softwareCatalog/SoftwareCatalogSearch.tsx +++ b/web/src/ui/pages/softwareCatalog/SoftwareCatalogSearch.tsx @@ -336,10 +336,6 @@ export function SoftwareCatalogSearch(props: Props) { return `${t( "softwareCatalogSearch.isInstallableOnUserComputer" )} (${softwareCount})`; - case "isTestable": - return `${t( - "softwareCatalogSearch.isTestable" - )} (${softwareCount})`; case "isPresentInSupportContract": return `${t( "softwareCatalogSearch.isPresentInSupportContract" diff --git a/web/src/ui/pages/softwareCatalog/route.ts b/web/src/ui/pages/softwareCatalog/route.ts index 87f0f16f..223a7280 100644 --- a/web/src/ui/pages/softwareCatalog/route.ts +++ b/web/src/ui/pages/softwareCatalog/route.ts @@ -67,8 +67,7 @@ export const routeDefs = { "isPresentInSupportContract", "isFromFrenchPublicServices", "doRespectRgaa", - "isInstallableOnUserComputer", - "isTestable" + "isInstallableOnUserComputer" ] as const) ); diff --git a/web/src/ui/pages/softwareDetails/AlikeSoftwareTab.tsx b/web/src/ui/pages/softwareDetails/AlikeSoftwareTab.tsx index 4c0ccc7d..4f0d5a6b 100644 --- a/web/src/ui/pages/softwareDetails/AlikeSoftwareTab.tsx +++ b/web/src/ui/pages/softwareDetails/AlikeSoftwareTab.tsx @@ -65,7 +65,6 @@ export const SimilarSoftwareTab = (props: Props) => { softwareDescription, userCount, referentCount, - testUrl, prerogatives, userDeclaration } = software; @@ -91,7 +90,6 @@ export const SimilarSoftwareTab = (props: Props) => { latestVersion={latestVersion} softwareDescription={softwareDescription} prerogatives={prerogatives} - testUrl={testUrl} userCount={userCount} referentCount={referentCount} declareFormLink={declarationForm}