[F] Handle pending accounts in SaveForm

Resolves #52
lsst-epo · Oct 12, 2023 · d320c45 · d320c45
1 parent 66d52d8
commit d320c45
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 8 deletions.
diff --git a/app/[locale]/[investigation]/[...uriSegments]/page.tsx b/app/[locale]/[investigation]/[...uriSegments]/page.tsx
@@ -92,7 +92,13 @@ const UriSegments: (props: UriSegmentsProps) => Promise<JSX.Element> = async ({
 
   const user = getUserFromJwt(craftToken);
 
-  return <Template {...{ site, user, locale }} data={entry} />;
+  return (
+    <Template
+      {...{ site, user, locale }}
+      data={entry}
+      userStatus={craftUserStatus}
+    />
+  );
 };
 
 export default UriSegments;
diff --git a/components/answers/SaveForm/SaveForm.tsx b/components/answers/SaveForm/SaveForm.tsx
@@ -11,15 +11,22 @@ import { getUserFromJwt } from "@/components/auth/serverHelpers";
 export default function SaveForm({
   investigationId,
   user,
+  userStatus,
 }: {
   investigationId: InvestigationId;
   user?: ReturnType<typeof getUserFromJwt>;
+  userStatus?: string;
 }) {
   const { t } = useTranslation();
 
   const [status, setStatus] = useState<
-    "emptyError" | "refreshError" | "mutationError" | "success" | null
-  >(null);
+    | "emptyError"
+    | "refreshError"
+    | "mutationError"
+    | "statusError"
+    | "success"
+    | null
+  >(userStatus === "pending" ? "statusError" : null);
 
   if (!investigationId || !user) return null;
 
@@ -48,6 +55,8 @@ export default function SaveForm({
           );
           if (result === "refreshError") {
             setStatus("refreshError");
+          } else if (result === "statusError") {
+            setStatus("statusError");
           } else {
             setStatus("success");
           }
@@ -57,7 +66,10 @@ export default function SaveForm({
       }}
       aria-label={t("answers.save_form.label") ?? undefined}
     >
-      <Submit disabled={status !== null} icon="FloppyDisk">
+      <Submit
+        disabled={status !== null}
+        icon="FloppyDisk"
+      >
         {(pending) =>
           t(
             pending
@@ -79,6 +91,9 @@ export default function SaveForm({
         {status === "mutationError" && (
           <p>{t("answers.save_form.mutation_error_message")}</p>
         )}
+        {status === "statusError" && (
+          <p>{t("answers.save_form.status_error_message")}</p>
+        )}
       </output>
     </form>
   );

diff --git a/components/educator-schema/saveAnswersAction.ts b/components/educator-schema/saveAnswersAction.ts
@@ -25,12 +25,16 @@ export default async function saveAnswers(
   investigationId: NonNullable<InvestigationId>,
   answers: Answers
 ) {
-  const { craftUserId, craftToken } = await getAuthCookies();
+  const { craftUserId, craftToken, craftUserStatus } = await getAuthCookies();
 
   if (!craftUserId || !craftToken) {
     return "refreshError";
   }
 
+  if (craftUserStatus === "pending") {
+    return "statusError";
+  }
+
   const answerSet = Object.values(answers);
 
   const { data, error } = await mutateAPI({

diff --git a/components/student-schema/saveAnswersAction.ts b/components/student-schema/saveAnswersAction.ts
@@ -25,12 +25,16 @@ export default async function saveAnswers(
   investigationId: NonNullable<InvestigationId>,
   answers: Answers
 ) {
-  const { craftUserId, craftToken } = await getAuthCookies();
+  const { craftUserId, craftToken, craftUserStatus } = await getAuthCookies();
 
   if (!craftUserId || !craftToken) {
     return "refreshError";
   }
 
+  if (craftUserStatus === "pending") {
+    return "statusError";
+  }
+
   const answerSet = Object.values(answers);
 
   const { data, error } = await mutateAPI({

diff --git a/components/templates/InvestigationChildPage/index.tsx b/components/templates/InvestigationChildPage/index.tsx
@@ -128,6 +128,7 @@ const InvestigationChildPage: FunctionComponent<{
   data: FragmentType<typeof Fragment>;
   site: string;
   user?: ReturnType<typeof getUserFromJwt>;
+  userStatus?: string;
   children?: React.ReactNode;
 }> = (props) => {
   const data = useFragment(Fragment, props.data);
@@ -145,7 +146,11 @@ const InvestigationChildPage: FunctionComponent<{
           )
       )}
       {data.hasSavePoint && props.user && (
-        <SaveForm investigationId={data.parent?.id} user={props.user} />
+        <SaveForm
+          investigationId={data.parent?.id}
+          user={props.user}
+          userStatus={props.userStatus}
+        />
       )}
     </Styled.ContentBlocks>
   );

diff --git a/public/localeStrings/en/translation.json b/public/localeStrings/en/translation.json
@@ -244,7 +244,8 @@
       "success_message": "Answers saved!",
       "empty_error_message": "No new answers to save.",
       "refresh_error_message": "Your session has expired. Please log back in and try again.",
-      "mutation_error_message": "There was an error saving your answers to your account."
+      "mutation_error_message": "There was an error saving your answers to your account.",
+      "status_error_message": "Activate your account to begin saving. Check your inbox for an activation email."
     }
   },
   "review": {