Skip to content

Commit 184cd4e

Browse files
authored
chore: update findable-ui to latest version v46.1.3 (#4603) (#4604)
* chore: update findable-ui to latest version v46.1.3 (#4603) * feat: added sort by to filters (#4603) --------- Co-authored-by: Fran McDade <[email protected]>
1 parent 93b247c commit 184cd4e

File tree

8 files changed

+423
-1271
lines changed

8 files changed

+423
-1271
lines changed

package-lock.json

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

package.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,29 @@
3232
"check-system-status:anvil-cmg": "esrun e2e/anvil/anvil-check-system-status.ts"
3333
},
3434
"dependencies": {
35-
"@databiosphere/findable-ui": "^42.1.0",
35+
"@databiosphere/findable-ui": "^46.1.3",
3636
"@emotion/react": "^11.13.3",
3737
"@emotion/styled": "^11.13.0",
3838
"@mdx-js/loader": "^3.0.1",
3939
"@mdx-js/react": "^3.0.1",
4040
"@mui/icons-material": "^7.0.1",
4141
"@mui/material": "^7.0.1",
42-
"@next/mdx": "^14.2.30",
42+
"@next/mdx": "^14.2.33",
4343
"@observablehq/plot": "^0.6.17",
4444
"@tanstack/react-table": "^8.19.2",
4545
"@tanstack/react-virtual": "^3.13.12",
4646
"@types/fhir": "^0.0.35",
4747
"copy-to-clipboard": "3.3.1",
4848
"csv-parse": "^5.0.4",
49+
"gray-matter": "^4.0.3",
4950
"isomorphic-dompurify": "^2.22.0",
5051
"jwt-decode": "^3.1.2",
5152
"ky": "^1.7.2",
5253
"match-sorter": "^6.3.1",
53-
"next": "^14.2.30",
54-
"next-auth": "^4.24.7",
54+
"next": "^14.2.33",
55+
"next-auth": "^4.24.13",
5556
"next-compose-plugins": "^2.2.1",
56-
"next-mdx-remote": "^4.2.0",
57+
"next-mdx-remote": "^4.4.1",
5758
"next-sitemap": "^4.2.3",
5859
"react": "^18.3.1",
5960
"react-dom": "^18.3.1",
@@ -66,6 +67,7 @@
6667
"remark-gfm": "^3.0.1",
6768
"remark-parse": "^10.0.2",
6869
"remark-rehype": "^10.1.0",
70+
"slugify": "^1.6.6",
6971
"unified": "^10.1.2",
7072
"uuid": "8.3.2",
7173
"yup": "^1.6.1"
@@ -76,7 +78,7 @@
7678
"@commitlint/config-conventional": "^19.6.0",
7779
"@digitak/esrun": "^3.2.26",
7880
"@mui/types": "^7.4.0",
79-
"@next/eslint-plugin-next": "^14.2.30",
81+
"@next/eslint-plugin-next": "^14.2.33",
8082
"@playwright/test": "^1.49.1",
8183
"@testing-library/jest-dom": "^5.16.5",
8284
"@testing-library/react": "^16.0.1",
@@ -90,7 +92,7 @@
9092
"@typescript-eslint/eslint-plugin": "^8.18.1",
9193
"babel-loader": "^9.2.1",
9294
"eslint": "^8.33.0",
93-
"eslint-config-next": "^14.2.30",
95+
"eslint-config-next": "^14.2.33",
9496
"eslint-config-prettier": "^9.1.0",
9597
"eslint-plugin-eslint-comments": "^3.2.0",
9698
"eslint-plugin-jsdoc": "^50.6.1",
@@ -100,7 +102,6 @@
100102
"eslint-plugin-sort-destructure-keys": "^2.0.0",
101103
"eslint-plugin-typescript-sort-keys": "^3.3.0",
102104
"got": "^14.4.5",
103-
"gray-matter": "^4.0.3",
104105
"husky": "^9.1.7",
105106
"jest": "^29.7.0",
106107
"jest-environment-jsdom": "^29.7.0",
@@ -109,6 +110,9 @@
109110
"typescript": "^5.5.4",
110111
"url-loader": "^4.1.1"
111112
},
113+
"overrides": {
114+
"glob": "^11.0.4"
115+
},
112116
"engines": {
113117
"node": "20.10.0"
114118
}

site-config/anvil-catalog/dev/index/consortiaEntityConfig.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ export const consortiaEntityConfig: EntityConfig<AnVILCatalogConsortium> = {
149149
},
150150
],
151151
tableOptions: {
152+
downloadFilename: "consortia",
153+
enableTableDownload: true,
152154
initialState: {
153155
columnVisibility: {
154156
[ANVIL_CATALOG_CATEGORY_KEY.STUDY_NAME]: false,
@@ -165,7 +167,6 @@ export const consortiaEntityConfig: EntityConfig<AnVILCatalogConsortium> = {
165167
} as ListConfig<AnVILCatalogConsortium>,
166168
listView: {
167169
disablePagination: true,
168-
enableDownload: true,
169170
},
170171
route: "consortia",
171172
staticLoadFile: "files/anvil-catalog/out/anvil-consortia.json",

site-config/anvil-catalog/dev/index/studiesEntityConfig.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ export const studiesEntityConfig: EntityConfig<AnVILCatalogStudy> = {
143143
},
144144
],
145145
tableOptions: {
146+
downloadFilename: "studies",
147+
enableTableDownload: true,
146148
initialState: {
147149
sorting: [
148150
{
@@ -155,7 +157,6 @@ export const studiesEntityConfig: EntityConfig<AnVILCatalogStudy> = {
155157
} as ListConfig<AnVILCatalogStudy>,
156158
listView: {
157159
disablePagination: true,
158-
enableDownload: true,
159160
},
160161
route: "studies",
161162
staticLoadFile: "files/anvil-catalog/out/anvil-studies.json",

site-config/anvil-catalog/dev/index/workspaceEntityConfig.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ export const workspaceEntityConfig: EntityConfig<AnVILCatalogWorkspace> = {
126126
},
127127
],
128128
tableOptions: {
129+
downloadFilename: "workspaces",
130+
enableTableDownload: true,
129131
initialState: {
130132
sorting: [
131133
{
@@ -138,7 +140,6 @@ export const workspaceEntityConfig: EntityConfig<AnVILCatalogWorkspace> = {
138140
} as ListConfig<AnVILCatalogWorkspace>,
139141
listView: {
140142
disablePagination: true,
141-
enableDownload: true,
142143
},
143144
route: "workspaces",
144145
staticLoadFile: "files/anvil-catalog/out/anvil-workspaces.json",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import dataDictionary from "./dataDictionary/data-dictionary.json";
2121
import { TABLE_OPTIONS } from "../../../app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/tableOptions";
2222
import { buildDataDictionary } from "../../../app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/dataDictionaryMapper";
2323
import { buildSummaries } from "./index/summaryViewModelBuilder";
24+
import { FILTER_SORT } from "@databiosphere/findable-ui/lib/common/filters/sort/config/types";
2425

2526
// Template constants
2627
const APP_TITLE = "AnVIL Data Explorer";
@@ -158,6 +159,7 @@ export function makeConfig(
158159
],
159160
export: exportConfig,
160161
exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/",
162+
filterSort: { sortBy: FILTER_SORT.COUNT },
161163
gitHubUrl,
162164
layout: {
163165
floating,

site-config/hca-dcp/dev/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { samplesEntityConfig } from "./index/samplesEntityConfig";
1414
import { floating } from "./layout/floating";
1515
import { buildSummaries } from "./index/summaryViewModelBuilder";
1616
import { TYPOGRAPHY_PROPS } from "@databiosphere/findable-ui/lib/styles/common/mui/typography";
17+
import { FILTER_SORT } from "@databiosphere/findable-ui/lib/common/filters/sort/config/types";
1718

1819
// Template constants
1920
const APP_TITLE = "HCA Data Explorer";
@@ -60,6 +61,7 @@ export function makeConfig(
6061
entities: [projectsEntityConfig, samplesEntityConfig, filesEntityConfig],
6162
export: exportConfig,
6263
exportToTerraUrl: EXPORT_TO_TERRA_URL,
64+
filterSort: { sortBy: FILTER_SORT.COUNT },
6365
gitHubUrl,
6466
layout: {
6567
floating,

site-config/lungmap/dev/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { projectsEntityConfig } from "./index/projectsEntityConfig";
1212
import { samplesEntityConfig } from "./index/samplesEntityConfig";
1313
import { socialMedia } from "./socialMedia";
1414
import { buildSummaries } from "./index/summaryViewModelBuilder";
15+
import { FILTER_SORT } from "@databiosphere/findable-ui/lib/common/filters/sort/config/types";
1516

1617
// Template constants
1718
const APP_TITLE = "LungMAP Data Explorer";
@@ -57,6 +58,7 @@ export function makeConfig(
5758
entities: [projectsEntityConfig, samplesEntityConfig, filesEntityConfig],
5859
export: exportConfig,
5960
exportToTerraUrl: EXPORT_TO_TERRA_URL,
61+
filterSort: { sortBy: FILTER_SORT.COUNT },
6062
gitHubUrl,
6163
layout: {
6264
footer: {

0 commit comments

Comments
 (0)