Commit b7597493 authored by Max Alekseenko's avatar Max Alekseenko

moved the use of the hook to another place

parent 4cee52ce
...@@ -9,6 +9,7 @@ import useDebounce from 'lib/hooks/useDebounce'; ...@@ -9,6 +9,7 @@ import useDebounce from 'lib/hooks/useDebounce';
import * as mixpanel from 'lib/mixpanel/index'; import * as mixpanel from 'lib/mixpanel/index';
import getQueryParamString from 'lib/router/getQueryParamString'; import getQueryParamString from 'lib/router/getQueryParamString';
import useRatings from './Rating/useRatings';
import useMarketplaceApps from './useMarketplaceApps'; import useMarketplaceApps from './useMarketplaceApps';
import useMarketplaceCategories from './useMarketplaceCategories'; import useMarketplaceCategories from './useMarketplaceCategories';
...@@ -85,10 +86,10 @@ export default function useMarketplace() { ...@@ -85,10 +86,10 @@ export default function useMarketplace() {
setSelectedCategoryId(newCategory); setSelectedCategoryId(newCategory);
}, []); }, []);
const { ratings, userRatings, rateApp, isSendingRating, isRatingLoading, canRate } = useRatings();
const { const {
isPlaceholderData, isError, error, data, displayedApps, setSorting, isPlaceholderData, isError, error, data, displayedApps, setSorting,
userRatings, rateApp, isSendingRating, isRatingLoading, canRate, } = useMarketplaceApps(debouncedFilterQuery, selectedCategoryId, favoriteApps, isFavoriteAppsLoaded, ratings);
} = useMarketplaceApps(debouncedFilterQuery, selectedCategoryId, favoriteApps, isFavoriteAppsLoaded);
const { const {
isPlaceholderData: isCategoriesPlaceholderData, data: categories, isPlaceholderData: isCategoriesPlaceholderData, data: categories,
} = useMarketplaceCategories(data, isPlaceholderData); } = useMarketplaceCategories(data, isPlaceholderData);
......
import { useQuery } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import React from 'react'; import React from 'react';
import type { MarketplaceAppWithSecurityReport } from 'types/client/marketplace'; import type { MarketplaceAppWithSecurityReport, AppRating } from 'types/client/marketplace';
import { MarketplaceCategory } from 'types/client/marketplace'; import { MarketplaceCategory } from 'types/client/marketplace';
import config from 'configs/app'; import config from 'configs/app';
...@@ -10,7 +10,6 @@ import useApiFetch from 'lib/api/useApiFetch'; ...@@ -10,7 +10,6 @@ import useApiFetch from 'lib/api/useApiFetch';
import useFetch from 'lib/hooks/useFetch'; import useFetch from 'lib/hooks/useFetch';
import { MARKETPLACE_APP } from 'stubs/marketplace'; import { MARKETPLACE_APP } from 'stubs/marketplace';
import useRatings from './Rating/useRatings';
import useSecurityReports from './useSecurityReports'; import useSecurityReports from './useSecurityReports';
import type { SortValue } from './utils'; import type { SortValue } from './utils';
...@@ -56,12 +55,12 @@ export default function useMarketplaceApps( ...@@ -56,12 +55,12 @@ export default function useMarketplaceApps(
selectedCategoryId: string = MarketplaceCategory.ALL, selectedCategoryId: string = MarketplaceCategory.ALL,
favoriteApps: Array<string> | undefined = undefined, favoriteApps: Array<string> | undefined = undefined,
isFavoriteAppsLoaded: boolean = false, // eslint-disable-line @typescript-eslint/no-inferrable-types isFavoriteAppsLoaded: boolean = false, // eslint-disable-line @typescript-eslint/no-inferrable-types
ratings: Record<string, AppRating> | undefined = undefined,
) { ) {
const fetch = useFetch(); const fetch = useFetch();
const apiFetch = useApiFetch(); const apiFetch = useApiFetch();
const { data: securityReports, isPlaceholderData: isSecurityReportsPlaceholderData } = useSecurityReports(); const { data: securityReports, isPlaceholderData: isSecurityReportsPlaceholderData } = useSecurityReports();
const { ratings, userRatings, rateApp, isSendingRating, isRatingLoading, canRate } = useRatings();
// Set the value only 1 time to avoid unnecessary useQuery calls and re-rendering of all applications // Set the value only 1 time to avoid unnecessary useQuery calls and re-rendering of all applications
const [ snapshotFavoriteApps, setSnapshotFavoriteApps ] = React.useState<Array<string> | undefined>(); const [ snapshotFavoriteApps, setSnapshotFavoriteApps ] = React.useState<Array<string> | undefined>();
...@@ -122,11 +121,6 @@ export default function useMarketplaceApps( ...@@ -122,11 +121,6 @@ export default function useMarketplaceApps(
isError, isError,
isPlaceholderData: isPlaceholderData || isSecurityReportsPlaceholderData, isPlaceholderData: isPlaceholderData || isSecurityReportsPlaceholderData,
setSorting, setSorting,
userRatings,
rateApp,
isSendingRating,
isRatingLoading,
canRate,
}), [ }), [
data, data,
displayedApps, displayedApps,
...@@ -135,10 +129,5 @@ export default function useMarketplaceApps( ...@@ -135,10 +129,5 @@ export default function useMarketplaceApps(
isPlaceholderData, isPlaceholderData,
isSecurityReportsPlaceholderData, isSecurityReportsPlaceholderData,
setSorting, setSorting,
userRatings,
rateApp,
isSendingRating,
isRatingLoading,
canRate,
]); ]);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment