Skip to content

Commit 9d5da3b

Browse files
frano-mFran McDade
frano-m
and
Fran McDade
authored
chore: update latest findable-ui package (#4039) (#4040)
Co-authored-by: Fran McDade <[email protected]>
1 parent 470a87f commit 9d5da3b

File tree

8 files changed

+298
-279
lines changed

8 files changed

+298
-279
lines changed

‎explorer/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎explorer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts --trace retain-on-failure"
3737
},
3838
"dependencies": {
39-
"@databiosphere/findable-ui": "1.0.1",
39+
"@databiosphere/findable-ui": "2.0.1",
4040
"@emotion/react": "11.11.1",
4141
"@emotion/styled": "11.11.0",
4242
"@mdx-js/loader": "^3.0.1",

‎explorer/site-config/anvil-catalog/dev/config.ts

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,44 +35,47 @@ export function makeConfig(
3535
appTitle: APP_TITLE,
3636
authentication: undefined,
3737
browserURL: browserUrl,
38-
categoryGroupConfigs: [
39-
{
40-
categoryConfigs: [
41-
{
42-
key: ANVIL_CATALOG_CATEGORY_KEY.CONSENT_CODE,
43-
label: ANVIL_CATALOG_CATEGORY_LABEL.CONSENT_CODE,
44-
},
45-
{
46-
key: ANVIL_CATALOG_CATEGORY_KEY.CONSORTIUM,
47-
label: ANVIL_CATALOG_CATEGORY_LABEL.CONSORTIUM,
48-
},
49-
{
50-
key: ANVIL_CATALOG_CATEGORY_KEY.DATA_TYPE,
51-
label: ANVIL_CATALOG_CATEGORY_LABEL.DATA_TYPE,
52-
},
53-
{
54-
key: ANVIL_CATALOG_CATEGORY_KEY.DB_GAP_ID,
55-
label: ANVIL_CATALOG_CATEGORY_LABEL.DB_GAP_ID,
56-
},
57-
{
58-
key: ANVIL_CATALOG_CATEGORY_KEY.DISEASE,
59-
label: ANVIL_CATALOG_CATEGORY_LABEL.DISEASE,
60-
},
61-
{
62-
key: ANVIL_CATALOG_CATEGORY_KEY.STUDY_DESIGN,
63-
label: ANVIL_CATALOG_CATEGORY_LABEL.STUDY_DESIGN,
64-
},
65-
{
66-
key: ANVIL_CATALOG_CATEGORY_KEY.STUDY_NAME,
67-
label: ANVIL_CATALOG_CATEGORY_LABEL.STUDY_NAME,
68-
},
69-
{
70-
key: ANVIL_CATALOG_CATEGORY_KEY.WORKSPACE_NAME,
71-
label: "Terra Workspace Name", // TODO review label here and elsewhere
72-
},
73-
],
74-
},
75-
],
38+
categoryGroupConfig: {
39+
categoryGroups: [
40+
{
41+
categoryConfigs: [
42+
{
43+
key: ANVIL_CATALOG_CATEGORY_KEY.CONSENT_CODE,
44+
label: ANVIL_CATALOG_CATEGORY_LABEL.CONSENT_CODE,
45+
},
46+
{
47+
key: ANVIL_CATALOG_CATEGORY_KEY.CONSORTIUM,
48+
label: ANVIL_CATALOG_CATEGORY_LABEL.CONSORTIUM,
49+
},
50+
{
51+
key: ANVIL_CATALOG_CATEGORY_KEY.DATA_TYPE,
52+
label: ANVIL_CATALOG_CATEGORY_LABEL.DATA_TYPE,
53+
},
54+
{
55+
key: ANVIL_CATALOG_CATEGORY_KEY.DB_GAP_ID,
56+
label: ANVIL_CATALOG_CATEGORY_LABEL.DB_GAP_ID,
57+
},
58+
{
59+
key: ANVIL_CATALOG_CATEGORY_KEY.DISEASE,
60+
label: ANVIL_CATALOG_CATEGORY_LABEL.DISEASE,
61+
},
62+
{
63+
key: ANVIL_CATALOG_CATEGORY_KEY.STUDY_DESIGN,
64+
label: ANVIL_CATALOG_CATEGORY_LABEL.STUDY_DESIGN,
65+
},
66+
{
67+
key: ANVIL_CATALOG_CATEGORY_KEY.STUDY_NAME,
68+
label: ANVIL_CATALOG_CATEGORY_LABEL.STUDY_NAME,
69+
},
70+
{
71+
key: ANVIL_CATALOG_CATEGORY_KEY.WORKSPACE_NAME,
72+
label: "Terra Workspace Name", // TODO review label here and elsewhere
73+
},
74+
],
75+
},
76+
],
77+
key: "anvil-catalog",
78+
},
7679
dataSource: {
7780
url: "",
7881
},

‎explorer/site-config/anvil-cmg/dev/config.ts

Lines changed: 65 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -39,68 +39,71 @@ export function makeConfig(
3939
appTitle: APP_TITLE,
4040
authentication: authenticationConfig,
4141
browserURL: browserUrl,
42-
categoryGroupConfigs: [
43-
{
44-
categoryConfigs: [
45-
{
46-
key: ANVIL_CMG_CATEGORY_KEY.DATASET_TITLE,
47-
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_TITLE,
48-
},
49-
{
50-
key: ANVIL_CMG_CATEGORY_KEY.DATASET_REGISTERED_ID,
51-
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_REGISTERED_ID,
52-
},
53-
],
54-
},
55-
{
56-
categoryConfigs: [
57-
{
58-
key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_ANATOMICAL_SITE,
59-
label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_ANATOMICAL_SITE,
60-
},
61-
{
62-
key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_BIOSAMPLE_TYPE,
63-
label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_BIOSAMPLE_TYPE,
64-
},
65-
{
66-
key: ANVIL_CMG_CATEGORY_KEY.DATASET_CONSENT_GROUP,
67-
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_CONSENT_GROUP,
68-
},
69-
{
70-
key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY,
71-
label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY,
72-
},
73-
{
74-
key: ANVIL_CMG_CATEGORY_KEY.DIAGNOSE_PHENOTYPE,
75-
label: ANVIL_CMG_CATEGORY_LABEL.DIAGNOSE_PHENOTYPE,
76-
},
77-
{
78-
key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_FORMAT,
79-
label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_FORMAT,
80-
},
81-
{
82-
key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_TYPE,
83-
label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_TYPE,
84-
},
85-
{
86-
key: ANVIL_CMG_CATEGORY_KEY.DONOR_ORGANISM_TYPE,
87-
label: ANVIL_CMG_CATEGORY_LABEL.DONOR_ORGANISM_TYPE,
88-
},
89-
{
90-
key: ANVIL_CMG_CATEGORY_KEY.DONOR_PHENOTYPIC_SEX,
91-
label: ANVIL_CMG_CATEGORY_LABEL.DONOR_PHENOTYPIC_SEX,
92-
},
93-
{
94-
key: ANVIL_CMG_CATEGORY_KEY.PREP_MATERIAL_NAME,
95-
label: ANVIL_CMG_CATEGORY_LABEL.PREP_MATERIAL_NAME,
96-
},
97-
{
98-
key: ANVIL_CMG_CATEGORY_KEY.DONOR_REPORTED_ETHNICITY,
99-
label: ANVIL_CMG_CATEGORY_LABEL.DONOR_REPORTED_ETHNICITY,
100-
},
101-
],
102-
},
103-
],
42+
categoryGroupConfig: {
43+
categoryGroups: [
44+
{
45+
categoryConfigs: [
46+
{
47+
key: ANVIL_CMG_CATEGORY_KEY.DATASET_TITLE,
48+
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_TITLE,
49+
},
50+
{
51+
key: ANVIL_CMG_CATEGORY_KEY.DATASET_REGISTERED_ID,
52+
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_REGISTERED_ID,
53+
},
54+
],
55+
},
56+
{
57+
categoryConfigs: [
58+
{
59+
key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_ANATOMICAL_SITE,
60+
label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_ANATOMICAL_SITE,
61+
},
62+
{
63+
key: ANVIL_CMG_CATEGORY_KEY.BIOSAMPLE_BIOSAMPLE_TYPE,
64+
label: ANVIL_CMG_CATEGORY_LABEL.BIOSAMPLE_BIOSAMPLE_TYPE,
65+
},
66+
{
67+
key: ANVIL_CMG_CATEGORY_KEY.DATASET_CONSENT_GROUP,
68+
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_CONSENT_GROUP,
69+
},
70+
{
71+
key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY,
72+
label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY,
73+
},
74+
{
75+
key: ANVIL_CMG_CATEGORY_KEY.DIAGNOSE_PHENOTYPE,
76+
label: ANVIL_CMG_CATEGORY_LABEL.DIAGNOSE_PHENOTYPE,
77+
},
78+
{
79+
key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_FORMAT,
80+
label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_FORMAT,
81+
},
82+
{
83+
key: ANVIL_CMG_CATEGORY_KEY.FILE_FILE_TYPE,
84+
label: ANVIL_CMG_CATEGORY_LABEL.FILE_FILE_TYPE,
85+
},
86+
{
87+
key: ANVIL_CMG_CATEGORY_KEY.DONOR_ORGANISM_TYPE,
88+
label: ANVIL_CMG_CATEGORY_LABEL.DONOR_ORGANISM_TYPE,
89+
},
90+
{
91+
key: ANVIL_CMG_CATEGORY_KEY.DONOR_PHENOTYPIC_SEX,
92+
label: ANVIL_CMG_CATEGORY_LABEL.DONOR_PHENOTYPIC_SEX,
93+
},
94+
{
95+
key: ANVIL_CMG_CATEGORY_KEY.PREP_MATERIAL_NAME,
96+
label: ANVIL_CMG_CATEGORY_LABEL.PREP_MATERIAL_NAME,
97+
},
98+
{
99+
key: ANVIL_CMG_CATEGORY_KEY.DONOR_REPORTED_ETHNICITY,
100+
label: ANVIL_CMG_CATEGORY_LABEL.DONOR_REPORTED_ETHNICITY,
101+
},
102+
],
103+
},
104+
],
105+
key: "anvil-cmg",
106+
},
104107
contentDir: "anvil-cmg",
105108
contentThemeOptionsFn: contentThemeOptions,
106109
dataSource: {

‎explorer/site-config/anvil/dev/config.ts

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,44 +26,47 @@ const config: SiteConfig = {
2626
appTitle: APP_TITLE,
2727
authentication: authenticationConfig,
2828
browserURL: BROWSER_URL,
29-
categoryGroupConfigs: [
30-
{
31-
categoryConfigs: [
32-
{
33-
key: ANVIL_CATEGORY_KEY.BIOSAMPLE_TYPE,
34-
label: ANVIL_CATEGORY_LABEL.BIOSAMPLE_TYPE,
35-
},
36-
{
37-
key: ANVIL_CATEGORY_KEY.DATA_MODALITY,
38-
label: ANVIL_CATEGORY_LABEL.DATA_MODALITY,
39-
},
40-
{
41-
key: ANVIL_CATEGORY_KEY.FILE_FORMAT,
42-
label: ANVIL_CATEGORY_LABEL.FILE_FORMAT,
43-
},
44-
{
45-
key: ANVIL_CATEGORY_KEY.FILE_TYPE,
46-
label: ANVIL_CATEGORY_LABEL.FILE_TYPE,
47-
},
48-
{
49-
key: ANVIL_CATEGORY_KEY.ORGANISM_TYPE,
50-
label: ANVIL_CATEGORY_LABEL.ORGANISM_TYPE,
51-
},
52-
{
53-
key: ANVIL_CATEGORY_KEY.PHENOTYPIC_SEX,
54-
label: ANVIL_CATEGORY_LABEL.PHENOTYPIC_SEX,
55-
},
56-
{
57-
key: ANVIL_CATEGORY_KEY.LIBRARY_PREPARATION,
58-
label: ANVIL_CATEGORY_LABEL.LIBRARY_PREPARATION,
59-
},
60-
{
61-
key: ANVIL_CATEGORY_KEY.REPORTED_ETHNICITY,
62-
label: ANVIL_CATEGORY_LABEL.REPORTED_ETHNICITY,
63-
},
64-
],
65-
},
66-
],
29+
categoryGroupConfig: {
30+
categoryGroups: [
31+
{
32+
categoryConfigs: [
33+
{
34+
key: ANVIL_CATEGORY_KEY.BIOSAMPLE_TYPE,
35+
label: ANVIL_CATEGORY_LABEL.BIOSAMPLE_TYPE,
36+
},
37+
{
38+
key: ANVIL_CATEGORY_KEY.DATA_MODALITY,
39+
label: ANVIL_CATEGORY_LABEL.DATA_MODALITY,
40+
},
41+
{
42+
key: ANVIL_CATEGORY_KEY.FILE_FORMAT,
43+
label: ANVIL_CATEGORY_LABEL.FILE_FORMAT,
44+
},
45+
{
46+
key: ANVIL_CATEGORY_KEY.FILE_TYPE,
47+
label: ANVIL_CATEGORY_LABEL.FILE_TYPE,
48+
},
49+
{
50+
key: ANVIL_CATEGORY_KEY.ORGANISM_TYPE,
51+
label: ANVIL_CATEGORY_LABEL.ORGANISM_TYPE,
52+
},
53+
{
54+
key: ANVIL_CATEGORY_KEY.PHENOTYPIC_SEX,
55+
label: ANVIL_CATEGORY_LABEL.PHENOTYPIC_SEX,
56+
},
57+
{
58+
key: ANVIL_CATEGORY_KEY.LIBRARY_PREPARATION,
59+
label: ANVIL_CATEGORY_LABEL.LIBRARY_PREPARATION,
60+
},
61+
{
62+
key: ANVIL_CATEGORY_KEY.REPORTED_ETHNICITY,
63+
label: ANVIL_CATEGORY_LABEL.REPORTED_ETHNICITY,
64+
},
65+
],
66+
},
67+
],
68+
key: "anvil",
69+
},
6770
dataSource: {
6871
defaultListParams: {
6972
size: "25",

0 commit comments

Comments
 (0)