Merge pull request #4420 from nulib/deploy/staging

Deploy v9.7.0 to production
nulib · Feb 21, 2025 · 59ade10 · 59ade10
2 parents 74cc5f4 + fd151e3
commit 59ade10
Show file tree

Hide file tree

Showing 46 changed files with 1,948 additions and 1,664 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -121,7 +121,7 @@ jobs:
       MIX_ENV: test
     services:
       db:
-        image: ghcr.io/nulib/postgres:10-alpine
+        image: postgres:16-alpine
         env:
           POSTGRES_USER: docker
           POSTGRES_PASSWORD: d0ck3r
@@ -231,6 +231,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         working-directory: app
-      - name: Test DB Rollback
-        run: mix ecto.rollback --all
-        working-directory: app
+      # - name: Test DB Rollback
+      #   run: mix ecto.rollback --all
+      #   working-directory: app
diff --git a/app/assets/js/components/Dashboards/LocalAuthorities/ModalAdd.jsx b/app/assets/js/components/Dashboards/LocalAuthorities/ModalAdd.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import { Button } from "@nulib/design-system";
 import { useForm, FormProvider } from "react-hook-form";
@@ -12,6 +12,10 @@ function DashboardsLocalAuthoritiesModalAdd({
 }) {
   const methods = useForm();
 
+  useEffect(() => {
+    if (isOpen) methods.reset();
+  }, [isOpen]);
+
   const onSubmit = (data) => {
     handleAddLocalAuthority(data);
     methods.reset();

diff --git a/app/assets/js/components/Dashboards/LocalAuthorities/ModalEdit.jsx b/app/assets/js/components/Dashboards/LocalAuthorities/ModalEdit.jsx
@@ -12,19 +12,14 @@ function DashboardsLocalAuthoritiesModalEdit({
   isOpen,
 }) {
   if (!currentAuthority) return null;
-  const [defaultValues, setDefaultValues] = React.useState({
-    hint: "",
-    label: "",
-  });
-  const methods = useForm();
-  const { isDirty } = methods.formState;
-
-  React.useEffect(() => {
-    setDefaultValues({
+  const methods = useForm({
+    defaultValues: {
       hint: currentAuthority.hint,
       label: currentAuthority.label,
-    });
-  }, [currentAuthority]);
+    },
+  });
+
+  const { isDirty } = methods.formState;
 
   const onSubmit = (data) => {
     handleUpdate(data);
@@ -59,7 +54,6 @@ function DashboardsLocalAuthoritiesModalEdit({
               required
             >
               <UIFormInput
-                defaultValue={defaultValues.label}
                 isReactHookForm
                 required
                 id="nul-authority-edit-label"
@@ -70,7 +64,6 @@ function DashboardsLocalAuthoritiesModalEdit({
             </UIFormField>
             <UIFormField label="Hint" forId="nul-authority-edit-hint">
               <UIFormInput
-                defaultValue={defaultValues.hint}
                 isReactHookForm
                 id="nul-authority-edit-hint"
                 name="hint"

diff --git a/app/assets/js/components/UI/MeadowVersion.jsx b/app/assets/js/components/UI/MeadowVersion.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 
 function UIMeadowVersion({ showHoneyVersion }) {
   if (!__MEADOW_VERSION__) {
-    return "v.dev";
+    return "v.walex.dev";
   }
 
   return (

diff --git a/app/assets/js/components/Work/Tabs/Administrative/Administrative.jsx b/app/assets/js/components/Work/Tabs/Administrative/Administrative.jsx
@@ -302,7 +302,7 @@ const WorkTabsAdministrative = ({ work }) => {
                 ) : null}
               </UIFormField>
 
-              <UIFormField label="Project / Job Tasker Number">
+              <UIFormField label="Project/Job Task Number">
                 {isEditing ? (
                   <UIFormInput
                     data-testid="project-task-number"
@@ -319,7 +319,7 @@ const WorkTabsAdministrative = ({ work }) => {
                     onClick={() =>
                       handleFacetLinkClick(
                         "ProjectTaskNumber",
-                        projectTaskNumber
+                        projectTaskNumber,
                       )
                     }
                   >