Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
b7597493
Commit
b7597493
authored
Jul 16, 2024
by
Max Alekseenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved the use of the hook to another place
parent
4cee52ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
15 deletions
+5
-15
useMarketplace.tsx
ui/marketplace/useMarketplace.tsx
+3
-2
useMarketplaceApps.tsx
ui/marketplace/useMarketplaceApps.tsx
+2
-13
No files found.
ui/marketplace/useMarketplace.tsx
View file @
b7597493
...
...
@@ -9,6 +9,7 @@ import useDebounce from 'lib/hooks/useDebounce';
import
*
as
mixpanel
from
'
lib/mixpanel/index
'
;
import
getQueryParamString
from
'
lib/router/getQueryParamString
'
;
import
useRatings
from
'
./Rating/useRatings
'
;
import
useMarketplaceApps
from
'
./useMarketplaceApps
'
;
import
useMarketplaceCategories
from
'
./useMarketplaceCategories
'
;
...
...
@@ -85,10 +86,10 @@ export default function useMarketplace() {
setSelectedCategoryId
(
newCategory
);
},
[]);
const
{
ratings
,
userRatings
,
rateApp
,
isSendingRating
,
isRatingLoading
,
canRate
}
=
useRatings
();
const
{
isPlaceholderData
,
isError
,
error
,
data
,
displayedApps
,
setSorting
,
userRatings
,
rateApp
,
isSendingRating
,
isRatingLoading
,
canRate
,
}
=
useMarketplaceApps
(
debouncedFilterQuery
,
selectedCategoryId
,
favoriteApps
,
isFavoriteAppsLoaded
);
}
=
useMarketplaceApps
(
debouncedFilterQuery
,
selectedCategoryId
,
favoriteApps
,
isFavoriteAppsLoaded
,
ratings
);
const
{
isPlaceholderData
:
isCategoriesPlaceholderData
,
data
:
categories
,
}
=
useMarketplaceCategories
(
data
,
isPlaceholderData
);
...
...
ui/marketplace/useMarketplaceApps.tsx
View file @
b7597493
import
{
useQuery
}
from
'
@tanstack/react-query
'
;
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
config
from
'
configs/app
'
;
...
...
@@ -10,7 +10,6 @@ import useApiFetch from 'lib/api/useApiFetch';
import
useFetch
from
'
lib/hooks/useFetch
'
;
import
{
MARKETPLACE_APP
}
from
'
stubs/marketplace
'
;
import
useRatings
from
'
./Rating/useRatings
'
;
import
useSecurityReports
from
'
./useSecurityReports
'
;
import
type
{
SortValue
}
from
'
./utils
'
;
...
...
@@ -56,12 +55,12 @@ export default function useMarketplaceApps(
selectedCategoryId
:
string
=
MarketplaceCategory
.
ALL
,
favoriteApps
:
Array
<
string
>
|
undefined
=
undefined
,
isFavoriteAppsLoaded
:
boolean
=
false
,
// eslint-disable-line @typescript-eslint/no-inferrable-types
ratings
:
Record
<
string
,
AppRating
>
|
undefined
=
undefined
,
)
{
const
fetch
=
useFetch
();
const
apiFetch
=
useApiFetch
();
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
const
[
snapshotFavoriteApps
,
setSnapshotFavoriteApps
]
=
React
.
useState
<
Array
<
string
>
|
undefined
>
();
...
...
@@ -122,11 +121,6 @@ export default function useMarketplaceApps(
isError
,
isPlaceholderData
:
isPlaceholderData
||
isSecurityReportsPlaceholderData
,
setSorting
,
userRatings
,
rateApp
,
isSendingRating
,
isRatingLoading
,
canRate
,
}),
[
data
,
displayedApps
,
...
...
@@ -135,10 +129,5 @@ export default function useMarketplaceApps(
isPlaceholderData
,
isSecurityReportsPlaceholderData
,
setSorting
,
userRatings
,
rateApp
,
isSendingRating
,
isRatingLoading
,
canRate
,
]);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment