@autobusal/providers 1.0.12 → 1.0.13

package/Setup/Preload.tsx

@@ -1,8 +1,5 @@
-import { useEffect } from 'react';
 import { Helmet } from 'react-helmet';
 import { SettingsData } from '../types';
-import { GetMenu } from '../services';
-import { useMenuStore } from '../stores/menu';
 
 interface Props {
   data: SettingsData
@@ -11,14 +8,6 @@ interface Props {
 
 // @todo: De adaugat din tema Favicons
 const Preload = ({ data, children }: Props): JSX.Element => {
-  const { data: MenuData } = GetMenu();
-
-  const menuStore = useMenuStore();
-
-  useEffect(() => {
-    menuStore.save(MenuData);
-  }, []);
-
   // we arrange the font family names before inserting them
   const fontTitle = data.theme.fontFamily.title.replace(/\ /g, '+');
   const fontContent = data.theme.fontFamily.content.replace(/\ /g, '+');

package/Setup/Setup.tsx

@@ -1,7 +1,7 @@
 import Preload from './Preload';
 import languages from './utilities/languages';
 import analytics from './utilities/analytics';
-import { GetSettings } from '../services';
+import { GetSettings, GetMenu } from '../services';
 
 interface Props {
   type: 'normal' | 'whitelabel'
@@ -11,6 +11,8 @@ interface Props {
 const Setup = ({ type, children }: Props): JSX.Element => {
   const { data } = GetSettings();
 
+  GetMenu();
+
   languages(type, data.preferences.languages.default);
 
   analytics(data.preferences.googleAnalyticsID);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/providers",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "type": "module",
   "main": "index.ts",
   "dependencies": {

package/services.ts

@@ -1,6 +1,7 @@
 import { useSuspenseQuery, UseSuspenseQueryResult } from '@tanstack/react-query';
 import apiClient from './Queries/apiClient';
 import { SettingsData, MenuData } from './types';
+import { useMenuStore } from './stores/menu';
 
 export const GetSettings = (): UseSuspenseQueryResult<SettingsData> => (
   useSuspenseQuery({
@@ -17,16 +18,20 @@ export const GetSettings = (): UseSuspenseQueryResult<SettingsData> => (
   })
 );
 
-export const GetMenu = (): UseSuspenseQueryResult<MenuData> => (
-  useSuspenseQuery({
+export const GetMenu = (): UseSuspenseQueryResult<MenuData> => {
+  const menuStore = useMenuStore();
+
+  return useSuspenseQuery({
     queryKey: ['get-menu'],
     queryFn: async () => (
       await apiClient
         .get('/api/menus/get')
-        .then(response => (
-          response.data
-        ))
+        .then(response => {
+          menuStore.save(response.data);
+
+          return {};
+        })
         .catch(() => {})
     )
   })
-);
+};