From 294da9a98effaa0a13fd5d1fc5011cf8f2ea11a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:35:31 +0000 Subject: [PATCH 1/2] Update ckeditor monorepo to v43 --- frontends/ol-ckeditor/package.json | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/frontends/ol-ckeditor/package.json b/frontends/ol-ckeditor/package.json index 7ff74d6f9a..dbcea925d4 100644 --- a/frontends/ol-ckeditor/package.json +++ b/frontends/ol-ckeditor/package.json @@ -11,27 +11,27 @@ "react": "18.3.1" }, "dependencies": { - "@ckeditor/ckeditor5-adapter-ckfinder": "^41.0.0", - "@ckeditor/ckeditor5-autoformat": "^41.0.0", - "@ckeditor/ckeditor5-basic-styles": "^41.0.0", - "@ckeditor/ckeditor5-block-quote": "^41.0.0", - "@ckeditor/ckeditor5-cloud-services": "^41.0.0", - "@ckeditor/ckeditor5-core": "^41.0.0", + "@ckeditor/ckeditor5-adapter-ckfinder": "^43.0.0", + "@ckeditor/ckeditor5-autoformat": "^43.0.0", + "@ckeditor/ckeditor5-basic-styles": "^43.0.0", + "@ckeditor/ckeditor5-block-quote": "^43.0.0", + "@ckeditor/ckeditor5-cloud-services": "^43.0.0", + "@ckeditor/ckeditor5-core": "^43.0.0", "@ckeditor/ckeditor5-dev-translations": "^40.0.0", "@ckeditor/ckeditor5-dev-utils": "^40.0.0", - "@ckeditor/ckeditor5-easy-image": "^41.0.0", - "@ckeditor/ckeditor5-editor-classic": "^41.0.0", - "@ckeditor/ckeditor5-essentials": "^41.0.0", - "@ckeditor/ckeditor5-heading": "^41.0.0", - "@ckeditor/ckeditor5-image": "^41.0.0", - "@ckeditor/ckeditor5-link": "^41.0.0", - "@ckeditor/ckeditor5-list": "^41.0.0", - "@ckeditor/ckeditor5-markdown-gfm": "^41.0.0", - "@ckeditor/ckeditor5-media-embed": "^41.0.0", - "@ckeditor/ckeditor5-paragraph": "^41.0.0", + "@ckeditor/ckeditor5-easy-image": "^43.0.0", + "@ckeditor/ckeditor5-editor-classic": "^43.0.0", + "@ckeditor/ckeditor5-essentials": "^43.0.0", + "@ckeditor/ckeditor5-heading": "^43.0.0", + "@ckeditor/ckeditor5-image": "^43.0.0", + "@ckeditor/ckeditor5-link": "^43.0.0", + "@ckeditor/ckeditor5-list": "^43.0.0", + "@ckeditor/ckeditor5-markdown-gfm": "^43.0.0", + "@ckeditor/ckeditor5-media-embed": "^43.0.0", + "@ckeditor/ckeditor5-paragraph": "^43.0.0", "@ckeditor/ckeditor5-react": "^7.0.0", - "@ckeditor/ckeditor5-theme-lark": "^41.0.0", - "@ckeditor/ckeditor5-ui": "^41.0.0", + "@ckeditor/ckeditor5-theme-lark": "^43.0.0", + "@ckeditor/ckeditor5-ui": "^43.0.0", "axios": "^1.6.3", "classnames": "^2.3.2", "ol-components": "0.0.0", From 4acd0a36267bb27ae0609f644792d89a60c9fbcf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:36:06 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- frontends/api/src/generated/v0/common.ts | 2 +- frontends/api/src/generated/v1/common.ts | 2 +- .../src/page-components/SearchDisplay/ResourceCategoryTabs.tsx | 2 +- .../src/components/Checkbox/CheckboxChoiceField.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontends/api/src/generated/v0/common.ts b/frontends/api/src/generated/v0/common.ts index bb09e071f6..6415152510 100644 --- a/frontends/api/src/generated/v0/common.ts +++ b/frontends/api/src/generated/v0/common.ts @@ -194,7 +194,7 @@ export const createRequestFunction = function ( const axiosRequestArgs = { ...axiosArgs.options, url: - (axios.defaults.baseURL ? "" : configuration?.basePath ?? basePath) + + (axios.defaults.baseURL ? "" : (configuration?.basePath ?? basePath)) + axiosArgs.url, } return axios.request(axiosRequestArgs) diff --git a/frontends/api/src/generated/v1/common.ts b/frontends/api/src/generated/v1/common.ts index 3685e76a9d..c22da3e38f 100644 --- a/frontends/api/src/generated/v1/common.ts +++ b/frontends/api/src/generated/v1/common.ts @@ -194,7 +194,7 @@ export const createRequestFunction = function ( const axiosRequestArgs = { ...axiosArgs.options, url: - (axios.defaults.baseURL ? "" : configuration?.basePath ?? basePath) + + (axios.defaults.baseURL ? "" : (configuration?.basePath ?? basePath)) + axiosArgs.url, } return axios.request(axiosRequestArgs) diff --git a/frontends/mit-open/src/page-components/SearchDisplay/ResourceCategoryTabs.tsx b/frontends/mit-open/src/page-components/SearchDisplay/ResourceCategoryTabs.tsx index ea88f888b2..3edd248b96 100644 --- a/frontends/mit-open/src/page-components/SearchDisplay/ResourceCategoryTabs.tsx +++ b/frontends/mit-open/src/page-components/SearchDisplay/ResourceCategoryTabs.tsx @@ -111,7 +111,7 @@ const ResourceCategoryTabList: React.FC = ({ } else { count = counts && t.resource_category - ? counts[t.resource_category] ?? 0 + ? (counts[t.resource_category] ?? 0) : undefined } return ( diff --git a/frontends/ol-components/src/components/Checkbox/CheckboxChoiceField.tsx b/frontends/ol-components/src/components/Checkbox/CheckboxChoiceField.tsx index 5765d33e74..146438c660 100644 --- a/frontends/ol-components/src/components/Checkbox/CheckboxChoiceField.tsx +++ b/frontends/ol-components/src/components/Checkbox/CheckboxChoiceField.tsx @@ -40,7 +40,7 @@ const CheckboxChoiceField: React.FC = ({ className, }) => { const isChecked = (choice: CheckboxProps) => - choice.value ? values?.includes(choice.value) ?? false : false + choice.value ? (values?.includes(choice.value) ?? false) : false return (