Fix/ Profile search - add institution

app/profile/compare/comparePage.js

@@ -4,13 +4,14 @@
 
 import { useSearchParams } from 'next/navigation'
 import { Suspense, useEffect, useState } from 'react'
+import ErrorDisplay from '../../../components/ErrorDisplay'
+import LoadingSpinner from '../../../components/LoadingSpinner'
 import api from '../../../lib/api-client'
-import { prettyId } from '../../../lib/utils'
+import { getNoteAuthorIds, getNoteAuthors, prettyId } from '../../../lib/utils'
+import CommonLayout from '../../CommonLayout'
 import Compare from './Compare'
+
 import styles from './Compare.module.scss'
-import ErrorDisplay from '../../../components/ErrorDisplay'
-import CommonLayout from '../../CommonLayout'
-import LoadingSpinner from '../../../components/LoadingSpinner'
 
 const addMetadata = (profile, fieldName) => {
   const localProfile = { ...profile }
@@ -111,14 +112,10 @@ function Page() {
           publication.apiVersion === 1
             ? publication.content.title
             : publication.content.title.value,
-        authors:
-          publication.apiVersion === 1
-            ? publication.content.authors
-            : publication.content.authors.value,
-        authorids: (publication.apiVersion === 1
-          ? publication.content.authorids
-          : publication.content.authorids.value
-        ).filter((id) => id),
+        authors: getNoteAuthors(publication, publication.apiVersion !== 1),
+        authorids: getNoteAuthorIds(publication, publication.apiVersion !== 1).filter(
+          (id) => id
+        ),
       }))
     }
     return []

app/profile/edit/page.js

@@ -1,15 +1,17 @@
 'use client'
 
+import { useRouter } from 'next/navigation'
 /* globals promptMessage,promptError: false */
 import { useEffect, useState } from 'react'
-import { useRouter } from 'next/navigation'
+import LoadingSpinner from '../../../components/LoadingSpinner'
 import ProfileEditor from '../../../components/profile/ProfileEditor'
+import useUser from '../../../hooks/useUser'
 import api from '../../../lib/api-client'
 import { formatProfileData } from '../../../lib/profiles'
-import useUser from '../../../hooks/useUser'
+import { getNoteAuthorIds, prettyId } from '../../../lib/utils'
 import LimitedStateAlert from './LimitedStateAlert'
+
 import styles from './Edit.module.scss'
