@tekkare/romulus 0.1.254 → 0.1.256

package/layer/app/oip-patients/vaccineLabels.ts

@@ -0,0 +1,180 @@
+/**
+ * Libelles des vocabulaires de l'index des cas apres vaccination.
+ *
+ * Les listes fermees viennent du pipeline (ai-pipelines, backend/app/vaccine.py) :
+ * gravite, evolution, avis des auteurs, dose suivante, type de cas, delai. Les
+ * cles de produit et d'agent sont derivees du nom ecrit dans l'article ; une
+ * cle que ce module ne connait pas s'affiche mise en forme, jamais vide.
+ */
+import type { PatientLang } from "./labels";
+
+type Labels = Record<string, { fr: string; en: string }>;
+
+/** `sars_cov_2` → « Sars cov 2 » : le dernier recours, pour une cle inconnue. */
+function prettify(value: string): string {
+  return value.replace(/_/g, " ").replace(/^\w/, (c) => c.toUpperCase());
+}
+
+/** Le libelle d'une valeur, ou la valeur mise en forme quand le vocabulaire ne la connait pas. */
+export function vaccineLabelOf(labels: Labels, value: string | number | null | undefined, lang: PatientLang): string {
+  if (value === null || value === undefined || value === "") return "";
+  const key = String(value);
+  return labels[key]?.[lang] ?? prettify(key);
+}
+
+export const SERIOUSNESS_LABELS: Labels = {
+  death: { fr: "Décès", en: "Died" },
+  life_threatening: { fr: "Pronostic vital engagé", en: "Life-threatening" },
+  hospitalisation: { fr: "Hospitalisation", en: "Admitted to hospital" },
+  disability: { fr: "Séquelle invalidante", en: "Lasting disability" },
+  medically_important: { fr: "Soins médicaux nécessaires", en: "Needed medical care" },
+  not_serious: { fr: "Non grave", en: "Not serious" },
+};
+
+/** Les gravites qui font un cas « grave » au sens de la pharmacovigilance. */
+export const SERIOUS_KEYS = ["death", "life_threatening", "hospitalisation", "disability"];
+
+export const EVENT_OUTCOME_LABELS: Labels = {
+  recovered: { fr: "Guéri", en: "Recovered" },
+  recovering: { fr: "En voie de guérison", en: "Recovering" },
+  sequelae: { fr: "Guéri avec séquelles", en: "Recovered with after-effects" },
+  not_recovered: { fr: "Non guéri", en: "Not recovered" },
+  fatal: { fr: "Décès", en: "Died" },
+  unknown: { fr: "Non précisé", en: "Not reported" },
+};
+
+export const CAUSALITY_LABELS: Labels = {
+  certain: { fr: "Lien certain", en: "Certain link" },
+  probable: { fr: "Lien probable", en: "Probable link" },
+  possible: { fr: "Lien possible", en: "Possible link" },
+  unlikely: { fr: "Lien peu probable", en: "Unlikely link" },
+  temporal_only: { fr: "Chronologie seule, sans conclusion", en: "Timing only, no causal claim" },
+  not_assessed: { fr: "Non discuté", en: "Not discussed" },
+};
+
+export const RECHALLENGE_LABELS: Labels = {
+  re_vaccinated_no_event: { fr: "Dose suivante reçue, sans récidive", en: "Next dose given, no problem" },
+  re_vaccinated_recurrence: { fr: "Dose suivante reçue, récidive", en: "Next dose given, it happened again" },
+  not_re_vaccinated: { fr: "Pas de dose suivante", en: "No further dose" },
+  advised_against: { fr: "Doses suivantes déconseillées", en: "Further doses advised against" },
+  unknown: { fr: "Non précisé", en: "Not reported" },
+};
+
+export const EVENT_CATEGORY_LABELS: Labels = {
+  adverse_event: { fr: "Événement après vaccination", en: "Event after vaccination" },
+  breakthrough_infection: { fr: "Infection malgré la vaccination", en: "Infection despite vaccination" },
+  vaccine_failure: { fr: "Échec de protection", en: "Vaccine did not protect" },
+  vaccination_in_special_population: { fr: "Vaccination en situation particulière", en: "Vaccination in a special situation" },
+  not_vaccine_related: { fr: "Sans lien avec un vaccin", en: "Not about a vaccine" },
+};
+
+/** Dans l'ordre du temps : la facette les range ainsi, pas par effectif. */
+export const ONSET_BAND_LABELS: Labels = {
+  same_day: { fr: "Le jour même", en: "Same day" },
+  within_week: { fr: "Dans la semaine", en: "Within a week" },
+  within_month: { fr: "1 à 4 semaines", en: "1 to 4 weeks" },
+  within_3_months: { fr: "1 à 3 mois", en: "1 to 3 months" },
+  later: { fr: "Plus de 3 mois", en: "More than 3 months" },
+  unknown: { fr: "Non précisé", en: "Not stated" },
+};
+export const ONSET_BAND_ORDER = Object.keys(ONSET_BAND_LABELS);
+
+export const PLATFORM_LABELS: Labels = {
+  mrna: { fr: "ARN messager", en: "mRNA" },
+  "viral vector": { fr: "Vecteur viral", en: "Viral vector" },
+  inactivated: { fr: "Inactivé", en: "Inactivated" },
+  "live attenuated": { fr: "Vivant atténué", en: "Live attenuated" },
+  subunit: { fr: "Sous-unitaire", en: "Subunit" },
+  toxoid: { fr: "Anatoxine", en: "Toxoid" },
+  conjugate: { fr: "Conjugué", en: "Conjugate" },
+  polysaccharide: { fr: "Polysaccharidique", en: "Polysaccharide" },
+};
+
+export const PATHOGEN_LABELS: Labels = {
+  sars_cov_2: { fr: "Covid-19 (SARS-CoV-2)", en: "Covid-19 (SARS-CoV-2)" },
+  varicella_zoster: { fr: "Varicelle, zona", en: "Chickenpox, shingles" },
+  hpv: { fr: "Papillomavirus (HPV)", en: "Papillomavirus (HPV)" },
+  tuberculosis: { fr: "Tuberculose", en: "Tuberculosis" },
+  measles: { fr: "Rougeole", en: "Measles" },
+  yellow_fever: { fr: "Fièvre jaune", en: "Yellow fever" },
+  rabies: { fr: "Rage", en: "Rabies" },
+  influenza: { fr: "Grippe", en: "Influenza" },
+  pneumococcus: { fr: "Pneumocoque", en: "Pneumococcus" },
+  meningococcus: { fr: "Méningocoque", en: "Meningococcus" },
+  hepatitis_b: { fr: "Hépatite B", en: "Hepatitis B" },
+  hepatitis_a: { fr: "Hépatite A", en: "Hepatitis A" },
+  tetanus: { fr: "Tétanos, diphtérie, coqueluche", en: "Tetanus, diphtheria, pertussis" },
+  rotavirus: { fr: "Rotavirus", en: "Rotavirus" },
+  rsv: { fr: "Virus respiratoire syncytial (VRS)", en: "Respiratory syncytial virus (RSV)" },
+  dengue: { fr: "Dengue", en: "Dengue" },
+  japanese_encephalitis: { fr: "Encéphalite japonaise", en: "Japanese encephalitis" },
+  typhoid: { fr: "Typhoïde", en: "Typhoid" },
+  polio: { fr: "Poliomyélite", en: "Polio" },
+  mpox: { fr: "Mpox, variole", en: "Mpox, smallpox" },
+  ebola: { fr: "Ebola", en: "Ebola" },
+  tick_borne_encephalitis: { fr: "Encéphalite à tiques", en: "Tick-borne encephalitis" },
+  rubella: { fr: "Rubéole", en: "Rubella" },
+  mumps: { fr: "Oreillons", en: "Mumps" },
+  cholera: { fr: "Choléra", en: "Cholera" },
+};
+
+export const PRODUCT_LABELS: Labels = {
+  comirnaty: { fr: "Comirnaty (Pfizer-BioNTech)", en: "Comirnaty (Pfizer-BioNTech)" },
+  spikevax: { fr: "Spikevax (Moderna)", en: "Spikevax (Moderna)" },
+  vaxzevria: { fr: "Vaxzevria (AstraZeneca)", en: "Vaxzevria (AstraZeneca)" },
+  jcovden: { fr: "Jcovden (Janssen)", en: "Jcovden (Janssen)" },
+  nuvaxovid: { fr: "Nuvaxovid (Novavax)", en: "Nuvaxovid (Novavax)" },
+  coronavac: { fr: "CoronaVac (Sinovac)", en: "CoronaVac (Sinovac)" },
+  bbibp_corv: { fr: "BBIBP-CorV (Sinopharm)", en: "BBIBP-CorV (Sinopharm)" },
+  covaxin: { fr: "Covaxin", en: "Covaxin" },
+  convidecia: { fr: "Convidecia (CanSino)", en: "Convidecia (CanSino)" },
+  sputnik_v: { fr: "Spoutnik V", en: "Sputnik V" },
+  other_covid: { fr: "Autre vaccin Covid-19", en: "Other Covid-19 vaccine" },
+  unspecified_covid: { fr: "Vaccin Covid-19 non précisé", en: "Unspecified Covid-19 vaccine" },
+  shingrix: { fr: "Shingrix", en: "Shingrix" },
+  zostavax: { fr: "Zostavax", en: "Zostavax" },
+  varicella: { fr: "Varicelle", en: "Varicella" },
+  hpv: { fr: "HPV", en: "HPV" },
+  bcg: { fr: "BCG", en: "BCG" },
+  mmr: { fr: "ROR", en: "MMR" },
+  measles: { fr: "Rougeole", en: "Measles" },
+  yellow_fever: { fr: "Fièvre jaune", en: "Yellow fever" },
+  rabies: { fr: "Rage", en: "Rabies" },
+  influenza: { fr: "Grippe", en: "Influenza" },
+  pneumococcal: { fr: "Pneumocoque", en: "Pneumococcal" },
+  meningococcal: { fr: "Méningocoque", en: "Meningococcal" },
+  hepatitis_b: { fr: "Hépatite B", en: "Hepatitis B" },
+  hepatitis_a: { fr: "Hépatite A", en: "Hepatitis A" },
+  dtp: { fr: "Diphtérie, tétanos, coqueluche", en: "Diphtheria, tetanus, pertussis" },
+  rotavirus: { fr: "Rotavirus", en: "Rotavirus" },
+  rsv: { fr: "VRS", en: "RSV" },
+  dengue: { fr: "Dengue", en: "Dengue" },
+  japanese_encephalitis: { fr: "Encéphalite japonaise", en: "Japanese encephalitis" },
+  typhoid: { fr: "Typhoïde", en: "Typhoid" },
+  polio: { fr: "Poliomyélite", en: "Polio" },
+  mpox_smallpox: { fr: "Mpox, variole", en: "Mpox, smallpox" },
+  ebola: { fr: "Ebola", en: "Ebola" },
+  tbe: { fr: "Encéphalite à tiques", en: "Tick-borne encephalitis" },
+  rubella: { fr: "Rubéole", en: "Rubella" },
+  mumps: { fr: "Oreillons", en: "Mumps" },
+  cholera: { fr: "Choléra", en: "Cholera" },
+};
+
+/** Ce qui retient une fiche d'etre comptee sans relecture, en clair. */
+export const VACCINE_FLAG_LABELS: Labels = {
+  exposure_missing: { fr: "L'article ne nomme aucun vaccin pour cette personne", en: "The paper names no vaccine for this person" },
+  exposure_unsupported: { fr: "Le vaccin indiqué ne figure pas dans le texte de l'article", en: "The vaccine named was not found in the paper's own text" },
+  event_missing: { fr: "Aucun événement clair n'a été trouvé", en: "No clear event was found" },
+  onset_before_vaccination: { fr: "Les troubles ont commencé avant la dose", en: "The problem started before the dose" },
+  not_vaccine_related: { fr: "Le cas ne concerne pas un vaccin", en: "The report is not about a vaccine" },
+  block_failed: { fr: "Les informations sur le vaccin n'ont pas pu être lues", en: "The vaccine details could not be read" },
+  delay_not_from_dose: { fr: "Le délai est compté depuis un traitement ou un événement, pas depuis la dose", en: "The delay is counted from a treatment or event, not from the dose" },
+  delay_implausible: { fr: "Le délai dépasse dix ans : probablement un âge plutôt qu'un délai", en: "The delay is over ten years, more likely an age than a delay" },
+  reported_elsewhere: { fr: "Cas déjà publié ailleurs : la personne peut être comptée deux fois", en: "Case published elsewhere, so the person may be counted twice" },
+};
+
+export const CHECK_LABELS: Labels = {
+  all: { fr: "Toutes les fiches", en: "All records" },
+  clean: { fr: "Sans contrôle ouvert", en: "No open check" },
+  flagged: { fr: "À vérifier", en: "Needing a check" },
+};

