From 3e825f91b77864961bff07d8594d6d8f9651cfa2 Mon Sep 17 00:00:00 2001 From: Jaap van der Meer Date: Tue, 30 Jan 2024 16:38:18 +0100 Subject: [PATCH 1/2] v1.4.6 --- src/plugins/strapi-plugin-internal-links/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/strapi-plugin-internal-links/package.json b/src/plugins/strapi-plugin-internal-links/package.json index 7a74cef..d05c372 100644 --- a/src/plugins/strapi-plugin-internal-links/package.json +++ b/src/plugins/strapi-plugin-internal-links/package.json @@ -1,6 +1,6 @@ { "name": "@webbio/strapi-plugin-internal-links", - "version": "1.4.5", + "version": "1.4.6", "description": "A custom field for Strapi that can create internal links", "scripts": { "develop": "tsc -p tsconfig.server.json -w", From e5bb6cbfa3548d6e36a3170072633d3521ba7ad2 Mon Sep 17 00:00:00 2001 From: Jaap van der Meer Date: Tue, 30 Jan 2024 16:47:02 +0100 Subject: [PATCH 2/2] chore: use shownotitle overwrite in form --- .../admin/src/components/form/index.tsx | 13 +++++++++---- .../admin/src/components/modal/index.tsx | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/plugins/strapi-plugin-internal-links/admin/src/components/form/index.tsx b/src/plugins/strapi-plugin-internal-links/admin/src/components/form/index.tsx index 5081754..6e0187b 100644 --- a/src/plugins/strapi-plugin-internal-links/admin/src/components/form/index.tsx +++ b/src/plugins/strapi-plugin-internal-links/admin/src/components/form/index.tsx @@ -19,9 +19,17 @@ import { Label } from '../label'; interface IProps extends Omit { attributeOptions?: IInternalLinkAttribute['options']; + shouldShowTitle?: boolean; } -const InternalLinkForm = ({ link, setLink, errors, setErrors, attributeOptions }: IProps): JSX.Element => { +const InternalLinkForm = ({ + link, + setLink, + errors, + setErrors, + attributeOptions, + shouldShowTitle +}: IProps): JSX.Element => { const { formatMessage } = useIntl(); const { data: pluginConfig, isLoading: isLoadingConfig } = useGetConfig({}); const useSinglePageType = !!pluginConfig?.useSinglePageType || pluginConfig?.pageBuilder?.enabled; @@ -46,9 +54,6 @@ const InternalLinkForm = ({ link, setLink, errors, setErrors, attributeOptions } usePlatformOptions({ page, pageOptionsIsLoading }); const [isExternalTab, setIsExternalTab] = useState(link.type === 'external'); const translationLinkKey = !isExternalTab ? 'generated-link' : 'link'; - const shouldShowTitle = - !isLoadingConfig && - (typeof attributeOptions?.noTitle === 'boolean' ? !attributeOptions?.noTitle : !pluginConfig?.defaultNoTitle); const onToggleCheckbox = (): void => { setIsExternalTab((prev) => !prev); diff --git a/src/plugins/strapi-plugin-internal-links/admin/src/components/modal/index.tsx b/src/plugins/strapi-plugin-internal-links/admin/src/components/modal/index.tsx index 9ee9c4e..c63151f 100644 --- a/src/plugins/strapi-plugin-internal-links/admin/src/components/modal/index.tsx +++ b/src/plugins/strapi-plugin-internal-links/admin/src/components/modal/index.tsx @@ -76,6 +76,7 @@ const InternalLinkModal = ({ errors={errors} setErrors={setErrors} attributeOptions={attribute?.options} + shouldShowTitle={shouldShowTitle} />