diff --git a/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/constants.ts b/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/constants.ts index 985d90fc0..11d7b2ebb 100644 --- a/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/constants.ts +++ b/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/constants.ts @@ -1,6 +1,6 @@ import { MarkdownCell } from "@databiosphere/findable-ui/lib/components/Table/components/TableCell/components/MarkdownCell/markdownCell"; import { Attribute } from "@databiosphere/findable-ui/lib/common/entities"; -import { ColumnDef } from "@tanstack/react-table"; +import { ColumnDef, CellContext } from "@tanstack/react-table"; export const COLUMN_DEFS: ColumnDef[] = [ { @@ -21,8 +21,9 @@ export const COLUMN_DEFS: ColumnDef[] = [ }, }, { - accessorFn: (row: Attribute) => ({ values: row.description }), - cell: MarkdownCell, + accessorKey: "description", + cell: (cellContext) => + MarkdownCell(cellContext as CellContext), enableColumnFilter: false, header: "Description", meta: { diff --git a/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/tableOptions.ts b/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/tableOptions.ts index dc0ee9706..9d4154e53 100644 --- a/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/tableOptions.ts +++ b/app/viewModelBuilders/azul/anvil-cmg/common/dataDictionaryMapper/tableOptions.ts @@ -8,10 +8,12 @@ export const TABLE_OPTIONS: Omit< > = { columns: COLUMN_DEFS, enableColumnFilters: false, + enableExpanding: false, enableGlobalFilter: false, + getRowCanExpand: () => false, + getRowId: (row) => row.name, initialState: { columnVisibility: { classKey: false }, - expanded: true, grouping: ["classKey"], }, }; diff --git a/package-lock.json b/package-lock.json index 95561deb6..9d76211e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,14 +8,14 @@ "name": "explorer", "version": "2.19.2", "dependencies": { - "@databiosphere/findable-ui": "^38.1.1", + "@databiosphere/findable-ui": "^40.0.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@mdx-js/loader": "^3.0.1", "@mdx-js/react": "^3.0.1", "@mui/icons-material": "^7.0.1", "@mui/material": "^7.0.1", - "@next/mdx": "^14.2.28", + "@next/mdx": "^14.2.30", "@observablehq/plot": "^0.6.17", "@tanstack/react-table": "^8.19.2", "@tanstack/react-virtual": "^3.13.12", @@ -26,7 +26,7 @@ "jwt-decode": "^3.1.2", "ky": "^1.7.2", "match-sorter": "^6.3.1", - "next": "^14.2.28", + "next": "^14.2.30", "next-auth": "^4.24.7", "next-compose-plugins": "^2.2.1", "next-mdx-remote": "^4.2.0", @@ -52,7 +52,7 @@ "@commitlint/config-conventional": "^19.6.0", "@digitak/esrun": "^3.2.26", "@mui/types": "^7.4.0", - "@next/eslint-plugin-next": "^14.2.28", + "@next/eslint-plugin-next": "^14.2.30", "@playwright/test": "^1.49.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^16.0.1", @@ -66,7 +66,7 @@ "@typescript-eslint/eslint-plugin": "^8.18.1", "babel-loader": "^9.2.1", "eslint": "^8.33.0", - "eslint-config-next": "^14.2.28", + "eslint-config-next": "^14.2.30", "eslint-config-prettier": "^9.1.0", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-jsdoc": "^50.6.1", @@ -2488,9 +2488,9 @@ } }, "node_modules/@databiosphere/findable-ui": { - "version": "38.1.1", - "resolved": "https://registry.npmjs.org/@databiosphere/findable-ui/-/findable-ui-38.1.1.tgz", - "integrity": "sha512-WogR/uDc9ZUmex+lzhoY/0IZq5ytJL9HHlsuqo4Kd1y1NAq1ZpAhhyw0Ub0Sdi6U7vdRkMhfT8G71VQzm+wXmg==", + "version": "40.0.0", + "resolved": "https://registry.npmjs.org/@databiosphere/findable-ui/-/findable-ui-40.0.0.tgz", + "integrity": "sha512-bGUTr3bEK7FtwsqEGiDp33gAAfnsreTemGzz04cpmqPo/bL9waPmijvToSD1KT3+Ace8cT2YvHqAjnvPjwKVjA==", "engines": { "node": "20.10.0" }, @@ -2506,7 +2506,7 @@ "copy-to-clipboard": "3.3.1", "isomorphic-dompurify": "^2.22.0", "ky": "^1.7.2", - "next": "^14.2.28", + "next": "^14.2.30", "next-auth": "^4.24.7", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -5179,18 +5179,18 @@ "integrity": "sha512-KBiBKrDY6kxTQWGzKjQB7QirL3PiiOkV7KW98leHFjtVRKtft76Ra5qSA/SL75xT44dp6hOcqiiJ6iievLOYug==" }, "node_modules/@next/eslint-plugin-next": { - "version": "14.2.28", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.28.tgz", - "integrity": "sha512-GQUPA1bTZy5qZdPV5MOHB18465azzhg8xm5o2SqxMF+h1rWNjB43y6xmIPHG5OV2OiU3WxuINpusXom49DdaIQ==", + "version": "14.2.30", + "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.30.tgz", + "integrity": "sha512-mvVsMIutMxQ4NGZEMZ1kiBNc+la8Xmlk30bKUmCPQz2eFkmsLv54Mha8QZarMaCtSPkkFA1TMD+FIZk0l/PpzA==", "dev": true, "dependencies": { "glob": "10.3.10" } }, "node_modules/@next/mdx": { - "version": "14.2.28", - "resolved": "https://registry.npmjs.org/@next/mdx/-/mdx-14.2.28.tgz", - "integrity": "sha512-gW3YZamw6MjgDjP58k40Fc8niBo4TJ+gjfC1/uzCAwMUliHF9jmFa9gmOEU2AQT1XNUOTZ05sERsKGXW7k3FDA==", + "version": "14.2.30", + "resolved": "https://registry.npmjs.org/@next/mdx/-/mdx-14.2.30.tgz", + "integrity": "sha512-CEUs6GR14NvRzxNVlVZw1YpPAY64N6uibQmaS7l+GCwhqHz5Z8aqBAtNfY/HVBJPzUCadJKsQI7ICLdZyw23eg==", "dependencies": { "source-map": "^0.7.0" }, @@ -9726,12 +9726,12 @@ } }, "node_modules/eslint-config-next": { - "version": "14.2.28", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-14.2.28.tgz", - "integrity": "sha512-UxJMRQ4uaEdLp3mVQoIbRIlEF0S2rTlyZhI/2yEMVdAWmgFfPY4iJZ68jCbhLvXMnKeHMkmqTGjEhFH5Vm9h+A==", + "version": "14.2.30", + "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-14.2.30.tgz", + "integrity": "sha512-4pTMb3wfpI+piVeEz3TWG1spjuXJJBZaYabi2H08z2ZTk6/N304POEovHdFmK6EZb4QlKpETulBNaRIITA0+xg==", "dev": true, "dependencies": { - "@next/eslint-plugin-next": "14.2.28", + "@next/eslint-plugin-next": "14.2.30", "@rushstack/eslint-patch": "^1.3.3", "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", @@ -10815,13 +10815,14 @@ } }, "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" }, "engines": { @@ -23333,9 +23334,9 @@ "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==" }, "@databiosphere/findable-ui": { - "version": "38.1.1", - "resolved": "https://registry.npmjs.org/@databiosphere/findable-ui/-/findable-ui-38.1.1.tgz", - "integrity": "sha512-WogR/uDc9ZUmex+lzhoY/0IZq5ytJL9HHlsuqo4Kd1y1NAq1ZpAhhyw0Ub0Sdi6U7vdRkMhfT8G71VQzm+wXmg==", + "version": "40.0.0", + "resolved": "https://registry.npmjs.org/@databiosphere/findable-ui/-/findable-ui-40.0.0.tgz", + "integrity": "sha512-bGUTr3bEK7FtwsqEGiDp33gAAfnsreTemGzz04cpmqPo/bL9waPmijvToSD1KT3+Ace8cT2YvHqAjnvPjwKVjA==", "requires": {} }, "@digitak/esrun": { @@ -25060,18 +25061,18 @@ "integrity": "sha512-KBiBKrDY6kxTQWGzKjQB7QirL3PiiOkV7KW98leHFjtVRKtft76Ra5qSA/SL75xT44dp6hOcqiiJ6iievLOYug==" }, "@next/eslint-plugin-next": { - "version": "14.2.28", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.28.tgz", - "integrity": "sha512-GQUPA1bTZy5qZdPV5MOHB18465azzhg8xm5o2SqxMF+h1rWNjB43y6xmIPHG5OV2OiU3WxuINpusXom49DdaIQ==", + "version": "14.2.30", + "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.30.tgz", + "integrity": "sha512-mvVsMIutMxQ4NGZEMZ1kiBNc+la8Xmlk30bKUmCPQz2eFkmsLv54Mha8QZarMaCtSPkkFA1TMD+FIZk0l/PpzA==", "dev": true, "requires": { "glob": "10.3.10" } }, "@next/mdx": { - "version": "14.2.28", - "resolved": "https://registry.npmjs.org/@next/mdx/-/mdx-14.2.28.tgz", - "integrity": "sha512-gW3YZamw6MjgDjP58k40Fc8niBo4TJ+gjfC1/uzCAwMUliHF9jmFa9gmOEU2AQT1XNUOTZ05sERsKGXW7k3FDA==", + "version": "14.2.30", + "resolved": "https://registry.npmjs.org/@next/mdx/-/mdx-14.2.30.tgz", + "integrity": "sha512-CEUs6GR14NvRzxNVlVZw1YpPAY64N6uibQmaS7l+GCwhqHz5Z8aqBAtNfY/HVBJPzUCadJKsQI7ICLdZyw23eg==", "requires": { "source-map": "^0.7.0" }, @@ -28403,12 +28404,12 @@ } }, "eslint-config-next": { - "version": "14.2.28", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-14.2.28.tgz", - "integrity": "sha512-UxJMRQ4uaEdLp3mVQoIbRIlEF0S2rTlyZhI/2yEMVdAWmgFfPY4iJZ68jCbhLvXMnKeHMkmqTGjEhFH5Vm9h+A==", + "version": "14.2.30", + "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-14.2.30.tgz", + "integrity": "sha512-4pTMb3wfpI+piVeEz3TWG1spjuXJJBZaYabi2H08z2ZTk6/N304POEovHdFmK6EZb4QlKpETulBNaRIITA0+xg==", "dev": true, "requires": { - "@next/eslint-plugin-next": "14.2.28", + "@next/eslint-plugin-next": "14.2.30", "@rushstack/eslint-patch": "^1.3.3", "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", @@ -29123,13 +29124,14 @@ } }, "form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, diff --git a/package.json b/package.json index e74177bef..36ebd116d 100644 --- a/package.json +++ b/package.json @@ -32,14 +32,14 @@ "check-system-status:anvil-cmg": "esrun e2e/anvil/anvil-check-system-status.ts" }, "dependencies": { - "@databiosphere/findable-ui": "^38.1.1", + "@databiosphere/findable-ui": "^40.0.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", "@mdx-js/loader": "^3.0.1", "@mdx-js/react": "^3.0.1", "@mui/icons-material": "^7.0.1", "@mui/material": "^7.0.1", - "@next/mdx": "^14.2.28", + "@next/mdx": "^14.2.30", "@observablehq/plot": "^0.6.17", "@tanstack/react-table": "^8.19.2", "@tanstack/react-virtual": "^3.13.12", @@ -50,7 +50,7 @@ "jwt-decode": "^3.1.2", "ky": "^1.7.2", "match-sorter": "^6.3.1", - "next": "^14.2.28", + "next": "^14.2.30", "next-auth": "^4.24.7", "next-compose-plugins": "^2.2.1", "next-mdx-remote": "^4.2.0", @@ -76,7 +76,7 @@ "@commitlint/config-conventional": "^19.6.0", "@digitak/esrun": "^3.2.26", "@mui/types": "^7.4.0", - "@next/eslint-plugin-next": "^14.2.28", + "@next/eslint-plugin-next": "^14.2.30", "@playwright/test": "^1.49.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^16.0.1", @@ -90,7 +90,7 @@ "@typescript-eslint/eslint-plugin": "^8.18.1", "babel-loader": "^9.2.1", "eslint": "^8.33.0", - "eslint-config-next": "^14.2.28", + "eslint-config-next": "^14.2.30", "eslint-config-prettier": "^9.1.0", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-jsdoc": "^50.6.1",