-import LoadingSpinner from '../../../components/LoadingSpinner'
 
 export default function Page() {
   const [profile, setProfile] = useState(null)
@@ -23,10 +25,10 @@ export default function Page() {
     let authorIds
     let invitation
     if (note.invitations) {
-      authorIds = note.content.authorids?.value
+      authorIds = getNoteAuthorIds(note, true)
       invitation = note.invitations[0]
     } else {
-      authorIds = note.content.authorids
+      authorIds = getNoteAuthorIds(note, false)
       // oxlint-disable-next-line prefer-destructuring
       invitation = note.invitation
     }
@@ -38,6 +40,7 @@ export default function Page() {
         'OpenReview.net/Archive/-/Direct_Upload_Revision',
       'DBLP.org/-/Record': 'DBLP.org/-/Author_Coreference',
       [`${process.env.SUPER_USER}/Public_Article/ORCID.org/-/Record`]: `${process.env.SUPER_USER}/Public_Article/-/Author_Removal`,
+      [`${process.env.SUPER_USER}/Public_Article/DBLP.org/-/Record`]: `${process.env.SUPER_USER}/Public_Article/-/Author_Removal`,
     }
     if (!authorIds) {
       throw new Error(`Note ${noteId} is missing author ids`)
@@ -73,6 +76,10 @@ export default function Page() {
           content: {
             author_index: { value: matchedIdx[0] },
             author_id: { value: '' },
+            ...(invitationMap[invitation] ===
+              `${process.env.SUPER_USER}/Public_Article/-/Author_Removal` && {
+              author_name: { value: prettyId(profileId) },
+            }),
           },
         }
       : {

components/DblpPublicationTable.js

@@ -17,28 +17,39 @@ export default function DblpPublicationTable({
   orPublicationsImportedByOtherProfile,
   maxNumberofPublicationsToImport,
 }) {
+  const { user } = useUser(true)
   const [profileIdsRequested, setProfileIdsRequested] = useState([])
-  const pubsCouldNotImport = [] // either existing or associated with other profile
-  const pubsCouldImport = []
-  dblpPublications.forEach((dblpPub) => {
-    const titleMatch = (orPub) =>
-      orPub.title === dblpPub.formattedTitle &&
-      orPub.authorCount === dblpPub.authorCount &&
-      orPub.venue === dblpPub.venue
-    const existing = orPublications.find(titleMatch)
-    const existingWithOtherProfile = orPublicationsImportedByOtherProfile.find(titleMatch)
-    if (existing || existingWithOtherProfile || dblpPub.authorIndex === -1) {
-      pubsCouldNotImport.push(dblpPub.key)
-    } else {
-      pubsCouldImport.push(dblpPub.key)
+
+  const categorizedDblpPublications = dblpPublications.map((dblpPub) => {
+    const externalIdOrtitleMatch = (orPub) =>
+      orPub.externalId === dblpPub.externalId ||
+      (orPub.title === dblpPub.formattedTitle &&
+        orPub.authorCount === dblpPub.authorCount &&
+        orPub.venue === dblpPub.venue)
+    const existing = orPublications.find(externalIdOrtitleMatch)
+    const existingWithOtherProfile =
+      orPublicationsImportedByOtherProfile.find(externalIdOrtitleMatch)
+
+    return {
+      ...dblpPub,
+      existing,
+      existingWithOtherProfile,
+      couldNotImport: existing || existingWithOtherProfile || dblpPub.authorIndex === -1,
     }
   })
-  const allExistInOpenReview = dblpPublications.length === pubsCouldNotImport.length
-  const allChecked =
-    dblpPublications.length - pubsCouldNotImport.length === selectedPublications.length
 
-  const dblpPublicationsGroupedByYear = groupBy(dblpPublications, (p) => p.year)
+  const pubsCouldNotImport = categorizedDblpPublications.flatMap((p) =>
+    p.couldNotImport ? [p.key] : []
+  )
+  const pubsCouldImport = categorizedDblpPublications
+    .map((p) => p.key)
+    .filter((key) => !pubsCouldNotImport.includes(key))
+  const allExistInOpenReview = categorizedDblpPublications.length === pubsCouldNotImport.length
+  const allChecked =
+    categorizedDblpPublications.length - pubsCouldNotImport.length ===
+    selectedPublications.length
 
+  const dblpPublicationsGroupedByYear = groupBy(categorizedDblpPublications, (p) => p.year)
   const toggleSelectAll = (checked) => {
     if (!checked) {
       setSelectedPublications([])
@@ -156,13 +167,9 @@ export default function DblpPublicationTable({
                   </>
                 ),
                 body: publicationsOfYear.map((publication) => {
-                  const titleMatch = (orPub) =>
-                    orPub.title === publication.formattedTitle &&
-                    orPub.authorCount === publication.authorCount &&
-                    orPub.venue === publication.venue
-                  const existingPublication = orPublications.find(titleMatch)
+                  const existingPublication = publication.existing
                   const existingPublicationOfOtherProfile =
-                    orPublicationsImportedByOtherProfile.find(titleMatch)
+                    publication.existingWithOtherProfile
                   const category = existingPublication
                     ? 'existing-publication'
                     : existingPublicationOfOtherProfile
@@ -186,6 +193,7 @@ export default function DblpPublicationTable({
                       source={publication.source}
                       profileIdsRequested={profileIdsRequested}
                       setProfileIdsRequested={setProfileIdsRequested}
+                      user={user}
                     />
                   )
                 }),
@@ -217,8 +225,8 @@ const DblpPublicationRow = ({
   source,
   profileIdsRequested,
   setProfileIdsRequested,
+  user,
 }) => {
-  const { user } = useUser(true)
   const [error, setError] = useState(null)
   const [profileMergeStatus, setProfileMergeStatus] = useState(null)
   const profileMergeInvitationId = `${process.env.SUPER_USER}/Support/-/Profile_Merge`

components/EditorComponents/ContentFieldEditor.js

@@ -1,5 +1,5 @@
 import { useContext, useState } from 'react'
-import { get, set } from 'lodash'
+import { get, set, unset } from 'lodash'
 import EditorComponentContext from '../EditorComponentContext'
 import { Tab, TabList, TabPanel, TabPanels, Tabs } from '../Tabs'
 import CodeEditorWidget from './CodeEditorWidget'
@@ -150,6 +150,10 @@ const JsonEditor = ({ existingFields, onFieldChange }) => {
             // { value: 'group', description: 'Group ID (Profile Search)' },
             // { value: 'profile', description: 'Profile ID (Profile Search)' },
             { value: 'group[]', description: 'Group ID Array (Profile Search)' },
+            {
+              value: 'author{}',
+              description: 'Author Object (Profile Search with Institution)',
+            },
             // { value: 'profile[]', description: 'Profile ID Array (Profile Search)' },
             // { value: 'note', description: 'Note ID (Not implemented)' },
             // { value: 'note[]', description: 'Note ID Array (Not implemented)' },
@@ -187,7 +191,7 @@ const JsonEditor = ({ existingFields, onFieldChange }) => {
         },
       },
       shouldBeShown: (formData) =>
-        !['const', 'file', 'date', 'boolean', 'json'].includes(formData.dataType),
+        !['const', 'file', 'date', 'boolean', 'json', 'author{}'].includes(formData.dataType),
       getValue: function (existingValue) {
         return get(existingValue, this.valuePath)
       },
@@ -432,12 +436,63 @@ const JsonEditor = ({ existingFields, onFieldChange }) => {
       },
       valuePath: 'value.param.markdown',
     },
+    institution: {
+      order: 9,
+      description: 'whether to include institution info',
+      value: {
+        param: {
+          input: 'checkbox',
+          type: 'boolean',
+          enum: [{ value: true, description: 'Include institution info' }],
+          optional: true,
+        },
+      },
+      shouldBeShown: (formData) => formData.dataType === 'author{}',
+      getValue: function (existingValue) {
+        const hasInstitution = get(existingValue, this.valuePath)
+        return !!hasInstitution
+      },
+      valuePath: 'value.param.properties.institutions',
+    },
   }
 
   const onFormChange = (updatedForm) => {
     const updatedField = Object.entries(fieldSpecificationsOfJsonField).reduce(
       (prev, [key, config]) => {
-        if (config.valuePath) {
+        if (key === 'dataType' && updatedForm[key] === 'author{}') {
+          set(prev, config.valuePath, updatedForm[key])
+          set(prev, 'value.param.properties', {
+            fullname: { param: { type: 'string' } },
+            username: { param: { type: 'string' } },
+          })
+        } else if (key === 'institution') {
+          const includeInstitution = updatedForm[key]
+          // eslint-disable-next-line no-unused-expressions
+          includeInstitution
+            ? set(prev, 'value.param.properties.institutions', {
+                param: {
+                  type: 'object{}',
+                  properties: {
+                    name: {
+                      param: {
+                        type: 'string',
+                      },
+                    },
+                    domain: {
+                      param: {
+                        type: 'string',
+                      },
+                    },
+                    country: {
+                      param: {
+                        type: 'string',
+                      },
+                    },
+                  },
+                },
+              })
+            : unset(prev, 'value.param.properties.institutions', undefined)
+        } else if (config.valuePath) {
           set(prev, config.valuePath, updatedForm[key])
         } else {
           set(prev, key, updatedForm[key])