migrate resource (resource migration 3/3)

gatsby-node.js

@@ -5,15 +5,14 @@ const { createFilePath } = require("gatsby-source-filesystem");
 const {
     stringWithDefault,
     resolveToArray,
-    resolveSlug,
-    resolveSoftwareTools,
     resourceQuery,
 } = require("./gatsby/utils/gatsby-resolver-utils");
 const {
-    DATASET_PATH,
     RESOURCES_GATSBY_NODE_KEY,
     MARKDOWN_REMARK_GATSBY_NODE_KEY,
     TEMPLATE_KEY_TO_TYPE,
+    ALLENITE_TEMPLATE_KEY,
+    PROGRAM_TEMPLATE_KEY,
 } = require("./gatsby/constants");
 
 const read = (p) => fs.readFileSync(path.join(__dirname, p), "utf8");
@@ -25,33 +24,12 @@ const read = (p) => fs.readFileSync(path.join(__dirname, p), "utf8");
  * and are referenced by other markdown files.
  */
 
-// TODO: use constants here when this gets revised when we migrate old resources
-// to new collection
-const DATA_ONLY_PAGES = ["software", "dataset", "allenite", "program"];
+const DATA_ONLY_PAGES = [ALLENITE_TEMPLATE_KEY, PROGRAM_TEMPLATE_KEY];
 
 exports.createSchemaCustomization = ({ actions }) => {
     const { createTypes } = actions;
     const typeDefs = [
-        `"""
-        Nested materials and methods block for idea posts.
-        """
-        type MaterialsAndMethods {
-        dataset: MarkdownRemark @link(by: "fields.slug")
-        protocols: [ProtocolItem!]!
-        cellLines: [CellLineItem!]!
-        software: [SoftwareTool!]!
-        }
-
-            type ProtocolItem {
-                protocol: String!
-            }
-
-        type CellLineItem {
-            name: String!
-            link: String
-        }
-
-        type PreliminaryFindings {
+        `type PreliminaryFindings {
             summary: String!
             figures: [ImgWithCaption!]!
         }
@@ -63,13 +41,6 @@ exports.createSchemaCustomization = ({ actions }) => {
             caption: String
         }
 
-            """
-            Software tool reference with optional custom description.
-            """
-            type SoftwareTool {
-                softwareTool: MarkdownRemark @link(by: "fields.slug")
-                customDescription: String
-            }
         `,
     ];
     createTypes(read("gatsby/schema/base.gql"));
@@ -122,32 +93,6 @@ exports.createResolvers = ({ reporter, createResolvers }) => {
                     return results.filter(Boolean);
                 },
             },
-            materialsAndMethods: {
-                resolve: (source) => {
-                    const raw = source.materialsAndMethods;
-                    const current = {
-                        dataset: null,
-                        cellLines: [],
-                        protocols: [],
-                        software: [],
-                    };
-
-                    if (!raw || typeof raw !== "object") {
-                        return current;
-                    }
-
-                    const resolvedDatasetSlug = resolveSlug(
-                        raw.dataset,
-                        DATASET_PATH,
-                    );
-                    current.dataset = resolvedDatasetSlug;
-                    current.cellLines = resolveToArray(raw.cellLines);
-                    current.protocols = resolveToArray(raw.protocols);
-                    current.software = resolveSoftwareTools(raw.software);
-
-                    return current;
-                },
-            },
             nextSteps: {
                 resolve: (source) => source.nextSteps ?? null,
             },

gatsby/constants.js

@@ -1,6 +1,5 @@
-const DATASET_PATH = `dataset`;
-const SOFTWARE_PATH = `software`;
-
+const ALLENITE_TEMPLATE_KEY = `allenite`;
+const PROGRAM_TEMPLATE_KEY = `program`;
 const RESOURCES_TEMPLATE_KEY = `resource`;
 
 const RESOURCES_GATSBY_NODE_KEY = `Resource`;
@@ -17,8 +16,8 @@ const TEMPLATE_KEY_TO_TYPE = {
     [RESOURCES_TEMPLATE_KEY]: RESOURCES_GATSBY_NODE_KEY,
 };
 module.exports = {
-    DATASET_PATH,
-    SOFTWARE_PATH,
+    ALLENITE_TEMPLATE_KEY,
+    PROGRAM_TEMPLATE_KEY,
     RESOURCES_TEMPLATE_KEY,
     MARKDOWN_REMARK_GATSBY_NODE_KEY,
     TEMPLATE_KEY_TO_TYPE,

gatsby/schema/base.gql

@@ -14,7 +14,6 @@ type Frontmatter {
     description: String
     draft: Boolean
     tags: [String!]
-    materialsAndMethods: MaterialsAndMethods!
     authors: [String!]!
     nextSteps: String
     program: [String!]

gatsby/utils/gatsby-resolver-utils.js

@@ -1,5 +1,4 @@
 const {
-    SOFTWARE_PATH,
     RESOURCES_TEMPLATE_KEY,
     TEMPLATE_KEY_TO_TYPE,
 } = require("../constants");
@@ -30,34 +29,6 @@ function resolveToArray(value) {
     return [];
 }
 
-/**
- * Prepares software tool references for Gatsby's @link directive.
- * Transforms tool names into slug paths that @link(by: "fields.slug") uses
- * to resolve the actual MarkdownRemark nodes. Filters out invalid entries
- * and preserves custom descriptions.
- * @param {Array<{softwareTool?: string, customDescription?: string}>|unknown} rawSoftware - Array of software tool objects from frontmatter
- * @returns {Array<{softwareTool: string|null, customDescription: string|null}>} Array with slug keys for @link resolution
- */
-const resolveSoftwareTools = (rawSoftware) => {
-    if (!Array.isArray(rawSoftware)) {
-        return [];
-    }
-    return rawSoftware
-        .map((item) => {
-            if (item && typeof item === "object" && item.softwareTool) {
-                return {
-                    softwareTool: resolveSlug(item.softwareTool, SOFTWARE_PATH),
-                    customDescription: stringWithDefault(
-                        item.customDescription,
-                        null,
-                    ),
-                };
-            }
-            return null;
-        })
-        .filter((item) => item !== null);
-};
-
 /**
  * Builds slugs from directory paths and ids/names.
  * Uses slugs in place of names to prevent namespace
@@ -94,6 +65,5 @@ module.exports = {
     stringWithDefault,
     resolveToArray,
     resolveSlug,
-    resolveSoftwareTools,
     resourceQuery,
 };

src/components/IdeaRoll.tsx

@@ -1,15 +1,37 @@
 import React from "react";
 
+
+
 import { Link, graphql, useStaticQuery } from "gatsby";
 
+
+
 import { MessageOutlined, StarOutlined } from "@ant-design/icons";
 import { useLocation } from "@reach/router";
 import { Avatar, List, Space } from "antd";
 
-import { MaterialsAndMethods } from "../types";
+
+
+import { ResourceNode } from "../types";
 import { IconText } from "./IconText";
 import { TagPopover } from "./TagPopover";
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 const { container } = require("../style/idea-roll.module.css");
 
 interface PostNode {
@@ -28,7 +50,7 @@ interface PostNode {
             authors?: string[];
             tags?: string[];
             type: string;
-            materialsAndMethods?: MaterialsAndMethods;
+            resources: ResourceNode[];
         };
     };
 }
@@ -51,7 +73,7 @@ const IdeaRollTemplate = (props: {
         authors: post.frontmatter.authors || [],
         concerns: post.frontmatter.concerns || "",
         dataset: {
-            ...post.frontmatter.materialsAndMethods?.dataset?.frontmatter,
+            ...post.frontmatter.resources.find((r) => r.type === "dataset"),
         },
     }));
     if (props.count) {
@@ -174,15 +196,8 @@ export default function IdeaRoll({
                             type
                             authors
                             concerns
-                            materialsAndMethods {
-                                dataset {
-                                    frontmatter {
-                                        name
-                                        description
-                                        link
-                                        status
-                                    }
-                                }
+                            resources {
+                                ...ResourceFields
                             }
                         }
                     }