Merge branch 'master' into telemetry-improvements

src/api/models.ts

@@ -40,7 +40,7 @@ export type SolrField =
   | 'first_author_facet_hier'
   | 'first_author_norm'
   | 'planetary_feature'
-  | 'gpn_id'
+  | 'planetary_feature_id'
   | 'grant'
   | 'grant_agencies'
   | 'grant_facet_hier'

src/api/search/models.ts

@@ -94,7 +94,7 @@ export const getAbstractParams = (id: string): IADSApiSearchParams => ({
     'pubnote',
     'book_author',
     'planetary_feature',
-    'gpn_id',
+    'planetary_feature_id',
   ],
   q: `identifier:"${id}"`,
 });

src/api/search/types.ts

@@ -247,7 +247,7 @@ export interface IDocsEntity {
   first_author_norm?: string;
   first_author?: string;
   planetary_feature?: string[];
-  gpn_id?: string[];
+  planetary_feature_id?: string[];
   grant_agencies?: string;
   grant_facet_hier?: string;
   grant_id?: string;

src/components/ResultList/Item/Item.tsx

@@ -50,6 +50,7 @@ export interface IItemProps {
   highlights?: string[];
   extraInfo?: string;
   linkNewTab?: boolean;
+  defaultCitation: string;
 }
 
 export const Item = (props: IItemProps): ReactElement => {
@@ -64,6 +65,7 @@ export const Item = (props: IItemProps): ReactElement => {
     highlights,
     extraInfo,
     linkNewTab = false,
+    defaultCitation = '',
   } = props;
   const { bibcode, pubdate, title = ['Untitled'], author = [], author_count, pub } = doc;
   const formattedPubDate = getFormattedNumericPubdate(pubdate);
@@ -118,7 +120,7 @@ export const Item = (props: IItemProps): ReactElement => {
             <Text as={MathJax} dangerouslySetInnerHTML={{ __html: unwrapStringValue(title) }} />
           </SimpleLink>
           <Flex alignItems="start" ml={1}>
-            {!isClient || hideActions ? null : <ItemResourceDropdowns doc={doc} />}
+            {!isClient || hideActions ? null : <ItemResourceDropdowns doc={doc} defaultCitation={defaultCitation} />}
           </Flex>
         </Flex>
         <Flex direction="column">

src/components/ResultList/Item/ItemResourceDropdowns.tsx

@@ -9,14 +9,11 @@ import { MouseEventHandler, ReactElement, useEffect } from 'react';
 import { SimpleLinkDropdown } from '@/components/Dropdown';
 import { isBrowser } from '@/utils/common/guards';
 import { IDocsEntity } from '@/api/search/types';
-import { useGetExportCitation } from '@/api/export/export';
-import { useSettings } from '@/lib/useSettings';
-import { exportFormats } from '@/components/CitationExporter/models';
-import { ExportApiFormatKey } from '@/api/export/types';
 import CopyToClipboard from 'react-copy-html-to-clipboard';
 
 export interface IItemResourceDropdownsProps {
   doc: IDocsEntity;
+  defaultCitation: string;
 }
 
 export interface IItem {
@@ -25,22 +22,10 @@ export interface IItem {
   path?: string;
 }
 
-export const ItemResourceDropdowns = ({ doc }: IItemResourceDropdownsProps): ReactElement => {
+export const ItemResourceDropdowns = ({ doc, defaultCitation }: IItemResourceDropdownsProps): ReactElement => {
   const router = useRouter();
   const isClient = useIsClient();
   const toast = useToast({ duration: 2000 });
-  const { settings } = useSettings();
-  const { defaultExportFormat, customFormats } = settings;
-
-  const { data: citationData } = useGetExportCitation(
-    {
-      // format: values(exportFormats).find((f) => f.label === defaultExportFormat).id,
-      format: ExportApiFormatKey.agu,
-      customFormat: defaultExportFormat === exportFormats.custom.label ? customFormats[0].code : undefined,
-      bibcode: [doc.bibcode],
-    },
-    { enabled: !!settings?.defaultExportFormat },
-  );
 
   const { hasCopied, onCopy, setValue, value } = useClipboard('');
 
@@ -172,10 +157,10 @@ export const ItemResourceDropdowns = ({ doc }: IItemResourceDropdownsProps): Rea
   };
 
   const handleCitationCopied = () => {
-    if (citationData?.export) {
+    if (defaultCitation !== '') {
       toast({ status: 'info', title: 'Copied to Clipboard' });
     } else {
-      toast({ status: 'error', title: 'There was a problem fetching citation' });
+      toast({ status: 'error', title: 'There was a problem fetching citation. Try reloading the page.' });
     }
   };
 
@@ -300,7 +285,7 @@ export const ItemResourceDropdowns = ({ doc }: IItemResourceDropdownsProps): Rea
         <MenuList>
           <MenuItem onClick={handleCopyAbstractUrl}>Copy URL</MenuItem>
 
-          <CopyToClipboard text={citationData?.export} onCopy={handleCitationCopied} options={{ asHtml: true }}>
+          <CopyToClipboard text={defaultCitation} onCopy={handleCitationCopied} options={{ asHtml: true }}>
             <MenuItem>Copy Citation</MenuItem>
           </CopyToClipboard>
         </MenuList>

src/components/ResultList/SimpleResultList.tsx

@@ -1,10 +1,15 @@
 import { Flex, VisuallyHidden } from '@chakra-ui/react';
 import { useIsClient } from '@/lib/useIsClient';
 import PT from 'prop-types';
-import { HTMLAttributes, ReactElement } from 'react';
+import { HTMLAttributes, ReactElement, useMemo } from 'react';
 import { Item } from './Item';
 import { useHighlights } from './useHighlights';
 import { IDocsEntity } from '@/api/search/types';
+import { useGetExportCitation } from '@/api/export/export';
+import { useSettings } from '@/lib/useSettings';
+import { ExportApiFormatKey } from '@/api/export/types';
+import { exportFormats } from '../CitationExporter';
+import { logger } from '@/logger';
 
 export interface ISimpleResultListProps extends HTMLAttributes<HTMLDivElement> {
   docs: IDocsEntity[];
@@ -38,6 +43,37 @@ export const SimpleResultList = (props: ISimpleResultListProps): ReactElement =>
 
   const { highlights, showHighlights, isFetchingHighlights } = useHighlights();
 
+  const { settings } = useSettings();
+  const { defaultExportFormat, customFormats } = settings;
+
+  const bibcodes = docs.map((d) => d.bibcode).sort();
+
+  const { data: citationData } = useGetExportCitation(
+    {
+      // format: values(exportFormats).find((f) => f.label === defaultExportFormat).id,
+      format: ExportApiFormatKey.agu,
+      customFormat: defaultExportFormat === exportFormats.custom.label ? customFormats[0].code : undefined,
+      bibcode: bibcodes,
+      sort: ['bibcode asc'],
+    },
+    { enabled: !!settings?.defaultExportFormat },
+  );
+
+  // a map from bibcode to citation
+  const defaultCitations = useMemo(() => {
+    const citationSet = new Map<string, string>();
+    try {
+      if (!!citationData) {
+        citationData.export.split('\n').forEach((c, index) => {
+          citationSet.set(bibcodes[index], c);
+        });
+      }
+    } catch (err) {
+      logger.error({ err }, 'Error processing citation data');
+    }
+    return citationSet;
+  }, [citationData, bibcodes]);
+
   return (
     <Flex
       as="section"
@@ -61,6 +97,7 @@ export const SimpleResultList = (props: ISimpleResultListProps): ReactElement =>
           highlights={highlights?.[index] ?? []}
           isFetchingHighlights={allowHighlight && isFetchingHighlights}
           useNormCite={useNormCite}
+          defaultCitation={defaultCitations?.get(doc.bibcode)}
         />
       ))}
     </Flex>

src/middleware.ts

@@ -113,10 +113,7 @@ const emitAnalytics = async (req: NextRequest): Promise<void> => {
 
   // For abs/ routes we want to send emit an event to the link gateway
   if (path.startsWith('/abs')) {
-    const url = `${process.env.BASE_URL}/link_gateway${path.replace(
-      '/abs',
-      '',
-    )}`;
+    const url = `${process.env.BASE_URL}/link_gateway${path.replace('/abs', '')}`;
     log.debug({ path, url }, 'Emitting abs route event to link gateway');
 
     try {
@@ -133,7 +130,8 @@ const getIp = (req: NextRequest) =>
   (
     req.headers.get('X-Original-Forwarded-For') ||
     req.headers.get('X-Forwarded-For') ||
-    req.headers.get('X-Real-Ip')
+    req.headers.get('X-Real-Ip') ||
+    ''
   )
     .split(',')
     .shift() || 'unknown';
@@ -183,21 +181,15 @@ export async function middleware(req: NextRequest) {
     return loginMiddleware(req, res);
   }
 
-  if (
-    path.startsWith('/user/account/register') ||
-    path.startsWith('/user/forgotpassword')
-  ) {
+  if (path.startsWith('/user/account/register') || path.startsWith('/user/forgotpassword')) {
     return redirectIfAuthenticated(req, res);
   }
 
   if (path.startsWith('/user/libraries') || path.startsWith('/user/settings')) {
     return protectedRoute(req, res);
   }
 
-  if (
-    path.startsWith('/user/account/verify/change-email') ||
-    path.startsWith('/user/account/verify/register')
-  ) {
+  if (path.startsWith('/user/account/verify/change-email') || path.startsWith('/user/account/verify/register')) {
     return verifyMiddleware(req, res);
   }
 

src/middlewares/botCheck.ts

@@ -15,7 +15,8 @@ const getIp = (req: NextRequest) =>
   (
     req.headers.get('X-Original-Forwarded-For') ||
     req.headers.get('X-Forwarded-For') ||
-    req.headers.get('X-Real-Ip')
+    req.headers.get('X-Real-Ip') ||
+    ''
   )
     .split(',')
     .shift() || 'unknown';

src/pages/abs/[id]/abstract.tsx

@@ -20,8 +20,8 @@ import {
   Tooltip,
   Tr,
   useDisclosure,
-  VisuallyHidden,
   useToast,
+  VisuallyHidden,
 } from '@chakra-ui/react';
 import { EditIcon, ExternalLinkIcon, TriangleDownIcon } from '@chakra-ui/icons';
 
@@ -244,7 +244,7 @@ const Details = ({ doc }: IDetailsProps): ReactElement => {
             )}
           </Detail>
           <Keywords keywords={doc.keyword} />
-          <PlanetaryFeatures features={doc.planetary_feature} ids={doc.gpn_id} />
+          <PlanetaryFeatures features={doc.planetary_feature} ids={doc.planetary_feature_id} />
           <Detail label="Comment(s)" value={doc.comment} />
           <Detail label="E-Print Comment(s)" value={doc.pubnote} />
         </Tbody>