From b1ad63f2678ed40cec7ec878b1ff3e0fddb9f141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deborah=20K=C3=B6pfer?= Date: Thu, 27 Jun 2024 11:20:50 +0200 Subject: [PATCH 1/3] fix(agencyLanguages.tsx): enable agencyid in header for multitenancy --- .../registration/agencySelection/AgencyLanguages.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx b/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx index de71fa48e..1217638d8 100644 --- a/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx +++ b/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx @@ -4,6 +4,7 @@ import { useContext, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { apiAgencyLanguages } from '../../../../api/apiAgencyLanguages'; import { LanguagesContext } from '../../../../globalState/provider/LanguagesProvider'; +import { useAppConfig } from '../../../../hooks/useAppConfig'; interface AgencyLanguagesProps { agencyId?: number; @@ -11,6 +12,7 @@ interface AgencyLanguagesProps { export const AgencyLanguages = ({ agencyId }: AgencyLanguagesProps) => { const { t } = useTranslation(); + const settings = useAppConfig(); const [languagesString, setLanguagesString] = useState(''); const { fixed: fixedLanguages } = useContext(LanguagesContext); @@ -18,7 +20,10 @@ export const AgencyLanguages = ({ agencyId }: AgencyLanguagesProps) => { (async () => { let languages = ['de']; if (agencyId !== undefined) { - languages = await apiAgencyLanguages(agencyId, false).then( + languages = await apiAgencyLanguages( + agencyId, + settings?.multitenancyWithSingleDomainEnabled + ).then( (res) => (languages = [...fixedLanguages, ...res.languages]) ); } From 19ee44bf07578222c7e08276df088207e69a60c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deborah=20K=C3=B6pfer?= Date: Thu, 27 Jun 2024 11:59:14 +0200 Subject: [PATCH 2/3] build(babel-dependency-issue): add dev dependency to prevent issues --- package-lock.json | 25 +++++++++++++++++++++++-- package.json | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1b30bc015..bed11c492 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,6 +95,7 @@ "devDependencies": { "@babel/core": "^7.23.7", "@babel/eslint-parser": "^7.23.3", + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@commitlint/cli": "^18.5.0", "@commitlint/config-conventional": "^18.5.0", "@cypress/react": "^7.0.3", @@ -818,9 +819,17 @@ } }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.0-placeholder-for-preset-env.2", + "version": "7.21.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", + "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", "dev": true, - "license": "MIT", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.21.0", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, "engines": { "node": ">=6.9.0" }, @@ -2054,6 +2063,18 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "dev": true, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/preset-env/node_modules/semver": { "version": "6.3.1", "dev": true, diff --git a/package.json b/package.json index 9dae06380..380c6a208 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,7 @@ "devDependencies": { "@babel/core": "^7.23.7", "@babel/eslint-parser": "^7.23.3", + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@commitlint/cli": "^18.5.0", "@commitlint/config-conventional": "^18.5.0", "@cypress/react": "^7.0.3", From 55d64fed93d99bfe8ca0df25bd0b5e38fca2e5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deborah=20K=C3=B6pfer?= Date: Thu, 27 Jun 2024 12:48:09 +0200 Subject: [PATCH 3/3] fix(AgencyLanguages.tsx): use effect dependency --- .../registration/agencySelection/AgencyLanguages.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx b/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx index 1217638d8..10986381c 100644 --- a/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx +++ b/src/extensions/components/registration/agencySelection/AgencyLanguages.tsx @@ -42,7 +42,12 @@ export const AgencyLanguages = ({ agencyId }: AgencyLanguagesProps) => { .join(' | ') ); })(); - }, [agencyId, fixedLanguages, t]); + }, [ + agencyId, + fixedLanguages, + settings?.multitenancyWithSingleDomainEnabled, + t + ]); return (