package/layer/app/oip-science/composables/useEuct.ts

@@ -137,7 +137,7 @@ export default function useEuct() {
       };
 
       queryCustomElastic({
-        index: 'ope_block374_clinical_trials_euct',
+        index: indexConfig.euct.index,
         customQuery: customQuery ? customQuery : query,
       })
         .then((res) => {

package/layer/app/oip-science/composables/useOipElastic.ts

@@ -5,6 +5,7 @@
 // de recherche) n'a pas de sens ici : les resultats reviennent a l'appelant.
 
 import { instrumentSearchClause, searchMatchOf } from "./useOipSearchExplain";
+import indexConfig from "../indexConfig.json";
 
 export default function useOipElastic() {
   const config = useRuntimeConfig();
@@ -459,8 +460,10 @@ export default function useOipElastic() {
     };
 
     // FETCH. FAS chose the aggregation shape from the current route (/pubmed,
-    // /euct); a layer view has no route of its own, the index says the same.
-    const currentPath = index.includes('pubmed') ? '/pubmed' : index.includes('euct') ? '/euct' : '';
+    // /euct); a layer view has no route of its own, the index says the same
+    // (indexes are Directus ids, resolved by the proxy).
+    const refs = String(index).split(',');
+    const currentPath = refs.includes(indexConfig.pubmed.index) ? '/pubmed' : refs.includes(indexConfig.euct.index) ? '/euct' : '';
     const res: any = await esFetch(cluster, index, query);
 
     if (!isDisposed && res) {

package/layer/app/oip-science/composables/usePubmed.ts

@@ -182,7 +182,7 @@ export default function usePubmed() {
   const lastUpdatedData = async () => {
     let lastUpdate = null;
     await queryCustomElastic({
-      index: 'oip-discovery-pubmed',
+      index: indexConfig.pubmed.index,
       customQuery: {
         from: 0,
 
@@ -241,7 +241,7 @@ export default function usePubmed() {
       };
 
       queryCustomElastic({
-        index: 'oip-discovery-pubmed',
+        index: indexConfig.pubmed.index,
         cluster: 'pubmed',
         customQuery: customQuery ? customQuery : query,
       })

package/layer/app/oip-science/indexConfig.json

@@ -1,6 +1,6 @@
 {
   "globalCT": {
-    "index": "oip_datamart_clinicaltrials_prod",
+    "index": "9ec0c673-7da4-4ead-8359-2d23b7b1318a",
     "nameList": "/ctgov/&ListName=globalCTList",
     "keyName": "globalCTList",
     "cluster": "pubmed",
@@ -68,7 +68,6 @@
           "Keywords": "keywords.keyword_name"
         }
       },
-
       "Arm and Intervention": {
         "type": "field",
         "values": {
@@ -78,7 +77,9 @@
       },
       "Genes": {
         "type": "field",
-        "values": { "Genes": "genomics.symbol" }
+        "values": {
+          "Genes": "genomics.symbol"
+        }
       },
       "Rare Diseases": {
         "type": "nested_field",
@@ -90,7 +91,7 @@
     }
   },
   "globalCTInvestigators": {
-    "index": "oip_datamart_clinical_trials_investigators_kol",
+    "index": "de97c889-a844-430d-ad39-b42812787f21",
     "nameList": "/ctgov/investigators&ListName=globalCTInvestigatorList",
     "keyName": "globalCTInvestigatorList",
     "cluster": "pubmed",
@@ -115,7 +116,7 @@
     ]
   },
   "globalCTCenters": {
-    "index": "oip_datamart_clinical_trials_centers_kcl",
+    "index": "b1e521b1-8722-406b-88e5-1c49d9cb7fa8",
     "nameList": "/ctgov/centers&ListName=globalCTCenterList",
     "keyName": "globalCTCenterList",
     "cluster": "pubmed",
@@ -142,7 +143,7 @@
     ]
   },
   "euct": {
-    "index": "ope_block374_clinical_trials_euct",
+    "index": "c332f362-2311-4025-b5de-327f81913f7d",
     "nameList": "/euct/&ListName=euCTList",
     "keyName": "euCTList",
     "cluster": "pubmed",
@@ -234,7 +235,7 @@
     }
   },
   "euctInvestigators": {
-    "index": "ope_block374_clinical_trials_eu_investigators",
+    "index": "fb8896df-8798-4bab-8219-2462d948a7a0",
     "nameList": "/euct/investigators&ListName=euroCTInvestigatorList",
     "keyName": "euroCTInvestigatorList",
     "cluster": "pubmed",
@@ -247,7 +248,6 @@
       "records.therapeutic_area",
       "records.diseases.icd10.combined_label",
       "records.diseases.section.label"
-      
     ],
     "nestedFields": [],
     "SuggFields": [
@@ -262,7 +262,7 @@
     ]
   },
   "euctCenters": {
-    "index": "ope_block374_clinical_trials_eu_kcl",
+    "index": "7f2e9e35-4bbd-4cbd-afb3-bab35999e17f",
     "nameList": "/euct/centers&ListName=euroCTCenterList",
     "keyName": "euroCTCenterList",
     "cluster": "pubmed",
@@ -295,7 +295,7 @@
     ]
   },
   "gene": {
-    "index": "ope_block410_genomics",
+    "index": "78743dbc-1c7d-4f34-8222-026a78d4e8b1",
     "nameList": "/omics/genes&ListName=omicsList",
     "keyName": "omicsList",
     "cluster": "pubmed",
@@ -366,7 +366,7 @@
     }
   },
   "molecule": {
-    "index": "oip-discovery-molecules",
+    "index": "64716d7e-eb95-492b-b91d-56c68f4f8911",
     "nameList": "/omics/molecules&ListName=moleculesList",
     "keyName": "moleculesList",
     "cluster": "pubmed",
@@ -414,7 +414,7 @@
     }
   },
   "pubmed": {
-    "index": "oip-discovery-pubmed",
+    "index": "cf7919cf-3980-4cf1-b192-f4e3b7d52a19",
     "nameList": "/pubmed&ListName=pubMedList",
     "keyName": "pubMedList",
     "cluster": "pubmed",
@@ -533,7 +533,7 @@
     }
   },
   "disease": {
-    "index": "oip-discovery-diseases",
+    "index": "40a95d53-f41b-4370-8745-0217684fb5b4",
     "nameList": "/omics/diseases&ListName=diseasesList",
     "keyName": "diseasesList",
     "cluster": "pubmed",
@@ -545,7 +545,9 @@
       "search_text",
       "concat_disease_name_icd10_code"
     ],
-    "nestedFields": ["icd10.code"],
+    "nestedFields": [
+      "icd10.code"
+    ],
     "SuggFields": [
       "symbol",
       "synonym",
@@ -587,11 +589,16 @@
     }
   },
   "patent": {
-    "index": "ope__patent__tekkare",
+    "index": "4587721d-538a-458d-9eb1-fc24911f366d",
     "nameList": "/patents&ListName=patentList",
     "keyName": "patentList",
     "cluster": "pubmed",
-    "fields": ["title", "abstract", "publication_id", "family_id"],
+    "fields": [
+      "title",
+      "abstract",
+      "publication_id",
+      "family_id"
+    ],
     "nestedFields": [
       "rare_diseases.concat_disease_name_orpha_code",
       "rare_diseases.disease_synonyms",
@@ -623,7 +630,6 @@
           "Abstract": "abstract"
         }
       },
