Skip to content

Chore : Clean hook usage in UseLunatic #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Grafikart wants to merge 2 commits into
base: v3-master
Choose a base branch
from
Open

Chore : Clean hook usage in UseLunatic #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab18589
ref: remove unecessary rerender in UseLunatic
Grafikart Sep 11, 2023
9e7aeae
ref: rebase
Grafikart Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/components/DraftBanner/DraftBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { SaveMessage } from './SaveMessage';
import { BannerAddress } from './BannerAddress';
import { loadSourceDataContext } from '../loadSourceData/LoadSourceDataContext';
import { useAsyncEffect } from '../../hooks/useAsyncEffect';
import { createPersonalizationMap } from '../orchestrator/UseLunatic';
import { getPersonalizationByName } from '../orchestrator/UseLunatic';

const useStyles = makeStyles()({
container: {
Expand Down Expand Up @@ -79,8 +79,9 @@ export function DraftBanner(props: PropsWithChildren<OrchestratedElement>) {
dependenciesHaveChanged(currentChange, bannerLabelDependencies)
) {
const updatedSUData = await getSurveyUnitData();
const newPersonalization: Record<string, string> =
createPersonalizationMap(updatedSUData?.personalization || []);
const newPersonalization = getPersonalizationByName(
updatedSUData?.personalization || []
);
setlabel(
newPersonalization.bannerLabel ? newPersonalization.bannerLabel : ''
);
Expand Down
55 changes: 27 additions & 28 deletions src/components/orchestrator/UseLunatic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { useEffect, useState, PropsWithChildren, useCallback } from 'react';
Copy link
Contributor

@ddecrulle ddecrulle Sep 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{ type PropsWithChildren, ...}`

import {
PropsWithChildren,
useCallback,
useEffect,
useMemo,
useState,
} from 'react';
import { useLunatic } from '@inseefr/lunatic';
import * as custom from '@inseefr/lunatic-dsfr';
import {
Expand All @@ -11,12 +17,10 @@ import { CloneElements } from './CloneElements';
import { useQuestionnaireTitle } from './useQuestionnaireTitle';
import { useRedirectIfAlreadyValidated } from './useRedirectIfAlreadyValidated';

export function createPersonalizationMap(
export function getPersonalizationByName(
personalization: Array<PersonalizationElement>
) {
return personalization.reduce((acc, { name, value }) => {
return { ...acc, [name]: value };
}, {});
): Record<string, string | number | boolean | string[]> {
return Object.fromEntries(personalization.map((p) => [p.name, p.value]));
}

export function UseLunatic(props: PropsWithChildren<OrchestratorProps>) {
Copy link
Contributor

@ddecrulle ddecrulle Sep 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hooks must be uncapitalized in React ?

Expand All @@ -33,42 +37,37 @@ export function UseLunatic(props: PropsWithChildren<OrchestratorProps>) {
disabled,
metadata,
} = props;
const [args, setArgs] = useState<Record<string, unknown>>({});

const [personalizationMap, setPersonalizationMap] = useState<
Record<string, string | number | boolean | Array<string>>
>({});
const { data, stateData, personalization = [] } = surveyUnitData ?? {};
const { currentPage: pageFromAPI, state } = stateData ?? {};
const [currentChange, setCurrentChange] = useState<{ name: string }>();

const onChange = useCallback(({ name }: { name: string }, value: unknown) => {
setCurrentChange({ name });
}, []);
const personalizationMap = useMemo(
() => getPersonalizationByName(personalization),
[personalization]
);

useEffect(() => {
setPersonalizationMap(createPersonalizationMap(personalization));
}, [personalization]);

useEffect(() => {
setArgs({
const args = useMemo(
() => ({
getReferentiel,
custom,
preferences,
features,
savingType,
autoSuggesterLoading,
onChange,
});
}, [
getReferentiel,
preferences,
features,
savingType,
autoSuggesterLoading,
onChange,
paginated,
]);
}),
[
getReferentiel,
preferences,
features,
savingType,
autoSuggesterLoading,
onChange,
paginated,
]
);

const {
getComponents,
Expand Down
20 changes: 9 additions & 11 deletions src/components/orchestrator/useQuestionnaireTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ function getTitleByPage(
source?: LunaticSource,
defaultTitle = ''
): Record<string, string> {
const base = {} as Record<string, string>;
if (!source) {
return base;
}
let title = defaultTitle;
return source.components.reduce((acc, component) => {
if (component.componentType === 'Sequence') {
title = component.title ?? defaultTitle;
}
return { ...acc, [component.page]: title };
}, base);
let sequenceTitle = defaultTitle;
const titleEntries =
source?.components.map((c) => {
if (c.componentType === 'Sequence') {
sequenceTitle = c.title ?? defaultTitle ?? '';
}
return [c.page, sequenceTitle];
}) ?? [];
return Object.fromEntries(titleEntries);
}

/**
Expand Down