@webbio/strapi-plugin-page-builder 0.12.2-platform → 0.12.3-platform

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

@@ -1,61 +1,61 @@
-import { useEffect } from 'react';
-import remove from 'lodash/remove';
-
-import { useLocalStorage, useSessionStorage } from '@mantine/hooks';
-
-import { Platform, useGetPlatforms } from '../../api/platform';
-
-const useDefaultPlatformFromLocalStorage = () => {
-	const { data: platforms, isLoading } = useGetPlatforms({});
-	// Set multiple platforms in local storage. When a new tab is opened, the first platform from the array will be selected.
-	const [platformsFromState, setPlatformsFromState] = useLocalStorage<Platform[] | undefined>({
-		key: 'selectedPlatforms',
-		defaultValue: undefined,
-		getInitialValueInEffect: false
-	});
-	const selectedPlatformFromState = platformsFromState?.[0];
-
-	// Session storage is used to keep the state of the current tab.
-	const [selectedPlatform, setSelectedPlatform] = useSessionStorage<Platform | undefined>({
-		key: 'selectedPlatform',
-		defaultValue: undefined,
-		getInitialValueInEffect: false
-	});
-
-	// When a new platform is selected, it is added as first element to the array of platforms in local storage.
-	// This makes sure that when a new tab is opened, the most recent platform will be selected.
-	useEffect(() => {
-		const platformArray: Platform[] = platformsFromState || [];
-		remove(platformArray, (p) => p.id === selectedPlatform?.id);
-
-		if (selectedPlatform) {
-			platformArray.unshift(selectedPlatform);
-		}
-		setPlatformsFromState(platformArray);
-	}, [selectedPlatform]);
-
-	useEffect(() => {
-		// If there are no platforms in local storage, select the first platform from the list.
-		if (
-			!isLoading &&
-			platforms?.[0]?.title &&
-			(!selectedPlatform?.id || !platforms.find((platform) => platform.id === selectedPlatformFromState?.id))
-		) {
-			setSelectedPlatform(platforms[0]);
-		}
-
-		// If there are no platforms in local storage and no platforms are returned from the API, set the selected platform to undefined.
-		if (!isLoading && (platforms || []).length === 0) {
-			setSelectedPlatform(undefined);
-		}
-
-		// If there is no selected platform in the session storage, set it to the selected platform from local storage.
-		if (!isLoading && selectedPlatformFromState?.id && !selectedPlatform) {
-			setSelectedPlatform(selectedPlatformFromState);
-		}
-	}, [isLoading, selectedPlatformFromState, platforms]);
-
-	return { selectedPlatform, setSelectedPlatform, platforms };
-};
-
-export { useDefaultPlatformFromLocalStorage };
+import { useEffect } from 'react';
+import remove from 'lodash/remove';
+
+import { useLocalStorage, useSessionStorage } from '@mantine/hooks';
+
+import { Platform, useGetPlatforms } from '../../api/platform';
+
+const useDefaultPlatformFromLocalStorage = () => {
+	const { data: platforms, isLoading } = useGetPlatforms({});
+	// Set multiple platforms in local storage. When a new tab is opened, the first platform from the array will be selected.
+	const [platformsFromState, setPlatformsFromState] = useLocalStorage<Platform[] | undefined>({
+		key: 'selectedPlatforms',
+		defaultValue: undefined,
+		getInitialValueInEffect: false
+	});
+	const selectedPlatformFromState = platformsFromState?.[0];
+
+	// Session storage is used to keep the state of the current tab.
+	const [selectedPlatform, setSelectedPlatform] = useSessionStorage<Platform | undefined>({
+		key: 'selectedPlatform',
+		defaultValue: undefined,
+		getInitialValueInEffect: false
+	});
+
+	// When a new platform is selected, it is added as first element to the array of platforms in local storage.
+	// This makes sure that when a new tab is opened, the most recent platform will be selected.
+	useEffect(() => {
+		const platformArray: Platform[] = platformsFromState || [];
+		remove(platformArray, (p) => p.id === selectedPlatform?.id);
+
+		if (selectedPlatform) {
+			platformArray.unshift(selectedPlatform);
+		}
+		setPlatformsFromState(platformArray);
+	}, [selectedPlatform]);
+
+	useEffect(() => {
+		// If there are no platforms in local storage, select the first platform from the list.
+		if (
+			!isLoading &&
+			platforms?.[0]?.title &&
+			(!selectedPlatform?.id || !platforms.find((platform) => platform.id === selectedPlatformFromState?.id))
+		) {
+			setSelectedPlatform(platforms[0]);
+		}
+
+		// If there are no platforms in local storage and no platforms are returned from the API, set the selected platform to undefined.
+		if (!isLoading && (platforms || []).length === 0) {
+			setSelectedPlatform(undefined);
+		}
+
+		// If there is no selected platform in the session storage, set it to the selected platform from local storage.
+		if (!isLoading && selectedPlatformFromState?.id && !selectedPlatform) {
+			setSelectedPlatform(selectedPlatformFromState);
+		}
+	}, [isLoading, selectedPlatformFromState, platforms]);
+
+	return { selectedPlatform, setSelectedPlatform, platforms };
+};
+
+export { useDefaultPlatformFromLocalStorage };

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

