Skip to content

Commit 600ce94

Browse files
ChengShi-1ChengShi-1
committed
fix: lint error and add changelog
1 parent 030a39e commit 600ce94

5 files changed

Lines changed: 77 additions & 25 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
6262
- Upgrade Keycloak to 26.3.2; updated SPI and test realm JSON.
6363
- Truncate long collection and dataset descriptions with expandable content. (#789)
6464
- UI polish: Files Table always shows action buttons. (#800)
65+
- Removed hard-coded references to /spa path and SPA name, changed to /modern (#945)
6566

6667
### Fixed
6768

‎tests/e2e-integration/e2e/sections/auth/Login.spec.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ describe('Login', () => {
4242

4343
cy.url().should((currentUrl) => {
4444
const baseUrl = Cypress.config().baseUrl as string
45-
expect([`${baseUrl}${FRONTEND_BASE_PATH}`, `${baseUrl}${FRONTEND_BASE_PATH}/collections`]).to.include(currentUrl)
45+
expect([
46+
`${baseUrl}${FRONTEND_BASE_PATH}`,
47+
`${baseUrl}${FRONTEND_BASE_PATH}/collections`
48+
]).to.include(currentUrl)
4649
})
4750

4851
cy.get('body').then(($body) => {

‎tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx‎

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ describe('Dataset', () => {
2727
cy.wrap(DatasetHelper.create())
2828
.its('persistentId')
2929
.then((persistentId: string) => {
30-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
30+
cy.visit(
31+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
32+
)
3133
cy.fixture('dataset-finch1.json').then((dataset: Dataset) => {
3234
cy.findByRole('heading', {
3335
name: dataset.datasetVersion.metadataBlocks.citation.fields[0].value
@@ -53,7 +55,9 @@ describe('Dataset', () => {
5355
cy.wrap(DatasetHelper.create(collectionId))
5456
.its('persistentId')
5557
.then((persistentId: string) => {
56-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
58+
cy.visit(
59+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
60+
)
5761
cy.findByText('Draft').should('exist')
5862
cy.findByRole('button', { name: 'Publish Dataset' }).should('exist').click()
5963
cy.findByRole('button', { name: 'Publish' }).should('exist')
@@ -70,7 +74,9 @@ describe('Dataset', () => {
7074
cy.wrap(DatasetHelper.create())
7175
.its('persistentId')
7276
.then((persistentId: string) => {
73-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
77+
cy.visit(
78+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
79+
)
7480
cy.findByText('Draft').should('exist')
7581
cy.findByRole('button', { name: 'Publish Dataset' }).should('exist').click()
7682
cy.findByRole('button', { name: 'Publish' }).should('exist')
@@ -178,7 +184,9 @@ describe('Dataset', () => {
178184
.its('persistentId')
179185
.then((persistentId: string) => {
180186
TestsUtils.logout()
181-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
187+
cy.visit(
188+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
189+
)
182190

183191
cy.findByTestId('not-found-page').should('exist')
184192
})
@@ -288,7 +296,9 @@ describe('Dataset', () => {
288296
)
289297
.its('persistentId')
290298
.then((persistentId: string) => {
291-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
299+
cy.visit(
300+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
301+
)
292302

293303
cy.findByText('Root').should('exist')
294304
cy.findByRole('link', { name: 'Scientific Research' }).should('exist').click()
@@ -301,7 +311,9 @@ describe('Dataset', () => {
301311
cy.wrap(DatasetHelper.create())
302312
.its('persistentId')
303313
.then((persistentId: string) => {
304-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
314+
cy.visit(
315+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
316+
)
305317

306318
cy.findByRole('button', { name: 'Edit Dataset' }).should('exist').click()
307319
cy.findByRole('button', { name: 'Delete Dataset' }).should('exist').click()
@@ -317,7 +329,9 @@ describe('Dataset', () => {
317329
cy.wrap(DatasetHelper.create())
318330
.its('persistentId')
319331
.then((persistentId: string) => {
320-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
332+
cy.visit(
333+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
334+
)
321335

322336
cy.findByText('Files').should('exist')
323337

@@ -329,7 +343,9 @@ describe('Dataset', () => {
329343
cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(3)), { timeout: 5000 })
330344
.its('persistentId')
331345
.then((persistentId: string) => {
332-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
346+
cy.visit(
347+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
348+
)
333349

334350
cy.findByText('Files').should('exist')
335351

@@ -349,7 +365,9 @@ describe('Dataset', () => {
349365
cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(30)), { timeout: 20000 })
350366
.its('persistentId')
351367
.then((persistentId: string) => {
352-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
368+
cy.visit(
369+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
370+
)
353371

354372
cy.findByText('Files').should('exist')
355373

@@ -373,7 +391,9 @@ describe('Dataset', () => {
373391
cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(30)), { timeout: 20000 })
374392
.its('persistentId')
375393
.then((persistentId: string) => {
376-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
394+
cy.visit(
395+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
396+
)
377397

378398
cy.findByText('Files').should('exist')
379399

@@ -403,7 +423,9 @@ describe('Dataset', () => {
403423
cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(3)))
404424
.its('persistentId')
405425
.then((persistentId: string) => {
406-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
426+
cy.visit(
427+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
428+
)
407429

408430
cy.findByText('Files').should('exist')
409431

@@ -441,7 +463,9 @@ describe('Dataset', () => {
441463
cy.wrap(DatasetHelper.createWithFiles(FileHelper.createManyRestricted(1)))
442464
.its('persistentId')
443465
.then((persistentId: string) => {
444-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
466+
cy.visit(
467+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
468+
)
445469

446470
cy.findByText('Files').should('exist')
447471

@@ -507,7 +531,9 @@ describe('Dataset', () => {
507531
.then((persistentId: string) => {
508532
cy.wait(1500) // Wait for the files to be embargoed
509533

510-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
534+
cy.visit(
535+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
536+
)
511537

512538
cy.wait(1500) // Wait for the files to be loaded
513539

@@ -566,7 +592,9 @@ describe('Dataset', () => {
566592
cy.wrap(DatasetHelper.createWithFiles(files))
567593
.its('persistentId')
568594
.then((persistentId: string) => {
569-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
595+
cy.visit(
596+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
597+
)
570598

571599
cy.findByText('Files').should('exist')
572600

@@ -687,7 +715,9 @@ describe('Dataset', () => {
687715
.then((fileData) => cy.wrap(DatasetHelper.createWithFiles([fileData])))
688716
.its('persistentId')
689717
.then((persistentId: string) => {
690-
cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
718+
cy.visit(
719+
`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`
720+
)
691721

692722
cy.findByText('Files').should('exist')
693723

‎tests/e2e-integration/e2e/sections/edit-dataset-metadata/EditDatasetMetadata.spec.tsx‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ describe('Edit Dataset metadata', () => {
2323
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
2424
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
2525

26-
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_METADATA}?${searchParams.toString()}`
26+
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${
27+
Route.EDIT_DATASET_METADATA
28+
}?${searchParams.toString()}`
2729

2830
cy.visit(editDatasetMetadataUrl)
2931

@@ -44,7 +46,9 @@ describe('Edit Dataset metadata', () => {
4446
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
4547
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
4648

47-
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_METADATA}?${searchParams.toString()}`
49+
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${
50+
Route.EDIT_DATASET_METADATA
51+
}?${searchParams.toString()}`
4852

4953
cy.visit(editDatasetMetadataUrl)
5054

@@ -71,7 +75,9 @@ describe('Edit Dataset metadata', () => {
7175
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
7276
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
7377

74-
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_METADATA}?${searchParams.toString()}`
78+
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${
79+
Route.EDIT_DATASET_METADATA
80+
}?${searchParams.toString()}`
7581

7682
TestsUtils.logout()
7783

@@ -90,7 +96,9 @@ describe('Edit Dataset metadata', () => {
9096
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
9197
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
9298

93-
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_METADATA}?${searchParams.toString()}`
99+
const editDatasetMetadataUrl = `${FRONTEND_BASE_PATH}${
100+
Route.EDIT_DATASET_METADATA
101+
}?${searchParams.toString()}`
94102

95103
TestsUtils.logout()
96104

‎tests/e2e-integration/e2e/sections/edit-dataset-terms/EditDatasetTerms.spec.tsx‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ describe('Edit Dataset Terms', () => {
2121
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
2222
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
2323

24-
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_TERMS}?${searchParams.toString()}`
24+
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${
25+
Route.EDIT_DATASET_TERMS
26+
}?${searchParams.toString()}`
2527

2628
cy.visit(editDatasetTermsUrl)
2729

@@ -73,7 +75,9 @@ describe('Edit Dataset Terms', () => {
7375
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
7476
searchParams.set('tab', 'restrictedFilesTerms')
7577

76-
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_TERMS}?${searchParams.toString()}`
78+
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${
79+
Route.EDIT_DATASET_TERMS
80+
}?${searchParams.toString()}`
7781

7882
cy.visit(editDatasetTermsUrl)
7983

@@ -129,7 +133,9 @@ describe('Edit Dataset Terms', () => {
129133
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
130134
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
131135

132-
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_TERMS}?${searchParams.toString()}`
136+
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${
137+
Route.EDIT_DATASET_TERMS
138+
}?${searchParams.toString()}`
133139

134140
cy.visit(editDatasetTermsUrl)
135141

@@ -171,7 +177,9 @@ describe('Edit Dataset Terms', () => {
171177
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
172178
searchParams.set('tab', 'restrictedFilesTerms')
173179

174-
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_TERMS}?${searchParams.toString()}`
180+
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${
181+
Route.EDIT_DATASET_TERMS
182+
}?${searchParams.toString()}`
175183

176184
cy.visit(editDatasetTermsUrl)
177185

@@ -192,7 +200,9 @@ describe('Edit Dataset Terms', () => {
192200
searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
193201
searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
194202

195-
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${Route.EDIT_DATASET_TERMS}?${searchParams.toString()}`
203+
const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${
204+
Route.EDIT_DATASET_TERMS
205+
}?${searchParams.toString()}`
196206

197207
cy.visit(editDatasetTermsUrl)
198208
cy.findByRole('link', { name: datasetTitle }).click()

0 commit comments

Comments
 (0)
⚡