Merge pull request #5043 from nulib/deploy/staging

Deploy v10.1.0 to production

Author: mbklein

.github/workflows/deploy.yml

@@ -99,6 +99,9 @@ jobs:
           } >> $GITHUB_OUTPUT
         env:
           REGISTRY_NAME: ${{ steps.login-ecr.outputs.registry }}
+      - name: Set Meadow Release Name
+        id: meadow-release
+        run: echo "name=meadow-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       - uses: docker/build-push-action@v2
         with:
           context: ./app
@@ -111,6 +114,7 @@ jobs:
             HONEYBADGER_API_KEY_FRONTEND=${{ secrets.HONEYBADGER_API_KEY_FRONTEND }}
             HONEYBADGER_ENVIRONMENT=${{ env.DEPLOY_ENV }}
             HONEYBADGER_REVISION=${{ github.sha }}
+            RELEASE_NAME=${{ steps.meadow-release.outputs.name }}
             MEADOW_TENANT=${{ env.MEADOW_TENANT }}
             MEADOW_VERSION=${{ env.MEADOW_VERSION }}
       - name: Upload Source Maps to Honeybadger

app/Dockerfile

@@ -6,13 +6,6 @@ FROM ${BUILD_IMAGE} AS build
 LABEL edu.northwestern.library.app=meadow \
   edu.northwestern.library.cache=true \
   edu.northwestern.library.stage=deps
-ARG HONEYBADGER_API_KEY=
-ARG HONEYBADGER_API_KEY_FRONTEND=
-ARG HONEYBADGER_ENVIRONMENT=
-ARG HONEYBADGER_REVISION=
-ARG MEADOW_TENANT=
-ARG MEADOW_VERSION=
-ENV MIX_ENV=prod
 RUN  mix local.hex --force \
   && mix local.rebar --force
 ENV NODE_VERSION=22
@@ -26,6 +19,7 @@ RUN apt update -qq \
  && apt update -qq \
  && apt install -y nodejs \
  && npm install -g npm@$NPM_VERSION
+ENV MIX_ENV=prod
 COPY . /app
 WORKDIR /app
 RUN mix deps.get --only prod \
@@ -42,15 +36,25 @@ RUN for flag in $(find . -name .docker-npm); do \
       cd -; \
     done
 WORKDIR /app
+ARG HONEYBADGER_API_KEY=
+ARG HONEYBADGER_API_KEY_FRONTEND=
+ARG HONEYBADGER_ENVIRONMENT=
+ARG HONEYBADGER_REVISION=
+ARG MEADOW_TENANT=
+ARG MEADOW_VERSION=
+ARG RELEASE_NAME=
+ENV RELEASE_NAME=${RELEASE_NAME}
 RUN mix release --overwrite
 
 # Create runtime image
 FROM ${RUNTIME_IMAGE}
 LABEL edu.northwestern.library.app=meadow \
-  edu.northwestern.library.stage=runtime
+edu.northwestern.library.stage=runtime
 RUN apt update -qq && apt install -y curl git jq libssl-dev libncurses5-dev
+ARG RELEASE_NAME=
+ENV RELEASE_NAME=${RELEASE_NAME}
 ENV LANG=C.UTF-8
-EXPOSE 4000 4369
+EXPOSE 4000 4369 9100-9155
 COPY --from=build /app/_build/prod/rel/meadow /app
 WORKDIR /app
 RUN npm install -g @anthropic-ai/claude-code \

app/assets/js/components/Plan/Panel/Diff.jsx

