Skip to content

Commit 16f97cd

Browse files
committed
fix: some tests error
1 parent acf5b17 commit 16f97cd

File tree

11 files changed

+314
-762
lines changed

11 files changed

+314
-762
lines changed

public/locales/en/dataset.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
"termsOfAccess": "Terms of Access for Restricted Files",
156156
"termsOfAccessInfo": "Restricting limits access to published files. People who want to use the restricted files can request access by default. If you disable request access, you must add information about access to the Terms of Access field. Learn about restricting files and dataset access in the User Guide.",
157157
"requestAccess": "Request Access",
158+
"enableAccessRequest": "Enable access request",
158159
"dataAccessPlace": "Data Access Place",
159160
"originalArchive": "Original Archive",
160161
"availabilityStatus": "Availability Status",
@@ -362,17 +363,6 @@
362363
"title": "Restricted Files + Terms of Access",
363364
"description": "Set up access restrictions and terms for restricted files in this dataset."
364365
},
365-
"restrictedFiles": {
366-
"requestAccess": "Request Access",
367-
"enableAccessRequest": "Enable access request",
368-
"termsOfAccess": "Terms of Access for Restricted Files",
369-
"dataAccessPlace": "Data Access Place",
370-
"originalArchive": "Original Archive",
371-
"availabilityStatus": "Availability Status",
372-
"contactForAccess": "Contact for Access",
373-
"sizeOfCollection": "Size of Collection",
374-
"studyCompletion": "Study Completion"
375-
},
376366
"guestBook": {
377367
"title": "Guest Book",
378368
"description": "Select a guestbook to have a user provide additional information when downloading a file.",

src/sections/edit-dataset-terms/EditDatasetTerms.tsx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { useDataset } from '../dataset/DatasetContext'
1212
import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
1313
import { NotFoundPage } from '../not-found-page/NotFoundPage'
1414
import { AppLoader } from '../shared/layout/app-loader/AppLoader'
15-
import { DatasetLicense } from '@/dataset/domain/models/Dataset'
15+
import { DatasetLicense, CustomTerms } from '@/dataset/domain/models/Dataset'
1616
import styles from './EditDatasetTerms.module.scss'
1717
import { useMediaQuery } from '@/shared/hooks/useMediaQuery'
1818

@@ -24,18 +24,6 @@ interface EditDatasetTermsProps {
2424
datasetRepository: DatasetRepository
2525
}
2626

27-
// TODO: Remove this interface and use from model
28-
interface CustomTermsData {
29-
termsOfUse: string
30-
confidentialityDeclaration?: string
31-
specialPermissions?: string
32-
restrictions?: string
33-
citationRequirements?: string
34-
depositorRequirements?: string
35-
conditions?: string
36-
disclaimer?: string
37-
}
38-
3927
export const EditDatasetTerms = ({
4028
defaultActiveTabKey,
4129
licenseRepository,
@@ -89,7 +77,7 @@ export const EditDatasetTerms = ({
8977
datasetRepository={datasetRepository}
9078
initialLicense={
9179
(dataset.license as DatasetLicense) ||
92-
(dataset.termsOfUse.customTerms as CustomTermsData)
80+
(dataset.termsOfUse.customTerms as CustomTerms)
9381
}
9482
isInitialCustomTerms={dataset.termsOfUse.customTerms !== undefined}
9583
/>
@@ -127,7 +115,7 @@ export const EditDatasetTerms = ({
127115
datasetRepository={datasetRepository}
128116
initialLicense={
129117
(dataset.license as DatasetLicense) ||
130-
(dataset.termsOfUse.customTerms as CustomTermsData)
118+
(dataset.termsOfUse.customTerms as CustomTerms)
131119
}
132120
isInitialCustomTerms={dataset.termsOfUse.customTerms !== undefined}
133121
/>

0 commit comments

Comments
 (0)