M2-4835: Change arrowParens to always

ChildMindInstitute · Feb 9, 2024 · 2f95166 · 2f95166
1 parent 2d09711
commit 2f95166
Show file tree

Hide file tree

Showing 258 changed files with 624 additions and 615 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
- "arrowParens": "avoid",
+ "arrowParens": "always",
  "bracketSameLine": true,
  "bracketSpacing": true,
  "singleQuote": true,

diff --git a/src/__mocks__/EditorController.tsx b/src/__mocks__/EditorController.tsx
@@ -2,5 +2,5 @@ import { Input } from '@mui/material';
 import { EditorProps } from 'md-editor-rt';
 
 export const StyledMdEditor = ({ modelValue, onChange, sanitize }: EditorProps) => (
- <Input value={sanitize?.(modelValue) ?? modelValue} onChange={e => onChange?.(e.target.value)} multiline />
+ <Input value={sanitize?.(modelValue) ?? modelValue} onChange={(e) => onChange?.(e.target.value)} multiline />
 );
diff --git a/src/modules/Auth/features/SignUp/AdvancedSettings/AdvancedSettings.tsx b/src/modules/Auth/features/SignUp/AdvancedSettings/AdvancedSettings.tsx
@@ -28,8 +28,8 @@ export const AdvancedSettings = () => {
 
  const handleFilterOptions = (options: ServerUrlOption[], params: FilterOptionsState<ServerUrlOption>) => {
  const { inputValue } = params;
- const filtered = options.filter(option => option.name.includes(inputValue));
- const isExisting = options.some(option => inputValue === option.value);
+ const filtered = options.filter((option) => option.name.includes(inputValue));
+ const isExisting = options.some((option) => inputValue === option.value);
  if (inputValue !== '' && !isExisting) {
  filtered.push({
  value: inputValue,
@@ -43,7 +43,7 @@ export const AdvancedSettings = () => {
  return (
  <StyledAdvancedSettings>
  <StyledSettingsButton
- onClick={() => setShowSettings(prevState => !prevState)}
+ onClick={() => setShowSettings((prevState) => !prevState)}
  endIcon={showSettings ? <Svg id="dropdown-up" /> : <Svg id="dropdown" />}>
  {t('advancedSettings')}
  </StyledSettingsButton>
@@ -61,7 +61,7 @@ export const AdvancedSettings = () => {
  disableClearable
  clearOnBlur
  options={BACKEND_SERVERS}
- getOptionLabel={option => (typeof option === 'string' ? option : option.name)}
+ getOptionLabel={(option) => (typeof option === 'string' ? option : option.name)}
  renderOption={(props, option) => <StyledMenuItem {...props}>{option.name}</StyledMenuItem>}
  renderInput={({ InputLabelProps, ...params }) => <TextField {...params} label={t('serverUrl')} />}
  freeSolo

diff --git a/src/modules/Builder/components/ConditionRow/Condition/Condition.test.tsx b/src/modules/Builder/components/ConditionRow/Condition/Condition.test.tsx
@@ -77,7 +77,7 @@ const mockedScoreConditionOptions = [
  },
 ];
 const mockedValueOptions = getValueOptionsList(
- mockedAppletFormData.activities[0].items.find(item => getEntityKey(item) === mockedConditional.itemKey),
+ mockedAppletFormData.activities[0].items.find((item) => getEntityKey(item) === mockedConditional.itemKey),
 );
 
 const mockedNames = {
@@ -111,7 +111,7 @@ const mockedPropsForEmptyCondition = {
  'data-testid': 'empty-condition',
 };
 
-const getAppletFormData = condition => ({
+const getAppletFormData = (condition) => ({
  ...mockedAppletFormData,
  activities: [
  {
@@ -244,7 +244,7 @@ describe('Condition', () => {
  const selectItemDropdown = screen.getByTestId('empty-condition-name-dropdown');
  const itemSelectOptions = selectItemDropdown.querySelectorAll('li');
 
- fireEvent.click([...itemSelectOptions].find(option => option.dataset.value === item));
+ fireEvent.click([...itemSelectOptions].find((option) => option.dataset.value === item));
  }
 
  const selectState = screen.getByTestId('empty-condition-type');

diff --git a/src/modules/Builder/components/ConditionRow/Condition/Condition.tsx b/src/modules/Builder/components/ConditionRow/Condition/Condition.tsx
@@ -76,7 +76,7 @@ export const Condition = ({
  placeholder={t(isRowTypeItem ? 'conditionItemNamePlaceholder' : 'select')}
  SelectProps={{
  renderValue: (value: unknown) => {
- const item = itemOptions?.find(item => item.value === value);
+ const item = itemOptions?.find((item) => item.value === value);
  const placeholder = isRowTypeItem ? t('conditionItemSelected', { value: item?.labelKey }) : item?.labelKey;
 
  return <span>{placeholder}</span>;

diff --git a/src/modules/Builder/components/ConditionRow/ConditionRow.utils.ts b/src/modules/Builder/components/ConditionRow/ConditionRow.utils.ts
@@ -51,7 +51,7 @@ export const getItemOptions = (items: ItemFormValues[], conditionRowType: Condit
  }, []) || [];
 
 export const getScoreOptions = (scores: ScoreReport[]) =>
- scores?.map(score => ({
+ scores?.map((score) => ({
  labelKey: `${t('score')}: ${score.name}`,
  value: score.key,
  type: ConditionItemType.Score,
@@ -67,7 +67,7 @@ export const getScoreConditionalsOptions = (scores: ScoreReport[]) =>
  scores?.reduce(
  (scoreConditionals: OptionListItem[], score: ScoreReport) => [
  ...scoreConditionals,
- ...(score.conditionalLogic?.map(conditional => ({
+ ...(score.conditionalLogic?.map((conditional) => ({
  labelKey: `${t('scoreConditionals')}: ${conditional.name}`,
  value: getEntityKey(conditional, false),
  type: ConditionItemType.ScoreCondition,

diff --git a/src/modules/Builder/components/DndDroppable/DndDroppable.test.tsx b/src/modules/Builder/components/DndDroppable/DndDroppable.test.tsx
@@ -21,7 +21,7 @@ describe('DndDroppable', () => {
  await act(async () => {
  render(renderComponent());
 
- await new Promise(resolve => requestAnimationFrame(resolve));
+ await new Promise((resolve) => requestAnimationFrame(resolve));
  });
  await waitFor(() => expect(Droppable).toHaveBeenCalled());
  });

diff --git a/src/modules/Builder/components/MLPlayer/MLPlayer.hooks.ts b/src/modules/Builder/components/MLPlayer/MLPlayer.hooks.ts
@@ -25,43 +25,43 @@ export const useMLPlayerSetup = (media: MediaType | null) => {
  const playerRef = useRef<ReactPlayer>(null);
 
  useEffect(() => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  url,
  }));
  }, [url]);
 
  const handlePlayPause = () => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  playing: !prevState.playing,
  }));
  };
 
  const handlePlay = () => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  playing: true,
  }));
  };
 
  const handlePause = () => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  playing: false,
  }));
  };
 
  const handleSeekChange = (e: Event, value: number | Array<number>) => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  played: value as number,
  seeking: true,
  }));
  };
 
  const handleSeekMouseUp = (e: SyntheticEvent | Event, value: number | Array<number>) => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  seeking: false,
  }));
@@ -71,15 +71,15 @@ export const useMLPlayerSetup = (media: MediaType | null) => {
 
  const handleProgress = (newState: OnProgressProps) => {
  if (!state.seeking) {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  ...newState,
  }));
  }
  };
 
  const handleDuration = (duration: number) => {
- setState(prevState => ({
+ setState((prevState) => ({
  ...prevState,
  duration,
  }));

diff --git a/src/modules/Builder/components/MediaUploader/MediaUploader.hooks.ts b/src/modules/Builder/components/MediaUploader/MediaUploader.hooks.ts
@@ -10,7 +10,7 @@ import { MediaUploaderHookProps } from './MediaUploader.types';
 export const useMediaUploader = ({ onUpload }: MediaUploaderHookProps) => {
  const uploadInputRef = useRef<HTMLInputElement>(null);
  const [error, setError] = useState<string>('');
- const { execute: executeMediaUpload } = useAsync(postFileUploadApi, response => {
+ const { execute: executeMediaUpload } = useAsync(postFileUploadApi, (response) => {
  const name = response?.config?.data?.get('file')?.name;
 
  return response?.data?.result && onUpload({ name, url: response?.data?.result.url ?? '', uploaded: true });

diff --git a/src/modules/Builder/components/ToggleItemContainer/ToggleItemContainer.tsx b/src/modules/Builder/components/ToggleItemContainer/ToggleItemContainer.tsx
@@ -34,7 +34,7 @@ export const ToggleItemContainer = ({
 }: ToggleItemProps) => {
  const { t } = useTranslation();
  const [open, setOpen] = useState(isOpenByDefault ?? true);
- const handleToggle = () => setOpen(prevState => !prevState);
+ const handleToggle = () => setOpen((prevState) => !prevState);
 
  const hasErrorMessage = !open && !!errorMessage;
  const titleErrorVisible = !open && (!!errorMessage || hasError);

diff --git a/src/modules/Builder/features/AboutApplet/AboutApplet.test.tsx b/src/modules/Builder/features/AboutApplet/AboutApplet.test.tsx
@@ -120,7 +120,7 @@ describe('AboutApplet', () => {
  'about-applet-watermark',
  ];
 
- fieldsDataTestIds.forEach(dataTestId => expect(screen.getByTestId(dataTestId)).toBeInTheDocument());
+ fieldsDataTestIds.forEach((dataTestId) => expect(screen.getByTestId(dataTestId)).toBeInTheDocument());
 
  const theme = screen.getByLabelText('Applet Color Theme').querySelector('input');
  theme && expect(theme.value).toBe('9b023afd-e5f9-403c-b154-fc8f35fcf3ab');

diff --git a/src/modules/Builder/features/Activities/Activities.test.tsx b/src/modules/Builder/features/Activities/Activities.test.tsx
@@ -70,7 +70,7 @@ jest.mock('react-router-dom', () => ({
  useNavigate: () => mockedUseNavigate,
 }));
 
-const renderActivities = formData => {
+const renderActivities = (formData) => {
  const ref = createRef();
 
  renderWithAppletFormData({
@@ -86,7 +86,7 @@ const renderActivities = formData => {
  return ref;
 };
 
-const addPerfTask = perfTaskType => {
+const addPerfTask = (perfTaskType) => {
  fireEvent.click(screen.getByTestId('builder-activities-add-perf-task'));
 
  switch (perfTaskType) {
@@ -131,7 +131,7 @@ describe('Activities', () => {
  `${mockedTestid}-0-hide`,
  `${mockedTestid}-0-remove`,
  `${mockedTestid}-0-dnd`,
- ].forEach(testId => {
+ ].forEach((testId) => {
  expect(screen.getByTestId(testId)).toBeVisible();
  });
  });
@@ -268,7 +268,7 @@ describe('Activities', () => {
  fireEvent.click(screen.getByTestId('builder-activities-add-perf-task'));
 
  [mockedIPadTestid, mockedMobileTestid, mockedFlankerTestid, mockedGyroscopeTestid, mockedTouchTestid].forEach(
- testId => {
+ (testId) => {
  expect(screen.getByTestId(testId)).toBeVisible();
  },
  );

diff --git a/src/modules/Builder/features/Activities/Activities.tsx b/src/modules/Builder/features/Activities/Activities.tsx
@@ -105,7 +105,7 @@ export const Activities = () => {
  flow.reportIncludedActivityName = '';
  flow.reportIncludedItemName = '';
  }
- const items = flow.items?.filter(item => item.activityKey !== activityKey);
+ const items = flow.items?.filter((item) => item.activityKey !== activityKey);
  if (items && items.length > 0) {
  acc.push({ ...flow, items });
  }
@@ -169,7 +169,7 @@ export const Activities = () => {
  {activities?.length ? (
  <DragDropContext onDragStart={() => setIsDragging(true)} onDragEnd={handleDragEnd}>
  <DndDroppable droppableId="activities-dnd" direction="vertical">
- {listProvided => (
+ {(listProvided) => (
  <Box {...listProvided.droppableProps} ref={listProvided.innerRef}>
  {activities.map((activity: ActivityFormValues, index: number) => {
  const activityKey = getActivityKey(activity);

diff --git a/src/modules/Builder/features/Activities/ActivitiesHeader/ActivitiesHeader.test.tsx b/src/modules/Builder/features/Activities/ActivitiesHeader/ActivitiesHeader.test.tsx
@@ -33,7 +33,7 @@ describe('ActivitiesHeader - Interaction Tests', () => {
  'CST Touch',
  ];
  const menuItem = screen.getByText(menu[0]);
- menu.forEach(item => {
+ menu.forEach((item) => {
  expect(screen.getByText(item)).toBeInTheDocument();
  });
  fireEvent.click(menuItem);

diff --git a/src/modules/Builder/features/ActivityAbout/ActivityAbout.hooks.ts b/src/modules/Builder/features/ActivityAbout/ActivityAbout.hooks.ts
@@ -13,7 +13,7 @@ const checkIfItemsHaveVariables = (items: ItemFormValues[]) => {
  return items.some(({ question }) => {
  const variableNames = getTextBetweenBrackets(question!);
 
- return variableNames.some(variable => !!itemsObject[variable]);
+ return variableNames.some((variable) => !!itemsObject[variable]);
  });
 };
 export const useCheckIfItemsHaveVariables = () => {
@@ -31,7 +31,7 @@ export const useCheckIfItemsHaveVariables = () => {
 };
 
 const checkIfItemsHaveRequiredOptions = (items: ItemFormValues[]) =>
- items.some(item => checkIfItemHasRequiredOptions(item.config));
+ items.some((item) => checkIfItemHasRequiredOptions(item.config));
 
 export const useCheckIfItemsHaveRequiredItems = () => {
  const { setValue, watch } = useFormContext();

diff --git a/src/modules/Builder/features/ActivityAbout/ActivityAbout.test.tsx b/src/modules/Builder/features/ActivityAbout/ActivityAbout.test.tsx
@@ -99,7 +99,7 @@ describe('ActivityAbout', () => {
  'builder-activity-about-reviewable',
  ];
 
- fieldsDataTestIds.forEach(dataTestId => expect(screen.getByTestId(dataTestId)).toBeInTheDocument());
+ fieldsDataTestIds.forEach((dataTestId) => expect(screen.getByTestId(dataTestId)).toBeInTheDocument());
  });
 
  test('should render all fields for exisiting applet with default values', () => {

diff --git a/src/modules/Builder/features/ActivityFlow/ActivityFlow.test.tsx b/src/modules/Builder/features/ActivityFlow/ActivityFlow.test.tsx
@@ -25,7 +25,7 @@ jest.mock('react-router-dom', () => ({
  useNavigate: () => mockedUseNavigate,
 }));
 
-const renderActivityFlow = formData => {
+const renderActivityFlow = (formData) => {
  const ref = createRef();
 
  renderWithAppletFormData({
@@ -83,7 +83,7 @@ describe('ActivityFlow', () => {
  `${mockedFlowTestid}-0-hide`,
  `${mockedFlowTestid}-0-remove`,
  `${mockedFlowTestid}-0-dnd`,
- ].forEach(testId => {
+ ].forEach((testId) => {
  expect(screen.getByTestId(testId)).toBeVisible();
  });
  });

diff --git a/src/modules/Builder/features/ActivityFlow/ActivityFlow.tsx b/src/modules/Builder/features/ActivityFlow/ActivityFlow.tsx
@@ -66,7 +66,7 @@ export const ActivityFlow = () => {
  );
 
  const handleAddActivityFlow = (positionToAdd?: number) => {
- const flowItems = activities.map(activity => ({
+ const flowItems = activities.map((activity) => ({
  key: uuidv4(),
  activityKey: getEntityKey(activity),
  }));
@@ -115,7 +115,7 @@ export const ActivityFlow = () => {
  {activityFlows?.length ? (
  <DragDropContext onDragStart={() => setIsDragging(true)} onDragEnd={handleDragEnd}>
  <DndDroppable droppableId="activity-flows-dnd" direction="vertical">
- {listProvided => (
+ {(listProvided) => (
  <Box {...listProvided.droppableProps} ref={listProvided.innerRef}>
  {activityFlows.map((flow, index) => {
  const activityFlowKey = getEntityKey(flow);

diff --git a/src/modules/Builder/features/ActivityFlow/ActivityFlow.utils.tsx b/src/modules/Builder/features/ActivityFlow/ActivityFlow.utils.tsx
@@ -40,7 +40,7 @@ export const getFlowsItemActions = ({
 
 export const getDuplicatedActivityFlow = (flow: ActivityFlowFormValues, name: string) => {
  const duplicatedItems =
- flow.items?.map(item => ({
+ flow.items?.map((item) => ({
  ...item,
  id: undefined,
  key: uuidv4(),

diff --git a/src/modules/Builder/features/ActivityFlowAbout/ActivityFlowAbout.test.tsx b/src/modules/Builder/features/ActivityFlowAbout/ActivityFlowAbout.test.tsx
@@ -20,7 +20,7 @@ const mockedAppletFormDataWithEmptyFlow = {
  activityFlows: [
  {
  ...getNewActivityFlow(),
- items: mockedAppletFormData.activities.map(activity => ({
+ items: mockedAppletFormData.activities.map((activity) => ({
  key: uuidv4(),
  activityKey: getEntityKey(activity),
  })),

diff --git a/src/modules/Builder/features/ActivityFlowBuilder/ActivityFlowBuilder.test.tsx b/src/modules/Builder/features/ActivityFlowBuilder/ActivityFlowBuilder.test.tsx
@@ -69,7 +69,7 @@ describe('Activity Flow Builder', () => {
  `${mockedFlowTestid}-duplicate`,
  `${mockedFlowTestid}-remove`,
  `${mockedFlowTestid}-dnd`,
- ].forEach(testId => {
+ ].forEach((testId) => {
  expect(screen.getByTestId(testId)).toBeVisible();
  });
  });

diff --git a/src/modules/Builder/features/ActivityFlowBuilder/ActivityFlowBuilder.tsx b/src/modules/Builder/features/ActivityFlowBuilder/ActivityFlowBuilder.tsx
@@ -70,7 +70,8 @@ export const ActivityFlowBuilder = () => {
  if (
  currentActivityFlow.reportIncludedActivityName &&
  flowActivityToDeleteData.activityKey === currentActivityFlow.reportIncludedActivityName &&
- activityFlowItems.filter(item => item.activityKey === currentActivityFlow.reportIncludedActivityName).length === 1
+ activityFlowItems.filter((item) => item.activityKey === currentActivityFlow.reportIncludedActivityName).length ===
+ 1
  ) {
  removeReportConfigItemValue();
  }
@@ -98,7 +99,8 @@ export const ActivityFlowBuilder = () => {
  if (
  flowActivityToUpdateIndex !== null &&
  currentActivityFlow.reportIncludedActivityName &&
- activityFlowItems.filter(item => item.activityKey === currentActivityFlow.reportIncludedActivityName).length === 1
+ activityFlowItems.filter((item) => item.activityKey === currentActivityFlow.reportIncludedActivityName).length ===
+ 1
  ) {
  removeReportConfigItemValue();
  }
@@ -131,7 +133,7 @@ export const ActivityFlowBuilder = () => {
  <>
  <DragDropContext onDragEnd={handleDragEnd}>
  <DndDroppable droppableId="activity-flow-builder-dnd" direction="vertical">
- {listProvided => (
+ {(listProvided) => (
  <Box {...listProvided.droppableProps} ref={listProvided.innerRef}>
  {activityFlowItems.map((item, index) => {
  const key = item.id || item.key;

diff --git a/src/modules/Builder/features/ActivityItems/ActivityItems.test.tsx b/src/modules/Builder/features/ActivityItems/ActivityItems.test.tsx
@@ -64,7 +64,7 @@ const renderActivityItemsWithItem = (formData = mockedAppletFormDataWithNewItem)
  }),
  routePath: page.builderAppletActivityItem,
  });
-const getActivityItemUrl = itemId =>
+const getActivityItemUrl = (itemId) =>
  generatePath(itemId ? page.builderAppletActivityItem : page.builderAppletActivityItems, {
  ...mockedParams,
  activityId: mockedNewActivity.key,