Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
Fix onboarding issues in suggested channels and initial registering
· 85ea636d
Martin Santangelo
authored
Nov 21, 2019
and
Brian Hatchet
committed
Nov 21, 2019
85ea636d
Merge branch 'fix/onboarding-issues-suggested-channels-and-initial-load' into 'release/3.12.0'
· c2c67ff3
Brian Hatchet
authored
Nov 21, 2019
Fix onboarding issues in suggested channels and initial registering See merge request
!422
c2c67ff3
Hide whitespace changes
Inline
Side-by-side
src/onboarding/OnboardingScreen.js
View file @
c2c67ff3
...
...
@@ -30,6 +30,7 @@ import WelcomeStep from './steps/WelcomeStep';
import
{
CommonStyle
as
CS
}
from
'
../styles/Common
'
;
import
navigationService
from
'
../navigation/NavigationService
'
;
import
i18nService
from
'
../common/services/i18n.service
'
;
import
CenteredLoading
from
'
../common/components/CenteredLoading
'
;
@
observer
@
inject
(
'
onboarding
'
,
'
hashtag
'
)
...
...
@@ -59,6 +60,9 @@ export default class OnboardingScreen extends Component {
render
()
{
const
steps
=
[];
if
(
!
this
.
props
.
onboarding
.
progress
)
{
return
<
CenteredLoading
/>
}
const
completed_items
=
this
.
props
.
onboarding
.
progress
.
completed_items
;
// if (!completed_items.some(r => r == 'creator_frequency')) {
...
...
src/onboarding/OnboardingService.js
View file @
c2c67ff3
...
...
@@ -33,7 +33,7 @@ class OnboardingService {
* Get suggested users
*/
getSuggestedUsers
()
{
return
api
.
get
(
'
api/v2/suggestions
'
,
{
limit
:
12
});
return
api
.
get
(
'
api/v2/suggestions
/user
'
,
{
limit
:
12
});
}
}
...
...
src/onboarding/OnboardingStore.js
View file @
c2c67ff3
...
...
@@ -25,8 +25,14 @@ class OnboardingStore {
}
async
getSuggestedUsers
()
{
const
users
=
await
onboardingService
.
getSuggestedUsers
();
if
(
users
.
suggestions
)
this
.
suggestedUsers
.
list
.
setList
({
entities
:
users
.
suggestions
.
map
(
r
=>
UserModel
.
create
(
r
.
entity
))});
try
{
const
users
=
await
onboardingService
.
getSuggestedUsers
();
if
(
users
.
suggestions
)
{
this
.
suggestedUsers
.
list
.
setList
({
entities
:
users
.
suggestions
.
map
(
r
=>
UserModel
.
create
(
r
.
entity
))});
}
}
catch
(
err
)
{
console
.
log
(
err
);
}
}
/**
...
...
src/onboarding/steps/SuggestedChannelsStep.js
View file @
c2c67ff3
...
...
@@ -17,15 +17,14 @@ import i18n from '../../common/services/i18n.service';
@
observer
export
default
class
SuggestedChannelsStep
extends
Component
{
component
Will
Mount
()
{
component
Did
Mount
()
{
this
.
props
.
onboarding
.
suggestedUsers
.
list
.
clearList
();
this
.
props
.
onboarding
.
getSuggestedUsers
();
}
renderUser
=
(
user
)
=>
{
return
<
DiscoveryUser
store
=
{
this
.
props
.
onboarding
.
suggestedUsers
}
entity
=
{{
item
:
user
}}
row
=
{{
item
:
user
}}
key
=
{
user
.
guid
}
/
>
}
...
...