@webbio/strapi-plugin-page-builder 0.8.5-platform → 0.9.1-platform

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

@@ -5,7 +5,10 @@ import { useSelector } from 'react-redux';
 import { useFetchClient } from '@strapi/helper-plugin';
 import pick from 'lodash/pick';
 
-import RelationInput from '@strapi/admin/admin/src/content-manager/components/RelationInput/RelationInput';
+import {
+	RelationInput,
+	RelationInputProps
+} from '../../StrapiCore/admin/admin/src/content-manager/components/Relations/RelationInput';
 
 import { useGetLocaleFromUrl } from '../../../utils/hooks/useGetLocaleFromUrl';
 import { getSearchFilteredEntities } from '../../../api/search-filtered-entity';
@@ -53,8 +56,15 @@ const MultiPlatformFilteredSelectField = ({
 	const defaultLocale = locales.find((locale: any) => locale.isDefault);
 	const selectedLocale = initialData?.locale ?? urlLocale ?? defaultLocale.code;
 
-	const [searchResults, setSearchResults] = useState<Record<string, any>>({ data: [] });
-	const [selectedResults, setSelectedResults] = useState<Record<string, any>>({ data: [] });
+	const [searchResults, setSearchResults] = useState<RelationInputProps['searchResults']>({
+		data: [],
+		isLoading: false
+	});
+	const [selectedResults, setSelectedResults] = useState<RelationInputProps['relations']>({
+		data: [],
+		isLoading: false,
+		isFetchingNextPage: false
+	});
 
 	const { formatMessage } = useIntl();
 
@@ -75,7 +85,7 @@ const MultiPlatformFilteredSelectField = ({
 		: '';
 
 	useEffect(() => {
-		setSelectedResults({ data: targetFieldValue });
+		setSelectedResults({ data: targetFieldValue, isLoading: false, isFetchingNextPage: false });
 	}, [targetFieldValue]);
 
 	const getItems = async (inputValue?: string) => {
@@ -97,7 +107,8 @@ const MultiPlatformFilteredSelectField = ({
 			publishedAt: x.publishedAt
 		}));
 
-		setSearchResults({ data: mapped || [] });
+		// @ts-expect-error data is fine
+		setSearchResults({ data: mapped || [], isLoading: false });
 	};
 
 	const handleRelationReorder = (oldIndex: number, newIndex: number) => {
@@ -123,7 +134,7 @@ const MultiPlatformFilteredSelectField = ({
 	return (
 		<RelationInput
 			id={name}
-			name={name}
+			name={name || ''}
 			error={error}
 			canReorder
 			description={hint}
@@ -181,7 +192,8 @@ const MultiPlatformFilteredSelectField = ({
 			)}
 			searchResults={searchResults}
 			size={8}
-			hint={hint}
+			// @ts-ignore
+			hint={hint || ''}
 			labelAction={labelAction}
 			required={required}
 		/>

package/admin/src/components/PlatformFilteredSelectField/hooks/useRelationLoad.tsx

@@ -1,7 +1,7 @@
 import get from 'lodash/get';
 import React from 'react';
-import { useRelation } from '@strapi/admin/admin/src/content-manager/hooks/useRelation/index';
-import { getInitialDataPathUsingTempKeys } from '@strapi/admin/admin/src/content-manager/utils/paths';
+import { useRelation } from '../../StrapiCore/admin/admin/src/content-manager/components/Relations/useRelation';
+import { getInitialDataPathUsingTempKeys } from '../../StrapiCore/admin/admin/src/content-manager/utils/paths';
 import RelationHelper, { IPlatformFilteredSelectFieldProps } from '../utils/relation-helper';
 import { useCMEditViewDataManager } from '@strapi/helper-plugin';
 import { useRouteMatch } from 'react-router-dom';
@@ -73,8 +73,10 @@ const useRelationLoad = ({ name, attribute }: IPlatformFilteredSelectFieldProps)
 				});
 			},
 			normalizeArguments: {
+				// @ts-expect-error
 				mainFieldName: relationMainFieldName,
 				shouldAddLink: true,
+				// @ts-expect-error
 				targetModel: targetAttributes?.targetModel
 			}
 		},