Merge pull request #1594 from research-software-directory/1580-admin-orcid-search

Search for ORCID in admin user overview

Author: ewan-escience

frontend/components/admin/rsd-users/apiRsdUsers.ts

@@ -12,6 +12,7 @@ import logger from '~/utils/logger'
 import {paginationUrlParams} from '~/utils/postgrestUrl'
 import {RsdAccountInfo} from './useRsdAccounts'
 import {LockAccountProps} from './LockUserModal'
+import {orcidRegex} from '~/utils/getORCID'
 
 type getLoginApiParams = {
   token: string,
@@ -36,13 +37,16 @@ export async function getRsdAccounts({page,rows,token,searchFor,adminsOnly,locke
     }
     // search
     if (searchFor) {
-      if (searchFor.match(/^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i) !== null) {
-        // if searchFor is uuid we search by account id
+      if (/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i.test(searchFor)) {
+        // if searchFor is a UUID we search by account ID
         query += `&id=eq.${searchFor}`
-      } else {
-        // else we search by name, email or organisation
-        query+=`&login_for_account_text_filter.or=(name.ilike."*${searchFor}*",email.ilike."*${searchFor}*",home_organisation.ilike."*${searchFor}*")`
-      }
+      } else if (orcidRegex.test(searchFor)) {
+        // else if searchFor is an ORCID we search on login_for_account sub
+		  query += `&login_for_account_text_filter.sub=eq.${searchFor}&login_for_account_text_filter.provider=eq.orcid`
+	  } else {
+		  // else we search by name, email or organisation
+		  query += `&login_for_account_text_filter.or=(name.ilike."*${searchFor}*",email.ilike."*${searchFor}*",home_organisation.ilike."*${searchFor}*")`
+	  }
     }
     // complete url
     const url = `${getBaseUrl()}/account?${query}`
@@ -168,7 +172,7 @@ export async function lockRsdAcount({
 
     let resp
 
-    if (account.lock_account===true){
+    if (account.lock_account){
       resp = await fetch(url, {
         method: 'PUT',
         headers: {

frontend/components/admin/rsd-users/useRsdAccounts.tsx

@@ -34,7 +34,7 @@ export type RsdAccountLockedInfo = {
 
 export default function useRsdAccounts(token: string, adminsOnly: boolean, lockedOnly: boolean, inactiveDays: number) {
   const {showErrorMessage}=useSnackbar()
-  const {searchFor, page, rows, setCount} = usePaginationWithSearch('Find user by account id, name, email or affiliation')
+  const {searchFor, page, rows, setCount} = usePaginationWithSearch('Find by account ID, name, email, ORCID or affiliation')
   const [accounts, setAccounts] = useState<RsdAccountInfo[]>([])
   // show loading only on initial load
   const [loading, setLoading] = useState(true)

frontend/utils/getORCID.ts

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all)
 // SPDX-FileCopyrightText: 2022 - 2023 dv4all
+// SPDX-FileCopyrightText: 2022 - 2025 Ewan Cahen (Netherlands eScience Center) <[email protected]>
 // SPDX-FileCopyrightText: 2022 - 2025 Netherlands eScience Center
-// SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
 // SPDX-FileCopyrightText: 2024 - 2025 Dusan Mijatovic (Netherlands eScience Center)
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -24,7 +24,7 @@ type OrcidExpandedSearchResponse = {
 }
 
 const baseUrl = 'https://pub.orcid.org/v3.0/expanded-search/'
-const orcidRegex = /^\d{4}-\d{4}-\d{4}-\d{3}[0-9X]$/
+export const orcidRegex = /^\d{4}-\d{4}-\d{4}-\d{3}[0-9X]$/
 
 export function isOrcid(stringToCheck: string): boolean {
   return stringToCheck.match(orcidRegex) !== null