Skip to content

display a "Loading" message while retrieving entities #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paxtonhare merged 1 commit into from
May 19, 2017
Merged

display a "Loading" message while retrieving entities #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions quick-start/src/main/ui/app/entity-modeler/entity-modeler.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
</div>
</div>
<div class="entities">
<div class="none" *ngIf="!entities || entities.length === 0">
<div class="none" *ngIf="!entitiesLoaded">
Loading entities...
</div>
<div class="none" *ngIf="entitiesLoaded && entities.length === 0">
You don't have any entities yet. Click the Wrench Icon to get started.
</div>
<svg #svgRoot *ngIf="entities" xmlns="http://www.w3.org/2000/svg">
<svg #svgRoot *ngIf="entitiesLoaded && entities" xmlns="http://www.w3.org/2000/svg">
<g class="nodes" [attr.transform]="mainTransform">
<g #entityDef *ngFor="let entity of entities"
class="entity-def"
Expand Down
2 changes: 2 additions & 0 deletions quick-start/src/main/ui/app/entity-modeler/entity-modeler.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export class EntityModelerComponent implements AfterViewChecked {
private svgRect: Rect;

public entities: Array<Entity>;
private entitiesLoaded: boolean = false;
private connections: Array<Connection> = [];
private entityMap: Map<string, Entity> = new Map<string, Entity>();
private draggingEntity: Entity;
Expand Down Expand Up @@ -139,6 +140,7 @@ export class EntityModelerComponent implements AfterViewChecked {

getEntities(): void {
this.entitiesService.entitiesChange.subscribe(entities => {
this.entitiesLoaded = true;
this.entities = entities;
this.entities.forEach((entity: Entity) => {
this.entityMap.set(entity.name, entity);
Expand Down