Skip to content
Snippets Groups Projects
Commit f595fda7 authored by William Welling's avatar William Welling
Browse files

using fixed RemoteData isLoading

parent f432fcb7
No related branches found
No related tags found
No related merge requests found
<div class="collection-page">
<div *ngIf="collectionData.hasSucceeded | async; else loadingCollection">
<div *ngIf="collectionData.hasSucceeded | async">
<!-- Collection Name -->
<ds-comcol-page-header
[name]="(collectionData.payload | async)?.name">
......@@ -31,9 +31,9 @@
[title]="'collection.page.license'">
</ds-comcol-page-content>
</div>
<ng-template #loadingCollection><ds-loading message="Loading collection..."></ds-loading></ng-template>
<ds-loading *ngIf="collectionData.isLoading | async" message="Loading collection..."></ds-loading>
<br>
<div *ngIf="itemData.hasSucceeded | async; else loadingItems">
<div *ngIf="itemData.hasSucceeded | async">
<h2>{{'collection.page.browse.recent.head' | translate}}</h2>
<ds-object-list
[config]="paginationConfig"
......@@ -42,5 +42,5 @@
[hideGear]="false">
</ds-object-list>
</div>
<ng-template #loadingItems><ds-loading message="Loading items..."></ds-loading></ng-template>
<ds-loading *ngIf="itemData.isLoading | async" message="Loading items..."></ds-loading>
</div>
<div class="community-page" *ngIf="communityData.hasSucceeded | async; else loadingCommunity">
<div class="community-page" *ngIf="communityData.hasSucceeded | async">
<!-- Community name -->
<ds-comcol-page-header [name]="(communityData.payload | async)?.name"></ds-comcol-page-header>
<!-- Community logo -->
......@@ -24,4 +24,4 @@
</ds-comcol-page-content>
<ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
</div>
<ng-template #loadingCommunity><ds-loading message="Loading community..."></ds-loading></ng-template>
<ds-loading *ngIf="communityData.isLoading | async" message="Loading community..."></ds-loading>
<!-- <div *ngIf="topLevelCommunities.hasSucceeded | async; else loadingCollections"> -->
<div *ngIf="topLevelCommunities.hasSucceeded | async">
<h2>{{'home.top-level-communities.head' | translate}}</h2>
<p class="lead">{{'home.top-level-communities.help' | translate}}</p>
......@@ -10,5 +9,4 @@
(paginationChange)="updatePage($event)">
</ds-object-list>
</div>
<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
<!-- <ng-template #loadingCollections><ds-loading message="Loading top level communities..."></ds-loading></ng-template> -->
\ No newline at end of file
<ds-loading *ngIf="topLevelCommunities.isLoading | async" message="Loading top level communities..."></ds-loading>
\ No newline at end of file
<div class="item-page" *ngIf="item.hasSucceeded | async; else loadingItem">
<div class="item-page" *ngIf="item.hasSucceeded | async">
<ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
<div class="simple-view-link">
<a class="btn btn-outline-primary col-4" [routerLink]="['/items/' + (item.payload | async)?.id]">
......@@ -17,4 +17,4 @@
<ds-item-page-full-file-section [item]="item.payload | async"></ds-item-page-full-file-section>
<ds-item-page-collections [item]="item.payload | async"></ds-item-page-collections>
</div>
<ng-template #loadingItem><ds-loading message="Loading item..."></ds-loading></ng-template>
<ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
<div class="item-page" *ngIf="item.hasSucceeded | async; else loadingItem">
<div class="item-page" *ngIf="item.hasSucceeded | async">
<ds-item-page-title-field [item]="item.payload | async"></ds-item-page-title-field>
<div class="row">
<div class="col-xs-12 col-md-4">
......@@ -21,4 +21,4 @@
</div>
</div>
</div>
<ng-template #loadingItem><ds-loading message="Loading item..."></ds-loading></ng-template>
<ds-loading *ngIf="item.isLoading | async" message="Loading item..."></ds-loading>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment