chore(catalogue): rename collections to resources #4178

mswertz · 2024-09-02T22:15:20Z

What are the main changes you did:

renamed collection to resource following discussion with project leads
renamed columns named 'collection(s)' to 'resource(s)'
renamed 'subcohorts' to 'subpopulations'

todo:

rename data model elements from collection to resource
fix test data
update UI to work with these changes
data manager has checked it all

todo following meeting:

remove Resource prefixes
rename Cohorts naar Subpopulations
rename back to '...Mappings' instead of 'Mapped ...'
mergen DAPs met "Organisation roles" zonder kolommen en toevoegen DAP als organisation role
Resource variables tabel komt terug, inclusief wat dataset naam is binnen de resource, en de derived variable kolom gaat weg
Support lead organisation checkbox to show lead seperately

data/_demodata/applications/datacatalogue_cohortstaging/Cohorts.csv

data/_demodata/applications/datacatalogue_cohortstaging/Resource cohorts.csv

data/_demodata/applications/datacatalogue_cohortstaging/Resource counts.csv

data/_demodata/applications/datacatalogue_cohortstaging/Resource collection events.csv

BrendaHijmans · 2024-09-04T14:06:30Z

The table 'Resource variables', which used to be 'Network variables' (linking e.g. LifeCycle variables to LongITools) is missing.

…enis/molgenis-emx2 into fix/rename_collections_to_resources

mswertz · 2024-09-04T21:44:14Z

'Network variables' (linking e.g. LifeCycle variables to LongITools) is missing.

Ok. With leading principle we should minimize changes between the versions and otherwise being functionally equivalent afaik

* removed 'Resource DAPs'

* renamed ontology 'Resource types FLAT'

…enis/molgenis-emx2 into fix/rename_collections_to_resources

connoratrug · 2024-09-13T07:29:53Z

backend/molgenis-emx2-typescript/src/test/java/org/molgenis/emx2/typescript/GeneratorTest.java

    File f =
        new File(
-            this.getClass().getClassLoader().getResource("generated-catalogue-types.ts").getFile());
-    String schemaName = GeneratorTest.class.getSimpleName() + "Catalogue";
+            this.getClass().getClassLoader().getResource("generated-typetest-types.ts").getFile());


nice , but i looks like its missing a lot of the types , i.e. its not really a type test ( do think we need a type test ( als for forms and stuff))

It now includes quite some diversity; we could include all test data models we have that don't have data or improve the pet store to be feature complete?

…enis/molgenis-emx2 into fix/rename_collections_to_resources

…ename_collections_to_resources

…enis/molgenis-emx2 into fix/rename_collections_to_resources

…ename_collections_to_resources

EleanorHyde-UMCG · 2024-09-17T08:07:32Z

I see "cohort studies" where I used to see "cohorts", is this correct? (I thought they were going to be called 'resources')

sonarqubecloud · 2024-09-17T08:44:38Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

EleanorHyde-UMCG · 2024-09-17T09:42:22Z

See the list of issues for comments and additional findings: here. This PR can't be merged just yet...

BrendaHijmans and others added 15 commits August 29, 2024 14:54

edit linkage section

890d105

add is lead organisation boolean

ff21f08

delete 'comments' column

c3d9c72

update demo data

2be74d1

Cohort study to Cohort

9152d50

Cohort study to cohort

4be8924

edit Collections.csv

9e8e561

edit catalogue types for tests

c13b6db

add organisation role = Lead

447bd33

Merge branch 'master' into feat/update-flat-model

c3dd1d8

edit collection types

36bca4d

edit order of attributes

9e1e477

fix test

4276ec6

renamed data model collections to resources

0f9fe22

make tests pass

b9e2678

mswertz marked this pull request as draft September 2, 2024 22:15

wip

d2e9ebe

BrendaHijmans reviewed Sep 4, 2024

View reviewed changes

data/_demodata/applications/datacatalogue_cohortstaging/Cohorts.csv Outdated Show resolved Hide resolved

BrendaHijmans reviewed Sep 4, 2024

View reviewed changes

BrendaHijmans and others added 5 commits September 4, 2024 17:41

update demo data catalogue

11e774d

merged master

48be934

Merge branch 'fix/rename_collections_to_resources' of github.com:molg…

baf17c2

…enis/molgenis-emx2 into fix/rename_collections_to_resources

merge with changes

7dc14c8

fix ui

3354f86

mswertz and others added 4 commits September 5, 2024 00:21

fix typescript test

1a48c33

hope to fix e2e test

89f5dbd

* renamed 'Resource ...' table to '...'

2f3366f

* removed 'Resource DAPs'

* removed obsolete ontologies

d727ccf

* renamed ontology 'Resource types FLAT'

mswertz and others added 6 commits September 11, 2024 22:13

update for Reused Variables

ebb8738

fix descriptions Organisations.csv

d499349

Update Resources.csv

db18b5c

fix lead organisation as seperate block

ed648c4

Merge branch 'fix/rename_collections_to_resources' of github.com:molg…

1d55a49

…enis/molgenis-emx2 into fix/rename_collections_to_resources

fix comment

e2298aa

mswertz marked this pull request as ready for review September 12, 2024 15:04

replace typetest with less volatile example

5db4505

connoratrug reviewed Sep 13, 2024

View reviewed changes

BrendaHijmans and others added 7 commits September 13, 2024 14:43

demo data for cohort staging profile

1481564

Merge branch 'fix/rename_collections_to_resources' of github.com:molg…

b055c19

…enis/molgenis-emx2 into fix/rename_collections_to_resources

clean up test

ef109b0

Merge branch 'master' into fix/rename_collections_to_resources

c78f5e6

Merge branch 'master' of github.com:molgenis/molgenis-emx2 into fix/r…

7060e69

…ename_collections_to_resources

Merge branch 'fix/rename_collections_to_resources' of github.com:molg…

bfb94a1

…enis/molgenis-emx2 into fix/rename_collections_to_resources

fix ininit loop issues, redesign org card

ec6bd5c

connoratrug self-assigned this Sep 16, 2024

connoratrug added 5 commits September 16, 2024 13:53

Merge branch 'master' of github.com:molgenis/molgenis-emx2 into fix/r…

242576a

…ename_collections_to_resources

update tests

4158aea

fetch by id

fec05d9

format

155ffdd

tweak test

740aeb9

fix: type destruct

c4b2ac8

connoratrug removed their assignment Sep 17, 2024

connoratrug approved these changes Sep 18, 2024

View reviewed changes

connoratrug merged commit 3e67c4e into master Sep 18, 2024
6 checks passed

connoratrug deleted the fix/rename_collections_to_resources branch September 18, 2024 10:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore(catalogue): rename collections to resources #4178

chore(catalogue): rename collections to resources #4178

Uh oh!

mswertz commented Sep 2, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BrendaHijmans commented Sep 4, 2024

Uh oh!

mswertz commented Sep 4, 2024 •

edited

Loading

Uh oh!

connoratrug Sep 13, 2024

Uh oh!

mswertz Sep 17, 2024

Uh oh!

EleanorHyde-UMCG commented Sep 17, 2024

Uh oh!

sonarqubecloud bot commented Sep 17, 2024

Uh oh!

EleanorHyde-UMCG commented Sep 17, 2024

Uh oh!

Uh oh!

Uh oh!

chore(catalogue): rename collections to resources #4178

chore(catalogue): rename collections to resources #4178

Uh oh!

Conversation

mswertz commented Sep 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BrendaHijmans commented Sep 4, 2024

Uh oh!

mswertz commented Sep 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

connoratrug Sep 13, 2024

Choose a reason for hiding this comment

Uh oh!

mswertz Sep 17, 2024

Choose a reason for hiding this comment

Uh oh!

EleanorHyde-UMCG commented Sep 17, 2024

Uh oh!

sonarqubecloud bot commented Sep 17, 2024

Quality Gate passed

Uh oh!

EleanorHyde-UMCG commented Sep 17, 2024

Uh oh!

Uh oh!

Uh oh!

mswertz commented Sep 2, 2024 •

edited

Loading

mswertz commented Sep 4, 2024 •

edited

Loading