-
       "Classification": {
         "type": "nested_field",
         "values": {
@@ -654,7 +660,7 @@
     }
   },
   "establishments": {
-    "index": "ope_block374__fr__clinical_trials__hco_directory",
+    "index": "919a60df-3447-4404-901b-2d293cfc00e1",
     "nameList": "/establishments/&ListName=establishmentList",
     "keyName": "establishmentList",
     "cluster": "pubmed",
@@ -675,31 +681,31 @@
     ]
   },
   "hcpPubmed": {
-    "index": "ope_block374__fr__clinical_trials__hcp__pubmed",
+    "index": "fb956659-f5be-4340-8b1b-07304db96ca7",
     "cluster": "pubmed"
   },
   "hcpNct": {
-    "index": "ope_block374__fr__clinical_trials__hcp__nct",
+    "index": "35f34ca6-2450-4dcf-a659-fb33140147ad",
     "cluster": "pubmed"
   },
   "hcpEuct": {
-    "index": "ope_block374__fr__clinical_trials__hcp__euct",
+    "index": "c246a516-84c7-4deb-9c0c-5afedf08ffdd",
     "cluster": "pubmed"
   },
   "hcoNct": {
-    "index": "ope_block374__fr__clinical_trials__hco__nct",
+    "index": "bb5bf512-a1c8-4805-b91a-00ae3b9caf64",
     "cluster": "pubmed"
   },
   "hcoEuct": {
-    "index": "ope_block374__fr__clinical_trials__hco__euct",
+    "index": "4efefe73-8421-48b5-8bf8-835cb1ad7e5e",
     "cluster": "pubmed"
   },
   "rpps": {
-    "index": "ope_block402_fr__hcp_physician__directory__rpps",
+    "index": "f9bcdd65-ec2a-47ad-b56d-7a59f2aa7898",
     "cluster": "pubmed"
   },
   "hcps": {
-    "index": "ope_block374__fr__clinical_trials__hcp_directory",
+    "index": "c8ad547a-6f97-4002-9853-5256308b6cff",
     "nameList": "/hcps/&ListName=hcpList",
     "keyName": "hcpList",
     "cluster": "pubmed",
@@ -718,7 +724,7 @@
     ]
   },
   "phrc": {
-    "index": "ope_block402_fr__drugs__phrc__datagouv",
+    "index": "da722bdc-3441-4358-9ab1-61c6afef3b0e",
     "nameList": "/appel-a-projet/&ListName=phrcList",
     "keyName": "phrcList",
     "cluster": "pubmed",

package/layer/app/types/oip.ts

@@ -8,6 +8,8 @@ export type OipNavItem = {
   href?: string;
   badge?: string;
   active?: boolean;
+  /** Sous-pages, sur un seul niveau : RmSidebarLeft les deplie sous l'entree. */
+  children?: OipNavItem[];
 };
 
 export type OipNavSection = {

package/layer/app/utils/oipResources.ts

@@ -16,6 +16,8 @@
 import type { RmProjectKind, RmProjectLang } from "@tekkare/romulus/utils/projects";
 import scienceIndexConfig from "../oip-science/indexConfig.json";
 import { DRUG_PROJECT_KINDS } from "../oip-drugs/kinds";
+import { OIP_PATIENT_INDEXES } from "../oip-patients/indexes";
+import { PATIENT_KIND, VACCINE_KIND } from "../oip-patients/kinds";
 
 /** Les apps qui ont des fiches a montrer, et ou les ouvrir. */
 export const OIP_RESOURCE_APPS = {
@@ -27,6 +29,10 @@ export const OIP_RESOURCE_APPS = {
     name: "France Drugs",
     url: "https://france-drugs.app.tekkare.com",
   },
+  ww_oip_patients: {
+    name: "OIP Case Atlas",
+    url: "https://global-case-atlas.app.tekkare.com",
+  },
 } as const;
 
 export type OipResourceApp = keyof typeof OIP_RESOURCE_APPS;
@@ -121,6 +127,28 @@ function drugsSpec(kind: RmProjectKind, view: string): OipResourceSpec {
   };
 }
 
+/**
+ * Une fiche d'OIP Case Atlas (cas de maladie rare, cas apres vaccination),
+ * lue sur le cluster `science` et montree d'un seul tenant, ses onglets
+ * compris. Elle s'adresse par son `record_id`, que le document donne.
+ */
+function patientsSpec(kind: RmProjectKind, view: string): OipResourceSpec {
+  return {
+    type: kind.type,
+    app: "ww_oip_patients",
+    cluster: "science",
+    kind,
+    routeId: (id) => id,
+    base: () => "",
+    tabs: [],
+    view,
+    detailPath: (id, tab, doc) => {
+      const path = kind.path!(doc ?? {}, id);
+      return tab && tab !== "summary" ? `${path}?tab=${encodeURIComponent(tab)}` : path;
+    },
+  };
+}
+
 /** La vue de chaque famille de fr_drugs_app (cf. useOipResourceViews). */
 const DRUG_VIEWS: Record<string, string> = {
   FrHasBrand: "drugs-brand",
@@ -159,7 +187,7 @@ export const OIP_RESOURCE_SPECS: OipResourceSpec[] = [
     type: "PubMed",
     kind: {
       type: "PubMed",
-      index: "oip-discovery-pubmed",
+      index: scienceIndexConfig.pubmed.index,
       label: { fr: "Publications", en: "Publications" },
       section: { fr: "PubMed", en: "PubMed" },
       icon: "Books",
@@ -338,6 +366,8 @@ export const OIP_RESOURCE_SPECS: OipResourceSpec[] = [
     tabs: [T.trials, T.publications],
   }),
   ...DRUG_PROJECT_KINDS.map((kind) => drugsSpec(kind, DRUG_VIEWS[kind.type]!)),
+  patientsSpec(PATIENT_KIND, "patients-patient"),
+  patientsSpec(VACCINE_KIND, "patients-vaccine"),
 ];
 
 export function oipResourceSpec(type: string): OipResourceSpec | undefined {
@@ -370,7 +400,9 @@ export const OIP_SCIENCE_INDEXES: string[] = Object.values(scienceIndexConfig as
 /** Les index que le proxy du layer accepte de lire, par cluster. */
 export function oipResourceIndexes(cluster: OipEsCluster): string[] {
   const declared = OIP_RESOURCE_SPECS.filter((spec) => spec.cluster === cluster).map((spec) => spec.kind.index);
-  return cluster === "science" ? [...new Set([...declared, ...OIP_SCIENCE_INDEXES])] : declared;
+  return cluster === "science"
+    ? [...new Set([...declared, ...OIP_SCIENCE_INDEXES, ...Object.values(OIP_PATIENT_INDEXES)])]
+    : declared;
 }
 
 /**

package/layer/nuxt.config.ts

@@ -22,12 +22,14 @@ export default defineNuxtConfig({
     compatibilityVersion: 4,
   },
   // Regles du cadre communes aux apps (bandeau de page, barre de filtres), et
-  // classes des fiches de France Augmented Science, limitees a `.oip-science`
-  // (cf. app/oip-science/science.css).
+  // classes des fiches de France Augmented Science, de fr_drugs_app et d'OIP
+  // Case Atlas, limitees a leur conteneur (`.oip-science`, `.oip-drugs`,
+  // `.oip-patients`).
   css: [
     fileURLToPath(new URL("./app/assets/oip-frame.css", import.meta.url)),
     fileURLToPath(new URL("./app/oip-science/science.css", import.meta.url)),
     fileURLToPath(new URL("./app/oip-drugs/drugs.css", import.meta.url)),
+    fileURLToPath(new URL("./app/oip-patients/patients.css", import.meta.url)),
   ],
   // Reglages serveur propres au layer. Les cles Directus (directus*Url,
   // directus*Token) restent declarees par l'app, qui les avait deja.
@@ -57,12 +59,14 @@ export default defineNuxtConfig({
     /**
      * Clusters Elasticsearch des vues de ressources (/api/oip/es) : domaine et
      * cle ApiKey. `science` porte les index de France Augmented Science
-     * (PubMed, essais), `hcp` l'annuaire, `drugs` ceux de fr_drugs_app. Une
+     * (PubMed, essais) et ceux d'OIP Case Atlas (patients), `hcp` l'annuaire, `drugs` ceux de fr_drugs_app. Une
      * app les remplit depuis ses propres variables, ou par
      * NUXT_OIP_ES_SCIENCE_DOMAIN / NUXT_OIP_ES_SCIENCE_AUTH, etc.
      */
     oipEs: {
-      science: { domain: "", auth: "" },
+      // Cas apres vaccination d'OIP Case Atlas : une autre cle sur le meme
+      // domaine. Vide : la cle principale.
+      science: { domain: "", auth: "", authVaccines: "" },
       hcp: { domain: "", auth: "" },
       // Associations et registres d'autorisation etrangers : une autre cle sur
       // le meme domaine, comme dans fr_drugs_app. Vides : la cle principale.

package/layer/server/api/oip/es.post.ts

@@ -3,6 +3,7 @@ import { requireOipSession } from "../../utils/oipAuth";
 import { findOipEsIndex, resolveOipEsIndex } from "../../utils/oipEsIndices";
 import { oipResourceIndexes, type OipEsCluster } from "../../../app/utils/oipResources";
 import { ES_INDEX } from "../../../app/oip-drugs/esIndices";
+import { OIP_PATIENT_INDEXES } from "../../../app/oip-patients/indexes";
 
 /**
  * POST /api/oip/es?cluster=&index=, servi par le layer OIP.
@@ -18,9 +19,13 @@ import { ES_INDEX } from "../../../app/oip-drugs/esIndices";
  * dans fr_drugs_app. Ses associations et ses registres d'autorisation
  * etrangers demandent une autre cle sur le meme domaine (`authAssociations`,
  * `authApprovals`) ; a defaut, la cle principale.
+ *
+ * Cluster `science` : les cas apres vaccination d'OIP Case Atlas ne se lisent
+ * pas avec la cle PubMed, mais avec une autre sur le meme domaine
+ * (`authVaccines`) ; a defaut, la cle principale.
  */
 
-type DrugsKeyGroup = "auth" | "authAssociations" | "authApprovals";
+type KeyGroup = "auth" | "authAssociations" | "authApprovals" | "authVaccines";
 
 const DRUG_IDS = new Set<string>(Object.values(ES_INDEX) as string[]);
 const ASSOCIATION_IDS = new Set<string>(
@@ -45,7 +50,7 @@ async function drugsKeyOf(ref: string): Promise<string> {
   return id && DRUG_IDS.has(id) ? id : "";
 }
 
-function drugsKeyGroup(id: string): DrugsKeyGroup {
+function drugsKeyGroup(id: string): KeyGroup {
   if (ASSOCIATION_IDS.has(id)) return "authAssociations";
   if (APPROVAL_IDS.has(id)) return "authApprovals";
   return "auth";
@@ -71,7 +76,7 @@ export default defineEventHandler(async (event) => {
   if (!index || !/^[A-Za-z0-9_.,-]+$/.test(index)) throw createError({ status: 400, message: "Invalid index" });
 
   const refs = index.split(",");
-  let authKey: DrugsKeyGroup = "auth";
+  let authKey: KeyGroup = "auth";
   if (cluster === "drugs") {
     // Une requete multi-index part avec une seule cle : ses index en relevent tous.
     const ids = await Promise.all(refs.map(drugsKeyOf));
@@ -80,8 +85,20 @@ export default defineEventHandler(async (event) => {
     if (groups.size > 1) throw createError({ status: 400, message: "Indexes require different credentials" });
     authKey = [...groups][0]!;
   } else {
+    // Les fiches designent leurs index par id Directus ; un nom (canonique ou
+    // physique) est admis s'il designe un index de la liste.
     const allowed = oipResourceIndexes(cluster as OipEsCluster);
-    if (refs.some((ref) => !allowed.includes(ref))) throw createError({ status: 403, message: "Index not allowed" });
+    const ids = await Promise.all(
+      refs.map(async (ref) => (allowed.includes(ref) ? ref : (await findOipEsIndex(ref).catch(() => undefined))?.id)),
+    );
+    if (ids.some((id) => !id || !allowed.includes(id))) throw createError({ status: 403, message: "Index not allowed" });
+    if (cluster === "science") {
+      const vaccines = (ref: string, index: number) =>
+        ref === OIP_PATIENT_INDEXES.VACCINE_PATIENTS || ids[index] === OIP_PATIENT_INDEXES.VACCINE_PATIENTS;
+      const groups = new Set(refs.map((ref, index) => (vaccines(ref, index) ? "authVaccines" : "auth")));
+      if (groups.size > 1) throw createError({ status: 400, message: "Indexes require different credentials" });
+      authKey = [...groups][0]!;
+    }
   }
 
   const auth = target[authKey] || target.auth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tekkare/romulus",
-  "version": "0.1.254",
+  "version": "0.1.256",
   "description": "Romulus Design System - Nuxt module by Tekkare",
   "license": "MIT",
   "type": "module",
@@ -19,7 +19,8 @@
     },
     "./layer": "./layer/nuxt.config.ts",
     "./layer-utils/*": "./layer/app/utils/*.ts",
-    "./layer-composables/*": "./layer/app/composables/*.ts"
+    "./layer-composables/*": "./layer/app/composables/*.ts",
+    "./layer-patients/*": "./layer/app/oip-patients/*.ts"
   },
   "main": "./dist/module.cjs",
   "module": "./dist/module.mjs",
@@ -48,6 +49,8 @@
     "@tiptap/starter-kit": "^3.31.4",
     "@tiptap/suggestion": "^3.31.4",
     "@tiptap/vue-3": "^3.31.4",
+    "cytoscape": "^3.33.1",
+    "cytoscape-fcose": "^2.2.0",
     "echarts": "^5.6.0",
     "html2canvas-pro": "^1.6.7",
     "jspdf": "^4.2.0",