Skip to content
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.

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

feat: added specific agency provider to provide agency specific links #986

Merged
merged 1 commit into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions src/components/appointment/Appointments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Overlay, OVERLAY_FUNCTIONS, OverlayItem } from '../overlay/Overlay';
import { Button, BUTTON_TYPES, ButtonItem } from '../button/Button';
import './appointments.styles.scss';
import {
AgencySpecificContext,
NOTIFICATION_TYPE_SUCCESS,
NotificationsContext
} from '../../globalState';
Expand Down Expand Up @@ -31,6 +32,7 @@ import { ListInfo } from '../listInfo/ListInfo';
export const Appointments = () => {
const { t: translate } = useTranslation();
const legalLinks = useContext(LegalLinksContext);
const { specificAgency } = useContext(AgencySpecificContext);
const { addNotification } = useContext(NotificationsContext);

const [loading, setLoading] = useState(true);
Expand Down Expand Up @@ -310,7 +312,11 @@ export const Appointments = () => {
<ScrollableSectionFooter>
<div className="profile__footer">
{legalLinks.map((legalLink, index) => (
<React.Fragment key={legalLink.url}>
<React.Fragment
key={legalLink.getUrl({
aid: specificAgency?.id
})}
>
{index > 0 && (
<Text
type="infoSmall"
Expand All @@ -319,8 +325,12 @@ export const Appointments = () => {
/>
)}
<a
key={legalLink.url}
href={legalLink.url}
key={legalLink.getUrl({
aid: specificAgency?.id
})}
href={legalLink.getUrl({
aid: specificAgency?.id
})}
target="_blank"
rel="noreferrer"
>
Expand Down
21 changes: 15 additions & 6 deletions src/components/formAccordion/FormAccordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
RequiredComponentsInterface,
RegistrationNotesInterface,
useTenant,
LegalLinkInterface
AgencySpecificContext
} from '../../globalState';
import { FormAccordionItem } from '../formAccordion/FormAccordionItem';
import { RegistrationUsername } from '../registration/RegistrationUsername';
Expand All @@ -35,6 +35,7 @@ import { ProposedAgencies } from '../../containers/registration/components/Propo
import { useConsultantAgenciesAndConsultingTypes } from '../../containers/registration/hooks/useConsultantAgenciesAndConsultingTypes';
import { FormAccordionData } from '../registration/RegistrationForm';
import { UrlParamsContext } from '../../globalState/provider/UrlParamsProvider';
import { TProvidedLegalLink } from '../../globalState/provider/LegalLinksProvider';

interface FormAccordionProps {
formAccordionData: FormAccordionData;
Expand All @@ -43,7 +44,7 @@ interface FormAccordionProps {
onValidation: Dispatch<SetStateAction<boolean>>;
additionalStepsData?: RequiredComponentsInterface;
registrationNotes?: RegistrationNotesInterface;
legalLinks: Array<LegalLinkInterface>;
legalLinks: TProvidedLegalLink[];
handleSubmitButtonClick: Function;
isSubmitButtonDisabled: boolean;
setIsDataProtectionSelected: Dispatch<SetStateAction<boolean>>;
Expand All @@ -67,6 +68,9 @@ export const FormAccordion = ({
const tenantData = useTenant();

const { consultingType, consultant } = useContext(UrlParamsContext);
const { setSpecificAgency, specificAgency } = useContext(
AgencySpecificContext
);
const { consultingTypes } = useConsultantAgenciesAndConsultingTypes();

const [activeItem, setActiveItem] = useState<number>(1);
Expand Down Expand Up @@ -108,7 +112,12 @@ export const FormAccordion = ({
);
formAccordionData.agency?.tenantId &&
setIsDataProtectionSelected(false);
}, [formAccordionData.agency, setIsDataProtectionSelected]);
setSpecificAgency(formAccordionData.agency);
}, [
formAccordionData.agency,
setSpecificAgency,
setIsDataProtectionSelected
]);

useEffect(() => {
onValidation(
Expand Down Expand Up @@ -205,9 +214,9 @@ export const FormAccordion = ({
'registration.dataProtection.label.and'
)
: '') +
`<span><button type="button" class="button-as-link" onclick="window.open('${
legalLink.url
}')">${translate(legalLink.label)}</button></span>`
`<span><button type="button" class="button-as-link" onclick="window.open('${legalLink.getUrl(
{ aid: specificAgency?.id }
)}')">${translate(legalLink.label)}</button></span>`
)
.join(''),
translate('registration.dataProtection.label.suffix')
Expand Down
14 changes: 11 additions & 3 deletions src/components/profile/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import { useState, useRef, useContext, useEffect, Fragment } from 'react';
import { logout } from '../logout/logout';
import {
AgencySpecificContext,
AUTHORITIES,
ConsultingTypesContext,
hasUserAuthority,
Expand Down Expand Up @@ -60,6 +61,7 @@ export const Profile = () => {

const legalLinks = useContext(LegalLinksContext);
const { userData } = useContext(UserDataContext);
const { specificAgency } = useContext(AgencySpecificContext);
const { consultingTypes } = useContext(ConsultingTypesContext);

const [mobileMenu, setMobileMenu] = useState<
Expand Down Expand Up @@ -467,7 +469,9 @@ export const Profile = () => {
</div>
<div className="profile__footer">
{legalLinks.map((legalLink, index) => (
<Fragment key={legalLink.url}>
<Fragment
key={legalLink.getUrl({ aid: specificAgency?.id })}
>
{index > 0 && (
<Text
type="infoSmall"
Expand All @@ -476,8 +480,12 @@ export const Profile = () => {
/>
)}
<a
key={legalLink.url}
href={legalLink.url}
key={legalLink.getUrl({
aid: specificAgency?.id
})}
href={legalLink.getUrl({
aid: specificAgency?.id
})}
target="_blank"
rel="noreferrer"
>
Expand Down
8 changes: 6 additions & 2 deletions src/components/sessionMenu/SessionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,12 @@ export const SessionMenu = (props: SessionMenuProps) => {
<div className="legalInformationLinks--menu">
{legalLinks.map((legalLink) => (
<a
href={legalLink.url}
key={legalLink.url}
href={legalLink.getUrl({
aid: activeSession?.agency?.id
})}
key={legalLink.getUrl({
aid: activeSession?.agency?.id
})}
target="_blank"
rel="noreferrer"
>
Expand Down
20 changes: 16 additions & 4 deletions src/components/stageLayout/StageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Button } from '../button/Button';
import { Text } from '../text/Text';
import './StageLayout.styles.scss';
import clsx from 'clsx';
import { LocaleContext } from '../../globalState';
import { AgencySpecificContext, LocaleContext } from '../../globalState';
import { useTranslation } from 'react-i18next';
import { LocaleSwitch } from '../localeSwitch/LocaleSwitch';
import { LegalLinksContext } from '../../globalState/provider/LegalLinksProvider';
Expand Down Expand Up @@ -33,6 +33,7 @@ export const StageLayout = ({
const { t: translate } = useTranslation();
const legalLinks = useContext(LegalLinksContext);
const { selectableLocales } = useContext(LocaleContext);
const { specificAgency } = useContext(AgencySpecificContext);
const settings = useAppConfig();
const { fromL } = useResponsive();

Expand Down Expand Up @@ -102,7 +103,11 @@ export const StageLayout = ({
{showLegalLinks && (
<div className={`stageLayout__legalLinks`}>
{legalLinks.map((legalLink, index) => (
<React.Fragment key={legalLink.url}>
<React.Fragment
key={legalLink.getUrl({
aid: specificAgency?.id
})}
>
{index > 0 && (
<Text
type="infoSmall"
Expand All @@ -113,9 +118,16 @@ export const StageLayout = ({
<button
type="button"
className="button-as-link"
data-cy-link={legalLink.url}
data-cy-link={legalLink.getUrl({
aid: specificAgency?.id
})}
onClick={() =>
window.open(legalLink.url, '_blank')
window.open(
legalLink.getUrl({
aid: specificAgency?.id
}),
'_blank'
)
}
>
<Text
Expand Down
8 changes: 4 additions & 4 deletions src/components/videoConference/WaitingRoom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ export const WaitingRoom = ({
'registration.dataProtection.label.and'
)
: '') +
`<a target="_blank" href="${
legalLink.url
}">${translate(
legalLink.label
`<a target="_blank" href="${legalLink.getUrl(
{ aid: null }
)}">${translate(
legalLink.getUrl({ aid: null })
)}</a>`
)
.join('')
Expand Down
6 changes: 3 additions & 3 deletions src/components/waitingRoom/WaitingRoom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,9 @@ export const WaitingRoom = (props: WaitingRoomProps) => {
'registration.dataProtection.label.and'
)
: '') +
`<a target="_blank" href="${
legalLink.url
}">${translate(legalLink.label)}</a>`
`<a target="_blank" href="${legalLink.getUrl(
{ aid: null }
)}">${translate(legalLink.label)}</a>`
)
.join(''),
translate(
Expand Down
1 change: 1 addition & 0 deletions src/globalState/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export * from './interfaces/LegalLinkInterface';
export * from './interfaces/ServerAppConfigInterface';
export * from './interfaces/AppConfig';

export * from './provider/AgencySpecificProvider';
export * from './provider/AnonymousConversationFinishedProvider';
export * from './provider/AnonymousEnquiryAcceptedProvider';
export * from './provider/AnonymousConversationStartedProvider';
Expand Down
1 change: 1 addition & 0 deletions src/globalState/interfaces/TenantDataInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface TenantDataInterface {
claim: string;
dataPrivacyConfirmation: string;
termsAndConditionsConfirmation: string;
renderedPrivacy: string;
};
settings?: TenantDataSettingsInterface;
}
Expand Down
1 change: 1 addition & 0 deletions src/globalState/interfaces/UserDataInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export interface AgencyDataInterface {
url?: string;
external?: boolean;
tenantId?: number;
agencySpecificPrivacy?: string;
}

export interface ConsultingTypeDataInterface {
Expand Down
39 changes: 39 additions & 0 deletions src/globalState/provider/AgencySpecificProvider.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import * as React from 'react';
import {
createContext,
useState,
useContext,
Dispatch,
SetStateAction,
useEffect
} from 'react';
import { UserDataContext } from './UserDataProvider';
import { AgencyDataInterface } from '../interfaces/UserDataInterface';
import useUrlParamsLoader from '../../utils/useUrlParamsLoader';

export const AgencySpecificContext = createContext<{
specificAgency: AgencyDataInterface;
setSpecificAgency: Dispatch<SetStateAction<AgencyDataInterface>>;
}>(null);

export function AgencySpecificProvider(props) {
const { userData } = useContext(UserDataContext);
const { agency: urlAgency } = useUrlParamsLoader();
const [agency, setAgency] = useState<AgencyDataInterface>();

useEffect(() => {
if (userData?.agencies?.length > 0) {
setAgency(userData.agencies[0]);
} else if (urlAgency) {
setAgency(urlAgency);
}
}, [urlAgency, userData]);

return (
<AgencySpecificContext.Provider
value={{ specificAgency: agency, setSpecificAgency: setAgency }}
>
{props.children}
</AgencySpecificContext.Provider>
);
}
49 changes: 43 additions & 6 deletions src/globalState/provider/LegalLinksProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,62 @@
import { createContext, ReactNode } from 'react';
import { createContext, ReactNode, useCallback, useMemo } from 'react';
import { LegalLinkInterface } from '../interfaces/LegalLinkInterface';
import * as React from 'react';
import { useAppConfig } from '../../hooks/useAppConfig';

export const LegalLinksContext = createContext<LegalLinkInterface[]>([]);
export type TProvidedLegalLink = Omit<LegalLinkInterface, 'url'> & {
getUrl: (params?: {
[key: string]: string | number | null | undefined;
}) => string;
};

export const LegalLinksContext = createContext<TProvidedLegalLink[]>([]);

type TLegalLinksProvider = {
legalLinks?: LegalLinkInterface[];
children: ReactNode;
};

export function LegalLinksProvider({
legalLinks,
legalLinks: externalLegalLinks,
children
}: TLegalLinksProvider) {
const settings = useAppConfig();

const getUrl = useCallback(
(
url: string,
params: { [key: string]: string | number | null | undefined }
) => {
const urlObject = Object.entries(params || {})
.filter(([, value]) => !!value)
.map(([key, value]) => [
key,
typeof value === 'number' ? value.toString() : value
])
.reduce((acc, [key, value]) => {
acc.searchParams.append(key, value);
return acc;
}, new URL(url));
return urlObject.toString();
},
[]
);

const legalLinks = useMemo<TProvidedLegalLink[]>(
() =>
(externalLegalLinks ?? settings.legalLinks ?? []).map(
({ url, ...legalLink }) => ({
...legalLink,
getUrl: (params: {
[key: string]: string | number | null | undefined;
}) => getUrl(url, params)
})
),
[externalLegalLinks, settings.legalLinks, getUrl]
);

return (
<LegalLinksContext.Provider
value={legalLinks ?? settings.legalLinks ?? []}
>
<LegalLinksContext.Provider value={legalLinks}>
{children}
</LegalLinksContext.Provider>
);
Expand Down
4 changes: 3 additions & 1 deletion src/globalState/state.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
RocketChatGlobalSettingsProvider,
AnonymousConversationStartedProvider,
SessionsDataProvider,
ModalProvider
ModalProvider,
AgencySpecificProvider
} from '.';

function ProviderComposer({ contexts, children }) {
Expand All @@ -35,6 +36,7 @@ function ContextProvider({ children }) {
<NotificationsProvider />,
<UpdateSessionListProvider />,
<UserDataProvider />,
<AgencySpecificProvider />,
<AnonymousConversationFinishedProvider />,
<WebsocketConnectionDeactivatedProvider />,
<SessionsDataProvider />,
Expand Down
Loading
Loading