pubs: image links for akvaplan projects (even if only nva/cristin id in data)

components/news/article_square.tsx

@@ -19,7 +19,7 @@ export const ArticleSquare = (
     href,
     hreflang,
     keywords,
-    width,
+    width = 512,
     height,
     maxWidth,
     type,
@@ -40,7 +40,7 @@ export const ArticleSquare = (
       target={target}
       title={desc}
     >
-      <SquareImage w={512} url={img512 ?? img ?? thumb} />
+      <SquareImage w={width} url={img512 ?? img ?? thumb} />
 
       <p
         dangerouslySetInnerHTML={{ __html: title ?? name ?? "" }}

components/project_link.tsx

@@ -2,42 +2,27 @@ import { projectURL, pubsURL } from "akvaplan_fresh/services/nav.ts";
 import { ArticleSquare } from "akvaplan_fresh/components/news/article_square.tsx";
 import { Card } from "akvaplan_fresh/components/card.tsx";
 import { t } from "akvaplan_fresh/text/mod.ts";
+import { SquareImage } from "akvaplan_fresh/components/square_image.tsx";
 
 const publicationsUrlForCristinProject = (cristin, lang) =>
   pubsURL({ lang }) + `?q=cristin_${cristin}`;
 
-export const ProjectLink = (multiple) => {
-  const { akvaplan, cristin, lang } = multiple;
-  const thumb =
-    `https://mnd-assets.mynewsdesk.com/image/upload/c_fill,dpr_auto,f_auto,g_auto,q_auto:good,w_512,ar_1:1/${""}`;
-  if (akvaplan) {
-    const {
-      id,
-      name,
-      cloudinary,
-    } = akvaplan;
-    const name_t = name?.[lang] as string ?? id;
-    const href_t = projectURL({ title: id, lang });
-    const thumb =
-      `https://mnd-assets.mynewsdesk.com/image/upload/c_fill,dpr_auto,f_auto,g_auto,q_auto:good,w_256,ar_1:1/${cloudinary}`;
-    return <ArticleSquare name={name_t} href={href_t} thumb={thumb} />;
-  }
-  if (cristin) {
-    const href = publicationsUrlForCristinProject(
-      cristin.id.split("/").at(-1),
-      lang,
-    );
-    return (
-      <li>
-        <a href={href}>
-          {cristin.title}
-        </a>
-      </li>
-    );
-  }
-  return <span>{JSON.stringify(multiple)}</span>;
+export const AkvaplanProjectLink = ({ id, label, cloudinary, lang }) => {
+  const name_t = label?.[lang] as string ?? id;
+  const href_t = projectURL({ title: id, lang });
+  const thumb = cloudinary
+    ? `https://mnd-assets.mynewsdesk.com/image/upload/c_fill,dpr_auto,f_auto,g_auto,q_auto:good,w_256,ar_1:1/${cloudinary}`
+    : undefined;
+
+  return thumb
+    ? <ArticleSquare name={name_t} href={href_t} width={128} thumb={thumb} />
+    : <li href={href_t}>{name_t ?? id}</li>;
 };
 
+//const href = publicationsUrlForCristinProject(cristin.id.split("/").at(-1),lang)
+const NvaProject = ({ name, title, id, lang }) => <li>{name ?? title ?? id}
+</li>;
+
 export const ProjectsAsImageLinks = ({ projects, lang }) => (
   projects?.length > 0
     ? (
@@ -46,11 +31,10 @@ export const ProjectsAsImageLinks = ({ projects, lang }) => (
           <summary style={{ paddingBottom: "1rem" }}>
             {t(projects.length === 1 ? "nav.Project" : "nav.Projects")}
           </summary>
-
-          {projects.map((p) =>
-            "cristin" in (p ?? {})
-              ? ProjectLink({ ...p, lang })
-              : <li>{JSON.stringify(p)}</li>
+          {projects.map(({ akvaplan, nva }) =>
+            akvaplan && akvaplan.id
+              ? AkvaplanProjectLink({ ...akvaplan, lang })
+              : NvaProject({ ...nva, lang })
           )}
         </details>
       </Card>

components/pub_article.tsx

@@ -15,6 +15,8 @@ import { isNvaUrl } from "akvaplan_fresh/services/nva.ts";
 import { isHandleUrl } from "akvaplan_fresh/services/handle.ts";
 import { CCIcons } from "akvaplan_fresh/components/cc-icons.tsx";
 import { Breadcrumbs } from "akvaplan_fresh/components/site_nav.tsx";
+import pub from "akvaplan_fresh/routes/pub.tsx";
+import { Section } from "akvaplan_fresh/components/section.tsx";
 
 export const PubArticle = ({
   pub: {
@@ -32,6 +34,7 @@ export const PubArticle = ({
     pdf,
     created,
     modified,
+    abstract,
   },
   lang,
 }: { pub: SlimPublication; lang: string }) => {
@@ -135,6 +138,22 @@ export const PubArticle = ({
             )}
           </section>
 
+          {abstract
+            ? (
+              <Section>
+                <h2>{t("Abstract")}</h2>
+                <p
+                  dangerouslySetInnerHTML={{ __html: abstract }}
+                  style={{
+                    maxWidth: "120ch",
+                    fontSize: "1rem",
+                    whiteSpace: "pre-wrap",
+                  }}
+                />
+              </Section>
+            )
+            : null}
+
           {pdf ||
               url?.endsWith(".pdf")
             ? (

components/square_image.tsx

@@ -1,7 +1,9 @@
 import { srcset } from "akvaplan_fresh/services/cloudinary.ts";
 
 export const WIDTHS = [512, 256, 145];
-export const SquareImage = ({ w, caption, url, widths = WIDTHS }) => (
+export const SquareImage = (
+  { w = WIDTHS[0], caption, url, widths = WIDTHS },
+) => (
   <>
     <img
       alt={caption ?? ""}
@@ -10,8 +12,8 @@ export const SquareImage = ({ w, caption, url, widths = WIDTHS }) => (
         ? widths.map((w) => srcset(url, { w, ar: "1:1" })).join(",\n")
         : ""}
       sizes="30vw"
-      width="512"
-      height="512"
+      width={w}
+      height={w}
       style={{
         // "transition": "2s ease-in-out",
         // borderRadius: "6px",

data/projects.json

@@ -2,7 +2,23 @@
   {
     "id": "polarfront",
     "cristin": 2524794,
-    "name": { "en": "Polar Front", "no": "Polar Front" },
+    "label": { "en": "Polar Front", "no": "Polar Front" },
     "cloudinary": "f1p8gecba7nuxbduxcou"
+  },
+  {
+    "id": "slice",
+    "cristin": 2694515,
+    "label": { "en": "SLICE", "no": "SLICE" },
+    "cloudinary": "kwy8kuceecjpjoh3yyy5"
+  },
+  {
+    "id": "dokumentar",
+    "cristin": 2703197,
+    "label": { "en": "DOKUMENTAR", "no": "DOKUMENTAR" }
+  },
+  {
+    "id": "mxr",
+    "cristin": 2663173,
+    "label": { "en": "MxR", "no": "MxR" }
   }
 ]

islands/pub_nva_pdf_augment.tsx

@@ -73,13 +73,13 @@ export const PubNvaPdfAugment = (
   };
 
   const embedPdfs = (publication: NvaPublicationLike, state: Signal) => {
-    const { entityDescription: { abstract, description } } = publication;
-    if (abstract) {
-      state.value.abstract = abstract;
-    }
-    if (abstract) {
-      state.value.description = description;
-    }
+    // const { entityDescription: { abstract, description } } = publication;
+    // if (abstract) {
+    //   state.value.abstract = abstract;
+    // }
+    // if (description) {
+    //   state.value.description = description;
+    // }
     publication?.associatedArtifacts?.filter(pdfFilter).map(
       async (file) => {
         const pdfUrl = await getPresignedPdfUrl(
@@ -126,7 +126,8 @@ export const PubNvaPdfAugment = (
 
       <div id={nvaPdfWrapperHtmlId} />
 
-      {state.value?.abstract && (
+      {
+        /* {state.value?.abstract && (
         <Section>
           <h2>{t("Abstract")}</h2>
           <p
@@ -138,7 +139,8 @@ export const PubNvaPdfAugment = (
             }}
           />
         </Section>
-      )}
+      )} */
+      }
 
       {state.value?.description &&
         (

routes/project.tsx

@@ -1,11 +1,6 @@
 // FIXME (project.tsx) https://github.com/akvaplan-niva/akvaplan_fresh/issues/232
-
-const cristinMap = new Map([
-  ["polarfront", 2524794],
-  ["dokumentar", 2703197],
-  ["slice", 2694515],
-  ["mxr", 2663173],
-]);
+import _projects from "akvaplan_fresh/data/projects.json" with { type: "json" };
+const cristinMap = new Map(_projects.map(({ id, cristin }) => [id, cristin]));
 
 import {
   editHref,

routes/pub.tsx

@@ -1,4 +1,5 @@
 // Nice PDF preview layout: https://pubs.acs.org/doi/epdf/10.1021/acs.est.4c04495?ref=article_openPDF
+
 import { longDate } from "../time/intl.ts";
 import {
   getNvaMetadata,
@@ -24,9 +25,16 @@ import { defineRoute, type RouteConfig } from "$fresh/server.ts";
 import {
   ProjectsAsImageLinks,
 } from "akvaplan_fresh/components/project_link.tsx";
-import { mergeNvaAndCristinProjectsWithAkvaplanProjects } from "akvaplan_fresh/services/projects.ts";
+
+// import {
+//   getAkvaplanProjectsFromNvaCristinIds,
+//   mergeNvaAndCristinProjectsWithAkvaplanProjects,
+// } from "akvaplan_fresh/services/projects.ts";
+
 import { isHandleUrl } from "akvaplan_fresh/services/handle.ts";
 import { pubsURL } from "akvaplan_fresh/services/nav.ts";
+import { extractNumericId } from "akvaplan_fresh/services/id.ts";
+import { akvaplanProjectsFromNvaProjects } from "akvaplan_fresh/services/projects.ts";
 
 export const config: RouteConfig = {
   routeOverride:
@@ -75,9 +83,11 @@ export default defineRoute(async (_req, ctx) => {
   // FIXME? Move NVA fetch to browser island (requires adding CORS to Akvaplan pubs service, or using a CORS proxy)
   const nvaPublication = nva ? await getNvaMetadata(nva) : undefined;
 
-  const projects = await mergeNvaAndCristinProjectsWithAkvaplanProjects(
-    nvaPublication?.projects,
-  );
+  const nvaProjects = nvaPublication ? nvaPublication?.projects : undefined;
+
+  const nvaProjectsWithAkvaplanIds = nvaProjects
+    ? await akvaplanProjectsFromNvaProjects(nvaProjects)
+    : undefined;
 
   const typeText = t(
     isHandleUrl(id) || isNvaUrl(id) ? `nva.${type}` : `type.${type}`,
@@ -130,21 +140,20 @@ export default defineRoute(async (_req, ctx) => {
         ? <PubNvaPdfAugment publication={nvaPublication} lang={lang} />
         : null}
 
-      {projects?.length > 0
+      {nvaProjectsWithAkvaplanIds?.length > 0
         ? (
           <section
             style={{
               paddingBottom: ".5rem",
             }}
           >
             <ProjectsAsImageLinks
-              projects={projects}
+              projects={nvaProjectsWithAkvaplanIds}
               lang={lang}
             />
           </section>
         )
         : null}
-
       {
         /* {nvaPublication?.fundings?.length > 0
         ? (

services/akvaplanist.ts

@@ -347,8 +347,12 @@ const withNameAndFrom = (a: Akvaplanist) => {
 const sortByName = (a: Akvaplanist, b: Akvaplanist) =>
   a.name?.localeCompare(b?.name ?? "") ?? 0;
 
-const buildSortReversed = (key: string) => (a: Akvaplanist, b: Akvaplanist) =>
-  new Date(b?.[key]).getTime() - new Date(a?.[key]).getTime();
+const buildSortReversed = (key: string) => (a: Akvaplanist, b: Akvaplanist) => {
+  const _b = b?.[key] ?? "";
+  const _a = a?.[key] ?? "";
+  const { compare } = Intl.Collator("no");
+  return compare(_b, _a);
+};
 
 const buildGrouper = (type: string) =>
   type === ""
@@ -361,23 +365,26 @@ const groupBy = (akva, grouper) =>
   [...Map.groupBy(
     akva,
     grouper,
-  )].sort((a, b) => b[0].localeCompare(a[0]));
+  )].sort((a, b) => b[0]?.localeCompare(a[0], "no"));
 
 export const getAkvaplanistsGroupedByYearStartedOrLeft = async () => {
-  const all = (await getAkvaplanistsFromDenoService("all") ?? [])
-    .map(withNameAndFrom)
-    .sort(sortByName);
+  const _all = (await getAkvaplanistsFromDenoService("all") ?? [])
+    .map(withNameAndFrom);
 
   const _current = all.filter(({ prior }) => prior !== true).sort(
     buildSortReversed("from"),
   );
 
+  const _prior = all.filter(({ prior }) => prior === true).sort(
+    buildSortReversed("expired"),
+  );
+
   const currentGroupedByFromYear = groupBy(
     _current,
     buildGrouper(""),
   );
   const priorGroupedByExpiredYear = groupBy(
-    all.filter(({ prior }) => prior === true),
+    _prior,
     buildGrouper("prior"),
   );
   return [currentGroupedByFromYear, priorGroupedByExpiredYear];

services/id.ts

@@ -0,0 +1,2 @@
+export const extractNumericId = (id: string | number) =>
+  Number(String(id).split("/").at(-1));

services/projects.ts

@@ -2,7 +2,7 @@ import { searchMynewsdesk } from "./mynewsdesk.ts";
 import { projectURL } from "./nav.ts";
 import { AbstractMynewsdeskItem, News } from "../@interfaces/mod.ts";
 import _projects from "akvaplan_fresh/data/projects.json" with { type: "json" };
-import { extractId } from "akvaplan_fresh/services/extract_id.ts";
+import { extractNumericId } from "akvaplan_fresh/services/id.ts";
 
 // https://akvaplan.no/en/news/2016-01-26/the-norwegian-ministry-of-foreign-affair-supports-akvaplan-niva-project-by-nok-14.3-million",
 // VEIEN http://localhost:7777/en/news/2023-01-30/hvordan-kan-rognkjeks-bli-en-robust-og-effektiv-rensefisk-i-lakseoppdrett
@@ -114,9 +114,6 @@ const cristinProjectMap = new Map(
   _projects.map((p) => [p.cristin, p]),
 );
 
-const extractNumericId = (id: string | number) =>
-  Number(String(id).split("/").at(-1));
-
 const getAkvaplanProjectByCristinProjectId = async (id: string) =>
   await Promise.resolve(
     cristinProjectMap.get(extractNumericId(id)),
@@ -125,16 +122,19 @@ const getAkvaplanProjectByCristinProjectId = async (id: string) =>
 export const fetchCristinProject = (id: number | string) =>
   fetch(`https://api.nva.unit.no/cristin/project/${extractNumericId(id)}`);
 
-export const mergeNvaAndCristinProjectsWithAkvaplanProjects = async (
-  projects,
-) =>
-  projects?.length > 0
-    ? await Array.fromAsync(
-      projects.map(async (nva) => {
-        const akvaplan = await getAkvaplanProjectByCristinProjectId(nva.id);
-        const r = await fetchCristinProject(nva.id);
-        const cristin = r?.ok ? await r.json() : undefined;
-        return { akvaplan, nva, cristin };
-      }),
-    )
-    : undefined;
+const cristinProjectAkvaplanId = new Map(
+  _projects.map((akvaplan) => [akvaplan.cristin, akvaplan]),
+);
+
+export const akvaplanProjectsFromNvaProjects = async (nvaProjects) =>
+  await Array.fromAsync(
+    nvaProjects?.map(async (nva, i) => {
+      await async function () {}();
+      const { cristin, id } = nva;
+      const pid = cristin ? cristin : extractNumericId(id);
+      const akvaplan = cristinProjectAkvaplanId.has(pid)
+        ? cristinProjectAkvaplanId.get(pid)
+        : undefined;
+      return { nva, akvaplan };
+    }),
+  );