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
0b447d5d
Commit
0b447d5d
authored
Jul 17, 2024
by
Max Alekseenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename var
parent
ccc01ede
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
19 deletions
+19
-19
MarketplaceAppCard.tsx
ui/marketplace/MarketplaceAppCard.tsx
+3
-3
MarketplaceAppModal.pw.tsx
ui/marketplace/MarketplaceAppModal.pw.tsx
+1
-1
MarketplaceAppModal.tsx
ui/marketplace/MarketplaceAppModal.tsx
+3
-3
MarketplaceAppTopBar.tsx
ui/marketplace/MarketplaceAppTopBar.tsx
+2
-2
MarketplaceList.tsx
ui/marketplace/MarketplaceList.tsx
+3
-3
useRatings.tsx
ui/marketplace/Rating/useRatings.tsx
+1
-1
useMarketplace.tsx
ui/marketplace/useMarketplace.tsx
+3
-3
Marketplace.tsx
ui/pages/Marketplace.tsx
+3
-3
No files found.
ui/marketplace/MarketplaceAppCard.tsx
View file @
0b447d5d
...
@@ -23,7 +23,7 @@ interface Props extends MarketplaceAppWithSecurityReport {
...
@@ -23,7 +23,7 @@ interface Props extends MarketplaceAppWithSecurityReport {
showContractList
:
(
id
:
string
,
type
:
ContractListTypes
)
=>
void
;
showContractList
:
(
id
:
string
,
type
:
ContractListTypes
)
=>
void
;
userRating
?:
AppRating
;
userRating
?:
AppRating
;
rateApp
:
RateFunction
;
rateApp
:
RateFunction
;
is
SendingRat
ing
:
boolean
;
is
RatingSend
ing
:
boolean
;
isRatingLoading
:
boolean
;
isRatingLoading
:
boolean
;
canRate
:
boolean
|
undefined
;
canRate
:
boolean
|
undefined
;
}
}
...
@@ -49,7 +49,7 @@ const MarketplaceAppCard = ({
...
@@ -49,7 +49,7 @@ const MarketplaceAppCard = ({
rating
,
rating
,
userRating
,
userRating
,
rateApp
,
rateApp
,
is
SendingRat
ing
,
is
RatingSend
ing
,
isRatingLoading
,
isRatingLoading
,
canRate
,
canRate
,
}:
Props
)
=>
{
}:
Props
)
=>
{
...
@@ -176,7 +176,7 @@ const MarketplaceAppCard = ({
...
@@ -176,7 +176,7 @@ const MarketplaceAppCard = ({
rating=
{
rating
}
rating=
{
rating
}
userRating=
{
userRating
}
userRating=
{
userRating
}
rate=
{
rateApp
}
rate=
{
rateApp
}
isSending=
{
is
SendingRat
ing
}
isSending=
{
is
RatingSend
ing
}
isLoading=
{
isRatingLoading
}
isLoading=
{
isRatingLoading
}
canRate=
{
canRate
}
canRate=
{
canRate
}
source=
"Discovery"
source=
"Discovery"
...
...
ui/marketplace/MarketplaceAppModal.pw.tsx
View file @
0b447d5d
...
@@ -23,7 +23,7 @@ const props = {
...
@@ -23,7 +23,7 @@ const props = {
isFavorite
:
false
,
isFavorite
:
false
,
userRating
:
undefined
,
userRating
:
undefined
,
rateApp
:
()
=>
{},
rateApp
:
()
=>
{},
is
SendingRat
ing
:
false
,
is
RatingSend
ing
:
false
,
isRatingLoading
:
false
,
isRatingLoading
:
false
,
canRate
:
undefined
,
canRate
:
undefined
,
};
};
...
...
ui/marketplace/MarketplaceAppModal.tsx
View file @
0b447d5d
...
@@ -30,7 +30,7 @@ type Props = {
...
@@ -30,7 +30,7 @@ type Props = {
showContractList
:
(
id
:
string
,
type
:
ContractListTypes
,
hasPreviousStep
:
boolean
)
=>
void
;
showContractList
:
(
id
:
string
,
type
:
ContractListTypes
,
hasPreviousStep
:
boolean
)
=>
void
;
userRating
?:
AppRating
;
userRating
?:
AppRating
;
rateApp
:
RateFunction
;
rateApp
:
RateFunction
;
is
SendingRat
ing
:
boolean
;
is
RatingSend
ing
:
boolean
;
isRatingLoading
:
boolean
;
isRatingLoading
:
boolean
;
canRate
:
boolean
|
undefined
;
canRate
:
boolean
|
undefined
;
}
}
...
@@ -43,7 +43,7 @@ const MarketplaceAppModal = ({
...
@@ -43,7 +43,7 @@ const MarketplaceAppModal = ({
showContractList
:
showContractListProp
,
showContractList
:
showContractListProp
,
userRating
,
userRating
,
rateApp
,
rateApp
,
is
SendingRat
ing
,
is
RatingSend
ing
,
isRatingLoading
,
isRatingLoading
,
canRate
,
canRate
,
}:
Props
)
=>
{
}:
Props
)
=>
{
...
@@ -176,7 +176,7 @@ const MarketplaceAppModal = ({
...
@@ -176,7 +176,7 @@ const MarketplaceAppModal = ({
rating=
{
rating
}
rating=
{
rating
}
userRating=
{
userRating
}
userRating=
{
userRating
}
rate=
{
rateApp
}
rate=
{
rateApp
}
isSending=
{
is
SendingRat
ing
}
isSending=
{
is
RatingSend
ing
}
isLoading=
{
isRatingLoading
}
isLoading=
{
isRatingLoading
}
fullView
fullView
canRate=
{
canRate
}
canRate=
{
canRate
}
...
...
ui/marketplace/MarketplaceAppTopBar.tsx
View file @
0b447d5d
...
@@ -33,7 +33,7 @@ const MarketplaceAppTopBar = ({ appId, data, isLoading, securityReport }: Props)
...
@@ -33,7 +33,7 @@ const MarketplaceAppTopBar = ({ appId, data, isLoading, securityReport }: Props)
const
appProps
=
useAppContext
();
const
appProps
=
useAppContext
();
const
isMobile
=
useIsMobile
();
const
isMobile
=
useIsMobile
();
const
{
ratings
,
userRatings
,
rateApp
,
is
SendingRat
ing
,
isRatingLoading
,
canRate
}
=
useRatings
();
const
{
ratings
,
userRatings
,
rateApp
,
is
RatingSend
ing
,
isRatingLoading
,
canRate
}
=
useRatings
();
const
goBackUrl
=
React
.
useMemo
(()
=>
{
const
goBackUrl
=
React
.
useMemo
(()
=>
{
if
(
appProps
.
referrer
&&
appProps
.
referrer
.
includes
(
'
/apps
'
)
&&
!
appProps
.
referrer
.
includes
(
'
/apps/
'
))
{
if
(
appProps
.
referrer
&&
appProps
.
referrer
.
includes
(
'
/apps
'
)
&&
!
appProps
.
referrer
.
includes
(
'
/apps/
'
))
{
...
@@ -92,7 +92,7 @@ const MarketplaceAppTopBar = ({ appId, data, isLoading, securityReport }: Props)
...
@@ -92,7 +92,7 @@ const MarketplaceAppTopBar = ({ appId, data, isLoading, securityReport }: Props)
rating=
{
ratings
[
appId
]
}
rating=
{
ratings
[
appId
]
}
userRating=
{
userRatings
[
appId
]
}
userRating=
{
userRatings
[
appId
]
}
rate=
{
rateApp
}
rate=
{
rateApp
}
isSending=
{
is
SendingRat
ing
}
isSending=
{
is
RatingSend
ing
}
isLoading=
{
isRatingLoading
}
isLoading=
{
isRatingLoading
}
canRate=
{
canRate
}
canRate=
{
canRate
}
source=
"App page"
source=
"App page"
...
...
ui/marketplace/MarketplaceList.tsx
View file @
0b447d5d
...
@@ -22,14 +22,14 @@ type Props = {
...
@@ -22,14 +22,14 @@ type Props = {
showContractList
:
(
id
:
string
,
type
:
ContractListTypes
)
=>
void
;
showContractList
:
(
id
:
string
,
type
:
ContractListTypes
)
=>
void
;
userRatings
:
Record
<
string
,
AppRating
>
;
userRatings
:
Record
<
string
,
AppRating
>
;
rateApp
:
RateFunction
;
rateApp
:
RateFunction
;
is
SendingRat
ing
:
boolean
;
is
RatingSend
ing
:
boolean
;
isRatingLoading
:
boolean
;
isRatingLoading
:
boolean
;
canRate
:
boolean
|
undefined
;
canRate
:
boolean
|
undefined
;
}
}
const
MarketplaceList
=
({
const
MarketplaceList
=
({
apps
,
showAppInfo
,
favoriteApps
,
onFavoriteClick
,
isLoading
,
selectedCategoryId
,
apps
,
showAppInfo
,
favoriteApps
,
onFavoriteClick
,
isLoading
,
selectedCategoryId
,
onAppClick
,
showContractList
,
userRatings
,
rateApp
,
is
SendingRat
ing
,
isRatingLoading
,
canRate
,
onAppClick
,
showContractList
,
userRatings
,
rateApp
,
is
RatingSend
ing
,
isRatingLoading
,
canRate
,
}:
Props
)
=>
{
}:
Props
)
=>
{
const
{
cutRef
,
renderedItemsNum
}
=
useLazyRenderedList
(
apps
,
!
isLoading
,
16
);
const
{
cutRef
,
renderedItemsNum
}
=
useLazyRenderedList
(
apps
,
!
isLoading
,
16
);
...
@@ -74,7 +74,7 @@ const MarketplaceList = ({
...
@@ -74,7 +74,7 @@ const MarketplaceList = ({
rating=
{
app
.
rating
}
rating=
{
app
.
rating
}
userRating=
{
userRatings
[
app
.
id
]
}
userRating=
{
userRatings
[
app
.
id
]
}
rateApp=
{
rateApp
}
rateApp=
{
rateApp
}
is
SendingRating=
{
isSendingRat
ing
}
is
RatingSending=
{
isRatingSend
ing
}
isRatingLoading=
{
isRatingLoading
}
isRatingLoading=
{
isRatingLoading
}
canRate=
{
canRate
}
canRate=
{
canRate
}
/>
/>
...
...
ui/marketplace/Rating/useRatings.tsx
View file @
0b447d5d
...
@@ -170,7 +170,7 @@ export default function useRatings() {
...
@@ -170,7 +170,7 @@ export default function useRatings() {
ratings
,
ratings
,
userRatings
,
userRatings
,
rateApp
,
rateApp
,
is
SendingRat
ing
:
isSending
,
is
RatingSend
ing
:
isSending
,
isRatingLoading
,
isRatingLoading
,
isUserRatingLoading
,
isUserRatingLoading
,
canRate
,
canRate
,
...
...
ui/marketplace/useMarketplace.tsx
View file @
0b447d5d
...
@@ -86,7 +86,7 @@ export default function useMarketplace() {
...
@@ -86,7 +86,7 @@ export default function useMarketplace() {
setSelectedCategoryId
(
newCategory
);
setSelectedCategoryId
(
newCategory
);
},
[]);
},
[]);
const
{
ratings
,
userRatings
,
rateApp
,
is
SendingRat
ing
,
isRatingLoading
,
canRate
}
=
useRatings
();
const
{
ratings
,
userRatings
,
rateApp
,
is
RatingSend
ing
,
isRatingLoading
,
canRate
}
=
useRatings
();
const
{
const
{
isPlaceholderData
,
isError
,
error
,
data
,
displayedApps
,
setSorting
,
isPlaceholderData
,
isError
,
error
,
data
,
displayedApps
,
setSorting
,
}
=
useMarketplaceApps
(
debouncedFilterQuery
,
selectedCategoryId
,
favoriteApps
,
isFavoriteAppsLoaded
,
ratings
);
}
=
useMarketplaceApps
(
debouncedFilterQuery
,
selectedCategoryId
,
favoriteApps
,
isFavoriteAppsLoaded
,
ratings
);
...
@@ -155,7 +155,7 @@ export default function useMarketplace() {
...
@@ -155,7 +155,7 @@ export default function useMarketplace() {
setSorting
,
setSorting
,
userRatings
,
userRatings
,
rateApp
,
rateApp
,
is
SendingRat
ing
,
is
RatingSend
ing
,
isRatingLoading
,
isRatingLoading
,
canRate
,
canRate
,
}),
[
}),
[
...
@@ -183,7 +183,7 @@ export default function useMarketplace() {
...
@@ -183,7 +183,7 @@ export default function useMarketplace() {
setSorting
,
setSorting
,
userRatings
,
userRatings
,
rateApp
,
rateApp
,
is
SendingRat
ing
,
is
RatingSend
ing
,
isRatingLoading
,
isRatingLoading
,
canRate
,
canRate
,
]);
]);
...
...
ui/pages/Marketplace.tsx
View file @
0b447d5d
...
@@ -72,7 +72,7 @@ const Marketplace = () => {
...
@@ -72,7 +72,7 @@ const Marketplace = () => {
setSorting
,
setSorting
,
userRatings
,
userRatings
,
rateApp
,
rateApp
,
is
SendingRat
ing
,
is
RatingSend
ing
,
isRatingLoading
,
isRatingLoading
,
canRate
,
canRate
,
}
=
useMarketplace
();
}
=
useMarketplace
();
...
@@ -221,7 +221,7 @@ const Marketplace = () => {
...
@@ -221,7 +221,7 @@ const Marketplace = () => {
showContractList=
{
showContractList
}
showContractList=
{
showContractList
}
userRatings=
{
userRatings
}
userRatings=
{
userRatings
}
rateApp=
{
rateApp
}
rateApp=
{
rateApp
}
is
SendingRating=
{
isSendingRat
ing
}
is
RatingSending=
{
isRatingSend
ing
}
isRatingLoading=
{
isRatingLoading
}
isRatingLoading=
{
isRatingLoading
}
canRate=
{
canRate
}
canRate=
{
canRate
}
/>
/>
...
@@ -235,7 +235,7 @@ const Marketplace = () => {
...
@@ -235,7 +235,7 @@ const Marketplace = () => {
showContractList=
{
showContractList
}
showContractList=
{
showContractList
}
userRating=
{
userRatings
[
selectedApp
.
id
]
}
userRating=
{
userRatings
[
selectedApp
.
id
]
}
rateApp=
{
rateApp
}
rateApp=
{
rateApp
}
is
SendingRating=
{
isSendingRat
ing
}
is
RatingSending=
{
isRatingSend
ing
}
isRatingLoading=
{
isRatingLoading
}
isRatingLoading=
{
isRatingLoading
}
canRate=
{
canRate
}
canRate=
{
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