@webbio/strapi-plugin-page-builder 0.18.0-platform → 0.18.1-platform

package/admin/src/components/EditView/CollectionTypeSettings/index.tsx

@@ -10,6 +10,7 @@ import { PAGE_TYPE_PAGE, PAGE_UID } from '../../../../../shared/utils/constants'
 import { usePlatformFormData } from '../../../utils/hooks/usePlatformFormData';
 import S from '../Details/styles';
 import { usePageTypeExists } from '../../../api/page-type-exists';
+import { delay } from '../../../utils/delay';
 
 interface CollectionTypeSettingsProps {
 	onlyPlatform?: boolean;
@@ -38,15 +39,26 @@ export const CollectionTypeSettings = ({ onlyPlatform }: CollectionTypeSettingsP
 		}
 	}, [modifiedData.page?.[0]]);
 
-	useEffect(() => {
-		if (isCreatingEntry) {
-			onChange({
+	// Reset page link if creating entry
+	// Reason for the delay is explained in usePlatformFormData.ts
+	const resetPageLinkIfCreatingEntry = async () => {
+		if (!isCreatingEntry || (isCreatingEntry && !initialData.page)) return;
+
+		await delay(100);
+
+		onChange(
+			{
 				target: {
 					name: 'page',
 					value: null
 				}
-			});
-		}
+			},
+			false
+		);
+	};
+
+	useEffect(() => {
+		resetPageLinkIfCreatingEntry();
 	}, []);
 
 	return (

package/admin/src/components/PlatformFilteredSelectField/index.tsx

@@ -55,16 +55,6 @@ const PlatformFilteredSelectField = (props: IPlatformFilteredSelectFieldProps) =
 	);
 };
 
-PlatformFilteredSelectField.defaultProps = {
-	description: undefined,
-	disabled: false,
-	error: undefined,
-	labelAction: undefined,
-	placeholder: undefined,
-	value: '',
-	required: false
-};
-
 export default PlatformFilteredSelectField;
 
 const getLocalizedActionLabel = (actionLabel?: JSX.Element, layout?: Record<string, any>): JSX.Element | undefined => {

package/admin/src/utils/delay.ts

@@ -0,0 +1 @@
+export const delay = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));

package/admin/src/utils/hooks/usePlatformFormData.ts

@@ -4,6 +4,7 @@ import { Platform } from '../../api/platform';
 import { useDefaultPlatformFromLocalStorage } from './useDefaultPlatformFromLocalStorage';
 import { useGetPlatformRelation } from '../../api/platform-relation';
 import { PLATFORM_UID } from '../../../../shared/utils/constants';
+import { delay } from '../delay';
 
 const usePlatformFormData = (form?: Record<string, any>, onPlatformChange?: (platform: Platform) => void) => {
 	const { onChange, initialData, modifiedData, layout, isCreatingEntry } = form || {};
@@ -77,7 +78,3 @@ const usePlatformFormData = (form?: Record<string, any>, onPlatformChange?: (pla
 };
 
 export { usePlatformFormData };
-
-function delay(ms: number) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webbio/strapi-plugin-page-builder",
-    "version": "0.18.0-platform",
+    "version": "0.18.1-platform",
     "description": "This is the description of the plugin.",
     "scripts": {
         "develop": "tsc -p tsconfig.server.json -w",