refactor: 💡 fix tests

Author: marc101101

.DS_Store

@@ -91,6 +91,11 @@ describe("UsersController", () => {
     (user as any).id = 1;
     userService.mocks.findUserWithCredentials.mockResolvedValue(user);
 
+    userService.mocks.getUser.mockResolvedValue({
+      firstName: "firstName",
+      lastName: "lastName",
+    });
+
     const token = "token";
     userService.mocks.generateLoginToken.mockReturnValue(token);
     const response = await controller.login({
@@ -111,6 +116,10 @@ describe("UsersController", () => {
     user.role = UserRole.Moderator;
     userService.mocks.findUserWithCredentials.mockResolvedValue(user);
     userService.mocks.generateLoginToken.mockReturnValue("token");
+    userService.mocks.getUser.mockResolvedValue({
+      firstName: "firstName",
+      lastName: "lastName",
+    });
     const response = await controller.login({
       data: {
         email: "test@foo.bar",
@@ -143,6 +152,10 @@ describe("UsersController", () => {
     const user = new User();
     user.role = role;
     userService.mocks.generateLoginToken.mockReturnValue(token);
+    userService.mocks.getUser.mockResolvedValue({
+      firstName: "firstname",
+      lastName: "lastName",
+    });
     const response = await controller.refreshLoginToken(user);
     expect(response.token).toBe(token);
     expect(response.user.role).toBe(role);

backend/test/controllers/users-controller.spec.ts

@@ -20,5 +20,6 @@ export const MockUserService = jest.fn(
       verifyUserByVerifyToken: jest.fn(),
       verifyUserResetPassword: jest.fn(),
       forgotPassword: jest.fn(),
+      getUser: jest.fn(),
     }),
 );

backend/test/services/mock/mock-user-service.ts

@@ -18,10 +18,6 @@ const Area = styled.textarea`
   resize: vertical;
 `;
 
-const Input = styled.input`
-  ${FieldStyle}
-`;
-
 /**
  * The type of the text input.
  */
@@ -63,13 +59,9 @@ export const TextInput = ({
   type = TextInputType.Text,
   autoFocus = false,
   mandatory,
-  min,
-  max,
   maxLength = 1024,
-  allowDecimals,
   isDisabled = false,
   name,
-  autoCompleteField,
   description,
   rows,
 }: ITextInputProps) => {
@@ -112,6 +104,7 @@ export const TextInput = ({
           variant="outlined"
           label={description}
           fullWidth
+          focused={isFocused}
           {...fieldProps}
         />
       </div>

frontend/src/components/base/text-input.tsx

@@ -15,8 +15,8 @@ export const countryNames = countries.map(({ country }) => country).sort();
 
 interface ICountryQuestionProps {
   question: QuestionDTO<CountryQuestionConfigurationDTO>;
-  value: string;
-  onChange: (value: string) => any;
+  valueInput: string;
+  onChange: (event: React.SyntheticEvent, value: string) => any;
   isDisabled?: boolean;
 }
 
@@ -25,13 +25,14 @@ interface ICountryQuestionProps {
  * Basically a choices question, but separating it allows better visualization.
  */
 export const CountryQuestion = ({
-  value,
+  valueInput,
   onChange,
   question,
   isDisabled,
 }: ICountryQuestionProps) => {
   const handleChange = useCallback(
-    (event: React.SyntheticEvent, value: string | null) => onChange(value!),
+    (event: React.SyntheticEvent, value: string | null) =>
+      onChange(event, value!),
     [onChange],
   );
 
@@ -47,7 +48,7 @@ export const CountryQuestion = ({
           )}
           disabled={isDisabled}
           onChange={handleChange}
-          value={value}
+          value={valueInput}
         />
       </FormField>
     </div>

frontend/src/components/forms/country-question.tsx

@@ -65,7 +65,7 @@ const Question = ({
         <CountryQuestion
           question={question as QuestionDTO<CountryQuestionConfigurationDTO>}
           onChange={onChange}
-          value={value}
+          valueInput={value}
           isDisabled={isDisabled}
         />
       );

frontend/src/components/forms/unified-question.tsx

@@ -20,7 +20,6 @@ import { InternalLink } from "../base/link";
 import { Text } from "../base/text";
 import { TimeChart } from "../base/time-chart";
 import { TitledNumber } from "../base/titled-number";
-import { WorldMap } from "../base/worldmap";
 import { Page } from "./page";
 import { SimpleCard } from "../base/simple-card";
 import { Grid } from "@mui/material";
@@ -212,7 +211,6 @@ export const Statistics = () => {
     }, [safeApplications]);
 
   const statistics = allQuestions.map(({ id, configuration, title }) => {
-    const key = `${title}-${id}`;
     const counts = answersByQuestionID[id!];
 
     if (!counts) {

frontend/src/components/pages/statistics.tsx

@@ -61,7 +61,7 @@ export const SidebarMenuItem = ({
   children,
 }: ISidebarMenuItemProps) => (
   <LI>
-    <Link to={to} exact onClick={onClick}>
+    <Link to={to!} exact onClick={onClick}>
       {children}
     </Link>
   </LI>

frontend/src/components/routers/sidebar/sidebar-menu.tsx

@@ -5,7 +5,6 @@ import type { FormSettingsDTO, QuestionDTO } from "../../api/types/dto";
 import { QuestionType } from "../../api/types/enums";
 import { moveArrayItemDown, moveArrayItemUp } from "../../util";
 import { Button } from "../base/button";
-import { Divider } from "../base/divider";
 import { Elevated } from "../base/elevated";
 import { FlexColumnContainer, Spacer } from "../base/flex";
 import { FormFieldButton } from "../base/form-field-button";