From fa7150b38fff901408cb1a3068e39e4260af96c1 Mon Sep 17 00:00:00 2001
From: connoratrug <47183404+connoratrug@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:16:42 +0200
Subject: [PATCH] fix: catalogue subpopulation types and query (#4282)

 fix: catalogue subpopulation types and query

- use correct queryt in vue component
- fix ontology type in type generator
- use generated types in catalogue app ( only subpopulation at this moment )
- update vue component with type fixes
---
 apps/nuxt3-ssr/interfaces/catalogue.ts        | 1052 +++++++++++++++++
 apps/nuxt3-ssr/interfaces/types.ts            |    3 +-
 .../subpopulations/[subpopulation].vue        |   61 +-
 .../molgenis/emx2/typescript/Generator.java   |    4 +-
 .../src/test/resources/expected-types.ts      |    4 +-
 .../test/resources/expected-typetest-types.ts |    4 +-
 6 files changed, 1096 insertions(+), 32 deletions(-)
 create mode 100644 apps/nuxt3-ssr/interfaces/catalogue.ts

diff --git a/apps/nuxt3-ssr/interfaces/catalogue.ts b/apps/nuxt3-ssr/interfaces/catalogue.ts
new file mode 100644
index 0000000000..a8ccbac4b4
--- /dev/null
+++ b/apps/nuxt3-ssr/interfaces/catalogue.ts
@@ -0,0 +1,1052 @@
+// Generated (on: 2024-09-30T14:18:30.812974) from Generator.java for schema: catalogue
+
+export interface IFile {
+  id?: string;
+  size?: number;
+  extension?: string;
+  url?: string;
+}
+
+export interface ITreeNode {
+  name: string;
+  children?: ITreeNode[];
+  parent?: {
+    name: string;
+  };
+}
+
+export interface IOntologyNode extends ITreeNode {
+  code?: string;
+  definition?: string;
+  ontologyTermURI?: string;
+  order?: number;
+}
+
+export interface IAgeGroups {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IAgeGroups;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IAgeGroups[];
+}
+
+export interface IAreasOfInformationCohorts {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IAreasOfInformationCohorts;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IAreasOfInformationCohorts[];
+}
+
+export interface IAreasOfInformationDs {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IAreasOfInformationDs;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IAreasOfInformationDs[];
+}
+
+export interface IBiospecimens {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IBiospecimens;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IBiospecimens[];
+}
+
+export interface ICatalogueTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ICatalogueTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ICatalogueTypes[];
+}
+
+export interface ICatalogues {
+  name: string;
+  network: IResources;
+  type: IOntologyNode;
+  description: string;
+  publisher?: string;
+}
+
+export interface IClinicalStudyTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IClinicalStudyTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IClinicalStudyTypes[];
+}
+
+export interface ICohortCollectionTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ICohortCollectionTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ICohortCollectionTypes[];
+}
+
+export interface ICohortDesigns {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ICohortDesigns;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ICohortDesigns[];
+}
+
+export interface ICohortStudyTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ICohortStudyTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ICohortStudyTypes[];
+}
+
+export interface ICollectionEvents {
+  resource: IResources;
+  name: string;
+  description?: string;
+  subpopulations?: ISubpopulations[];
+  startDate?: string;
+  endDate?: string;
+  ageGroups?: IOntologyNode[];
+  numberOfParticipants?: number;
+  areasOfInformation?: IOntologyNode[];
+  dataCategories?: IOntologyNode[];
+  sampleCategories?: IOntologyNode[];
+  standardizedTools?: IOntologyNode[];
+  standardizedToolsOther?: string;
+  coreVariables?: string[];
+}
+
+export interface IContacts {
+  resource: IResources;
+  role?: IOntologyNode[];
+  roleDescription?: string;
+  firstName: string;
+  lastName: string;
+  displayName: string;
+  prefix?: string;
+  initials?: string;
+  title?: IOntologyNode;
+  organisation?: IOrganisations;
+  email?: string;
+  orcid?: string;
+  homepage?: string;
+  photo?: IFile;
+  expertise?: string;
+}
+
+export interface IContributionTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IContributionTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IContributionTypes[];
+}
+
+export interface ICountries {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ICountries;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ICountries[];
+}
+
+export interface IDataAccessConditions {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDataAccessConditions;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDataAccessConditions[];
+}
+
+export interface IDataCategories {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDataCategories;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDataCategories[];
+}
+
+export interface IDataUseConditions {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDataUseConditions;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDataUseConditions[];
+}
+
+export interface IDatasetMappings {
+  source: IResources;
+  sourceDataset: IDatasets;
+  target: IResources;
+  targetDataset: IDatasets;
+  order?: number;
+  description?: string;
+  syntax?: string;
+}
+
+export interface IDatasetTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDatasetTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDatasetTypes[];
+}
+
+export interface IDatasets {
+  resource: IResources;
+  name: string;
+  label?: string;
+  datasetType?: IOntologyNode[];
+  unitOfObservation?: IOntologyNode;
+  keywords?: IOntologyNode[];
+  description?: string;
+  numberOfRows?: number;
+  mappedTo?: IDatasetMappings[];
+  mappedFrom?: IDatasetMappings[];
+  sinceVersion?: string;
+  untilVersion?: string;
+}
+
+export interface IDatasourceTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDatasourceTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDatasourceTypes[];
+}
+
+export interface IDiseases {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDiseases;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDiseases[];
+}
+
+export interface IDocumentTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IDocumentTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IDocumentTypes[];
+}
+
+export interface IDocumentation {
+  resource: IResources;
+  name: string;
+  type?: IOntologyNode;
+  description?: string;
+  url?: string;
+  file?: IFile;
+}
+
+export interface IExternalIdentifierTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IExternalIdentifierTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IExternalIdentifierTypes[];
+}
+
+export interface IExternalIdentifiers {
+  resource: IResources;
+  identifier: string;
+  externalIdentifierType?: IOntologyNode;
+  externalIdentifierTypeOther?: string;
+}
+
+export interface IFormats {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IFormats;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IFormats[];
+}
+
+export interface IFundingTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IFundingTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IFundingTypes[];
+}
+
+export interface IICDOMorphologies {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IICDOMorphologies;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IICDOMorphologies[];
+}
+
+export interface IICDOTopologies {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IICDOTopologies;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IICDOTopologies[];
+}
+
+export interface IInclusionCriteria {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IInclusionCriteria;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IInclusionCriteria[];
+}
+
+export interface IInformedConsentRequired {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IInformedConsentRequired;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IInformedConsentRequired[];
+}
+
+export interface IInformedConsentTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IInformedConsentTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IInformedConsentTypes[];
+}
+
+export interface IKeywords {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IKeywords;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IKeywords[];
+}
+
+export interface ILanguages {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ILanguages;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ILanguages[];
+}
+
+export interface ILinkageStrategies {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ILinkageStrategies;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ILinkageStrategies[];
+}
+
+export interface ILinkages {
+  resource: IResources;
+  linkedResource: IResources;
+  otherLinkedResource?: string;
+  linkageStrategy?: IOntologyNode;
+  linkageVariable?: string;
+  linkageVariableUnique?: boolean;
+  linkageCompleteness?: string;
+  preLinked?: boolean;
+}
+
+export interface IMappingStatus {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IMappingStatus;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IMappingStatus[];
+}
+
+export interface IMedDRA {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IMedDRA;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IMedDRA[];
+}
+
+export interface INetworkTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: INetworkTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: INetworkTypes[];
+}
+
+export interface IObservationTargets {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IObservationTargets;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IObservationTargets[];
+}
+
+export interface IOrganisationRoles {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IOrganisationRoles;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IOrganisationRoles[];
+}
+
+export interface IOrganisations {
+  resource: IResources;
+  id: string;
+  pid?: string;
+  name: string;
+  acronym?: string;
+  logo?: IFile;
+  country?: IOntologyNode[];
+  website?: string;
+  role?: IOntologyNode[];
+  isLeadOrganisation?: boolean;
+}
+
+export interface IPopulationEntry {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IPopulationEntry;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IPopulationEntry[];
+}
+
+export interface IPopulationExit {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IPopulationExit;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IPopulationExit[];
+}
+
+export interface IPopulationOfInterest {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IPopulationOfInterest;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IPopulationOfInterest[];
+}
+
+export interface IPublications {
+  resource: IResources;
+  doi: string;
+  title: string;
+  isDesignPublication?: boolean;
+  reference?: string;
+}
+
+export interface IRefreshPeriods {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IRefreshPeriods;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IRefreshPeriods[];
+}
+
+export interface IRegions {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IRegions;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IRegions[];
+}
+
+export interface IReleaseTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IReleaseTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IReleaseTypes[];
+}
+
+export interface IResourceCounts {
+  resource: IResources;
+  ageGroup: IOntologyNode;
+  populationSize?: number;
+  activeSize?: number;
+  noIndividualsWithSamples?: number;
+  meanObservationYears?: number;
+  meanYearsActive?: number;
+  medianAge?: number;
+  proportionFemale?: number;
+}
+
+export interface IResourceMappings {
+  source: IResources;
+  sourceVersion?: string;
+  target: IResources;
+  targetVersion?: string;
+  cdmsOther?: string;
+  mappingStatus?: IOntologyNode;
+  eTLFrequency?: number;
+  eTLSpecificationUrl?: string;
+  eTLSpecificationDocument?: IFile;
+}
+
+export interface IResourceTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IResourceTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IResourceTypes[];
+}
+
+export interface IResources {
+  id: string;
+  pid?: string;
+  name: string;
+  localName?: string;
+  acronym?: string;
+  type?: IOntologyNode[];
+  typeOther?: string;
+  cohortType?: IOntologyNode[];
+  clinicalStudyType?: IOntologyNode[];
+  rWDType?: IOntologyNode[];
+  networkType?: IOntologyNode[];
+  website?: string;
+  description?: string;
+  keywords?: string;
+  externalIdentifiers?: IExternalIdentifiers[];
+  dateEstablished?: string;
+  startDataCollection?: string;
+  endDataCollection?: string;
+  timeSpanDescription?: string;
+  contactEmail?: string;
+  logo?: IFile;
+  status?: IOntologyNode;
+  license?: string;
+  design?: IOntologyNode;
+  designDescription?: string;
+  designSchematic?: IFile;
+  dataCollectionType?: IOntologyNode[];
+  dataCollectionDescription?: string;
+  reasonSustained?: string;
+  unitOfObservation?: string;
+  recordTrigger?: string;
+  subpopulations?: ISubpopulations[];
+  collectionEvents?: ICollectionEvents[];
+  resources?: IResources[];
+  partOfResources?: IResources[];
+  numberOfParticipants?: number;
+  numberOfParticipantsWithSamples?: number;
+  underlyingPopulation?: string;
+  populationOfInterest?: IOntologyNode[];
+  populationOfInterestOther?: string;
+  countries?: IOntologyNode[];
+  regions?: IOntologyNode[];
+  populationAgeGroups?: IOntologyNode[];
+  inclusionCriteria?: IOntologyNode[];
+  otherInclusionCriteria?: string;
+  populationEntry?: IOntologyNode[];
+  populationEntryOther?: string;
+  populationExit?: IOntologyNode[];
+  populationExitOther?: string;
+  populationDisease?: IOntologyNode[];
+  populationOncologyTopology?: IOntologyNode[];
+  populationOncologyMorphology?: IOntologyNode[];
+  populationCoverage?: string;
+  populationNotCovered?: string;
+  counts?: IResourceCounts[];
+  peopleInvolved?: IContacts[];
+  organisationsInvolved?: IOrganisations[];
+  networksInvolved?: IResources[];
+  datasets?: IDatasets[];
+  samplesets?: ISamplesets[];
+  areasOfInformation?: IOntologyNode[];
+  areasOfInformationRwd?: IOntologyNode[];
+  qualityOfLifeOther?: string;
+  causeOfDeathCodeOther?: string;
+  indicationVocabularyOther?: string;
+  geneticDataVocabularyOther?: string;
+  careSettingOther?: string;
+  medicinalProductVocabularyOther?: string;
+  prescriptionsVocabularyOther?: string;
+  dispensingsVocabularyOther?: string;
+  proceduresVocabularyOther?: string;
+  biomarkerDataVocabularyOther?: string;
+  diagnosisMedicalEventVocabularyOther?: string;
+  dataDictionaryAvailable?: boolean;
+  diseaseDetails?: IOntologyNode[];
+  biospecimenCollected?: IOntologyNode[];
+  languages?: IOntologyNode[];
+  multipleEntries?: boolean;
+  hasIdentifier?: boolean;
+  identifierDescription?: string;
+  prelinked?: boolean;
+  linkageOptions?: string;
+  linkagePossibility?: boolean;
+  linkedResources?: ILinkages[];
+  informedConsentType?: IOntologyNode;
+  informedConsentRequired?: IOntologyNode;
+  informedConsentOther?: string;
+  dataAccessConditions?: IOntologyNode[];
+  dataUseConditions?: IOntologyNode[];
+  dataAccessConditionsDescription?: string;
+  dataAccessFee?: boolean;
+  accessIdentifiableData?: string;
+  accessIdentifiableDataRoute?: string;
+  accessSubjectDetails?: boolean;
+  accessSubjectDetailsRoute?: string;
+  accessThirdParty?: boolean;
+  accessThirdPartyConditions?: string;
+  accessNonEU?: boolean;
+  accessNonEUConditions?: string;
+  biospecimenAccess?: boolean;
+  biospecimenAccessConditions?: string;
+  governanceDetails?: string;
+  approvalForPublication?: boolean;
+  releaseType?: IOntologyNode;
+  releaseDescription?: string;
+  numberOfRecords?: number;
+  releaseFrequency?: number;
+  refreshTime?: number;
+  lagTime?: number;
+  refreshPeriod?: IOntologyNode[];
+  preservation?: boolean;
+  preservationDuration?: number;
+  standardOperatingProcedures?: boolean;
+  qualification?: boolean;
+  qualificationsDescription?: string;
+  auditPossible?: boolean;
+  completeness?: string;
+  completenessOverTime?: string;
+  completenessResults?: string;
+  qualityDescription?: string;
+  qualityOverTime?: string;
+  accessForValidation?: boolean;
+  qualityValidationFrequency?: string;
+  qualityValidationMethods?: string;
+  correctionMethods?: string;
+  qualityValidationResults?: string;
+  mappingsToCommonDataModels?: IDatasetMappings[];
+  commonDataModelsOther?: string;
+  eTLStandardVocabularies?: IOntologyNode[];
+  eTLStandardVocabulariesOther?: string;
+  publications?: IPublications[];
+  fundingSources?: IOntologyNode[];
+  fundingScheme?: IOntologyNode[];
+  fundingStatement?: string;
+  citationRequirements?: string;
+  acknowledgements?: string;
+  documentation?: IDocumentation[];
+  supplementaryInformation?: string;
+  collectionStartPlanned?: string;
+  collectionStartActual?: string;
+  analysisStartPlanned?: string;
+  analysisStartActual?: string;
+  dataSources?: IResources[];
+  medicalConditionsStudied?: IOntologyNode[];
+  dataExtractionDate?: string;
+  analysisPlan?: string;
+  objectives?: string;
+  results?: string;
+}
+
+export interface IReusedVariables {
+  resource: IResources;
+  variable: IVariables;
+}
+
+export interface ISampleCategories {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ISampleCategories;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ISampleCategories[];
+}
+
+export interface ISampleTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ISampleTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ISampleTypes[];
+}
+
+export interface ISamplesets {
+  resource: IResources;
+  name: string;
+  sampleTypes?: IOntologyNode[];
+}
+
+export interface IStandardizedTools {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IStandardizedTools;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IStandardizedTools[];
+}
+
+export interface IStatusDetails {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IStatusDetails;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IStatusDetails[];
+}
+
+export interface IStudyFunding {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IStudyFunding;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IStudyFunding[];
+}
+
+export interface IStudyStatus {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IStudyStatus;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IStudyStatus[];
+}
+
+export interface ISubmissionTypes {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ISubmissionTypes;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ISubmissionTypes[];
+}
+
+export interface ISubmissions {
+  submissionDate: string;
+  submitterName: string;
+  resources: IResources[];
+  submitterEmail: string;
+  submitterOrganisation?: string;
+  submitterRole?: IOntologyNode;
+  submitterRoleOther?: string;
+  submissionType?: IOntologyNode;
+  submissionDescription?: string;
+  responsiblePersons?: string;
+  acceptanceDate?: string;
+}
+
+export interface ISubmitterRoles {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ISubmitterRoles;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ISubmitterRoles[];
+}
+
+export interface ISubpopulationCounts {
+  resource: IResources;
+  subpopulation: ISubpopulations;
+  ageGroup: IOntologyNode;
+  nTotal?: number;
+  nFemale?: number;
+  nMale?: number;
+}
+
+export interface ISubpopulations {
+  resource: IResources;
+  name: string;
+  description?: string;
+  numberOfParticipants?: number;
+  counts?: ISubpopulationCounts[];
+  inclusionStart?: number;
+  inclusionEnd?: number;
+  ageGroups?: IOntologyNode[];
+  mainMedicalCondition?: IOntologyNode[];
+  comorbidity?: IOntologyNode[];
+  countries?: IOntologyNode[];
+  regions?: IOntologyNode[];
+  inclusionCriteria?: string;
+}
+
+export interface ITitles {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: ITitles;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ITitles[];
+}
+
+export interface IUnits {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IUnits;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IUnits[];
+}
+
+export interface IVariableMappings {
+  source: IResources;
+  sourceDataset: IDatasets;
+  sourceVariables?: IVariables[];
+  sourceVariablesOtherDatasets?: IVariables[];
+  target: IResources;
+  targetDataset: IDatasets;
+  targetVariable: IVariables;
+  repeats: string;
+  match: IOntologyNode;
+  description?: string;
+  syntax?: string;
+  comments?: string;
+}
+
+export interface IVariableRepeatUnits {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IVariableRepeatUnits;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IVariableRepeatUnits[];
+}
+
+export interface IVariableValues {
+  variable: IVariables;
+  value: string;
+  label: string;
+  order?: number;
+  isMissing?: boolean;
+  ontologyTermURI?: string;
+  sinceVersion?: string;
+  untilVersion?: string;
+}
+
+export interface IVariables {
+  resource: IResources;
+  dataset: IDatasets;
+  name: string;
+  useExternalDefinition?: IVariables;
+  label?: string;
+  description?: string;
+  collectionEvent?: ICollectionEvents[];
+  format?: IOntologyNode;
+  unit?: IOntologyNode;
+  sinceVersion?: string;
+  untilVersion?: string;
+  reusedInResources?: IReusedVariables[];
+  repeatUnit?: IOntologyNode;
+  repeatMin?: number;
+  repeatMax?: number;
+  exampleValues?: string[];
+  permittedValues?: IVariableValues[];
+  keywords?: IOntologyNode[];
+  vocabularies?: IOntologyNode[];
+  notes?: string;
+  mappings?: IVariableMappings[];
+}
+
+export interface IVersion {}
+
+export interface IVocabularies {
+  order?: number;
+  name: string;
+  label?: string;
+  parent?: IVocabularies;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IVocabularies[];
+}
diff --git a/apps/nuxt3-ssr/interfaces/types.ts b/apps/nuxt3-ssr/interfaces/types.ts
index 12e0950461..10f98b7e5a 100644
--- a/apps/nuxt3-ssr/interfaces/types.ts
+++ b/apps/nuxt3-ssr/interfaces/types.ts
@@ -3,6 +3,7 @@ import type {
   IFile,
   INode,
 } from "../../tailwind-components/types/types";
