fixing code smells

bcgov · Aug 15, 2023 · 2c6bc2b · 2c6bc2b
1 parent f81e413
commit 2c6bc2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/api/src/services/survey-service.ts b/api/src/services/survey-service.ts
@@ -731,7 +731,7 @@ export class SurveyService extends DBService {
 
     // The remaining funding sources with either update if they have a survey_funding_source_id
     // or insert new record
-    surveyData.funding_sources.forEach(async (fundingSource) => {
+    surveyData.funding_sources.forEach((fundingSource) => {
       if (fundingSource.survey_funding_source_id) {
         // Update funding source
         promises.push(
@@ -754,7 +754,7 @@ export class SurveyService extends DBService {
       }
     });
 
-    return Promise.all(promises);
+    await Promise.all(promises);
   }
 
   /**

diff --git a/app/src/components/fields/StartEndDateFields.tsx b/app/src/components/fields/StartEndDateFields.tsx
@@ -19,6 +19,14 @@ interface IStartEndDateFieldsProps {
   endDateHelperText?: string;
 }
 
+const CalendarStartIcon: React.FC = () => {
+  return <Icon path={mdiCalendarStart} size={1} />;
+};
+
+const CalendarEndIcon: React.FC = () => {
+  return <Icon path={mdiCalendarEnd} size={1} />;
+};
+
 /**
  * Start/end date fields - commonly used throughout forms
  *
@@ -42,14 +50,13 @@ const StartEndDateFields: React.FC<IStartEndDateFieldsProps> = (props) => {
 
   const formattedEndDateValue =
     (rawEndDateValue && moment(rawEndDateValue).isValid() && moment(rawEndDateValue)) || null;
-
   return (
     <LocalizationProvider dateAdapter={AdapterMoment}>
       <Grid container item spacing={3}>
         <Grid item xs={12} md={4}>
           <DatePicker
             slots={{
-              openPickerIcon: () => <Icon path={mdiCalendarStart} size={1} />
+              openPickerIcon: CalendarStartIcon
             }}
             slotProps={{
               textField: {
@@ -81,7 +88,7 @@ const StartEndDateFields: React.FC<IStartEndDateFieldsProps> = (props) => {
         <Grid item xs={12} md={4}>
           <DatePicker
             slots={{
-              openPickerIcon: () => <Icon path={mdiCalendarEnd} size={1} />
+              openPickerIcon: CalendarEndIcon
             }}
             slotProps={{
               textField: {