Merge pull request #15 from City-of-Turku/develop

Release v1.0.0

src/components/Buttons/HomeButton/HomeButton.tsx

@@ -5,7 +5,6 @@ import { useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 import { useAppDispatch, useAppSelector } from '../../../hooks/reduxHooks';
 import userSlice from '../../../redux/slices/userSlice';
-import { logoutUser } from '../../../utils/mobilityProfileAPI';
 
 const HomeButton = () => {
   const intl = useIntl();
@@ -17,7 +16,6 @@ const HomeButton = () => {
 
   const endPoll = () => {
     if (token?.length) {
-      logoutUser(token);
       setIsLoggedIn(false);
     }
     return;

src/components/Buttons/LinkButton/LinkButton.tsx

@@ -13,7 +13,6 @@ const LinkButton = ({ urlValue, translationId, isActive }: LinkButtonProps) => {
           role="button"
           type="button"
           disabled={!isActive}
-          aria-disabled={!isActive}
           className="button-primary p-2"
           aria-label={intl.formatMessage({ id: translationId })}
         >

src/components/Buttons/LinkButton/__tests__/LinkButton.test.tsx

@@ -55,6 +55,5 @@ describe('<LinkButton />', () => {
     expect(button[0].getAttribute('aria-label')).toContain(
       finnishTranslations['app.buttons.link.summary'],
     );
-    expect(button[0].getAttribute('aria-disabled')).toEqual('false');
   });
 });

src/components/Content/Content.tsx

@@ -1,12 +1,28 @@
 import React from 'react';
 import { useAppSelector } from '../../hooks/reduxHooks';
+import HomeButton from '../Buttons/HomeButton/HomeButton';
+import ErrorComponent from '../Errors/ErrorComponent/ErrorComponent';
 import Loading from '../Loading/Loading';
 import QuestionForm from '../QuestionForm/QuestionForm';
 
 const Content = () => {
-  const { isLoggedIn } = useAppSelector((state) => state.user);
+  const { isLoggedIn, isError } = useAppSelector((state) => state.user);
 
-  return <div className="content-inner">{isLoggedIn ? <QuestionForm /> : <Loading />}</div>;
+  const renderSecondaryContent = () => {
+    if (isError) {
+      return (
+        <ErrorComponent translationId="app.result.error">
+          <HomeButton />
+        </ErrorComponent>
+      );
+    } else {
+      return <Loading />;
+    }
+  };
+
+  return (
+    <div className="content-inner">{isLoggedIn ? <QuestionForm /> : renderSecondaryContent()}</div>
+  );
 };
 
 export default Content;

src/components/Forms/EmailForm/EmailForm.tsx

@@ -5,7 +5,6 @@ import { useIntl } from 'react-intl';
 import { useAppSelector } from '../../../hooks/reduxHooks';
 import { EmailField } from '../../../types';
 import { postSubscribeInfo } from '../../../utils/mobilityProfileAPI';
-import ErrorText from '../../Typography/ErrorText/ErrorText';
 import TextBasic from '../../Typography/TextBasic/TextBasic';
 
 const EmailForm = () => {
@@ -15,9 +14,7 @@ const EmailForm = () => {
   const intl = useIntl();
 
   const { user } = useAppSelector((state) => state);
-  const resultId = user?.profileResult?.id;
   const userId = user?.userId;
-  const token = user?.csrfToken;
 
   const registerLink = 'https://rekisteri.turku.fi/Saabe_data';
 
@@ -33,7 +30,7 @@ const EmailForm = () => {
 
   const onSubmit: SubmitHandler<EmailField> = (data) => {
     if (userId?.length) {
-      postSubscribeInfo(data.email, resultId, setHasUserAnswered, setIsApiError, token);
+      postSubscribeInfo(data.email, userId, setHasUserAnswered, setIsApiError);
     }
   };
 
@@ -60,6 +57,7 @@ const EmailForm = () => {
             </label>
             <input
               type="email"
+              id="email"
               placeholder={intl.formatMessage({ id: 'app.form.email.label' })}
               {...register('email', {
                 required: true,
@@ -80,18 +78,17 @@ const EmailForm = () => {
             </div>
           )}
           <div className="mb-2 center-text">
-            <Button
-              type="submit"
-              role="button"
-              disabled={hasUserAnswered}
-              aria-disabled={hasUserAnswered}
-              className="input-submit"
-            >
+            <Button type="submit" role="button" disabled={hasUserAnswered} className="input-submit">
               {intl.formatMessage({ id: 'app.input.submit.newsletter' })}
             </Button>
-            {hasUserAnswered ? <TextBasic translationId="app.result.newsletter.success" /> : null}
+            {hasUserAnswered ? (
+              <TextBasic
+                translationId={
+                  isApiError ? 'app.result.newsletter.error' : 'app.result.newsletter.success'
+                }
+              />
+            ) : null}
           </div>
-          {isApiError ? <ErrorText /> : null}
         </form>
       </div>
     </div>