...
 
Commits (2)
......@@ -125,4 +125,9 @@ m-app {
padding-left: 8px;
}
}
}
\ No newline at end of file
}
.m-loader {
width: 100% ;
padding: 16px;
text-align: center;
}
......@@ -207,7 +207,7 @@
<ng-content select="[bottom-content]"></ng-content>
<div class="tabs" *ngIf="!hideTabs">
<div class="tabs" *ngIf="!hideTabs && !isPending(activity)">
<minds-button-thumbs-up [object]="activity"></minds-button-thumbs-up>
<minds-button-thumbs-down [object]="activity"></minds-button-thumbs-down>
<m-wire-button *ngIf="session.getLoggedInUser().guid != (activity.remind_object ? activity.remind_object.owner_guid : activity.owner_guid)"
......@@ -280,6 +280,6 @@
</div>
<!-- Pending block -->
<div class="mdl-card__supporting-text m-activity--pending" *ngIf="activity.pending && session.getLoggedInUser()?.guid == activity.owner_guid" i18n="@@MINDS__CARDS__ACTIVITY__AWAITING_MODERATION">
<div class="mdl-card__supporting-text m-activity--pending" *ngIf="isPending(activity)" i18n="@@MINDS__CARDS__ACTIVITY__AWAITING_MODERATION">
This post is awaiting moderation.
</div>
......@@ -404,6 +404,10 @@ export class Activity implements OnInit {
return activity && this.blockedUsers.indexOf(activity.owner_guid) > -1;
}
isPending(activity) {
return activity && activity.pending && activity.pending !== '0';
}
detectChanges() {
this.cd.markForCheck();
this.cd.detectChanges();
......
<div class="mdl-grid" style="max-width:900px; justify-content: center;">
<div class="m-loader" *ngIf="inProgress">
<div class="mdl-spinner mdl-js-spinner is-active" [mdl]></div>
</div>
<div class="m-error-splash" *ngIf="error && !inProgress">
<img [src]="minds.cdn_assets_url + 'assets/logos/logo.svg'">
<h3 class="mdl-color-text--red-300">{{error}}</h3>
......
......@@ -68,6 +68,8 @@ export class NewsfeedSingleComponent {
load(guid: string) {
this.context.set('activity');
this.inProgress = true;
const fetchSingleGuid = this.featuresService.has('sync-feeds') ?
this.loadFromFeedsService(guid) :
this.loadLegacy(guid);
......@@ -86,6 +88,8 @@ export class NewsfeedSingleComponent {
break;
}
this.inProgress = false;
if (this.activity.ownerObj) {
this.context.set('activity', {
label: `@${this.activity.ownerObj.username} posts`,
......@@ -102,12 +106,13 @@ export class NewsfeedSingleComponent {
}
})
.catch(e => {
this.inProgress = false;
if (e.status === 0) {
this.error = 'Sorry, there was a timeout error.';
} else {
this.error = 'Sorry, we couldn\'t load the activity';
}
this.inProgress = false;
});
}
......