Merge pull request #928 from nowcommunity/fix-error-with-key-prop-in-update-tabs

Improve Update tab

backend/src/services/species.ts

@@ -94,14 +94,13 @@ export const getSpeciesDetails = async (id: number) => {
       now_sau: {
         include: {
           now_sr: {
-            select: {
+            include: {
               ref_ref: {
-                select: {
+                include: {
                   ref_authors: true,
                   ref_journal: true,
                 },
               },
-              rid: true,
             },
           },
         },

cypress/support/commands.js

@@ -27,7 +27,7 @@
 Cypress.Commands.add('login', username => {
   cy.clearLocalStorage()
   cy.visit('/login')
-  cy.contains('Login').click()
+  cy.get('[data-cy="login-button"]', { timeout: 10000 }).should('be.visible').click()
   cy.get('[data-cy="username-basic"]').type(username)
   cy.get('[data-cy="password-basic"]').type('test')
   cy.get('[data-cy="login-button"]').click()

frontend/src/components/DetailView/common/UpdateTab.tsx

@@ -1,4 +1,4 @@
-import { ReferenceOfUpdate, UpdateLog } from '@/shared/types'
+import { AnyReference, ReferenceOfUpdate, UpdateLog } from '@/shared/types'
 import { useDetailContext } from '@/components/DetailView/Context/DetailContext'
 import { EditingModal } from '@/components/DetailView/common/EditingModal'
 import { SimpleTable } from '@/components/DetailView/common/SimpleTable'
@@ -18,9 +18,10 @@ const makeNameList = (names: Array<string | null>) => {
   return names[0] ?? ''
 }
 
-const ReferenceList = ({ references, big }: { references: ReferenceOfUpdate[]; big: boolean }) => {
+const ReferenceList = ({ references, big }: { references: AnyReference[]; big: boolean }) => {
   const getReferenceText = (ref: ReferenceOfUpdate) => {
     // php version: html/include/database.php -> referenceCitation()
+    //const ref = referenceOfUpdate.ref_ref
     const authors = makeNameList(ref.ref_authors.map(author => author.author_surname))
     const issue = ref.issue ? ` (${ref.issue}) ` : ''
     if (ref.ref_type_id === 1) {
@@ -37,6 +38,7 @@ const ReferenceList = ({ references, big }: { references: ReferenceOfUpdate[]; b
     // All other types
     return `${authors} ${ref.date_primary ? `(${ref.date_primary}). ` : ''} ${ref.title_primary?.concat('. ') ?? ''}${ref.title_secondary?.concat('. ') ?? ''}${ref.title_series?.concat('. ') ?? ''}${ref.gen_notes?.concat('.') ?? ''}`
   }
+
   return (
     <Stack>
       {references.map(ref => (
@@ -44,7 +46,7 @@ const ReferenceList = ({ references, big }: { references: ReferenceOfUpdate[]; b
           key={ref.rid}
           sx={{ padding: '0.4em', margin: '0.5em', maxWidth: big ? '50em' : '30em', backgroundColor: 'lightblue' }}
         >
-          <div style={{ wordWrap: 'break-word', whiteSpace: 'normal' }}>{getReferenceText(ref)}</div>
+          <div style={{ wordWrap: 'break-word', whiteSpace: 'normal' }}>{getReferenceText(ref.ref_ref)}</div>
           {big && (
             <div>
               <Link to={`/reference/${ref.rid}`}>View</Link>
@@ -90,10 +92,7 @@ export const UpdateTab = <T, UpdateType extends MRT_RowData & { updates: UpdateL
       accessorKey: refFieldName as string,
       header: 'Reference',
       Cell: ({ row }: { row: MRT_Row<UpdateType> }) => (
-        <ReferenceList
-          references={(row.original[refFieldName] as { ref_ref: ReferenceOfUpdate }[]).map(item => item.ref_ref)}
-          big={false}
-        />
+        <ReferenceList references={row.original[refFieldName]} big={false} />
       ),
     },
     {
@@ -105,7 +104,7 @@ export const UpdateTab = <T, UpdateType extends MRT_RowData & { updates: UpdateL
           coordinator={row.original[`${prefix}_coordinator`] as string}
           updates={row.original.updates}
           comment={row.original[`${prefix}_comment` as keyof UpdateType] as string}
-          references={row.original[refFieldName] as { ref_ref: ReferenceOfUpdate }[]}
+          references={row.original[refFieldName]}
         />
       ),
     },
@@ -118,7 +117,7 @@ export const UpdateTab = <T, UpdateType extends MRT_RowData & { updates: UpdateL
   )
 }
 
-const DetailsModal = <RefType extends { ref_ref: ReferenceOfUpdate }>({
+const DetailsModal = ({
   updates,
   references,
   comment,
@@ -127,7 +126,7 @@ const DetailsModal = <RefType extends { ref_ref: ReferenceOfUpdate }>({
   coordinator,
 }: {
   updates: UpdateLog[]
-  references: RefType[]
+  references: AnyReference[]
   comment: string
   date: Date
   authorizer: string
@@ -179,11 +178,7 @@ const DetailsModal = <RefType extends { ref_ref: ReferenceOfUpdate }>({
       </Card>
       <Divider />
       <h3>References</h3>
-      {references.length === 0 ? (
-        <Box>Update has no references.</Box>
-      ) : (
-        <ReferenceList references={references.map(ref => ref.ref_ref)} big />
-      )}
+      {references.length === 0 ? <Box>Update has no references.</Box> : <ReferenceList references={references} big />}
       <Divider />
       <h3>Changed database values</h3>
       <SimpleTable columns={columns} data={updates} />

frontend/src/components/Species/SpeciesDetails.tsx

@@ -25,7 +25,7 @@ export const SpeciesDetails = () => {
     document.title = 'New species'
   }
   const [editSpeciesRequest, { isLoading: mutationLoading }] = useEditSpeciesMutation()
-  const { isError, isFetching, data } = useGetSpeciesDetailsQuery(id!, { skip: isNew })
+  const { isError, isFetching, data } = useGetSpeciesDetailsQuery(encodeURIComponent(id!), { skip: isNew })
   const { notify } = useNotify()
   const navigate = useNavigate()
   const [deleteMutation, { isSuccess: deleteSuccess, isError: deleteError }] = useDeleteSpeciesMutation()

frontend/src/shared/types/data.ts

@@ -444,8 +444,12 @@ export type ReferenceOfUpdate = Prisma.ref_ref & {
   ref_journal: Prisma.ref_journal
 }
 
-export type LocalityReference = Prisma.now_lr & ReferenceOfUpdate
-export type SpeciesReference = Prisma.now_sr & ReferenceOfUpdate
+export type LocalityReference = Prisma.now_lr & { ref_ref: ReferenceOfUpdate }
+export type SpeciesReference = Prisma.now_sr & { ref_ref: ReferenceOfUpdate }
+export type TimeUnitReference = Prisma.now_tr & { ref_ref: ReferenceOfUpdate }
+export type TimeBoundReference = Prisma.now_br & { ref_ref: ReferenceOfUpdate }
+
+export type AnyReference = LocalityReference | SpeciesReference | TimeUnitReference | TimeBoundReference
 
 export type ReferenceJournalType = {
   journal_id?: number