+
Are you sure you want to delete software {modal?.highlight?.brand_name} from hightlight?
-
{subtitle} diff --git a/frontend/components/cards/StatusBanner.tsx b/frontend/components/cards/StatusBanner.tsx index 0bd86dc8f..47dc54bff 100644 --- a/frontend/components/cards/StatusBanner.tsx +++ b/frontend/components/cards/StatusBanner.tsx @@ -48,6 +48,6 @@ export default function StatusBanner({ Not published } - + ) } diff --git a/frontend/components/charts/d3LineChart/NoDataAvailableChart.tsx b/frontend/components/charts/d3LineChart/NoDataAvailableChart.tsx index 65b20395b..a27ade0eb 100644 --- a/frontend/components/charts/d3LineChart/NoDataAvailableChart.tsx +++ b/frontend/components/charts/d3LineChart/NoDataAvailableChart.tsx @@ -114,12 +114,12 @@ function drawLine(props: LineChartConfig) { lineGroup.selectAll('.line') .data([noCommitData]) .join('path') - .attr('class','line') - .attr('d',d=>generateScaledLine(d as any)) - .attr('fill','none') - .attr('stroke', strokeColor) - .attr('stroke-width', 2) - .attr('stroke-opacity', 0.7) + .attr('class','line') + .attr('d',d=>generateScaledLine(d as any)) + .attr('fill','none') + .attr('stroke', strokeColor) + .attr('stroke-width', 2) + .attr('stroke-opacity', 0.7) const sw = group.append('switch') sw.append('foreignObject') diff --git a/frontend/components/charts/d3LineChart/SingleLineChart.test.tsx b/frontend/components/charts/d3LineChart/SingleLineChart.test.tsx index 61113084f..0868699c5 100644 --- a/frontend/components/charts/d3LineChart/SingleLineChart.test.tsx +++ b/frontend/components/charts/d3LineChart/SingleLineChart.test.tsx @@ -24,10 +24,10 @@ it('renders chart with d3-line-chart svg group', async() => { // render chart with mocked line data const {container} = render(WrappedComponentWithProps( SingleLineChart, { - props: { - data: mockLineData - } - })) + props: { + data: mockLineData + } + })) // wait for root svg element const svg = await screen.findByTestId('d3-line-chart') diff --git a/frontend/components/charts/d3LineChart/drawLineChart.tsx b/frontend/components/charts/d3LineChart/drawLineChart.tsx index 6ff52efe1..a35bce646 100644 --- a/frontend/components/charts/d3LineChart/drawLineChart.tsx +++ b/frontend/components/charts/d3LineChart/drawLineChart.tsx @@ -125,12 +125,12 @@ export default function drawLineChart(props: LineChartConfig) { lineGroup.selectAll('.line') .data([data]) .join('path') - .attr('class','line') - .attr('d',d=>generateScaledLine(d as any)) - .attr('fill','none') - .attr('stroke', strokeColor) - .attr('stroke-width', 2) - .attr('stroke-opacity', 0.7) + .attr('class','line') + .attr('d',d=>generateScaledLine(d as any)) + .attr('fill','none') + .attr('stroke', strokeColor) + .attr('stroke-width', 2) + .attr('stroke-opacity', 0.7) return true } diff --git a/frontend/components/cookies/CookieConsentMatomo.tsx b/frontend/components/cookies/CookieConsentMatomo.tsx index 537eecdd5..77b78d1e8 100644 --- a/frontend/components/cookies/CookieConsentMatomo.tsx +++ b/frontend/components/cookies/CookieConsentMatomo.tsx @@ -62,17 +62,17 @@ export default function CookieConsentMatomo({matomo, route}: CookieConsentMatomo data-testid="cookie-consent-matomo" >
-
-
-
- We use
-
-
+
+
+
+ We use
+
+
cookies
-
- with
+
+ with
matomo.org
to provide a better user experience.
diff --git a/frontend/components/feedback/FeedbackPanelButton.tsx b/frontend/components/feedback/FeedbackPanelButton.tsx
index 57b6b872d..4802c07b0 100644
--- a/frontend/components/feedback/FeedbackPanelButton.tsx
+++ b/frontend/components/feedback/FeedbackPanelButton.tsx
@@ -94,7 +94,7 @@ User Agent: ${navigator.userAgent}`
className="placeholder:text-base-500 outline-0 p-2 w-full h-28 text-sm bg-base-700 text-base-100 border border-base-600 rounded"
placeholder="Ideas on how to improve this page or report an issue?" value={text}
onChange={e => setText(e.target.value)}>
-
+
{/* Location URL */}
diff --git a/frontend/components/form/ControlledSlugTextField.tsx b/frontend/components/form/ControlledSlugTextField.tsx
index 68f1087c3..f68075638 100644
--- a/frontend/components/form/ControlledSlugTextField.tsx
+++ b/frontend/components/form/ControlledSlugTextField.tsx
@@ -75,7 +75,7 @@ export default function ControlledSlugTextField({
- {helperInfo?.length || 0}/{helperInfo?.maxLength}
-
- )
- } else {
- return (
-
- {helperInfo?.length || 0}/{helperInfo.maxLength}
-
- )
+ return (
+
+ {helperInfo?.length || 0}/{helperInfo?.maxLength}
+
+ )
+ } else {
+ return (
+
+ {helperInfo?.length || 0}/{helperInfo.maxLength}
+
+ )
}
return null
}
diff --git a/frontend/components/form/SlugTextField.tsx b/frontend/components/form/SlugTextField.tsx
index 96cd2f7ea..ab519001b 100644
--- a/frontend/components/form/SlugTextField.tsx
+++ b/frontend/components/form/SlugTextField.tsx
@@ -58,7 +58,7 @@ export default function SlugTextField({
- ) {
function ParticipatingOrganisations({organisations}:{organisations:OrganisationForOverview[]}) {
return (
- 
-
-
-
-
+
)
}
@@ -193,28 +193,28 @@ function clearBackgroundImage(event: React.MouseEvent{name}
- {description}
+
+
-
+
+
+
+
{name}
+ {description}
+
-
- {
- organisations.map(item => {
- return(
-
- )
-
- )
- })
- }
+
+
+ {
+ organisations.map(item => {
+ return(
+
+
+
+ )
+ })
+ }
-
-
-
-
- {/* Software spotlights */}
- Research for grand challenges.
- {/*
+ {/* Head and claim */}
+
+
+
+
-
+
- Promote and Discover
-
+ Promote and Discover
Research Software
- Because software matters
-
+ Promote and Discover
+
Promote and Discover
Research Software
+ Because software matters
-
Software Spotlights
-Outstanding software products of the Helmholtz community
-
-
-
-
- {/* Software meta repository */}
-
+ {/* Software spotlights */}
+
+
+
Software Spotlights
+Outstanding software products of the Helmholtz community
+
+
+
+
+
+
Browse software
-
-
-
-
-
+ {/* Software meta repository */}
+ Discover by research topic
- {/*Browse Software by Research Topic
*/}
-
+
- {/* Teaser */}
-
+
+ Discover by research topic
+ {/*Browse Software by Research Topic
*/}
+
-
- {
strategy="lazyOnload"
nonce={nonce}
>
- {`
+ {`
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['requireConsent']);
diff --git a/frontend/pages/admin/orcid-users.tsx b/frontend/pages/admin/orcid-users.tsx
index 420602374..821f0e3f1 100644
--- a/frontend/pages/admin/orcid-users.tsx
+++ b/frontend/pages/admin/orcid-users.tsx
@@ -53,7 +53,7 @@ export default function OrcidWitelistPage() {
fetchWhitelistedOrcids()
}
- return (
+ return (
{pageTitle}
diff --git a/frontend/pages/invite/organisation/[id].tsx b/frontend/pages/invite/organisation/[id].tsx
index abfb26a7c..e475e6ee7 100644
--- a/frontend/pages/invite/organisation/[id].tsx
+++ b/frontend/pages/invite/organisation/[id].tsx
@@ -53,7 +53,7 @@ export default function InviteOrganisationMaintainer({organisationInfo, error}:
}
return (
-
+
Organisation Maintainer Invite | RSD
diff --git a/frontend/pages/invite/project/[id].tsx b/frontend/pages/invite/project/[id].tsx
index 212c3f330..aa74ed3a9 100644
--- a/frontend/pages/invite/project/[id].tsx
+++ b/frontend/pages/invite/project/[id].tsx
@@ -53,7 +53,7 @@ export default function InviteProjectMaintainer({projectInfo, error}:
}
return (
-
+
Project Maintainer Invite | RSD
diff --git a/frontend/pages/invite/software/[id].tsx b/frontend/pages/invite/software/[id].tsx
index 8f18c7846..d8aa17af3 100644
--- a/frontend/pages/invite/software/[id].tsx
+++ b/frontend/pages/invite/software/[id].tsx
@@ -51,7 +51,7 @@ export default function InviteSoftwareMaintainer({softwareInfo, error}:
}
return (
-
+
Software Maintainer Invite | RSD
diff --git a/frontend/pages/organisations/[...slug].tsx b/frontend/pages/organisations/[...slug].tsx
index 28990363d..3bff0225c 100644
--- a/frontend/pages/organisations/[...slug].tsx
+++ b/frontend/pages/organisations/[...slug].tsx
@@ -75,26 +75,26 @@ export default function OrganisationPage({
rsd_page_rows
}}
>
-
- {/* ORGANISATION HEADER */}
-
-
- {/* TAB CONTENT */}
-
-
-
+ {/* ORGANISATION HEADER */}
+
+
+ {/* TAB CONTENT */}
+
+
+
diff --git a/frontend/utils/getDataCite.ts b/frontend/utils/getDataCite.ts
index b745e8a6b..c5b774c73 100644
--- a/frontend/utils/getDataCite.ts
+++ b/frontend/utils/getDataCite.ts
@@ -179,7 +179,7 @@ export function dataCiteGraphQLItemToMentionItem(item: WorkResponse) {
image_url: null,
mention_type: dataciteToRsdType(item),
source: 'DataCite',
- note: null
+ note: null,
}
return mention
}
@@ -195,15 +195,15 @@ export async function getDataciteItemByDoiGraphQL(doi: string) {
body: JSON.stringify({
operationName: null,
variables:{},
- query
- })
+ query,
+ }),
})
if (resp.status === 200) {
const json: DataciteWorkGraphQLResponse = await resp.json()
return {
status:200,
- message:json.data.work
+ message:json.data.work,
}
}
const error = await extractReturnMessage(resp)
@@ -212,7 +212,7 @@ export async function getDataciteItemByDoiGraphQL(doi: string) {
logger(`getDataciteItemsByDoiGraphQL: ${e?.message}`, 'error')
return {
status: 500,
- message: e?.message
+ message: e?.message,
}
}
}
@@ -228,15 +228,15 @@ export async function getDataciteItemsByDoiGraphQL(dois: string[]) {
body: JSON.stringify({
operationName: null,
variables:{},
- query
- })
+ query,
+ }),
})
if (resp.status === 200) {
const json = await resp.json()
return {
status:200,
- message:json.data.works.nodes
+ message:json.data.works.nodes,
}
}
const error = await extractReturnMessage(resp)
@@ -245,7 +245,7 @@ export async function getDataciteItemsByDoiGraphQL(dois: string[]) {
logger(`getDataciteItemsByDoiGraphQL: ${e?.message}`, 'error')
return {
status: 500,
- message: e?.message
+ message: e?.message,
}
}
}
@@ -261,8 +261,8 @@ export async function getDataciteItemsByTitleGraphQL(title: string) {
body: JSON.stringify({
operationName: null,
variables: {},
- query
- })
+ query,
+ }),
})
if (resp.status === 200) {
const json: DataciteWorksGraphQLResponse = await resp.json()
@@ -289,8 +289,8 @@ export async function getSoftwareVersionInfoForDoi(doi: string) {
body: JSON.stringify({
operationName: null,
variables: {},
- query
- })
+ query,
+ }),
})
const json = await extractRespFromGraphQL(resp)
@@ -303,13 +303,13 @@ export async function getSoftwareVersionInfoForDoi(doi: string) {
function dataciteToRsdType(item: WorkResponse): MentionTypeKeys {
switch (item.type.trim().toLowerCase()) {
- // additional validation using resourceType
+ // additional validation using resourceType
case 'audiovisual':
return rsdTypeFromResourceType(item.types.resourceType)
case 'text':
return rsdTypeFromResourceType(item.types.resourceType)
default:
- // by default using type value
+ // by default using type value
return rsdTypeFromResourceType(item.type)
}
}
diff --git a/frontend/utils/handleFileUpload.test.ts b/frontend/utils/handleFileUpload.test.ts
index b3781ae84..039d783cc 100644
--- a/frontend/utils/handleFileUpload.test.ts
+++ b/frontend/utils/handleFileUpload.test.ts
@@ -46,8 +46,11 @@ it('returns 413 when file exceeds maxFileSize', async () => {
const props = {
target: {
files: [
- {size: maxFileSize + 1}
- ]}}
+ {size: maxFileSize + 1},
+ ],
+ other: 1,
+ },
+ }
const resp = await handleFileUpload(props as any)
expect(resp).toEqual({
diff --git a/frontend/utils/logger.ts b/frontend/utils/logger.ts
index b1432f769..d07598b90 100644
--- a/frontend/utils/logger.ts
+++ b/frontend/utils/logger.ts
@@ -10,19 +10,19 @@ export default function logger(
logType:LogType='info'
){
switch(logType){
- case 'error':
+ case 'error':
// eslint-disable-next-line
console.error(`[ERROR] ${message}`)
- break
- case 'warn':
+ break
+ case 'warn':
// eslint-disable-next-line
console.warn(`[WARNING] ${message}`)
- break
- default:
+ break
+ default:
// info logs only in dev
- if (process.env.NODE_ENV ==='development'){
+ if (process.env.NODE_ENV ==='development'){
// eslint-disable-next-line
console.log(`[INFO] ${message}`)
- }
+ }
}
}
-
)
}
diff --git a/frontend/components/home/rsd/index.tsx b/frontend/components/home/rsd/index.tsx
index 5d1901bd7..5eda8d584 100644
--- a/frontend/components/home/rsd/index.tsx
+++ b/frontend/components/home/rsd/index.tsx
@@ -46,7 +46,7 @@ function GlowingButton({text,url,target='_self',minWidth='9rem'}: {text: string,
className="flex gap-4 cursor-pointer"
target={target}
passHref
- >
+ >
Upcoming
-This service is in active development. Upcoming features include:
-
-
- Login with your Helmholtz Institution's account
- Add your own software products
- Add related projects, funding and institutions
- Obtain a free license consultation from HIFIS
- Do you have suggestions for improvements or new features?
-
+ {/* Teaser */}
+
+
- {/* Participating organsiations */}
-
+
+
+
+
Upcoming
+This service is in active development. Upcoming features include:
+
+
-
+ Login with your Helmholtz Institution's account
+ Add your own software products
+ Add related projects, funding and institutions
+ Obtain a free license consultation from HIFIS
Do you have suggestions for improvements or new features?
+
-
+
-
-
+ {/* Participating organsiations */}
+ Participating organisations
-
+
- {/* For RSEs and Researchers */}
- {/*
+
+ Participating organisations
+
+ {/* For RSEs and Researchers */}
+ {/*
*/}
- For RSEs and Researchers
A place for Research Software that is being developed in the Helmholtz Association.
@@ -408,8 +408,8 @@ export default function HelmholtzHome() {
@@ -86,16 +86,16 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
{/* Reference Div to center align card */}
({data
export default function TableBody({
data, columns}: { data: T[], columns: Column[] }) {
- return (
+ return (
{data.map((item,i) => {
return ({columns, onSort}:
{columns: Column[], onSort:(column:K)=>void}) {
- return (
+ return (
{columns.map((col, i) => {
@@ -26,13 +26,13 @@ export default function TableHeader({columns, onSort}:
onClick={() => onSort(col.key)}
sx={col?.sx}
>
- onSort(col.key)}
- >
- {col.label}
-
+ onSort(col.key)}
+ >
+ {col.label}
+
)
})}
diff --git a/frontend/components/user/UserNavItems.tsx b/frontend/components/user/UserNavItems.tsx
index 9e754b81c..d7ae42f60 100644
--- a/frontend/components/user/UserNavItems.tsx
+++ b/frontend/components/user/UserNavItems.tsx
@@ -93,5 +93,5 @@ export const userMenu:UserMenuItems = {
component: (props?) =>
{/* Jumbo Text*/}
fetchUnusedInvitations()}/>
+
+
+ {renderLinkOptions()}
+ fetchUnusedInvitations()}/>
)
}
diff --git a/frontend/components/projects/edit/organisations/EditProjectOrganisationsIndex.test.tsx b/frontend/components/projects/edit/organisations/EditProjectOrganisationsIndex.test.tsx
index 42301261b..d7998f3ce 100644
--- a/frontend/components/projects/edit/organisations/EditProjectOrganisationsIndex.test.tsx
+++ b/frontend/components/projects/edit/organisations/EditProjectOrganisationsIndex.test.tsx
@@ -186,17 +186,17 @@ describe('frontend/components/projects/edit/organisations/index.tsx', () => {
// call createOrganisation api
expect(mockCreateOrganisation).toBeCalledTimes(1)
expect(mockCreateOrganisation).toBeCalledWith({
- 'organisation': {
- 'is_tenant': false,
- 'logo_id': null,
- 'name': searchFor,
- 'parent': null,
- 'primary_maintainer': null,
- 'ror_id': null,
- 'slug': expectSlug,
- 'website': expectWebsite,
- },
- 'token': mockSession.token,
+ 'organisation': {
+ 'is_tenant': false,
+ 'logo_id': null,
+ 'name': searchFor,
+ 'parent': null,
+ 'primary_maintainer': null,
+ 'ror_id': null,
+ 'slug': expectSlug,
+ 'website': expectWebsite,
+ },
+ 'token': mockSession.token,
})
})
diff --git a/frontend/components/projects/edit/output/AddOutput.tsx b/frontend/components/projects/edit/output/AddOutput.tsx
index 31c4d307b..d220a1655 100644
--- a/frontend/components/projects/edit/output/AddOutput.tsx
+++ b/frontend/components/projects/edit/output/AddOutput.tsx
@@ -21,17 +21,17 @@ export default function AddOutput() {
return (
<>
-
-
)
}
diff --git a/frontend/components/projects/edit/output/EditProjectOutputIndex.test.tsx b/frontend/components/projects/edit/output/EditProjectOutputIndex.test.tsx
index 0acc3e1f9..0972b7270 100644
--- a/frontend/components/projects/edit/output/EditProjectOutputIndex.test.tsx
+++ b/frontend/components/projects/edit/output/EditProjectOutputIndex.test.tsx
@@ -157,14 +157,14 @@ describe('frontend/components/projects/edit/output/index.tsx', () => {
// call RSD api to find mention by DOI
expect(mockFindPublicationByTitle).toBeCalledTimes(1)
expect(mockFindPublicationByTitle).toBeCalledWith({
- 'project': editProjectState.project.id,
- searchFor,
- 'token': mockSession.token
+ 'project': editProjectState.project.id,
+ searchFor,
+ 'token': mockSession.token
})
})
})
- it('add custom mention', async() => {
+ it('add custom mention', async() => {
// resolve existing mentions to []
mockGetOutputForProject.mockResolvedValueOnce([])
// resolve search with mockedItems
@@ -229,23 +229,23 @@ describe('frontend/components/projects/edit/output/index.tsx', () => {
await waitFor(() => {
expect(mockAddNewOutputToProject).toBeCalledTimes(1)
expect(mockAddNewOutputToProject).toBeCalledWith({
- 'item': {
- 'authors': null,
- 'doi': null,
- 'id': null,
- 'image_url': null,
- 'journal': null,
- 'mention_type': 'book',
- 'note': null,
- 'page': null,
- 'publication_year': null,
- 'publisher': null,
- 'source': 'RSD',
- 'title': 'Test value',
- 'url': 'https://google.com/link1',
- },
- 'project': editProjectState.project.id,
- 'token': mockSession.token,
+ 'item': {
+ 'authors': null,
+ 'doi': null,
+ 'id': null,
+ 'image_url': null,
+ 'journal': null,
+ 'mention_type': 'book',
+ 'note': null,
+ 'page': null,
+ 'publication_year': null,
+ 'publisher': null,
+ 'source': 'RSD',
+ 'title': 'Test value',
+ 'url': 'https://google.com/link1',
+ },
+ 'project': editProjectState.project.id,
+ 'token': mockSession.token,
})
})
})
diff --git a/frontend/components/projects/edit/output/FindOutput.tsx b/frontend/components/projects/edit/output/FindOutput.tsx
index b92f4f8dd..75e48afb4 100644
--- a/frontend/components/projects/edit/output/FindOutput.tsx
+++ b/frontend/components/projects/edit/output/FindOutput.tsx
@@ -57,29 +57,29 @@ export default function FindOutput() {
return (
<>
-
-
+ />
+
+
)
}
diff --git a/frontend/components/projects/edit/output/ImportProjectOutput.tsx b/frontend/components/projects/edit/output/ImportProjectOutput.tsx
index 718528c98..084fe6c45 100644
--- a/frontend/components/projects/edit/output/ImportProjectOutput.tsx
+++ b/frontend/components/projects/edit/output/ImportProjectOutput.tsx
@@ -28,15 +28,15 @@ export default function ImportProjectOutput() {
return (
<>
-
-
+
+
)
}
diff --git a/frontend/components/projects/edit/related/RelatedProjectList.tsx b/frontend/components/projects/edit/related/RelatedProjectList.tsx
index 2b2939dda..c6c374fd7 100644
--- a/frontend/components/projects/edit/related/RelatedProjectList.tsx
+++ b/frontend/components/projects/edit/related/RelatedProjectList.tsx
@@ -100,15 +100,15 @@ export function RelatedProjectItem({project, onDelete}: ProjectItemProps) {
data-testid="related-project-item"
secondaryAction={
<>
-
-
-
+
+
+
}
sx={{
minHeight:itemHeight,
diff --git a/frontend/components/projects/edit/team/AggregatedMemberModal.tsx b/frontend/components/projects/edit/team/AggregatedMemberModal.tsx
index 2e8849c40..cbe98a144 100644
--- a/frontend/components/projects/edit/team/AggregatedMemberModal.tsx
+++ b/frontend/components/projects/edit/team/AggregatedMemberModal.tsx
@@ -120,7 +120,7 @@ export default function AggregatedMemberModal({open, onCancel, onSubmit, member}
}
return (
-
{
await waitFor(() => {
expect(mockPostTeamMember).toBeCalledTimes(1)
expect(mockPostTeamMember).toBeCalledWith({
- 'member': {
- 'affiliation': newPerson.affiliation,
- 'avatar_id': null,
- 'email_address': newPerson.email,
- 'family_names': newPerson.family_names,
- 'given_names': newPerson.given_names,
- 'id': memberId,
- 'is_contact_person': true,
- 'orcid': null,
- 'position': 1,
- 'project': editProjectState.project.id,
- 'role': newPerson.role,
- },
- 'token': mockSession.token,
+ 'member': {
+ 'affiliation': newPerson.affiliation,
+ 'avatar_id': null,
+ 'email_address': newPerson.email,
+ 'family_names': newPerson.family_names,
+ 'given_names': newPerson.given_names,
+ 'id': memberId,
+ 'is_contact_person': true,
+ 'orcid': null,
+ 'position': 1,
+ 'project': editProjectState.project.id,
+ 'role': newPerson.role,
+ },
+ 'token': mockSession.token,
})
})
@@ -282,10 +282,10 @@ describe('frontend/components/projects/edit/team/index.tsx', () => {
// validate delete called
expect(mockDeleteTeamMemberById).toBeCalledTimes(1)
expect(mockDeleteTeamMemberById).toBeCalledWith({
- 'ids': [
- mockTeamMembers[0].id,
- ],
- 'token': mockSession.token,
+ 'ids': [
+ mockTeamMembers[0].id,
+ ],
+ 'token': mockSession.token,
})
// confirm member removed from list
const remainedMembers = screen.getAllByTestId('team-member-item')
diff --git a/frontend/components/projects/edit/team/EditTeamMemberModal.tsx b/frontend/components/projects/edit/team/EditTeamMemberModal.tsx
index f8c484b92..c90857fc3 100644
--- a/frontend/components/projects/edit/team/EditTeamMemberModal.tsx
+++ b/frontend/components/projects/edit/team/EditTeamMemberModal.tsx
@@ -109,7 +109,7 @@ export default function TeamMemberModal({open, onCancel, onSubmit, member, pos}:
setRemoveAvatar(formData.avatar_id)
// update form
setValue('avatar_id', null, {shouldDirty: true,shouldValidate:true})
- } else {
+ } else {
// just remove uploaded image from form
// because it is not saved yet to DB
setValue('avatar_b64', null)
@@ -179,7 +179,7 @@ export default function TeamMemberModal({open, onCancel, onSubmit, member, pos}:
}
return (
-
@@ -95,20 +95,20 @@ export default function SoftwareMaintainerLink({software,brand_name,account,toke
return (
<>
- }
- onClick={createInviteLink}
- >
+ }
+ onClick={createInviteLink}
+ >
Generate invite link
-
-
- {renderLinkOptions()}
- fetchUnusedInvitations()}/>
+
+
+ {renderLinkOptions()}
+ fetchUnusedInvitations()}/>
)
}
diff --git a/frontend/components/software/edit/mentions/AddMention.tsx b/frontend/components/software/edit/mentions/AddMention.tsx
index 82249061e..7d2b4c93a 100644
--- a/frontend/components/software/edit/mentions/AddMention.tsx
+++ b/frontend/components/software/edit/mentions/AddMention.tsx
@@ -22,17 +22,17 @@ export default function AddMention() {
return (
<>
-
-
)
}
diff --git a/frontend/components/software/edit/mentions/EditSoftwareMentionsIndex.test.tsx b/frontend/components/software/edit/mentions/EditSoftwareMentionsIndex.test.tsx
index d885749de..6d2559d19 100644
--- a/frontend/components/software/edit/mentions/EditSoftwareMentionsIndex.test.tsx
+++ b/frontend/components/software/edit/mentions/EditSoftwareMentionsIndex.test.tsx
@@ -170,9 +170,9 @@ describe('frontend/components/software/edit/maintainers/index.tsx', () => {
// call RSD api to find mention by DOI
expect(mockFindPublicationByTitle).toBeCalledTimes(1)
expect(mockFindPublicationByTitle).toBeCalledWith({
- 'software': softwareState.software.id,
- searchFor,
- 'token': mockSession.token
+ 'software': softwareState.software.id,
+ searchFor,
+ 'token': mockSession.token
})
})
})
@@ -242,23 +242,23 @@ describe('frontend/components/software/edit/maintainers/index.tsx', () => {
await waitFor(() => {
expect(mockAddNewMentionToSoftware).toBeCalledTimes(1)
expect(mockAddNewMentionToSoftware).toBeCalledWith({
- 'item': {
- 'authors': null,
- 'doi': null,
- 'id': null,
- 'image_url': null,
- 'journal': null,
- 'mention_type': 'book',
- 'note': null,
- 'page': null,
- 'publication_year': null,
- 'publisher': null,
- 'source': 'RSD',
- 'title': 'Test value',
- 'url': 'https://google.com/link1',
- },
- 'software': softwareState.software.id,
- 'token': mockSession.token,
+ 'item': {
+ 'authors': null,
+ 'doi': null,
+ 'id': null,
+ 'image_url': null,
+ 'journal': null,
+ 'mention_type': 'book',
+ 'note': null,
+ 'page': null,
+ 'publication_year': null,
+ 'publisher': null,
+ 'source': 'RSD',
+ 'title': 'Test value',
+ 'url': 'https://google.com/link1',
+ },
+ 'software': softwareState.software.id,
+ 'token': mockSession.token,
})
})
})
diff --git a/frontend/components/software/edit/mentions/ImportSoftwareMentions.tsx b/frontend/components/software/edit/mentions/ImportSoftwareMentions.tsx
index 5eadf7907..af1089116 100644
--- a/frontend/components/software/edit/mentions/ImportSoftwareMentions.tsx
+++ b/frontend/components/software/edit/mentions/ImportSoftwareMentions.tsx
@@ -27,15 +27,15 @@ export default function ImportSoftwareMentions() {
return (
<>
-
-
+
+
)
}
diff --git a/frontend/components/software/edit/organisations/EditOrganisationModal.tsx b/frontend/components/software/edit/organisations/EditOrganisationModal.tsx
index 1c53256dc..726356936 100644
--- a/frontend/components/software/edit/organisations/EditOrganisationModal.tsx
+++ b/frontend/components/software/edit/organisations/EditOrganisationModal.tsx
@@ -133,7 +133,7 @@ export default function EditOrganisationModal({open, onCancel, onSubmit, organis
}
return (
-
- }
+ }
-
+
)
}
diff --git a/frontend/components/software/overview/highlights/HighlightsCarousel.tsx b/frontend/components/software/overview/highlights/HighlightsCarousel.tsx
index 5470d1d5e..cae93d09b 100644
--- a/frontend/components/software/overview/highlights/HighlightsCarousel.tsx
+++ b/frontend/components/software/overview/highlights/HighlightsCarousel.tsx
@@ -24,8 +24,8 @@ export const HighlightsCarousel = ({items=[]}: {items:SoftwareHighlight[]}) => {
useEffect(() => {
const calculateDistance = () => {
- const rect = divRef.current?.getBoundingClientRect()
- setDistance(Math.ceil(rect?.left ?? 0) + 16)
+ const rect = divRef.current?.getBoundingClientRect()
+ setDistance(Math.ceil(rect?.left ?? 0) + 16)
}
if (typeof window !== 'undefined') {
calculateDistance()
@@ -58,28 +58,28 @@ export const HighlightsCarousel = ({items=[]}: {items:SoftwareHighlight[]}) => {
Show your research software to the world
The
+ className="text-transparent font-medium bg-clip-text bg-gradient-to-tr from-[#03A9F1] to-[#09FBD3] px-1">
Research Software Directory
-
+
is designed to show the impact research software has on research and society. We
stimulate the reuse of research software and encourage proper citation of research
software to ensure researchers and RSEs get credit for their work. {/*Learn more.*/}
@@ -151,12 +151,12 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
id="get-started"
className="px-5 md:px-10 py-5 ">
+ data-aos="fade" data-aos-duration="400" data-aos-easing="ease-in-out"> {/* eslint-disable-next-line react/no-unescaped-entities */} Let's get started!
+ data-aos-delay="100" data-aos-duration="400" data-aos-easing="ease-in-out">
Discover research software relevant to your research!
Get more information on how to add your own software or organization.
+ data-aos="fade" data-aos-duration="400" data-aos-easing="ease-in-out"> Learn more
+ data-aos-delay="100" data-aos-duration="400" data-aos-easing="ease-in-out"> Try out our online demo, or get more detailed information in our documentation and FAQ.
@@ -279,7 +279,7 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
+ data-aos-easing="ease-in-out">
+ data-aos-delay="100"
+ data-aos-easing="ease-in-out">
+ data-aos-delay="200"
+ data-aos-easing="ease-in-out">
- Publishing project page
+ severity="info"
+ sx={{
+ marginTop:'1rem'
+ }}
+ >
+ Publishing project page
Setting the page status to published will expose the project page to all visitors.
Unpublished project can be found under
- your profile
- page.
-
+ your profile
+ page.
+
)
}
diff --git a/frontend/components/projects/edit/information/SortableProjectLinkItem.tsx b/frontend/components/projects/edit/information/SortableProjectLinkItem.tsx
index b07b4da27..708630740 100644
--- a/frontend/components/projects/edit/information/SortableProjectLinkItem.tsx
+++ b/frontend/components/projects/edit/information/SortableProjectLinkItem.tsx
@@ -16,7 +16,7 @@ type SortableProjectLinkProps = {
}
export default function SortableProjectLinksItem({pos, item, onEdit, onDelete}: SortableProjectLinkProps) {
- return (
+ return (
-
-
-
+
+
@@ -93,20 +93,20 @@ export default function ProjectMaintainerLink({project,title,account,token}: {pr
return (
<>
- }
- onClick={createInviteLink}
- >
+ }
+ onClick={createInviteLink}
+ >
Generate invite link
-
-
- {renderLinkOptions()}
- + data-aos="fade" data-aos-duration="400" data-aos-easing="ease-in-out"> {/* eslint-disable-next-line react/no-unescaped-entities */} About us
+ data-aos-delay="100" data-aos-duration="400" data-aos-easing="ease-in-out"> The Research Software Directory is an open source project initiated by the Netherlands eScience Center and jointly developed with Helmholtz. Feel free to contact us or join our effort! @@ -331,7 +331,7 @@ export default function RsdHome({software_cnt, project_cnt, organisation_cnt, co
+ data-aos-duration="500" data-aos-easing="ease-in-out">
{host.email &&
fetchUnusedInvitations()}/>
+
+
+ {renderLinkOptions()}
+ fetchUnusedInvitations()}/>
)
}
diff --git a/frontend/components/organisation/settings/updateOrganisationSettings.tsx b/frontend/components/organisation/settings/updateOrganisationSettings.tsx
index 19272df42..326fc3175 100644
--- a/frontend/components/organisation/settings/updateOrganisationSettings.tsx
+++ b/frontend/components/organisation/settings/updateOrganisationSettings.tsx
@@ -9,7 +9,7 @@ export async function patchOrganisationTable({id, data, token}:
{id:string, data: any, token: string }) {
try {
// extract only required items
- const url = `/api/v1/organisation?id=eq.${id}`
+ const url = `/api/v1/organisation?id=eq.${id}`
const resp = await fetch(url, {
method: 'PATCH',
headers: {
diff --git a/frontend/components/organisation/units/ResearchUnitItem.tsx b/frontend/components/organisation/units/ResearchUnitItem.tsx
index 29e25bd2f..a6b6d4a78 100644
--- a/frontend/components/organisation/units/ResearchUnitItem.tsx
+++ b/frontend/components/organisation/units/ResearchUnitItem.tsx
@@ -122,7 +122,7 @@ export default function UnitItem({pos,slug,name,website,logo_id,isMaintainer,onE
}
secondary={getSecondaryLabel()}
- />
-
+ />
+
)
}
diff --git a/frontend/components/organisation/units/ResearchUnitList.tsx b/frontend/components/organisation/units/ResearchUnitList.tsx
index 6d73e144a..cf141e6a1 100644
--- a/frontend/components/organisation/units/ResearchUnitList.tsx
+++ b/frontend/components/organisation/units/ResearchUnitList.tsx
@@ -36,8 +36,8 @@ export default function ResearchUnitsList({loading, units, onEdit, isPrimaryMain
The organisation has no research units
{
isPrimaryMaintainer ?
- Add one using ADD button!
- :null
+ Add one using ADD button!
+ :null
}
)
@@ -48,19 +48,19 @@ export default function ResearchUnitsList({loading, units, onEdit, isPrimaryMain
width: '100%',
}}>
{ units.map((item,pos) => {
- return (
-
+
+
)
diff --git a/frontend/components/projects/edit/information/ProjectLinkModal.tsx b/frontend/components/projects/edit/information/ProjectLinkModal.tsx
index 3234effbb..960d9fcbe 100644
--- a/frontend/components/projects/edit/information/ProjectLinkModal.tsx
+++ b/frontend/components/projects/edit/information/ProjectLinkModal.tsx
@@ -141,48 +141,48 @@ export default function ProjectLinkModal({open, url_for_project, onCancel, onSub
width: ['100%', '37rem'],
padding: '2rem 1.5rem 2.5rem'
}}>
-
+ data-aos-easing="ease-in-out">
}
@@ -95,20 +95,20 @@ export default function OrganisationMaintainerLink({organisation, name, account,
return (
<>
- }
- onClick={createInviteLink}
- >
+ }
+ onClick={createInviteLink}
+ >
Generate invite link
-
-
- {renderLinkOptions()}
-
+ data-aos-duration="500" data-aos-easing="ease-in-out">
+ >
-
- {body}
-
-
-
-
+
+ }
+ onClick={onDelete}
+ >
Remove
-
-
+
+
)
diff --git a/frontend/components/layout/FlexibleGridSection.tsx b/frontend/components/layout/FlexibleGridSection.tsx
index d743cd01e..6effbf920 100644
--- a/frontend/components/layout/FlexibleGridSection.tsx
+++ b/frontend/components/layout/FlexibleGridSection.tsx
@@ -49,30 +49,30 @@ export const FlexibleGridSection = styled('section', {
})
(({theme, minWidth, maxWidth, minHeight, maxHeight, height}) => {
// basic definitions
- const props: any = {
- flex: 1,
- display: 'grid',
- width: '100%',
- // gridGap: '1rem',
- flexWrap: 'wrap',
- // padding: '1rem 0rem 1rem 0rem',
- alignItems: 'stretch',
+ const props: any = {
+ flex: 1,
+ display: 'grid',
+ width: '100%',
+ // gridGap: '1rem',
+ flexWrap: 'wrap',
+ // padding: '1rem 0rem 1rem 0rem',
+ alignItems: 'stretch',
// borderBottom: `1px solid ${theme.palette.divider}`,
// backgroundColor: theme.palette.background.paper,
// overflow: 'auto'
- }
- if (height) {
+ }
+ if (height) {
// dynamic grid-auto-rows
- props['gridAutoRows'] = height
- }else if (minHeight && maxHeight) {
+ props['gridAutoRows'] = height
+ }else if (minHeight && maxHeight) {
// dynamic grid-auto-rows
- props['gridTemplateRows'] = `repeat(auto-fit,minmax(${minHeight ?? '5rem'}, ${maxHeight ?? '7rem'}))`
- }
- // dynamic grid-template-columns
- if (minWidth && maxWidth) {
- props['gridTemplateColumns'] = `repeat(auto-fit, minmax(${minWidth}, ${maxWidth ?? '7rem'}))`
- }
- return props
-})
+ props['gridTemplateRows'] = `repeat(auto-fit,minmax(${minHeight ?? '5rem'}, ${maxHeight ?? '7rem'}))`
+ }
+ // dynamic grid-template-columns
+ if (minWidth && maxWidth) {
+ props['gridTemplateColumns'] = `repeat(auto-fit, minmax(${minWidth}, ${maxWidth ?? '7rem'}))`
+ }
+ return props
+ })
export default FlexibleGridSection
diff --git a/frontend/components/layout/ImageAsBackground.tsx b/frontend/components/layout/ImageAsBackground.tsx
index 8bb9183ab..31c6340be 100644
--- a/frontend/components/layout/ImageAsBackground.tsx
+++ b/frontend/components/layout/ImageAsBackground.tsx
@@ -19,7 +19,7 @@ type ImageAsBackgroundProps = {
export default function ImageAsBackground(
{src, alt, className, bgSize = 'cover', bgPosition = 'center center',
- noImgMsg = 'no image avaliable'}: ImageAsBackgroundProps
+ noImgMsg = 'no image avaliable'}: ImageAsBackgroundProps
) {
if (!src) {
diff --git a/frontend/components/layout/SortableListItemActions.tsx b/frontend/components/layout/SortableListItemActions.tsx
index 610c94013..cf918ecd6 100644
--- a/frontend/components/layout/SortableListItemActions.tsx
+++ b/frontend/components/layout/SortableListItemActions.tsx
@@ -43,16 +43,16 @@ export default function SortableListItemActions({pos,listeners,onEdit,onDelete}:
if (typeof onDelete !== 'undefined') {
return (
{
- onDelete(pos)
- }}
- sx={{marginRight: '1rem'}}
- >
-
+ title="Delete"
+ edge="end"
+ aria-label="delete"
+ onClick={() => {
+ onDelete(pos)
+ }}
+ sx={{marginRight: '1rem'}}
+ >
+
{config.newItem.title}
-
- }
- onClick={onNewOutput}>
+
+
+
+
+ {config.newItem.title}
+
+ }
+ onClick={onNewOutput}>
Create
-
-
- Search
-
-
- Search
+
+
+ {config.builkImport.title}
-
-
- {config.builkImport.title}
+
+
+ {config.newItem.title}
-
- }
- onClick={onNewItem}>
+
+
+
+
+ {config.newItem.title}
+
+ }
+ onClick={onNewItem}>
Create
-
-
- {config.builkImport.title}
-
-
- {config.builkImport.title}
+
+
+
{/* Languages */}
- {scrollPosition > 0 &&
-
+
)
}
diff --git a/frontend/components/table/TableBody.tsx b/frontend/components/table/TableBody.tsx
index 1ce6982f7..25b46fd48 100644
--- a/frontend/components/table/TableBody.tsx
+++ b/frontend/components/table/TableBody.tsx
@@ -86,7 +86,7 @@ function TableRow
- {/* render software card in the row direction */}
- {items.map(highlight => (
-
-
-
- ))
- }
+ {/* Carousel */}
+
+ {/* render software card in the row direction */}
+ {items.map(highlight => (
+
+
+ ))
+ }
+
diff --git a/frontend/components/user/project-quality/SortableTable.tsx b/frontend/components/user/project-quality/SortableTable.tsx
index 30de96795..9beb35a61 100644
--- a/frontend/components/user/project-quality/SortableTable.tsx
+++ b/frontend/components/user/project-quality/SortableTable.tsx
@@ -72,7 +72,7 @@ export default function SortableTable({metadata, initialData, initialOrder=''}:
})}
-
+
{data.map((item, pos) => {
return (
diff --git a/frontend/components/user/project-quality/apiProjectQuality.tsx b/frontend/components/user/project-quality/apiProjectQuality.tsx
index 91be75f0d..88ff043e4 100644
--- a/frontend/components/user/project-quality/apiProjectQuality.tsx
+++ b/frontend/components/user/project-quality/apiProjectQuality.tsx
@@ -35,24 +35,24 @@ export type ProjectQualityProps = {
export type ProjectQualityKeys = keyof ProjectQualityProps
const realLabels = new Map()
- realLabels.set('title', {'label': 'Title', 'type': 'link', sx:{minWidth:'14rem'}})
- realLabels.set('score', {'label': 'Metadata score', 'type': 'pct'})
- realLabels.set('has_subtitle', {'label': 'Subtitle', 'type': 'boolean'})
- realLabels.set('is_published', {'label': 'Published', 'type': 'boolean'})
- realLabels.set('date_start', {'label': 'Start date', 'type': 'text', sx:{'whiteSpace': 'nowrap'}})
- realLabels.set('date_end', {'label': 'End date', 'type': 'text', sx:{'whiteSpace': 'nowrap'}})
- realLabels.set('grant_id', {'label': 'Grant ID', 'type': 'text'})
- realLabels.set('has_image', {'label': 'Image', 'type': 'boolean'})
- realLabels.set('has_contact_person', {'label': 'Contact person', 'type': 'boolean'})
- realLabels.set('team_member_cnt', {'label': 'Team members', 'type': 'number'})
- realLabels.set('participating_org_cnt', {'label': 'Participating organisations', 'type': 'number'})
- realLabels.set('funding_org_cnt', {'label': 'Funding organisations', 'type': 'number'})
- realLabels.set('software_cnt', {'label': 'Related software', 'type': 'number'})
- realLabels.set('project_cnt', {'label': 'Related projects', 'type': 'number'})
- realLabels.set('keyword_cnt', {'label': 'Keywords', 'type': 'number'})
- realLabels.set('research_domain_cnt', {'label': 'Research domains', 'type': 'number'})
- realLabels.set('impact_cnt', {'label': 'Impact', 'type': 'number'})
- realLabels.set('output_cnt', {'label': 'Output', 'type': 'number'})
+realLabels.set('title', {'label': 'Title', 'type': 'link', sx:{minWidth:'14rem'}})
+realLabels.set('score', {'label': 'Metadata score', 'type': 'pct'})
+realLabels.set('has_subtitle', {'label': 'Subtitle', 'type': 'boolean'})
+realLabels.set('is_published', {'label': 'Published', 'type': 'boolean'})
+realLabels.set('date_start', {'label': 'Start date', 'type': 'text', sx:{'whiteSpace': 'nowrap'}})
+realLabels.set('date_end', {'label': 'End date', 'type': 'text', sx:{'whiteSpace': 'nowrap'}})
+realLabels.set('grant_id', {'label': 'Grant ID', 'type': 'text'})
+realLabels.set('has_image', {'label': 'Image', 'type': 'boolean'})
+realLabels.set('has_contact_person', {'label': 'Contact person', 'type': 'boolean'})
+realLabels.set('team_member_cnt', {'label': 'Team members', 'type': 'number'})
+realLabels.set('participating_org_cnt', {'label': 'Participating organisations', 'type': 'number'})
+realLabels.set('funding_org_cnt', {'label': 'Funding organisations', 'type': 'number'})
+realLabels.set('software_cnt', {'label': 'Related software', 'type': 'number'})
+realLabels.set('project_cnt', {'label': 'Related projects', 'type': 'number'})
+realLabels.set('keyword_cnt', {'label': 'Keywords', 'type': 'number'})
+realLabels.set('research_domain_cnt', {'label': 'Research domains', 'type': 'number'})
+realLabels.set('impact_cnt', {'label': 'Impact', 'type': 'number'})
+realLabels.set('output_cnt', {'label': 'Output', 'type': 'number'})
async function fetchProjectQuality(showAll: boolean, token:string) {
try {
diff --git a/frontend/components/user/project-quality/index.tsx b/frontend/components/user/project-quality/index.tsx
index eca6b5b45..0b4080db2 100644
--- a/frontend/components/user/project-quality/index.tsx
+++ b/frontend/components/user/project-quality/index.tsx
@@ -86,11 +86,11 @@ export default function ProjectQuality() {
minHeight: '90vh',
}}
>
-
+ >
Removing your RSD account
In order to be able to remove your account from RSD you first need to accept Terms of Service and Privacy Statement. After that remove account button will be enabled. If you do not wish to accept the terms of service but want your account to be removed from RSD please send an email to RSD support at
- {host.email}.
+ {host.email}.
)
}
diff --git a/frontend/components/user/settings/UserAgreementModal.tsx b/frontend/components/user/settings/UserAgreementModal.tsx
index f0dd51626..2682495fa 100644
--- a/frontend/components/user/settings/UserAgreementModal.tsx
+++ b/frontend/components/user/settings/UserAgreementModal.tsx
@@ -87,7 +87,7 @@ export default function UserAgrementModal() {
{/* Render only if userInfo present in order to properly load defaultValues */}
{userInfo &&
@@ -104,33 +104,33 @@ export default function UserAgrementModal() {
-
-
+
+ }
+ onClick={onClose}
+ >
Accept
-
-
+
+
)
diff --git a/frontend/components/user/settings/useGetUserAgreementStatus.tsx b/frontend/components/user/settings/useGetUserAgreementStatus.tsx
index 53a33ae20..8cf1e7776 100644
--- a/frontend/components/user/settings/useGetUserAgreementStatus.tsx
+++ b/frontend/components/user/settings/useGetUserAgreementStatus.tsx
@@ -25,11 +25,11 @@ export function useGetUserAgreementStatus(token: string, user:RsdUser|null, setA
setOpen(true)
}
if (
- typeof(setAgreeTerms) === 'function' && typeof(setNoticePrivacy) === 'function' &&
+ typeof(setAgreeTerms) === 'function' && typeof(setNoticePrivacy) === 'function' &&
typeof(respData.data.agree_terms) === 'boolean' && typeof(respData.data.notice_privacy_statement) === 'boolean'
- ) {
- setAgreeTerms(respData.data.agree_terms)
- setNoticePrivacy(respData.data.notice_privacy_statement)
+ ) {
+ setAgreeTerms(respData.data.agree_terms)
+ setNoticePrivacy(respData.data.notice_privacy_statement)
}
}
}
diff --git a/frontend/components/user/software/SoftwareCard.tsx b/frontend/components/user/software/SoftwareCard.tsx
index 841229c3d..65272ab00 100644
--- a/frontend/components/user/software/SoftwareCard.tsx
+++ b/frontend/components/user/software/SoftwareCard.tsx
@@ -66,7 +66,7 @@ export default function SoftwareCard({href, brand_name, short_statement, is_feat
function renderPublished() {
if (typeof is_published != 'undefined' && is_published === false) {
return (
-
diff --git a/frontend/config/userMenuItems.tsx b/frontend/config/userMenuItems.tsx
index a676c323c..d808295c1 100644
--- a/frontend/config/userMenuItems.tsx
+++ b/frontend/config/userMenuItems.tsx
@@ -18,8 +18,8 @@ import Logout from '@mui/icons-material/Logout'
import {MenuItemType} from './menuItems'
export function getUserMenuItems(
- role: 'rsd_admin' | 'rsd_user'='rsd_user'
- ) {
+ role: 'rsd_admin' | 'rsd_user'='rsd_user'
+) {
const userMenuItems: MenuItemType[] = [
{
diff --git a/frontend/pages/_document.tsx b/frontend/pages/_document.tsx
index e952d6463..499052c29 100644
--- a/frontend/pages/_document.tsx
+++ b/frontend/pages/_document.tsx
@@ -68,7 +68,7 @@ export default class MyDocument extends DocumentYou may view or modify your agreement at any time in your profile settings.
- {mention_cnt &&
+ {mention_cnt &&
- }
- {contributor_cnt &&
+ }
+ {contributor_cnt &&
- }
+ }