Merge pull request #2390 from HHS/main

[Prod] Fixes from accessibility review

frontend/src/components/GoalForm/ResourceRepeater.js

@@ -3,7 +3,11 @@ import { isValidResourceUrl } from '@ttahub/common';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
 import {
-  FormGroup, Label, Button, Fieldset,
+  FormGroup,
+  Label,
+  Button,
+  Fieldset,
+  ErrorMessage,
 } from '@trussworks/react-uswds';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTrash } from '@fortawesome/free-solid-svg-icons';
@@ -22,7 +26,7 @@ export default function ResourceRepeater({
   isLoading,
 }) {
   const addResource = () => {
-    if ((error.props.children) || resources.some((r) => !r.value)) {
+    if ((error) || resources.some((r) => !r.value)) {
       return;
     }
     const newResources = [...resources, { key: uuidv4(), value: '' }];
@@ -45,7 +49,7 @@ export default function ResourceRepeater({
 
   return (
     <>
-      <FormGroup error={error.props.children}>
+      <FormGroup error={!!(error)}>
         <div>
           <Fieldset>
             <legend>
@@ -58,7 +62,9 @@ export default function ResourceRepeater({
               Enter one resource per field. To enter more resources, select “Add new resource”
             </span>
           </Fieldset>
-          {error.props.children ? error : null}
+          <ErrorMessage>
+            {error}
+          </ErrorMessage>
           <div className="ttahub-resource-repeater">
             { resources.map((r, i) => (
               <div key={r.key} className={`display-flex${r.value && !isValidResourceUrl(r.value) ? ' ttahub-resource__error' : ''}`} id="resources">
@@ -103,13 +109,14 @@ ResourceRepeater.propTypes = {
     value: PropTypes.string,
   })).isRequired,
   setResources: PropTypes.func.isRequired,
-  error: PropTypes.node.isRequired,
+  error: PropTypes.string,
   validateResources: PropTypes.func.isRequired,
   isLoading: PropTypes.bool,
   toolTipText: PropTypes.string,
 };
 
 ResourceRepeater.defaultProps = {
+  error: '',
   isLoading: false,
   toolTipText: 'Copy & paste web address of TTA resource used for this objective. Usually an ECLKC page.',
 };

frontend/src/pages/ActivityReport/Pages/components/Objective.js

@@ -388,9 +388,7 @@ export default function Objective({
         resources={resourcesForRepeater}
         isOnReport={isOnReport || false}
         setResources={onChangeResources}
-        error={errors.resources
-          ? ERROR_FORMAT(errors.resources.message)
-          : NO_ERROR}
+        error={errors.resources ? errors.resources.message : ''}
         validateResources={onBlurResources}
         inputName={objectiveResourcesInputName}
         userCanEdit

frontend/src/pages/ActivityReport/__tests__/index.js

@@ -1173,9 +1173,8 @@ describe('ActivityReport', () => {
       userEvent.click(saveGoal);
     });
 
-    const errors = document.querySelectorAll('.usa-error-message');
-    expect(errors.length).toBe(1);
-    // they'll be one at least (objective suspend reason modal error sits in the dom at all times)
+    const errors = document.querySelectorAll('.usa-error-message:not(:empty)');
+    expect(errors.length).toBe(0);
 
     await waitFor(() => {
       expect(fetchMock.called('/api/activity-reports/1', { method: 'PUT' })).toBe(true);

frontend/src/pages/TrainingReportForm/pages/eventSummary.js

@@ -176,7 +176,7 @@ const EventSummary = ({
               </FormItem>
             </div>
             <div className="margin-top-2" data-testid="creator-select">
-              <Label htmlFor="creatorName">
+              <Label htmlFor="ownerId">
                 Event creator
                 <Req />
               </Label>

src/models/goal.js

@@ -7,6 +7,7 @@ const {
   afterCreate,
   afterUpdate,
   afterDestroy,
+  beforeCreate,
 } = require('./hooks/goal');
 const { GOAL_CREATED_VIA, CREATION_METHOD } = require('../constants');
 
@@ -152,6 +153,7 @@ export default (sequelize, DataTypes) => {
     hooks: {
       beforeValidate: async (instance, options) => beforeValidate(sequelize, instance, options),
       beforeUpdate: async (instance, options) => beforeUpdate(sequelize, instance, options),
+      beforeCreate: async (instance, options) => beforeCreate(sequelize, instance, options),
       afterCreate: async (instance, options) => afterCreate(sequelize, instance, options),
       afterUpdate: async (instance, options) => afterUpdate(sequelize, instance, options),
       afterDestroy: async (instance, options) => afterDestroy(sequelize, instance, options),

src/models/hooks/goal.js

@@ -1,5 +1,10 @@
 const { Op } = require('sequelize');
-const { GOAL_STATUS, GOAL_COLLABORATORS, OBJECTIVE_STATUS } = require('../../constants');
+const {
+  GOAL_STATUS,
+  GOAL_COLLABORATORS,
+  OBJECTIVE_STATUS,
+  CREATION_METHOD,
+} = require('../../constants');
 const {
   currentUserPopulateCollaboratorForType,
 } = require('../helpers/genericCollaborator');
@@ -28,7 +33,25 @@ const findOrCreateGoalTemplate = async (sequelize, transaction, regionId, name,
     },
     transaction,
   });
-  return { id: goalTemplate[0].id, name };
+  return { id: goalTemplate[0].id, name, creationMethod: goalTemplate[0].creationMethod };
+};
+
+const checkForCuratedGoal = async (sequelize, instance) => {
+  // we don't want to be setting goalTemplateId if it's already set
+  if (instance.goalTemplateId) return;
+
+  const curatedTemplate = await sequelize.models.GoalTemplate.findOne({
+    where: {
+      hash: sequelize.fn('md5', sequelize.fn('NULLIF', sequelize.fn('TRIM', instance.name), '')),
+      creationMethod: CREATION_METHOD.CURATED,
+      regionId: null,
+    },
+    attributes: ['id'],
+  });
+
+  if (curatedTemplate) {
+    instance.set('goalTemplateId', curatedTemplate.id);
+  }
 };
 
 const autoPopulateOnAR = (_sequelize, instance, options) => {
@@ -299,6 +322,10 @@ const beforeValidate = async (sequelize, instance, options) => {
   preventNameChangeWhenOnApprovedAR(sequelize, instance, options);
 };
 
+const beforeCreate = async (sequelize, instance, options) => {
+  await checkForCuratedGoal(sequelize, instance, options);
+};
+
 const beforeUpdate = async (sequelize, instance, options) => {
   preventNameChangeWhenOnApprovedAR(sequelize, instance, options);
   await preventCloseIfObjectivesOpen(sequelize, instance, options);
@@ -329,10 +356,12 @@ export {
   autoPopulateOnApprovedAR,
   preventNameChangeWhenOnApprovedAR,
   preventCloseIfObjectivesOpen,
+  checkForCuratedGoal,
   propagateName,
   beforeValidate,
   beforeUpdate,
   afterCreate,
   afterUpdate,
+  beforeCreate,
   afterDestroy,
 };

src/models/hooks/goal.test.js

@@ -3,6 +3,7 @@ const {
   processForEmbeddedResources,
   findOrCreateGoalTemplate,
   preventCloseIfObjectivesOpen,
+  beforeCreate,
 } = require('./goal');
 const { GOAL_STATUS, OBJECTIVE_STATUS } = require('../../constants');
 const { createRecipient, createGrant, createGoal } = require('../../testUtils');
@@ -18,6 +19,54 @@ const {
 jest.mock('../../services/resource');
 
 describe('goal hooks', () => {
+  describe('beforeCreate', () => {
+    it('does nothing if instance already has goalTemplateId', async () => {
+      const instanceSet = jest.fn();
+      const instance = {
+        goalTemplateId: 1,
+        set: instanceSet,
+      };
+      await expect(beforeCreate({}, instance)).resolves.not.toThrow();
+      expect(instanceSet).not.toHaveBeenCalled();
+    });
+
+    it('does nothing if sequelize cannot find a curated template', async () => {
+      const instanceSet = jest.fn();
+      const instance = {
+        goalTemplateId: null,
+        set: instanceSet,
+      };
+      const sequelize = {
+        fn: jest.fn(),
+        models: {
+          GoalTemplate: {
+            findOne: jest.fn().mockResolvedValue(null),
+          },
+        },
+      };
+      await expect(beforeCreate(sequelize, instance)).resolves.not.toThrow();
+      expect(instanceSet).not.toHaveBeenCalled();
+    });
+
+    it('sets goalTemplateId if a curated template is found', async () => {
+      const instanceSet = jest.fn();
+      const instance = {
+        goalTemplateId: null,
+        set: instanceSet,
+      };
+      const sequelize = {
+        fn: jest.fn(),
+        models: {
+          GoalTemplate: {
+            findOne: jest.fn().mockResolvedValue({ id: 1 }),
+          },
+        },
+      };
+      await expect(beforeCreate(sequelize, instance)).resolves.not.toThrow();
+      expect(instanceSet).toHaveBeenCalledWith('goalTemplateId', 1);
+    });
+  });
+
   describe('preventCloseIfObjectivesOpen', () => {
     it('does nothing if instance.changed is not an array', async () => {
       const instance = {