@@ -1,9 +1,9 @@
-import { useQueryParams } from '@strapi/helper-plugin';
-
-const useGetLocaleFromUrl = () => {
-	const [{ query }] = useQueryParams() as any;
-
-	return query?.plugins?.i18n?.locale;
-};
-
-export { useGetLocaleFromUrl };
+import { useQueryParams } from '@strapi/helper-plugin';
+
+const useGetLocaleFromUrl = () => {
+	const [{ query }] = useQueryParams() as any;
+
+	return query?.plugins?.i18n?.locale;
+};
+
+export { useGetLocaleFromUrl };

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

@@ -1,34 +1,34 @@
-import { useLayoutEffect } from 'react';
-
-import { useQueryParams } from '@strapi/helper-plugin';
-
-import { findElementParent } from '../../utils/findElementParent';
-import { findDomElement } from '../../utils/findDomElement';
-import { useGetPlatforms } from '../../api/platform';
-
-const filtersToRemove = ['platform', 'pageType'];
-
-export const useHideOverviewFilterTags = () => {
-	const [{ query }] = useQueryParams() as any;
-	const { data: platforms } = useGetPlatforms({});
-
-	useLayoutEffect(() => {
-		filtersToRemove.forEach((filter) => removeFilterElement(filter, query));
-	}, [query, platforms]);
-};
-
-const removeFilterElement = (filterToRemove?: string, query?: Record<string, any>): void => {
-	if (!filterToRemove || !query || !(JSON.stringify(query.filters || {}) || '').includes(filterToRemove)) {
-		return;
-	}
-
-	const filterTag = findDomElement(`//button//span[contains(., '${filterToRemove} is')]`);
-
-	if (filterTag) {
-		const parent = findElementParent(filterTag, 'DIV', 2);
-
-		if (parent?.remove) {
-			parent.style.display = 'none';
-		}
-	}
-};
+import { useLayoutEffect } from 'react';
+
+import { useQueryParams } from '@strapi/helper-plugin';
+
+import { findElementParent } from '../../utils/findElementParent';
+import { findDomElement } from '../../utils/findDomElement';
+import { useGetPlatforms } from '../../api/platform';
+
+const filtersToRemove = ['platform', 'pageType'];
+
+export const useHideOverviewFilterTags = () => {
+	const [{ query }] = useQueryParams() as any;
+	const { data: platforms } = useGetPlatforms({});
+
+	useLayoutEffect(() => {
+		filtersToRemove.forEach((filter) => removeFilterElement(filter, query));
+	}, [query, platforms]);
+};
+
+const removeFilterElement = (filterToRemove?: string, query?: Record<string, any>): void => {
+	if (!filterToRemove || !query || !(JSON.stringify(query.filters || {}) || '').includes(filterToRemove)) {
+		return;
+	}
+
+	const filterTag = findDomElement(`//button//span[contains(., '${filterToRemove} is')]`);
+
+	if (filterTag) {
+		const parent = findElementParent(filterTag, 'DIV', 2);
+
+		if (parent?.remove) {
+			parent.style.display = 'none';
+		}
+	}
+};

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

