Merge branch 'new-release' into CR/product_detail

# Conflicts:
#	package.json
#	src/utils/solrMapping.js

1 files changed, 31 insertions, 30 deletions

diff --git a/src-migrate/modules/page-content/index.tsx b/src-migrate/modules/page-content/index.tsx
index 547b1957..af597641 100644
--- a/src-migrate/modules/page-content/index.tsx
+++ b/src-migrate/modules/page-content/index.tsx
@@ -1,44 +1,45 @@
-import { useMemo } from "react"
-import { useQuery } from "react-query"
-import { PageContentProps } from "~/types/pageContent"
-import { getPageContent } from "~/services/pageContent"
+import { useMemo } from 'react';
+import { useQuery } from 'react-query';
+import { PageContentProps } from '~/types/pageContent';
+import { getPageContent } from '~/services/pageContent';
 
 type Props = {
-  path: string
-}
+  path: string;
+};
 
 const PageContent = ({ path }: Props) => {
-  const { data, isLoading } = useQuery<PageContentProps>(`page-content:${path}`, async () => await getPageContent({ path }))
+  const { data, isLoading } = useQuery<PageContentProps>(
+    `page-content:${path}`,
+    async () => await getPageContent({ path })
+  );
 
   const parsedContent = useMemo<string>(() => {
-    if (!data) return ''
+    if (!data) return '';
     return data.content.replaceAll(
       'src="/web/image',
       `src="${process.env.NEXT_PUBLIC_ODOO_API_HOST}/web/image`
-    )
-  }, [data])
+    );
+  }, [data]);
+  console.log('parsedContent', parsedContent);
+  if (isLoading) return <PageContentSkeleton />;
 
-  if (isLoading) return <PageContentSkeleton />
-
-  return (
-    <div dangerouslySetInnerHTML={{ __html: parsedContent || '' }}></div>
-  )
-}
+  return <div dangerouslySetInnerHTML={{ __html: parsedContent || '' }}></div>;
+};
 
 const PageContentSkeleton = () => (
-  <div className="animate-pulse grid gap-y-4">
-    <div className="w-full h-10 bg-gray-300 rounded" />
-    <div className="h-2" />
-    <div className="w-full h-4 bg-gray-300 rounded" />
-    <div className="w-full h-4 bg-gray-300 rounded" />
-    <div className="w-full h-4 bg-gray-300 rounded" />
-    <div className="w-8/12 h-4 bg-gray-300 rounded" />
-    <div className="h-2" />
-    <div className="w-full h-4 bg-gray-300 rounded" />
-    <div className="w-full h-4 bg-gray-300 rounded" />
-    <div className="w-full h-4 bg-gray-300 rounded" />
-    <div className="w-1/2 h-4 bg-gray-300 rounded" />
+  <div className='animate-pulse grid gap-y-4'>
+    <div className='w-full h-10 bg-gray-300 rounded' />
+    <div className='h-2' />
+    <div className='w-full h-4 bg-gray-300 rounded' />
+    <div className='w-full h-4 bg-gray-300 rounded' />
+    <div className='w-full h-4 bg-gray-300 rounded' />
+    <div className='w-8/12 h-4 bg-gray-300 rounded' />
+    <div className='h-2' />
+    <div className='w-full h-4 bg-gray-300 rounded' />
+    <div className='w-full h-4 bg-gray-300 rounded' />
+    <div className='w-full h-4 bg-gray-300 rounded' />
+    <div className='w-1/2 h-4 bg-gray-300 rounded' />
   </div>
-)
+);
 
-export default PageContent
\ No newline at end of file
+export default PageContent;