fix(datatrak): Fix survey autofill loading (#5883)

* add loading * Update TaskOverdueChecker.js
beyondessential · Sep 6, 2024 · 20bc1ac · 20bc1ac
1 parent fd9323e
commit 20bc1ac
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/packages/central-server/src/scheduledTasks/TaskOverdueChecker.js b/packages/central-server/src/scheduledTasks/TaskOverdueChecker.js
@@ -3,6 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 import { sendEmail } from '@tupaia/server-utils';
+import { requireEnv } from '@tupaia/utils';
 import winston from 'winston';
 import { ScheduledTask } from './ScheduledTask';
 
@@ -32,6 +33,7 @@ export class TaskOverdueChecker extends ScheduledTask {
         winston.error(`Assignee with id ${overdueTask.assignee_id} not found`);
         continue;
       }
+      const datatrakURL = requireEnv('DATATRAK_FRONT_END_URL');
 
       const result = await sendEmail(assignee.email, {
         subject: 'Task overdue on Tupaia.org',
@@ -40,6 +42,10 @@ export class TaskOverdueChecker extends ScheduledTask {
           userName: assignee.first_name,
           surveyName: overdueTask.survey_name,
           entityName: overdueTask.entity_name,
+          cta: {
+            url: `${datatrakURL}/tasks/${overdueTask.id}`,
+            text: 'View task',
+          },
         },
       });
 

diff --git a/packages/datatrak-web/src/features/Survey/SurveyContext/SurveyContext.tsx b/packages/datatrak-web/src/features/Survey/SurveyContext/SurveyContext.tsx
@@ -61,7 +61,7 @@ export const SurveyContext = ({ children, surveyCode, countryCode }) => {
   const primaryEntityQuestion = flattenedScreenComponents.find(
     question => question.type === QuestionType.PrimaryEntity,
   );
-  const autoFillAnswers = usePrimaryEntityQuestionAutoFill(
+  const { data: autoFillAnswers } = usePrimaryEntityQuestionAutoFill(
     primaryEntityQuestion,
     flattenedScreenComponents,
     primaryEntityCode,

diff --git a/packages/datatrak-web/src/features/Survey/SurveyLayout.tsx b/packages/datatrak-web/src/features/Survey/SurveyLayout.tsx
@@ -4,6 +4,7 @@
  */
 
 import React from 'react';
+import { useIsFetching } from 'react-query';
 import { Outlet, generatePath, useNavigate, useParams } from 'react-router';
 import { useFormContext } from 'react-hook-form';
 import styled from 'styled-components';
@@ -76,6 +77,8 @@ export const SurveyLayout = () => {
   const from = useFromLocation();
   const primaryEntityCode = usePrimaryEntityLocation();
   const params = useParams<SurveyParams>();
+  const isFetchingEntities = useIsFetching({ queryKey: ['entityAncestors'] });
+
   const {
     updateFormData,
     formData,
@@ -152,7 +155,7 @@ export const SurveyLayout = () => {
 
   const handleClickSubmit = handleSubmit(onSubmit, onError);
 
-  const showLoader = isSubmittingSurveyResponse || isResubmittingSurveyResponse;
+  const showLoader = isSubmittingSurveyResponse || isResubmittingSurveyResponse || isFetchingEntities;
 
   return (
     <>

diff --git a/packages/datatrak-web/src/features/Survey/utils/usePrimaryEntityQuestionAutoFill.ts b/packages/datatrak-web/src/features/Survey/utils/usePrimaryEntityQuestionAutoFill.ts
@@ -37,15 +37,18 @@ export const usePrimaryEntityQuestionAutoFill = (
   primaryEntityCode?: Entity['code'],
 ) => {
   const user = useCurrentUserContext();
-  const { data: ancestors } = useEntityAncestors(user.project?.code, primaryEntityCode);
+  const { data = {}, ...query } = useEntityAncestors(user.project?.code, primaryEntityCode);
 
-  if (!ancestors) {
-    return {};
-  }
+  const ancestors = data
+    ? getEntityQuestionAncestorAnswers(
+        primaryEntityQuestion as SurveyScreenComponent,
+        keyBy(questions, 'id'),
+        keyBy(data, 'type'),
+      )
+    : {};
 
-  return getEntityQuestionAncestorAnswers(
-    primaryEntityQuestion as SurveyScreenComponent,
-    keyBy(questions, 'id'),
-    keyBy(ancestors, 'type'),
-  );
+  return {
+    ...query,
+    data: ancestors,
+  };
 };