@@ -1,64 +1,64 @@
-import { useEffect } from 'react';
-
-import { Platform } from '../../api/platform';
-import { useDefaultPlatformFromLocalStorage } from './useDefaultPlatformFromLocalStorage';
-import { useGetPlatformRelation } from '../../api/platform-relation';
-import { PLATFORM_UID } from '../../../../shared/utils/constants';
-
-const usePlatformFormData = (form?: Record<string, any>, onPlatformChange?: (platform: Platform) => void) => {
-	const { onChange, initialData, modifiedData, layout } = form || {};
-	const { isLoading: isLoadingPlatform, data: platformRelation } = useGetPlatformRelation({
-		id: initialData?.id,
-		uid: layout.uid
-	});
-
-	const { selectedPlatform: defaultPlatform, setSelectedPlatform: setDefaultPlatform } =
-		useDefaultPlatformFromLocalStorage();
-	const isPlatformPage = layout.uid === PLATFORM_UID;
-
-	useEffect(() => {
-		if (!isLoadingPlatform && !platformRelation?.id && defaultPlatform && !isPlatformPage) {
-			handleSelectPlatform(defaultPlatform);
-		}
-
-		// If a user lands on a page which has a different platform linked than the one that is globally selected,
-		// we want to update the global selection to match the page's platform (if the user has access to it).
-		if (platformRelation?.id && defaultPlatform?.id && platformRelation.id !== defaultPlatform.id) {
-			setDefaultPlatform(platformRelation);
-		}
-	}, [isLoadingPlatform, defaultPlatform]);
-
-	const setFormValue = (name: string, value?: string | Record<string, any>[]) => {
-		onChange({
-			target: {
-				name,
-				value
-			},
-			shouldSetInitialValue: true
-		});
-	};
-
-	const handleSelectPlatform = async (platform: Platform) => {
-		onPlatformChange?.(platform);
-		if (platform?.title) {
-			const formPlatform = {
-				...platform,
-				label: platform.title,
-				value: platform.id
-			};
-			setFormValue('platform', [formPlatform]);
-		} else {
-			setFormValue('platform', []);
-		}
-	};
-
-	return {
-		defaultPlatform,
-		selectedPlatform:
-			(isPlatformPage && initialData) ||
-			(modifiedData?.platform?.[0]?.id ? modifiedData?.platform?.[0] : platformRelation),
-		isLoadingPlatform
-	};
-};
-
-export { usePlatformFormData };
+import { useEffect } from 'react';
+
+import { Platform } from '../../api/platform';
+import { useDefaultPlatformFromLocalStorage } from './useDefaultPlatformFromLocalStorage';
+import { useGetPlatformRelation } from '../../api/platform-relation';
+import { PLATFORM_UID } from '../../../../shared/utils/constants';
+
+const usePlatformFormData = (form?: Record<string, any>, onPlatformChange?: (platform: Platform) => void) => {
+	const { onChange, initialData, modifiedData, layout } = form || {};
+	const { isLoading: isLoadingPlatform, data: platformRelation } = useGetPlatformRelation({
+		id: initialData?.id,
+		uid: layout.uid
+	});
+
+	const { selectedPlatform: defaultPlatform, setSelectedPlatform: setDefaultPlatform } =
+		useDefaultPlatformFromLocalStorage();
+	const isPlatformPage = layout.uid === PLATFORM_UID;
+
+	useEffect(() => {
+		if (!isLoadingPlatform && !platformRelation?.id && defaultPlatform && !isPlatformPage) {
+			handleSelectPlatform(defaultPlatform);
+		}
+
+		// If a user lands on a page which has a different platform linked than the one that is globally selected,
+		// we want to update the global selection to match the page's platform (if the user has access to it).
+		if (platformRelation?.id && defaultPlatform?.id && platformRelation.id !== defaultPlatform.id) {
+			setDefaultPlatform(platformRelation);
+		}
+	}, [isLoadingPlatform, defaultPlatform]);
+
+	const setFormValue = (name: string, value?: string | Record<string, any>[]) => {
+		onChange({
+			target: {
+				name,
+				value
+			},
+			shouldSetInitialValue: true
+		});
+	};
+
+	const handleSelectPlatform = async (platform: Platform) => {
+		onPlatformChange?.(platform);
+		if (platform?.title) {
+			const formPlatform = {
+				...platform,
+				label: platform.title,
+				value: platform.id
+			};
+			setFormValue('platform', [formPlatform]);
+		} else {
+			setFormValue('platform', []);
+		}
+	};
+
+	return {
+		defaultPlatform,
+		selectedPlatform:
+			(isPlatformPage && initialData) ||
+			(modifiedData?.platform?.[0]?.id ? modifiedData?.platform?.[0] : platformRelation),
+		isLoadingPlatform
+	};
+};
+
+export { usePlatformFormData };

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

