Skip to content

Commit ffd92e1

Browse files
frano-mclaude
andauthored
chore: update findable-ui to latest (#4651) (#4652)
* chore: update findable-ui to latest (#4651) * chore: add explicit JSX imports for React 19 compatibility (#4651) React 19 requires explicit JSX imports as JSX is no longer globally available. Added `import { JSX } from "react"` to all files that use JSX.Element type annotations. Also added next-env.d.ts to .eslintignore as it is auto-generated by Next.js 15. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * chore: remove ky from transpilePackages (#4651) Next.js 15 has native ESM support, so ky no longer needs to be transpiled. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test: update mock data to use azul_url property name (#4651) Rename url -> azul_url in project matrix test mocks to match the Azul API response format. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: use dynamic NODE_ENV check for MDX development option (#4651) Fixes _jsxDEV is not a function error in CI by matching the pattern used in contentPages.ts instead of hardcoding development: false. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: resolve _jsxDEV error by aligning files/ dependencies (#4651) - Remove duplicate packages from files/package.json that are already in main package.json (unified, remark-parse, remark-rehype, etc.) - Update rehype-stringify from v9 to v10 for unified v11 compatibility - Set NODE_ENV=production in build-anvil-db script to ensure MDX compiles with production JSX runtime instead of development Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: add explicit wait for filter dropdown visibility in E2E test (#4651) Wait for the filter option to be visible before clicking the checkbox to fix flaky test behavior in CI environments with higher latency. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Fran McDade <18710366+frano-m@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 328ad08 commit ffd92e1

File tree

68 files changed

+4436
-10329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+4436
-10329
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**/node_modules/*
22
**/out/*
33
**/.next/*
4+
next-env.d.ts
45

56
build
67

__tests__/project-matrix-mapper.test.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ const COUNT_MATRIX = "Count Matrix";
2323
const LARGE_INTESTINE = "large intestine";
2424
const LYMPH_NODE = "lymph node";
2525
const MOCK_PROJECT_MATRIX_FILE_0 = {
26+
azul_url: "https://path/to/file0?version=0&catalog=dcp2ebi",
2627
name: "123.loom",
2728
size: 254147853,
28-
url: "https://path/to/file0?version=0&catalog=dcp2ebi",
2929
};
3030
const MOCK_PROJECT_MATRIX_FILE_1 = {
31+
azul_url: "https://path/to/file1?version=0&catalog=dcp2ebi",
3132
name: "456.loom",
3233
size: 254147854,
33-
url: "https://path/to/file1?version=0&catalog=dcp2ebi",
3434
};
3535
const CONTRIBUTED_ANALYSES = {
3636
genusSpecies: {
@@ -42,16 +42,16 @@ const CONTRIBUTED_ANALYSES = {
4242
libraryConstructionApproach: {
4343
[LibraryConstructionApproach.TENX_V2]: [
4444
{
45+
azul_url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
4546
name: MOCK_PROJECT_MATRIX_FILE_0.name,
4647
size: MOCK_PROJECT_MATRIX_FILE_0.size,
47-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
4848
},
4949
],
5050
[LibraryConstructionApproach.SMART_SEQ2]: [
5151
{
52+
azul_url: MOCK_PROJECT_MATRIX_FILE_1.azul_url,
5253
name: MOCK_PROJECT_MATRIX_FILE_1.name,
5354
size: MOCK_PROJECT_MATRIX_FILE_1.size,
54-
url: MOCK_PROJECT_MATRIX_FILE_1.url,
5555
},
5656
],
5757
},
@@ -60,14 +60,14 @@ const CONTRIBUTED_ANALYSES = {
6060
libraryConstructionApproach: {
6161
[LibraryConstructionApproach.TENX_V2]: [
6262
{
63+
azul_url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
6364
name: MOCK_PROJECT_MATRIX_FILE_0.name,
6465
size: MOCK_PROJECT_MATRIX_FILE_0.size,
65-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
6666
},
6767
{
68+
azul_url: MOCK_PROJECT_MATRIX_FILE_1.azul_url,
6869
name: MOCK_PROJECT_MATRIX_FILE_1.name,
6970
size: MOCK_PROJECT_MATRIX_FILE_1.size,
70-
url: MOCK_PROJECT_MATRIX_FILE_1.url,
7171
},
7272
],
7373
},
@@ -99,7 +99,7 @@ describe("MatrixMapper", () => {
9999
expect(matrixView0.stage[0]).toEqual("adult");
100100
expect(matrixView0.fileName).toEqual(MOCK_PROJECT_MATRIX_FILE_0.name);
101101
expect(matrixView0.size).toEqual(MOCK_PROJECT_MATRIX_FILE_0.size);
102-
expect(matrixView0.url).toEqual(MOCK_PROJECT_MATRIX_FILE_0.url);
102+
expect(matrixView0.url).toEqual(MOCK_PROJECT_MATRIX_FILE_0.azul_url);
103103

104104
const matrixView1 = matrixViews[1];
105105
expect(matrixView0.libraryConstructionApproach.length).toEqual(1);
@@ -112,7 +112,7 @@ describe("MatrixMapper", () => {
112112
expect(matrixView1.stage[0]).toEqual("adult");
113113
expect(matrixView1.fileName).toEqual(MOCK_PROJECT_MATRIX_FILE_1.name);
114114
expect(matrixView1.size).toEqual(MOCK_PROJECT_MATRIX_FILE_1.size);
115-
expect(matrixView1.url).toEqual(MOCK_PROJECT_MATRIX_FILE_1.url);
115+
expect(matrixView1.url).toEqual(MOCK_PROJECT_MATRIX_FILE_1.azul_url);
116116

117117
const matrixView2 = matrixViews[2];
118118
expect(matrixView0.libraryConstructionApproach.length).toEqual(1);
@@ -125,7 +125,7 @@ describe("MatrixMapper", () => {
125125
expect(matrixView2.stage[0]).toEqual("adult");
126126
expect(matrixView2.fileName).toEqual(MOCK_PROJECT_MATRIX_FILE_0.name);
127127
expect(matrixView2.size).toEqual(MOCK_PROJECT_MATRIX_FILE_0.size);
128-
expect(matrixView2.url).toEqual(MOCK_PROJECT_MATRIX_FILE_0.url);
128+
expect(matrixView2.url).toEqual(MOCK_PROJECT_MATRIX_FILE_0.azul_url);
129129

130130
const matrixView3 = matrixViews[3];
131131
expect(matrixView0.libraryConstructionApproach.length).toEqual(1);
@@ -138,7 +138,7 @@ describe("MatrixMapper", () => {
138138
expect(matrixView3.stage[0]).toEqual("adult");
139139
expect(matrixView3.fileName).toEqual(MOCK_PROJECT_MATRIX_FILE_1.name);
140140
expect(matrixView3.size).toEqual(MOCK_PROJECT_MATRIX_FILE_1.size);
141-
expect(matrixView3.url).toEqual(MOCK_PROJECT_MATRIX_FILE_1.url);
141+
expect(matrixView3.url).toEqual(MOCK_PROJECT_MATRIX_FILE_1.azul_url);
142142
});
143143

144144
/**
@@ -153,7 +153,7 @@ describe("MatrixMapper", () => {
153153
const matrixView0 = matrixViews[0];
154154
expect(matrixView0.fileName).toEqual(MOCK_PROJECT_MATRIX_FILE_0.name);
155155
expect(matrixView0.size).toEqual(MOCK_PROJECT_MATRIX_FILE_0.size);
156-
expect(matrixView0.url).toEqual(MOCK_PROJECT_MATRIX_FILE_0.url);
156+
expect(matrixView0.url).toEqual(MOCK_PROJECT_MATRIX_FILE_0.azul_url);
157157
expect(matrixView0.organ.length).toEqual(2);
158158
expect(matrixView0.organ.indexOf(LARGE_INTESTINE)).not.toEqual(-1);
159159
expect(matrixView0.organ.indexOf(LYMPH_NODE)).not.toEqual(-1);
@@ -166,7 +166,7 @@ describe("MatrixMapper", () => {
166166
const matrixView1 = matrixViews[1];
167167
expect(matrixView1.fileName).toEqual(MOCK_PROJECT_MATRIX_FILE_1.name);
168168
expect(matrixView1.size).toEqual(MOCK_PROJECT_MATRIX_FILE_1.size);
169-
expect(matrixView1.url).toEqual(MOCK_PROJECT_MATRIX_FILE_1.url);
169+
expect(matrixView1.url).toEqual(MOCK_PROJECT_MATRIX_FILE_1.azul_url);
170170
expect(matrixView1.organ.length).toEqual(2);
171171
expect(matrixView1.organ.indexOf(LARGE_INTESTINE)).not.toEqual(-1);
172172
expect(matrixView1.organ.indexOf(LYMPH_NODE)).not.toEqual(-1);
@@ -200,7 +200,7 @@ describe("MatrixMapper", () => {
200200
],
201201
organ: [LYMPH_NODE, LARGE_INTESTINE],
202202
size: MOCK_PROJECT_MATRIX_FILE_0.size,
203-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
203+
url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
204204
version: "1",
205205
},
206206
];
@@ -223,8 +223,8 @@ describe("MatrixMapper", () => {
223223
genusSpecies: {
224224
"Homo sapiens,Mus musculus": [
225225
{
226+
azul_url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
226227
name: MOCK_PROJECT_MATRIX_FILE_0.name,
227-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
228228
},
229229
],
230230
},
@@ -246,8 +246,8 @@ describe("MatrixMapper", () => {
246246
genusSpecies: {
247247
"Mus musculus,Homo sapiens": [
248248
{
249+
azul_url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
249250
name: MOCK_PROJECT_MATRIX_FILE_0.name,
250-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
251251
},
252252
],
253253
},
@@ -273,7 +273,7 @@ describe("MatrixMapper", () => {
273273
libraryConstructionApproach: [LibraryConstructionApproach.TENX_V2],
274274
organ: [LYMPH_NODE, LARGE_INTESTINE],
275275
size: MOCK_PROJECT_MATRIX_FILE_0.size,
276-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
276+
url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
277277
version: "1",
278278
},
279279
{
@@ -284,7 +284,7 @@ describe("MatrixMapper", () => {
284284
libraryConstructionApproach: [LibraryConstructionApproach.TENX_V2],
285285
organ: [LYMPH_NODE, LARGE_INTESTINE],
286286
size: MOCK_PROJECT_MATRIX_FILE_1.size,
287-
url: MOCK_PROJECT_MATRIX_FILE_1.url,
287+
url: MOCK_PROJECT_MATRIX_FILE_1.azul_url,
288288
version: "1",
289289
},
290290
];
@@ -308,7 +308,7 @@ describe("MatrixMapper", () => {
308308
libraryConstructionApproach: [LibraryConstructionApproach.TENX_V2],
309309
organ: [LYMPH_NODE],
310310
size: MOCK_PROJECT_MATRIX_FILE_0.size,
311-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
311+
url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
312312
version: "1",
313313
},
314314
{
@@ -319,7 +319,7 @@ describe("MatrixMapper", () => {
319319
libraryConstructionApproach: [LibraryConstructionApproach.TENX_V2],
320320
organ: [LARGE_INTESTINE],
321321
size: MOCK_PROJECT_MATRIX_FILE_1.size,
322-
url: MOCK_PROJECT_MATRIX_FILE_1.url,
322+
url: MOCK_PROJECT_MATRIX_FILE_1.azul_url,
323323
version: "1",
324324
},
325325
];
@@ -343,7 +343,7 @@ describe("MatrixMapper", () => {
343343
libraryConstructionApproach: [LibraryConstructionApproach.SMART_SEQ2],
344344
organ: [LYMPH_NODE],
345345
size: MOCK_PROJECT_MATRIX_FILE_0.size,
346-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
346+
url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
347347
version: "1",
348348
},
349349
{
@@ -354,7 +354,7 @@ describe("MatrixMapper", () => {
354354
libraryConstructionApproach: [LibraryConstructionApproach.TENX_V2], // "10x .."
355355
organ: [LYMPH_NODE],
356356
size: MOCK_PROJECT_MATRIX_FILE_1.size,
357-
url: MOCK_PROJECT_MATRIX_FILE_1.url,
357+
url: MOCK_PROJECT_MATRIX_FILE_1.azul_url,
358358
version: "1",
359359
},
360360
];
@@ -391,14 +391,14 @@ describe("MatrixMapper", () => {
391391
genusSpecies: {
392392
"Homo sapiens": [
393393
{
394+
azul_url: MOCK_PROJECT_MATRIX_FILE_0.azul_url,
394395
name: MOCK_PROJECT_MATRIX_FILE_0.name,
395396
size: MOCK_PROJECT_MATRIX_FILE_0.size,
396-
url: MOCK_PROJECT_MATRIX_FILE_0.url,
397397
},
398398
{
399+
azul_url: MOCK_PROJECT_MATRIX_FILE_1.azul_url,
399400
name: MOCK_PROJECT_MATRIX_FILE_1.name,
400401
size: MOCK_PROJECT_MATRIX_FILE_1.size,
401-
url: MOCK_PROJECT_MATRIX_FILE_1.url,
402402
},
403403
],
404404
},

app/components/Detail/components/AccessibilityBadge/accessibilityBadge.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import { AccessibilityBadgeProps } from "@databiosphere/findable-ui/lib/components/Detail/components/AccessibilityBadge/accessibilityBadge";
23
import { AccessibilityBadge as Badge } from "./accessibilityBadge.styles";
34

app/components/Detail/components/AccessibilityBadge/components/Stack/stack.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Stack as MStack } from "@mui/material";
2-
import { ReactNode } from "react";
2+
import { JSX, ReactNode } from "react";
33

44
interface StackProps {
55
children: ReactNode | ReactNode[];

app/components/Detail/components/AnVILCMG/components/RequestAccess/requestAccess.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import { Props } from "./types";
23
import { ListItemText, MenuItem } from "@mui/material";
34
import { Actions } from "@databiosphere/findable-ui/lib/components/Layout/components/BackPage/components/BackPageHero/components/Actions/actions";

app/components/Detail/components/ConsentCodeList/consentCodeList.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import { ConsentTooltip } from "../ConsentTooltip/consentTooltip";
23

34
interface ConsentCodeListProps {

app/components/Detail/components/ConsentTooltip/consentTooltip.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import { Tooltip } from "@mui/material";
23

34
interface ConsentTooltipProps {

app/components/Detail/components/Consortium/components/ConsortiumDescription/consortiumDescription.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import {
23
MdxMarkdown,
34
MDXSerializeResult,

app/components/Detail/components/EntityGuard/components/EntityDeprecated/entityDeprecated.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary";
23
import { AlertIcon } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/components/AlertIcon/alertIcon";
34
import { SectionActions } from "@databiosphere/findable-ui/lib/components/common/Section/section.styles";

app/components/Detail/components/EntityGuard/components/EntityWithdrawn/entityWithdrawn.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { JSX } from "react";
12
import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary";
23
import { AlertIcon } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/components/AlertIcon/alertIcon";
34
import { SectionActions } from "@databiosphere/findable-ui/lib/components/common/Section/section.styles";

0 commit comments

Comments
 (0)