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)
Pro activity feeds tweaks
· f91c12f8
Emiliano Balbuena
authored
Nov 27, 2019
and
Mark Harding
committed
Nov 27, 2019
f91c12f8
Merge branch 'goal/pro-activities-feed' into 'master'
· 56564e7b
Mark Harding
authored
Nov 27, 2019
Pro activity feeds tweaks See merge request
!673
56564e7b
Hide whitespace changes
Inline
Side-by-side
src/app/modules/pro/channel/channel.service.ts
View file @
56564e7b
...
...
@@ -157,7 +157,7 @@ export class ProChannelService implements OnDestroy {
throw
new
Error
(
'
No channel
'
);
}
const
endpoint
=
`api/v2/pro/content/
${
this
.
currentChannel
.
guid
}
/all
/top
`
;
const
endpoint
=
`api/v2/pro/content/
${
this
.
currentChannel
.
guid
}
/all`
;
const
qs
=
{
limit
:
params
.
limit
||
24
,
from_timestamp
:
params
.
offset
||
''
,
...
...
src/app/modules/pro/channel/list/list.component.ts
View file @
56564e7b
...
...
@@ -34,8 +34,6 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
entities
:
any
[]
=
[];
algorithm
:
string
;
query
:
string
;
period
:
string
;
...
...
@@ -97,7 +95,7 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
default
:
throw
new
Error
(
'
Unknown type
'
);
}
this
.
algorithm
=
params
[
'
algorithm
'
]
||
'
top
'
;
this
.
query
=
params
[
'
query
'
]
||
''
;
this
.
period
=
params
[
'
period
'
]
||
''
;
this
.
selectedHashtag
=
params
[
'
hashtag
'
]
||
'
all
'
;
...
...
@@ -149,7 +147,7 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
params
.
sync
=
1
;
}
let
url
=
`api/v2/pro/content/
${
this
.
channelService
.
currentChannel
.
guid
}
/
${
this
.
type
}
/
${
this
.
algorithm
}
`
;
let
url
=
`api/v2/pro/content/
${
this
.
channelService
.
currentChannel
.
guid
}
/
${
this
.
type
}
`
;
try
{
this
.
feedsService
...
...