Update v1.9.0

CITATION.cff

@@ -75,5 +75,5 @@ keywords:
   - Software Impact
   - Software Reuse
 license: Apache-2.0
-version: v1.8.0
-date-released: '2022-10-14'
+version: v1.9.0
+date-released: '2022-10-28'

Makefile

@@ -62,7 +62,7 @@ data:
 	docker-compose down
 
 spotlights:
-	docker-compose run initial-spotlights
+	docker-compose run --rm initial-spotlights
 
 # Helper commands
 # -

data-generation/main.js

@@ -37,6 +37,7 @@ function generateMentions(amountExtra = 10) {
 		'thesis',
 		'videoRecording',
 		'webpage',
+		'workshop',
 		'other',
 	];
 
@@ -55,6 +56,7 @@ function generateMentions(amountExtra = 10) {
 			image_url: null,
 			mention_type: faker.helpers.arrayElement(mentionTypes),
 			source: 'faker',
+			note: faker.helpers.maybe(() => faker.company.catchPhrase(), 0.3) ?? null
 		});
 	}
 
@@ -70,6 +72,7 @@ function generateMentions(amountExtra = 10) {
 			image_url: null,
 			mention_type: faker.helpers.arrayElement(mentionTypes),
 			source: 'faker',
+			note: faker.helpers.maybe(() => faker.company.catchPhrase(), 0.3) ?? null
 		});
 	}
 

database/008-create-mention-table.sql

@@ -22,6 +22,7 @@ CREATE TYPE mention_type AS ENUM (
 	'thesis',
 	'videoRecording',
 	'webpage',
+	'workshop',
 	'other'
 );
 
