-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(catalogue)!: convert catalogue ssr user interface to flat model. BREAKING CHANGE #4114
Conversation
…catalogue_flat_ui
…-emx2 into feat/catalogue_flat_ui
…-emx2 into feat/catalogue_flat_ui
"Cohort study", | ||
"cohorts", | ||
"Study", | ||
"studies", | ||
"Network", | ||
"networks", | ||
"Databank", | ||
"databanks", | ||
"Data source", | ||
"datasources"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why the upper and lower case mix ?
@@ -31,7 +41,7 @@ defineProps<{ | |||
<span | |||
class="hover:flex items-center justify-items-end align-middle min-w-[2rem] hover:z-50 py-2" | |||
> | |||
{{ columnProps.value.cohort.id }} | |||
{{ columnProps.value }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
columnProps ? , no need for .value en template
@@ -1,15 +1,15 @@ | |||
<script setup lang="ts"> | |||
import type { ICohort, IVariableWithMappings } from "~/interfaces/types"; | |||
import type { ICollection, IVariableWithMappings } from "~/interfaces/types"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ICollection to use as a collection of type T ? maybe not relevant for catalogue UI
menu.push({ | ||
label: "Data sources", | ||
link: `/${route.params.schema}/ssr-catalogue/${catalogueRouteParam}/datasources`, | ||
label: "collections(" + props.catalogue.collections_agg?.count + ")", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does not work for all paths, and maybe pushed to much information , ui needs to make constant tradeoffs between overview, consistency. Suggest to remove and reconsider in separate feature pr
apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/[catalogue]/[collectionType]/index.vue
Outdated
Show resolved
Hide resolved
<ContentBlock | ||
v-if="projectCatalogues.length === 0 && thematicCatalogues.length === 0" | ||
title="No Catalogues found" | ||
description="Please add catalogues via admin user interface" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure if we should to use the ui for these kind of data management instructions
// add the search to the filters | ||
filterBuilder = { | ||
...filterBuilder, | ||
...{ _or: [{ _search: searchFilter.search }] }, | ||
}; | ||
} else { | ||
// add the search to the filters | ||
filterBuilder = { | ||
...filterBuilder, | ||
...{ _search: searchFilter.search }, | ||
}; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merge branch and move adding the 'or' down the tree ?
* @param variables | ||
* @param cohorts | ||
* @param collections |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest to remove in favour of ts types
Schema cohortStaging = database.createSchema(COHORT_STAGING); | ||
AvailableDataModels.DATA_CATALOGUE_COHORT_STAGING.install(cohortStaging, true); | ||
assertEquals(19, cohortStaging.getTableNames().size()); | ||
} | ||
|
||
@Disabled |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
delete ? , or add reason why it is disabled
warnings during dev ` WARN Components directory not found: /Users/[user]/Code/emx2/molgenis-emx2/apps/nuxt3-ssr/components/viz ` |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code looks good and checked the basics, wait for e2e test before merge
closes https://github.com/molgenis/GCC/issues/592
breaks compatability with the previous unflat data model, therefore breaking change?
What are the main changes you did:
how to test:
Remaining issues collection screen:
todo:
data migrations missing, tbd later:
proposed data model / ontology changes, tbd later:
later: