Skip to content
Commits on Source (6)
......@@ -44,8 +44,8 @@ e2e:base:
artifacts:
when: always
paths:
- cypress/screenshots/**/*.mp4
- cypress/videos/**/*.mp4
- cypress/screenshots
- cypress/videos
cache:
paths:
- .npm
......@@ -71,8 +71,8 @@ e2e:chrome:
artifacts:
when: always
paths:
- cypress/screenshots/**/*.mp4
- cypress/videos/**/*.mp4
- cypress/screenshots
- cypress/videos
cache:
paths:
- .npm
......
......@@ -43,7 +43,7 @@ export class EntitiesService {
if (!this.entities.has(feedItem.urn)) {
urnsToFetch.push(feedItem.urn);
}
if (this.entities.has(feedItem.urn) && !feedItem.entity) {
if (this.entities.has(feedItem.urn) && !feedItem.entity && feed.length < 20) {
urnsToResync.push(feedItem.urn);
}
}
......
......@@ -299,6 +299,6 @@ export class NewsfeedSortedComponent implements OnInit, OnDestroy {
// return false;
//}
return (i > 0 && (i % 5) === 0 && i <= 80) || i === 1;
return (i > 0 && (i % 5) === 0) || i === 1;
}
}
......@@ -11,7 +11,7 @@
<ng-container *ngFor="let activity$ of (feedsService.feed | async); let i = index">
<ng-container *mIfFeature="'es-feeds'">
<m-featured-content
*ngIf="(i > 0 && (i % 8) === 0 && i <= 40) || i === 2"
*ngIf="(i > 0 && (i % 5) === 0) || i === 2"
[slot]="i + 1"
></m-featured-content>
</ng-container>
......
......@@ -125,6 +125,12 @@ export class NewsfeedSubscribedComponent {
loadNext() {
if (this.featuresService.has('es-feeds')) {
if (this.feedsService.canFetchMore
&& !this.feedsService.inProgress.getValue()
&& this.feedsService.offset.getValue()
) {
this.feedsService.fetch(); // load the next 150 in the background
}
this.feedsService.loadMore();
} else {
this.loadLegacy();
......