@@ -1,12 +1,12 @@
-import { useRef, useEffect } from 'react';
-
-// Hook
-export const usePrevious = <T>(value: T): T | null => {
-	const ref: React.MutableRefObject<T | null> = useRef(null);
-
-	useEffect(() => {
-		ref.current = value;
-	}, [value]);
-
-	return ref.current;
-};
+import { useRef, useEffect } from 'react';
+
+// Hook
+export const usePrevious = <T>(value: T): T | null => {
+	const ref: React.MutableRefObject<T | null> = useRef(null);
+
+	useEffect(() => {
+		ref.current = value;
+	}, [value]);
+
+	return ref.current;
+};

package/admin/src/utils/sanitizeModules.ts

@@ -1,93 +1,93 @@
-export const sanitizeModules = (modules: Record<string, any>[], convertToJSON = true) =>
-	modules?.map((module, idx) => {
-		try {
-			const sanitizedModule = sanitizeObject(module, idx, convertToJSON);
-
-			// go through top level properties in the module
-			for (let prop in sanitizedModule) {
-				// Strapi didn't give us the properties in an array when we used the Strapi API to get modules
-				// But it crashes when we try and have single relations not in an array, so we put them into an array.
-				if (
-					sanitizedModule[prop] &&
-					sanitizedModule[prop].hasOwnProperty('__is_array__') &&
-					!Array.isArray(sanitizedModule[prop])
-				) {
-					sanitizedModule[prop] = [{ ...sanitizedModule[prop] }];
-				}
-
-				// If a property is null, Strapi decides it should crash completely so we remove those.
-				if (sanitizedModule[prop] === null) {
-					delete sanitizedModule[prop];
-				}
-			}
-
-			const result = {
-				...sanitizedModule
-			};
-
-			return result;
-		} catch (error) {
-			console.error('ERROR IN SANITIZE MODULES', error);
-		}
-	});
-
-function sanitizeObject(obj: any, idx: number, convertToJSON = true): any {
-	try {
-		for (let key in obj) {
-			try {
-				if (typeof obj[key] === 'object' && obj[key] !== null && obj[key] !== undefined) {
-					sanitizeObject(obj[key], idx);
-				}
-			} catch (error) {
-				console.error('ERROR in loop', error);
-				return undefined;
-			}
-		}
-
-		// We have to remove the id for components, but not for relations to other collection items
-		// We use createdAt to check, only collection items have this property (hopefully)
-		if (obj.hasOwnProperty('id') && !obj.hasOwnProperty('createdAt')) {
-			obj['__temp_key__'] = idx;
-			delete obj['id'];
-		} else if (obj.hasOwnProperty('id') && obj.hasOwnProperty('createdAt')) {
-			// if it's a relation to a collection item, it has to be in an array because it crashes otherwise.
-			// We use this property at the top of this file, only for top level properties.
-			obj['__is_array__'] = true;
-		}
-
-		try {
-			if (obj.hasOwnProperty('defaultModuleOptions')) {
-				delete obj['defaultModuleOptions'].id;
-
-				let spacing = obj['defaultModuleOptions']?.spacing;
-
-				if (convertToJSON && spacing) {
-					spacing = JSON.stringify(spacing);
-				}
-
-				obj['defaultModuleOptions'] = {
-					...obj['defaultModuleOptions'],
-					spacing,
-					__temp_key__: idx
-				};
-			}
-		} catch (error) {
-			console.error('error in defaultmodule options', error);
-		}
-
-		// Strapi doesnt give us the mainfield and label properties when we get the data using the Strapi API
-		// So we add them here using other properties. This might be expanded with more if statements if required,
-		if (obj.hasOwnProperty('name') && !obj.hasOwnProperty('mainField') && !obj.hasOwnProperty('label')) {
-			obj['label'] = obj['name'];
-			obj['mainField'] = obj['name'];
-		}
-		if (obj.hasOwnProperty('title') && !obj.hasOwnProperty('mainField') && !obj.hasOwnProperty('label')) {
-			obj['label'] = obj['title'];
-			obj['mainField'] = obj['title'];
-		}
-
-		return obj;
-	} catch (error) {
-		console.error('error in root sanitize object', error);
-	}
-}
+export const sanitizeModules = (modules: Record<string, any>[], convertToJSON = true) =>
+	modules?.map((module, idx) => {
+		try {
+			const sanitizedModule = sanitizeObject(module, idx, convertToJSON);
+
+			// go through top level properties in the module
+			for (let prop in sanitizedModule) {
+				// Strapi didn't give us the properties in an array when we used the Strapi API to get modules
+				// But it crashes when we try and have single relations not in an array, so we put them into an array.
+				if (
+					sanitizedModule[prop] &&
+					sanitizedModule[prop].hasOwnProperty('__is_array__') &&
+					!Array.isArray(sanitizedModule[prop])
+				) {
+					sanitizedModule[prop] = [{ ...sanitizedModule[prop] }];
+				}
+
+				// If a property is null, Strapi decides it should crash completely so we remove those.
+				if (sanitizedModule[prop] === null) {
+					delete sanitizedModule[prop];
+				}
+			}
+
+			const result = {
+				...sanitizedModule
+			};
+
+			return result;
+		} catch (error) {
+			console.error('ERROR IN SANITIZE MODULES', error);
+		}
+	});
+
+function sanitizeObject(obj: any, idx: number, convertToJSON = true): any {
+	try {
+		for (let key in obj) {
+			try {
+				if (typeof obj[key] === 'object' && obj[key] !== null && obj[key] !== undefined) {
+					sanitizeObject(obj[key], idx);
+				}
+			} catch (error) {
+				console.error('ERROR in loop', error);
+				return undefined;
+			}
+		}
+
+		// We have to remove the id for components, but not for relations to other collection items
+		// We use createdAt to check, only collection items have this property (hopefully)
+		if (obj.hasOwnProperty('id') && !obj.hasOwnProperty('createdAt')) {
+			obj['__temp_key__'] = idx;
+			delete obj['id'];
+		} else if (obj.hasOwnProperty('id') && obj.hasOwnProperty('createdAt')) {
+			// if it's a relation to a collection item, it has to be in an array because it crashes otherwise.
+			// We use this property at the top of this file, only for top level properties.
+			obj['__is_array__'] = true;
+		}
+
+		try {
+			if (obj.hasOwnProperty('defaultModuleOptions')) {
+				delete obj['defaultModuleOptions'].id;
+
+				let spacing = obj['defaultModuleOptions']?.spacing;
+
+				if (convertToJSON && spacing) {
+					spacing = JSON.stringify(spacing);
+				}
+
+				obj['defaultModuleOptions'] = {
+					...obj['defaultModuleOptions'],
+					spacing,
+					__temp_key__: idx
+				};
+			}
+		} catch (error) {
+			console.error('error in defaultmodule options', error);
+		}
+
+		// Strapi doesnt give us the mainfield and label properties when we get the data using the Strapi API
+		// So we add them here using other properties. This might be expanded with more if statements if required,
+		if (obj.hasOwnProperty('name') && !obj.hasOwnProperty('mainField') && !obj.hasOwnProperty('label')) {
+			obj['label'] = obj['name'];
+			obj['mainField'] = obj['name'];
+		}
+		if (obj.hasOwnProperty('title') && !obj.hasOwnProperty('mainField') && !obj.hasOwnProperty('label')) {
+			obj['label'] = obj['title'];
+			obj['mainField'] = obj['title'];
+		}
+
+		return obj;
+	} catch (error) {
+		console.error('error in root sanitize object', error);
+	}
+}