@@ -37,6 +38,7 @@ CREATE TABLE mention (
 	image_url VARCHAR(500) CHECK (image_url ~ '^https?://'),
 	mention_type mention_type NOT NULL,
 	source VARCHAR(50) NOT NULL,
+	note VARCHAR(500),
 	scraped_at TIMESTAMPTZ,
 	created_at TIMESTAMPTZ NOT NULL,
 	updated_at TIMESTAMPTZ NOT NULL

docker-compose.yml

@@ -239,6 +239,7 @@ services:
 
   initial-spotlights:
     image: ghcr.io/hifis-net/rsd-spotlight-migration:latest
+    pull_policy: always
     environment:
       - POSTGREST_URL
       - PGRST_JWT_SECRET

frontend/components/cookies/CookieConsentMatomo.tsx

@@ -52,8 +52,8 @@ export default function CookieConsentMatomo({matomo, route}: CookieConsentMatomo
       className="fixed bottom-0 right-0 animated animatedFadeInUp fadeInUp"
       data-testid="cookie-consent-matomo"
     >
-      <div className="container mx-auto px-20 ">
-          <div className="border border-b-base-content border-t-4 border-x-4 border-b-0 w-96 bg-white shadow-lg p-6 rounded-tr-3xl">
+      <div className="container mx-auto sm:px-20">
+          <div className="border border-b-base-content border-t-4 border-x-4 border-b-0 bg-white shadow-lg p-6 rounded-tr-3xl sm:w-96">
             <div className="w-16 mx-auto relative  mb-3">
               <CookieTwoToneIcon className="scale-[2]  mb-3" color="primary" fontSize="large"/>
             </div>

frontend/components/layout/TagChip.tsx

@@ -10,8 +10,6 @@ export default function TagChip({label, title}:
       title={title ? title : label}
       label={label}
       sx={{
-        marginBottom: '1rem',
-        marginRight: '0.5rem',
         maxWidth: '21rem',
         borderRadius: '0.125rem',
         textTransform: 'capitalize'

frontend/components/layout/TagChipFilter.tsx

@@ -0,0 +1,36 @@
+import Chip from '@mui/material/Chip'
+import SearchIcon from '@mui/icons-material/Search'
+import Link from 'next/link'
+
+export default function TagChipFilter({url, label, title}:
+  { label: string, url:string ,title?: string }) {
+
+  if (!label) return null
+
+  return (
+    <Link
+      href={url}
+      passHref
+    >
+    <a>
+    <Chip
+      title={`Click to filter for ${title ? title : label}`}
+      label={label}
+      icon={<SearchIcon />}
+      clickable
+      sx={{
+        maxWidth: '21rem',
+        borderRadius: '0.125rem',
+        textTransform: 'capitalize',
+        '& .MuiChip-icon': {
+          order: 1,
+          margin:'0rem 0.5rem 0rem 0rem',
+          height: '1.125rem',
+          width: '1.125rem'
+        }
+      }}
+    />
+    </a>
+    </Link>
+  )
+}

frontend/components/mention/EditMentionModal.tsx

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) <christian.meessen@gfz-potsdam.de>
-// SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
 // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+// SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
+// SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
+// SPDX-FileCopyrightText: 2022 Netherlands eScience Center
 // SPDX-FileCopyrightText: 2022 dv4all
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -213,22 +215,37 @@ export default function EditMentionModal({open, onCancel, onSubmit, item, pos, t
             }}
             rules={config.url.validation}
           />
-          <div className="py-2"></div>
           {formData.mention_type === 'highlight' ?
-            <ControlledTextField
-              control={control}
-              options={{
-                name: 'image_url',
-                label: config.image_url.label,
-                useNull: true,
-                defaultValue: formData?.image_url,
-                helperTextMessage: config.image_url.help,
-                helperTextCnt: `${formData?.image_url?.length || 0}/${config.image_url.validation.maxLength.value}`
-              }}
-              rules={config.image_url.validation}
-            />
+            <>
+              <div className="py-2"></div>
+              <ControlledTextField
+                control={control}
+                options={{
+                  name: 'image_url',
+                  label: config.image_url.label,
+                  useNull: true,
+                  defaultValue: formData?.image_url,
+                  helperTextMessage: config.image_url.help,
+                  helperTextCnt: `${formData?.image_url?.length || 0}/${config.image_url.validation.maxLength.value}`
+                }}
+                rules={config.image_url.validation}
+              />
+            </>
             :null
           }
+          <div className="py-2"></div>
+          <ControlledTextField
+            control={control}
+            options={{
+              name: 'note',
+              label: config.note.label,
+              useNull: true,
+              defaultValue: formData?.note,
+              helperTextMessage: config.note.help,
+              helperTextCnt: `${formData?.note?.length || 0}/${config.note.validation.maxLength.value}`,
+            }}
+            rules={config.note.validation}
+          />
           <Alert severity="warning" sx={{marginTop: '1.5rem'}}>
             {/* <AlertTitle sx={{fontWeight: 500}}>Validate entered information</AlertTitle> */}
             Please double check the data because this entry <strong>cannot be edited after it has been created</strong>.

frontend/components/mention/MentionItemBase.tsx

@@ -8,6 +8,7 @@ import {ReactNode} from 'react'
 import {MentionItemProps} from '~/types/Mention'
 import MentionAuthors from './MentionAuthors'
 import MentionDoi from './MentionDoi'
+import MentionNote from './MentionNote'
 import MentionPublisherItem from './MentionPublisherItem'
 
 export type MentionItemRole = 'list'|'find'|'view'
@@ -69,6 +70,7 @@ export default function MentionItemBase({item,pos,nav,type,role='find'}:MentionI
         className="text-sm"
         role={role}
       />
+      <MentionNote note={item.note} />
     </article>
   )
 }

frontend/components/mention/MentionNote.tsx

@@ -0,0 +1,7 @@
+
+export default function MentionNote({note}: { note: string | null }) {
+  if (note) {
+    return <div className="mt-2 text-sm opacity-60">{note}</div>
+  }
+  return null
+}

frontend/components/mention/MentionViewItem.tsx

@@ -11,6 +11,7 @@ import MentionAuthors from './MentionAuthors'
 import MentionPublisherItem from './MentionPublisherItem'
 import MentionDoi from './MentionDoi'
 import {MentionTitle} from './MentionItemBase'
+import MentionNote from './MentionNote'
 
 export default function MentionViewItem({item, pos}: {item: MentionItemProps, pos:number}) {
 
@@ -39,6 +40,7 @@ export default function MentionViewItem({item, pos}: {item: MentionItemProps, po
             doi={item?.doi}
             className="text-sm"
           />
+          <MentionNote note={item.note} />
         </div>
         <div className="flex justify-center items-center">
           {item?.url ? <LinkIcon /> : null}

frontend/components/mention/config.ts

@@ -1,4 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+// SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
+// SPDX-FileCopyrightText: 2022 Netherlands eScience Center
 // SPDX-FileCopyrightText: 2022 dv4all
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -87,6 +89,17 @@ export const mentionModal = {
       }
     }
   },
+  note: {
+    label: 'Note',
+    help: 'Add a custom note',
+    validation: {
+      required: false,
+      maxLength: {
+        value: 500,
+        message: 'Maximum length is 500'
+      }
+    }
+  },
   image_url: {
     label: 'Image url*',
     help: 'Url to publication image is required for highlighted mention',
@@ -190,7 +203,7 @@ export const mentionType = {
   interview: {
     key: 'interview',
     plural: 'Interviews',
-    singular: 'Interviews',
+    singular: 'Interview',
     manual: true
   },
   journalArticle: {
@@ -220,7 +233,7 @@ export const mentionType = {
   report: {
     key: 'report',
     plural: 'Reports',
-    singular: 'Reports',
+    singular: 'Report',
     manual: true
   },
   thesis: {
@@ -241,6 +254,12 @@ export const mentionType = {
     singular: 'Webpage',
     manual: true
   },
+  workshop: {
+    key: 'workshop',
+    plural: 'Workshops',
+    singular: 'Workshop',
+    manual: true
+  },
   other: {
     key: 'other',
     plural: 'Other',

frontend/components/projects/ProjectKeywordFilter.tsx

@@ -15,7 +15,7 @@ type KeywordFilterProps = {
  * Keywords filter component. It receives array of keywords and returns
  * array of selected tags to use in filter using onSelect callback function
  */
-export default function ProjectKeywordsFilter({items=[], onApply}:KeywordFilterProps) {
+export default function ProjectKeywordFilter({items=[], onApply}:KeywordFilterProps) {
   return (
     <KeywordFilter
       items={items}

frontend/components/projects/ProjectKeywords.tsx

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+// SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
+// SPDX-FileCopyrightText: 2022 Netherlands eScience Center
+// SPDX-FileCopyrightText: 2022 dv4all
+//
+// SPDX-License-Identifier: Apache-2.0
+
+import {KeywordForProject} from '~/types/Project'
+import {ssrProjectsUrl} from '~/utils/postgrestUrl'
+import TagChipFilter from '../layout/TagChipFilter'
+
+type TagWithTitle = {
+  title: string
+  label: string
+}
+
+export default function ProjectKeywords({keywords=[]}:{keywords:KeywordForProject[]}) {
+
+  function renderTags() {
+    if (keywords.length === 0) {
+      return <i>Not specified</i>
+    }
+    return (
+      <div className="flex flex-wrap gap-2 py-1">
+        {
+          keywords.map((item, pos) => {
+            const url = ssrProjectsUrl({keywords: [item.keyword]})
+            return <TagChipFilter url={url} key={pos} label={item.keyword} />
+          })
+        }
+      </div>
+    )
+  }
+
+  return (
+    <div>
+      <h4 className="text-primary py-4">
+        Keywords
+      </h4>
+      {renderTags()}
+    </div>
+  )
+}

frontend/components/projects/ProjectSidebar.tsx

@@ -10,7 +10,7 @@ import {KeywordForProject, ProjectLink, ResearchDomain} from '../../types/Projec
 import ProjectStatus from './ProjectStatus'
 import ProjectFunding from './ProjectFunding'
 import ProjectLinks from './ProjectLinks'
-import ProjectTags from './ProjectTags'
+import ProjectKeywords from './ProjectKeywords'
 import {ProjectOrganisationProps} from '~/types/Organisation'
 import ResearchDomains from './ResearchDomains'
 
@@ -48,9 +48,8 @@ export default function ProjectSidebar({date_start, date_end, grant_id, links, r
         domains={researchDomains}
       />
 
-      <ProjectTags
-        title="Keywords"
-        tags={keywords.map(item=>item.keyword)}
+      <ProjectKeywords
+        keywords={keywords}
       />
 
     </aside>