@@ -4,6 +4,7 @@ import {
   toArray,
   toRows,
   isCodedTerm,
+  isNestedCodedTerm,
 } from "@js/components/Plan/Panel/diff-helpers";
 
 /**
@@ -43,6 +44,66 @@ const renderCodedTerm = (value) => {
   return JSON.stringify(value, null, 0);
 };
 
+/**
+ * Render a notes array
+ */
+const renderNotes = (notes) => {
+  if (!Array.isArray(notes) || notes.length === 0) return "—";
+
+  return (
+    <ul>
+      {notes.map((note, i) => (
+        <li key={i}>
+          {note.type?.label && (
+            <strong>{note.type.label}: </strong>
+          )}
+          {note.note || "—"}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+/**
+ * Render a related_url array
+ */
+const renderRelatedUrls = (urls) => {
+  if (!Array.isArray(urls) || urls.length === 0) return "—";
+
+  return (
+    <ul>
+      {urls.map((item, i) => (
+        <li key={i}>
+          {item.label?.label && (
+            <strong>{item.label.label}: </strong>
+          )}
+          {item.url ? (
+            <a href={item.url} target="_blank" rel="noopener noreferrer">
+              {item.url}
+            </a>
+          ) : (
+            "—"
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+/**
+ * Render a nested coded term field (notes or related_url)
+ */
+const renderNestedCodedTerm = (path, value) => {
+  if (path.endsWith("notes")) {
+    return renderNotes(value);
+  }
+  if (path.endsWith("related_url")) {
+    return renderRelatedUrls(value);
+  }
+  // Fallback to generic rendering
+  return renderGenericValue(value);
+};
+
 /**
  * Render a generic (non-controlled) value
  */
@@ -104,6 +165,8 @@ const PlanPanelChangesDiff = ({ proposedChanges }) => {
                     title={change.label}
                     items={toArray(change.value)}
                   />
+                ) : change.nestedCoded ? (
+                  renderNestedCodedTerm(change.path, change.value)
                 ) : isCodedTerm(change.path) ? (
                   renderCodedTerm(change.value)
                 ) : (

app/assets/js/components/Plan/Panel/diff-helpers.js

@@ -2,6 +2,7 @@ import {
   WORK_FIELDS,
   CONTROLLED_TERM_FIELDS,
   CODED_TERM_FIELDS,
+  NESTED_CODED_TERM_FIELDS,
 } from "@js/components/Plan/fields";
 
 /**
@@ -19,6 +20,11 @@ const isControlled = (path) => CONTROLLED_TERM_FIELDS.has(path);
  */
 const isCodedTerm = (path) => CODED_TERM_FIELDS.has(path);
 
+/**
+ * Determine if a given dotted path is a nested coded term field
+ */
+const isNestedCodedTerm = (path) => NESTED_CODED_TERM_FIELDS.has(path);
+
 /**
  * Lookup a display label from WORK_FIELDS
  */
@@ -80,6 +86,19 @@ const toRows = (changeObj, method) => {
         continue;
       }
 
+      if (isNestedCodedTerm(path)) {
+        rows.push({
+          id: `${method}-${path}`,
+          method,
+          path,
+          label: getFieldLabel(path, WORK_FIELDS),
+          value,
+          controlled: false,
+          nestedCoded: true,
+        });
+        continue;
+      }
+
       // Is a primitive value or array
       if (value == null || typeof value !== "object" || Array.isArray(value)) {
         rows.push({
@@ -102,4 +121,11 @@ const toRows = (changeObj, method) => {
   return rows;
 };
 
-export { toArray, isControlled, isCodedTerm, getFieldLabel, toRows };
+export {
+  toArray,
+  isControlled,
+  isCodedTerm,
+  isNestedCodedTerm,
+  getFieldLabel,
+  toRows,
+};

app/assets/js/components/Plan/Panel/diff-helpers.test.js

@@ -22,7 +22,12 @@ jest.mock("@js/components/Plan/fields", () => {
     "descriptive_metadata.rights_statement",
   ]);
 
-  return { WORK_FIELDS, CONTROLLED_TERM_FIELDS, CODED_TERM_FIELDS };
+  const NESTED_CODED_TERM_FIELDS = new Set([
+    "descriptive_metadata.notes",
+    "descriptive_metadata.related_url",
+  ]);
+
+  return { WORK_FIELDS, CONTROLLED_TERM_FIELDS, CODED_TERM_FIELDS, NESTED_CODED_TERM_FIELDS };
 });
 
 import { toArray, isControlled, getFieldLabel, toRows } from "./diff-helpers";

app/assets/js/components/Plan/fields.js

@@ -68,3 +68,14 @@ export const CODED_TERM_FIELDS = new Set([
   "descriptive_metadata.license",
   "descriptive_metadata.rights_statement",
 ]);
+
+/**
+ * Set of nested coded term fields by their dotted paths
+ * These are arrays of objects where each object contains a coded term
+ * - notes: array of {note: string, type: {id, scheme, label}}
+ * - related_url: array of {url: string, label: {id, scheme, label}}
+ */
+export const NESTED_CODED_TERM_FIELDS = new Set([
+  "descriptive_metadata.notes",
+  "descriptive_metadata.related_url",
+]);