+import type { ISubpopulations } from "./catalogue";
 export interface IResource {
   id: string;
   pid: string;
@@ -83,7 +84,7 @@ export interface IResource {
   datasets: { name: string }[];
   populationOncologyTopology?: IOntologyNode[];
   populationOncologyMorphology?: IOntologyNode[];
-  subpopulations: any[];
+  subpopulations: ISubpopulations[];
   subpopulations_agg: { count: number };
   partOfResources: IResource[];
 }
diff --git a/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/[catalogue]/[resourceType]/[resource]/subpopulations/[subpopulation].vue b/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/[catalogue]/[resourceType]/[resource]/subpopulations/[subpopulation].vue
index f4f5df45b7..99c09b67e2 100644
--- a/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/[catalogue]/[resourceType]/[resource]/subpopulations/[subpopulation].vue
+++ b/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/[catalogue]/[resourceType]/[resource]/subpopulations/[subpopulation].vue
@@ -1,13 +1,20 @@
 <script setup lang="ts">
+import type { ISubpopulations } from "~/interfaces/catalogue";
+import type { IMgError } from "~/interfaces/types";
 import dateUtils from "~/utils/dateUtils";
-import subpopulationGql from "~~/gql/subpopulations";
+import subpopulationGql from "~~/gql/subpopulation";
 const config = useRuntimeConfig();
 const route = useRoute();
 
 const query = moduleToString(subpopulationGql);
 
-let subpopulation: Ref = ref();
-const { data: subpopulationData } = await useFetch(
+interface ISubpopulationQueryResponse {
+  data: {
+    Subpopulations: ISubpopulations[];
+  };
+}
+
+const { data } = await useFetch<ISubpopulationQueryResponse, IMgError>(
   `/${route.params.schema}/graphql`,
   {
     method: "POST",
@@ -19,24 +26,17 @@ const { data: subpopulationData } = await useFetch(
       },
     },
   }
-).catch((e) => console.log(e));
-
-watch(
-  subpopulationDataData,
-  function setData(data: any) {
-    subpopulation = data?.data?.Subpopulations[0];
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
 );
 
+const subpopulation = data.value?.data?.Subpopulations?.[0] ?? null;
+useHead({ title: subpopulation?.name });
+
 const cohortOnly = computed(() => {
   const routeSetting = route.query["cohort-only"] as string;
   return routeSetting === "true" || config.public.cohortOnly;
 });
 const pageCrumbs: any = {};
+
 pageCrumbs[
   cohortOnly.value ? "home" : (route.params.catalogue as string)
 ] = `/${route.params.schema}/ssr-catalogue/${route.params.catalogue}`;
@@ -44,7 +44,6 @@ pageCrumbs[
   "Resources"
 ] = `/${route.params.schema}/ssr-catalogue/${route.params.catalogue}/resources`;
 
-// @ts-ignore
 pageCrumbs[
   route.params.collection as string
 ] = `/${route.params.schema}/ssr-catalogue/${route.params.catalogue}/resources/${route.params.resources}`;
@@ -82,8 +81,8 @@ if (subpopulation?.inclusionStart || subpopulation?.inclusionEnd) {
   items.push({
     label: "Start/end year",
     content: dateUtils.startEndYear(
-      subpopulation.inclusionStart,
-      subpopulation.inclusionEnd
+      subpopulation.inclusionStart?.toString(),
+      subpopulation.inclusionEnd?.toString()
     ),
   });
 }
@@ -92,7 +91,7 @@ if (subpopulation?.countries) {
   items.push({
     label: "Countries",
     content: renderList(
-      subpopulation.countries.sort((a, b) => b.order - a.order),
+      subpopulation.countries.sort((a, b) => (b.order ?? 0) - (a.order ?? 0)),
       toName
     ),
   });
@@ -109,24 +108,31 @@ if (subpopulation?.ageGroups?.length) {
   tocItems.push({ label: "Age categories", id: "age_categories" });
 }
 
-let mainMedicalConditionTree = [];
+const mainMedicalConditionTree = computed(() => {
+  if (subpopulation?.mainMedicalCondition?.length) {
+    return buildTree(subpopulation.mainMedicalCondition);
+  } else {
+    return [];
+  }
+});
+
+const comorbidityTree = computed(() => {
+  if (subpopulation?.comorbidity?.length) {
+    return buildTree(subpopulation.comorbidity);
+  } else {
+    return [];
+  }
+});
+
 if (subpopulation?.mainMedicalCondition?.length) {
-  mainMedicalConditionTree = buildTree(subpopulation.mainMedicalCondition);
   tocItems.push({
     label: "Main medical condition",
     id: "main_medical_condition",
   });
 }
-
-let comorbidityTree = [];
 if (subpopulation?.comorbidity?.length) {
-  comorbidityTree = buildTree(subpopulation.comorbidity);
   tocItems.push({ label: "Comorbidity", id: "comorbidity" });
 }
-
-// todo add count table ( empty in current test set)
-
-useHead({ title: subpopulation?.name });
 </script>
 
 <template>
@@ -188,7 +194,6 @@ useHead({ title: subpopulation?.name });
           <ContentOntology :tree="comorbidityTree" :collapse-all="false" />
         </ContentBlock>
       </ContentBlocks>
-      <!-- todo add count table ( empty in current test set) -->
     </template>
   </LayoutsDetailPage>
 </template>
diff --git a/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java b/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java
index 7496344207..6dbd644441 100644
--- a/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java
+++ b/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java
@@ -28,7 +28,9 @@ export interface IFile {
   export interface ITreeNode {
     name: string;
     children?: ITreeNode[];
-    parent?: string;
+    parent?: {
+      name: string;
+    };
   }
 
   export interface IOntologyNode extends ITreeNode {
diff --git a/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts b/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts
index 2e978d850f..03f7f535fc 100644
--- a/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts
+++ b/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts
@@ -10,7 +10,9 @@ export interface IFile {
 export interface ITreeNode {
   name: string;
   children?: ITreeNode[];
-  parent?: string;
+  parent?: {
+    name: string;
+  };
 }
 
 export interface IOntologyNode extends ITreeNode {
diff --git a/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts b/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts
index 68114a1e61..dbd02ddc90 100644
--- a/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts
+++ b/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts
@@ -10,7 +10,9 @@ export interface IFile {
 export interface ITreeNode {
     name: string;
     children?: ITreeNode[];
-    parent?: string;
+    parent?: {
+        name: string;
+    };
 }
 
 export interface IOntologyNode extends ITreeNode {