Skip to content

Commit

Permalink
Merge branch 'dev' into BHBC-1013_2
Browse files Browse the repository at this point in the history
  • Loading branch information
@anissa-agahchen
anissa-agahchen authored May 4, 2021
2 parents 8d6235a + b8cc500 commit 6cf813c
Show file tree
Hide file tree
Showing 21 changed files with 2,507 additions and 2,054 deletions.
2 changes: 1 addition & 1 deletion api/src/models/project-create.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ describe('PostObjectivesData', () => {
});

it('sets caveats', function () {
expect(projectObjectivesData.caveats).to.equal(null);
expect(projectObjectivesData.caveats).to.equal('');
});
});

Expand Down
2 changes: 1 addition & 1 deletion api/src/models/project-create.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export class PostObjectivesData {
defaultLog.debug({ label: 'PostObjectivesData', message: 'params', obj });

this.objectives = obj?.objectives || '';
this.caveats = obj?.caveats || null;
this.caveats = obj?.caveats || '';
}
}

Expand Down
6 changes: 3 additions & 3 deletions api/src/models/project-update.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,11 +702,11 @@ describe('GetObjectivesData', () => {
});

it('sets objectives', () => {
expect(data.objectives).to.equal(null);
expect(data.objectives).to.equal('');
});

it('sets caveats', () => {
expect(data.caveats).to.equal(null);
expect(data.caveats).to.equal('');
});

it('sets revision_count', () => {
Expand Down Expand Up @@ -754,7 +754,7 @@ describe('PutObjectivesData', () => {
});

it('sets caveats', () => {
expect(data.caveats).to.equal(null);
expect(data.caveats).to.equal('');
});

it('sets revision_count', () => {
Expand Down
6 changes: 3 additions & 3 deletions api/src/models/project-update.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export class PutObjectivesData {
defaultLog.debug({ label: 'PutObjectivesData', message: 'params', obj });

this.objectives = obj?.objectives || '';
this.caveats = obj?.caveats || null;
this.caveats = obj?.caveats || '';
this.revision_count = obj?.revision_count ?? null;
}
}
Expand Down Expand Up @@ -204,8 +204,8 @@ export class GetObjectivesData {
constructor(obj?: any) {
defaultLog.debug({ label: 'GetObjectivesData', message: 'params', obj });

this.objectives = obj?.objectives || null;
this.caveats = obj?.caveats || null;
this.objectives = obj?.objectives || '';
this.caveats = obj?.caveats || '';
this.revision_count = obj?.revision_count ?? null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/map/MapContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const MapContainer: React.FC<IMapContainerProps> = (props) => {
id={mapId}
center={[55, -128]}
zoom={5}
scrollWheelZoom={true}>
scrollWheelZoom={false}>
<MapBounds bounds={bounds} />

<FeatureGroup>
Expand Down
16 changes: 8 additions & 8 deletions app/src/components/map/__snapshots__/MapContainer.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ exports[`MapContainer matches the snapshot with draw controls hidden 1`] = `
<input
checked="checked"
class="leaflet-control-layers-selector"
name="leaflet-base-layers_95"
name="leaflet-base-layers_91"
type="radio"
/>
<span>
Expand All @@ -123,7 +123,7 @@ exports[`MapContainer matches the snapshot with draw controls hidden 1`] = `
<div>
<input
class="leaflet-control-layers-selector"
name="leaflet-base-layers_95"
name="leaflet-base-layers_91"
type="radio"
/>
<span>
Expand Down Expand Up @@ -397,7 +397,7 @@ exports[`MapContainer matches the snapshot with geometries being passed in 1`] =
<input
checked="checked"
class="leaflet-control-layers-selector"
name="leaflet-base-layers_49"
name="leaflet-base-layers_47"
type="radio"
/>
<span>
Expand All @@ -409,7 +409,7 @@ exports[`MapContainer matches the snapshot with geometries being passed in 1`] =
<div>
<input
class="leaflet-control-layers-selector"
name="leaflet-base-layers_49"
name="leaflet-base-layers_47"
type="radio"
/>
<span>
Expand Down Expand Up @@ -698,7 +698,7 @@ exports[`MapContainer matches the snapshot with non editable geos being passed i
<input
checked="checked"
class="leaflet-control-layers-selector"
name="leaflet-base-layers_80"
name="leaflet-base-layers_77"
type="radio"
/>
<span>
Expand All @@ -710,7 +710,7 @@ exports[`MapContainer matches the snapshot with non editable geos being passed i
<div>
<input
class="leaflet-control-layers-selector"
name="leaflet-base-layers_80"
name="leaflet-base-layers_77"
type="radio"
/>
<span>
Expand Down Expand Up @@ -984,7 +984,7 @@ exports[`MapContainer sets the bounds of the geo being passed in successfully 1`
<input
checked="checked"
class="leaflet-control-layers-selector"
name="leaflet-base-layers_162"
name="leaflet-base-layers_156"
type="radio"
/>
<span>
Expand All @@ -996,7 +996,7 @@ exports[`MapContainer sets the bounds of the geo being passed in successfully 1`
<div>
<input
class="leaflet-control-layers-selector"
name="leaflet-base-layers_162"
name="leaflet-base-layers_156"
type="radio"
/>
<span>
Expand Down
Loading

0 comments on commit 6cf813c

Please sign in to comment.