package/custom.d.ts

@@ -1,6 +1,6 @@
-declare module '@strapi/design-system/*';
-declare module '@strapi/design-system';
-declare module '@strapi/icons';
-declare module '@strapi/icons/*';
-declare module '@strapi/helper-plugin';
-declare module '@strapi/admin/*';
+declare module '@strapi/design-system/*';
+declare module '@strapi/design-system';
+declare module '@strapi/icons';
+declare module '@strapi/icons/*';
+declare module '@strapi/helper-plugin';
+declare module '@strapi/admin/*';

package/dist/package.json

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

package/dist/server/bootstrap.js

@@ -198,7 +198,7 @@ const afterUpdate = async (result) => {
                 data: {
                     ...pageData,
                     id: result.collectionTypeData[0].id,
-                    ...result.customPublishedAt ? { publishedAt: result.customPublishedAt } : undefined,
+                    ...(result.customPublishedAt ? { publishedAt: result.customPublishedAt } : undefined),
                     lifecycleState: {
                         exit: true
                     }

package/dist/server/graphql/page-by-path.js

@@ -5,15 +5,15 @@ const apollo_server_koa_1 = require("apollo-server-koa");
 const strapi_1 = require("../utils/strapi");
 const getPageByPath = (strapi) => {
     const typeDefs = () => {
-        return `
-				extend type Page {
-					collectionType: GenericMorph
-				}
-
-        type Query {
-          getPageByPath(path: String, domain: String, publicationState: PublicationState): PageEntity
-        }
-
+        return `
+				extend type Page {
+					collectionType: GenericMorph
+				}
+
+        type Query {
+          getPageByPath(path: String, domain: String, publicationState: PublicationState): PageEntity
+        }
+
       `;
     };
     const resolvers = (strapi) => {
@@ -61,21 +61,24 @@ const getPageByPath = (strapi) => {
                                 };
                                 return result;
                             };
-                            const results = await getPage();
-                            if (((_a = Object.values(results)) === null || _a === void 0 ? void 0 : _a.filter(Boolean).length) > 0) {
-                                if (!((_b = results === null || results === void 0 ? void 0 : results.platform) === null || _b === void 0 ? void 0 : _b.isPrivate) && !(results === null || results === void 0 ? void 0 : results.isPrivate)) {
-                                    return results;
+                            const result = await getPage();
+                            if (((_a = Object.values(result)) === null || _a === void 0 ? void 0 : _a.filter(Boolean).length) > 0) {
+                                if ((result === null || result === void 0 ? void 0 : result.path) === '404' || result.path === '500') {
+                                    return result;
+                                }
+                                if (!((_b = result === null || result === void 0 ? void 0 : result.platform) === null || _b === void 0 ? void 0 : _b.isPrivate) && !(result === null || result === void 0 ? void 0 : result.isPrivate)) {
+                                    return result;
                                 }
-                                if ((((_c = results === null || results === void 0 ? void 0 : results.platform) === null || _c === void 0 ? void 0 : _c.isPrivate) === true && ctx.koaContext.req.headers.authorization) ||
-                                    ((results === null || results === void 0 ? void 0 : results.isPrivate) === true && ctx.koaContext.req.headers.authorization)) {
+                                if ((((_c = result === null || result === void 0 ? void 0 : result.platform) === null || _c === void 0 ? void 0 : _c.isPrivate) === true && ctx.koaContext.req.headers.authorization) ||
+                                    ((result === null || result === void 0 ? void 0 : result.isPrivate) === true && ctx.koaContext.req.headers.authorization)) {
                                     const auth = ctx.koaContext.req.headers.authorization;
                                     const token = auth.split(' ');
                                     const jwtService = strapi.plugin('users-permissions').service('jwt');
                                     const decodedToken = await jwtService.verify(token[1]);
                                     if (decodedToken) {
                                         const user = ctx.state.user;
-                                        if (((_d = user === null || user === void 0 ? void 0 : user.platform) === null || _d === void 0 ? void 0 : _d.id) === ((_e = results === null || results === void 0 ? void 0 : results.platform) === null || _e === void 0 ? void 0 : _e.id)) {
-                                            return results;
+                                        if (((_d = user === null || user === void 0 ? void 0 : user.platform) === null || _d === void 0 ? void 0 : _d.id) === ((_e = result === null || result === void 0 ? void 0 : result.platform) === null || _e === void 0 ? void 0 : _e.id)) {
+                                            return result;
                                         }
                                     }
                                 }