Skip to content

Commit 048a8a5

Browse files
Katherine BrownKatherine Brown
authored andcommitted
added layers to mock, display layers in events on one line seperated by commas
1 parent 0c606ad commit 048a8a5

File tree

3 files changed

+62
-32
lines changed

3 files changed

+62
-32
lines changed

plugins/arcgis/web-app/projects/main/src/lib/arc-event/arc-event.component.html

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,24 @@
1616
<mat-list-item class="arcEvent">
1717
<div class="arcEvent__info">
1818
<a href="/#/admin/events/{{event.id}}" target="_blank">{{event.name}}</a>
19-
20-
<div *ngIf="!event.layers.length" class="featureLayer_value">
21-
<div>This event is not synchronizing to any ArcGIS layers.</div>
22-
<br/>
23-
<mat-divider *ngIf="!last"></mat-divider>
19+
20+
<div *ngIf="event.layers.length; else noLayers">
21+
<div>
22+
<ng-container *ngFor="let featureLayer of event.layers; let i = index">
23+
{{ layerDisplay(featureLayer) }}<span *ngIf="i < event.layers.length - 1">, </span>
24+
</ng-container>
25+
</div>
2426
</div>
27+
28+
<ng-template #noLayers>
29+
<div>This event is not synchronizing to any ArcGIS layers.</div>
30+
</ng-template>
2531
</div>
2632
<div class="arcEvent__edit">
2733
<button mat-button color="primary" (click)="onEditEvent(event)">Edit</button>
2834
</div>
2935
</mat-list-item>
30-
31-
<mat-list *ngIf="event.layers.length">
32-
<mat-list-item *ngFor="let featureLayer of event.layers">
33-
<div>{{ layerDisplay(featureLayer) }}</div>
34-
<mat-divider></mat-divider>
35-
</mat-list-item>
36-
</mat-list>
37-
36+
<mat-divider *ngIf="!last"></mat-divider>
3837
</ng-container>
3938
</mat-list>
4039
</section>

plugins/arcgis/web-app/projects/main/src/lib/arc-event/arc-event.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
margin-top: 16px;
66
}
77

8+
.arc-event {
9+
mat-card-subtitle {
10+
margin-bottom: 0px;
11+
}
12+
}
13+
814
.arcEvent__info {
915
flex-grow: 1;
1016
}

plugins/arcgis/web-app/projects/showcase/src/app/arc.service.mock.ts

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,30 @@ export const mockArcGISEventResult3 = Object.freeze<MageEvent>({
3838
title: 'test field 3'
3939
}]
4040
}]
41-
})
41+
});
4242

4343
@Injectable({
4444
providedIn: 'root'
4545
})
46+
4647
export class MockArcService implements ArcServiceInterface {
4748
fetchFeatureServiceLayers(featureServiceUrl: string): Observable<FeatureLayer[]> {
48-
throw new Error("Method not implemented.");
49+
return of([
50+
{
51+
id: 1,
52+
name: 'Layer 1',
53+
geometryType: 'esriGeometryPoint',
54+
events: ['test event result name 1', 'test event result name 2']
55+
},
56+
{
57+
id: 2,
58+
name: 'Layer 2',
59+
geometryType: 'esriGeometryPolygon',
60+
events: ['test event result name 2']
61+
}
62+
]);
4963
}
64+
5065
fetchArcConfig(): Observable<ArcGISPluginConfig> {
5166
return of({
5267
enabled: true,
@@ -55,7 +70,21 @@ export class MockArcService implements ArcServiceInterface {
5570
startupIntervalSeconds: 1,
5671
updateIntervalSeconds: 1,
5772
batchSize: 100,
58-
featureServices: [],
73+
featureServices: [
74+
{
75+
url: 'https://mock.service.com/FeatureServer/0',
76+
layers: [
77+
{
78+
layer: 'Layer 1',
79+
events: ['test event result name 1', 'test event result name 2']
80+
},
81+
{
82+
layer: 'Layer 2',
83+
events: ['test event result name 2']
84+
}
85+
]
86+
}
87+
],
5988
attachmentModifiedTolerance: 5000,
6089
textFieldLength: 100,
6190
textAreaFieldLength: 256,
@@ -96,35 +125,31 @@ export class MockArcService implements ArcServiceInterface {
96125
fetchArcLayers(featureUrl: string) {
97126
return of({
98127
layers: [
99-
{
100-
id: 0,
101-
name: 'mage_sync',
102-
geometryType: 'esriGeometryPoint'
103-
},
104-
]
105-
}
106-
)
128+
{
129+
id: 0,
130+
name: 'mage_sync',
131+
geometryType: 'esriGeometryPoint'
132+
},
133+
]
134+
}
135+
)
107136
}
108137

109138
fetchEvents() {
110-
return of([mockArcGISEventResult1, mockArcGISEventResult2, mockArcGISEventResult3])
139+
return of([mockArcGISEventResult1, mockArcGISEventResult2, mockArcGISEventResult3]);
111140
}
112141

113142
fetchPopulatedEvents() {
114-
return of([mockArcGISEventResult1, mockArcGISEventResult2, mockArcGISEventResult3])
143+
return of([mockArcGISEventResult1, mockArcGISEventResult2, mockArcGISEventResult3]);
115144
}
116145

117146
putArcConfig(config: ArcGISPluginConfig) {}
118147

119148
removeUserTrack(userTrackId: string): Observable<ArcGISPluginConfig> {
120-
return of(
121-
defaultArcGISPluginConfig
122-
)
149+
return of(defaultArcGISPluginConfig);
123150
}
124151

125152
removeOperation(operationId: string): Observable<ArcGISPluginConfig> {
126-
return of(
127-
defaultArcGISPluginConfig
128-
)
153+
return of(defaultArcGISPluginConfig);
129154
}
130155
}

0 commit comments

Comments
 (0)