Skip to content

Commit

Permalink
fixed formating issue
Browse files Browse the repository at this point in the history
  • Loading branch information
ronitjadhav committed Jan 17, 2024
1 parent 385a4a0 commit 4c64c0c
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 44 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex items-center mb-5">
<gn-ui-text-input
[(value)]="wmsUrl"
(valueChange)="urlChange.next($event);"
(valueChange)="urlChange.next($event)"
[hint]="'map.wms.urlInput.hint' | translate"
class="w-96"
>
Expand All @@ -18,39 +18,37 @@

<div *ngIf="!loading && layers.length > 0">
<h2 class="font-bold" translate>map.layers.available</h2>
<ng-container
*ngFor="let layer of layers"
[ngTemplateOutlet]="layerTreeItem"
[ngTemplateOutletContext]="{
layer: layer
}"
/>
<ng-container
*ngFor="let layer of layers"
[ngTemplateOutlet]="layerTreeItem"
[ngTemplateOutletContext]="{
layer: layer
}"
></ng-container>
</div>

<ng-template #layerTreeItem let-layer="layer">
<div class="flex items-center justify-between layer-tree-item my-2">
<p
class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap"
>
{{ layer.title }}
</p>
<gn-ui-button
*ngIf="layer.name"
class="layer-add-btn"
type="primary"
(buttonClick)="addLayer(layer)"
extraClass="text-sm !px-2 !py-1"
translate
><span translate> map.layer.add </span></gn-ui-button
>
</div>
<div class="flex items-center justify-between layer-tree-item my-2">
<p class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap">
{{ layer.title }}
</p>
<gn-ui-button
*ngIf="layer.name"
class="layer-add-btn"
type="primary"
(buttonClick)="addLayer(layer)"
extraClass="text-sm !px-2 !py-1"
translate
><span translate> map.layer.add </span></gn-ui-button
>
</div>
<div *ngIf="layer.children?.length > 0" class="ml-4">
<ng-container
*ngFor="let child of layer.children"
[ngTemplateOutlet]="layerTreeItem"
[ngTemplateOutletContext]="{
layer: child
}"
layer: child
}"
>
</ng-container>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import { By } from '@angular/platform-browser'

jest.mock('@camptocamp/ogc-client', () => ({
WmsEndpoint: class {
constructor(private url) {
}
constructor(private url) {}
isReady() {
if (this.url.indexOf('error') > -1) {
return Promise.reject(new Error('Something went wrong'))
Expand All @@ -32,8 +31,8 @@ jest.mock('@camptocamp/ogc-client', () => ({
{
name: 'layer3',
title: 'Layer 3',
}
]
},
],
},
]
}
Expand Down Expand Up @@ -75,7 +74,7 @@ describe('AddLayerFromWmsComponent', () => {
expect(component.layers).toEqual([])
})

describe('loadLayers', () =>{
describe('loadLayers', () => {
describe('while layers are loading', () => {
beforeEach(() => {
component.wmsUrl = 'http://my.service.org/wait'
Expand All @@ -95,18 +94,23 @@ describe('AddLayerFromWmsComponent', () => {
it('shows a list of layers', () => {
expect(component.errorMessage).toBeFalsy()
expect(component.loading).toBe(false)
expect(component.layers).toEqual([{
expect(component.layers).toEqual([
{
name: 'layer1',
title: 'Layer 1',
children: expect.any(Array)
}
children: expect.any(Array),
},
])
})
it('should show an Add layer button for each layer with a name', () => {
fixture.detectChanges()
const layerElts = fixture.debugElement.queryAll(By.css('.layer-tree-item'))
const layerElts = fixture.debugElement.queryAll(
By.css('.layer-tree-item')
)
expect(layerElts.length).toBe(3)
const hasButtons = layerElts.map(layerElt => !!layerElt.query(By.css('.layer-add-btn')))
const hasButtons = layerElts.map(
(layerElt) => !!layerElt.query(By.css('.layer-add-btn'))
)
expect(hasButtons).toEqual([true, false, true])
})
})
Expand All @@ -125,12 +129,12 @@ describe('AddLayerFromWmsComponent', () => {
})
describe('error and then valid service', () => {
beforeEach(async () => {
component.wmsUrl = 'http://my.service.org/error'
await component.loadLayers().catch(() => {
// do nothing
})
component.wmsUrl = 'http://my.service.org/wms'
await component.loadLayers()
component.wmsUrl = 'http://my.service.org/error'
await component.loadLayers().catch(() => {
// do nothing
})
component.wmsUrl = 'http://my.service.org/wms'
await component.loadLayers()
})
it('shows no error', () => {
expect(component.errorMessage).toBeFalsy()
Expand All @@ -146,15 +150,15 @@ describe('AddLayerFromWmsComponent', () => {
component.addLayer({
name: 'myLayer',
title: 'My Layer',
abstract: 'This is my layer'
abstract: 'This is my layer',
})
})
it('adds the selected layer in the current map context', () => {
expect(mapFacade.addLayer).toHaveBeenCalledWith({
name: 'myLayer',
title: 'My Layer',
type: 'wms',
url: 'http://my.service.org/wms'
url: 'http://my.service.org/wms',
})
})
})
Expand Down

0 comments on commit 4c64c0c

Please sign in to comment.