Skip to content
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

Sonar cleanup #1545

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Sonar cleanup #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
327abc7
Sonar cleanup
dhlevi Jan 18, 2024
4f1dbd8
Merge branch 'main' into sonar-fixes
dhlevi Jan 18, 2024
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
1 change: 0 additions & 1 deletion ...p/components/dashboard-component/widgets/situation-widget/situation-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
padding: 20px;
display: flex;
max-height: 416px;
padding: 16;
flex-direction: column;
align-items: flex-start;
gap: 12px;
Expand Down
2 changes: 1 addition & 1 deletion ...full-details/area-restrictions-full-details/area-restrictions-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
alt="Location Pin" />{{restrictionData.fireCentre}}</div>
<div class="info"><img height="20" width="20" class="icon" src="/assets/images/svg-icons/carbon_calendar.svg"
alt="Calendar" />Discovered on {{incident.discoveryDate}}<img height="20" width="20" class="arrow-button"
src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
alt="icon" src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
</div>
</div>
<hr>
Expand Down
4 changes: 2 additions & 2 deletions ...pp/components/full-details/evac-alert-full-details/evac-alert-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
alt="Location Pin" />{{incident.fireCentreName}}</div>
<div class="info"><img class="icon" src="/assets/images/svg-icons/carbon_calendar.svg" alt="Calendar" />Discovered
on {{incident.discoveryDate}}<img (click)="navToIncident(incident)" class="arrow-button"
src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
alt="icon" src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
</div>
</div>
<br>
Expand Down Expand Up @@ -113,4 +113,4 @@
src="/assets/images/svg-icons/fluent_open.svg" alt="Launch" /></button>
</div>
<wfnews-evac-other-info></wfnews-evac-other-info>
</div>
</div>
4 changes: 2 additions & 2 deletions ...pp/components/full-details/evac-order-full-details/evac-order-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
alt="Location Pin" />{{incident.fireCentreName}}</div>
<div class="info"><img class="icon" src="/assets/images/svg-icons/carbon_calendar.svg"
alt="Calendar" />Discovered on {{incident.discoveryDate}}<img (click)="navToIncident(incident)"
class="arrow-button" src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
alt="icon" class="arrow-button" src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
</div>
</div>
<br>
Expand Down Expand Up @@ -138,4 +138,4 @@
src="/assets/images/svg-icons/fluent_open.svg" alt="Launch" /></button>
</div>
<wfnews-evac-other-info></wfnews-evac-other-info>
</div>
</div>
6 changes: 3 additions & 3 deletions ...public-incident-page/incident-info-panel-mobile/incident-info-panel-mobile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ <h1>Evacuations</h1>
<img class="icon" height="16" width="16" src="/assets/images/svg-icons/issuing_agency.svg"
alt="issuing_agency" />Issued by {{item.issuingAgency}}
<img height="20" (click)="navigateToEvac(item)" width="20" class="arrow-button-order"
src="/assets/images/svg-icons/forward-arrow-red.svg">
alt="icon" src="/assets/images/svg-icons/forward-arrow-red.svg">
</div>
</div>
</div>
Expand All @@ -182,7 +182,7 @@ <h1>Evacuations</h1>
src="/assets/images/svg-icons/issuing_agency.svg" alt="issuing_agency" />Issued by
{{item.issuingAgency}}
<img height="20" (click)="navigateToEvac(item)" width="20" class="arrow-button-alert"
src="/assets/images/svg-icons/forward-arrow-yellow.svg">
alt="icon" src="/assets/images/svg-icons/forward-arrow-yellow.svg">
</div>
</div>
</div>
Expand Down Expand Up @@ -212,7 +212,7 @@ <h1>Area Restrictions</h1>
src="/assets/images/svg-icons/calendar.svg" alt="calendar" />Issued on
{{convertToDateYear(area.accessStatusEffectiveDate)}}
<img (click)="navigateToAreaRestriction(area)" height="20" width="20" class="arrow-button-area"
src="/assets/images/svg-icons/forward-arrow-grey.svg">
alt="icon" src="/assets/images/svg-icons/forward-arrow-grey.svg">
</div>
</div>
</ng-template>
Expand Down
10 changes: 5 additions & 5 deletions ...p/components/saved/saved-location-full-details/saved-location-full-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<div class="saved-location-detail">
<div class="saved-detail">
<div class="saved-title">
<img class="location-icon"
<img class="location-icon" alt="icon"
src="/assets/images/svg-icons/carbon_partly-cloudy.svg">Current Weather
</div>
<div class="saved-subtitle">Today at {{stationHour}}</div>
<img (click)="navigateToWeather()" class="arrow-button-bottom"
<img (click)="navigateToWeather()" class="arrow-button-bottom" alt="icon"
src="/assets/images/svg-icons/forward-arrow-grey.svg">
</div>
</div>
Expand Down Expand Up @@ -169,7 +169,7 @@
<div class="subtitle">
<img class="icon" src="/assets/images/svg-icons/issuing_agency.svg" alt="issuing_agency" />Issued by
{{item.attributes.ISSUING_AGENCY}}
<img (click)="navigateToEvac(item)" class="arrow-button-order"
<img (click)="navigateToEvac(item)" class="arrow-button-order" alt="icon"
src="/assets/images/svg-icons/forward-arrow-red.svg">
</div>
</div>
Expand All @@ -184,7 +184,7 @@
<div class="subtitle"><img class="icon" src="/assets/images/svg-icons/issuing_agency.svg"
alt="issuing_agency" />Issued by
{{item.attributes.ISSUING_AGENCY}}
<img (click)="navigateToEvac(item)" class="arrow-button-alert"
<img (click)="navigateToEvac(item)" class="arrow-button-alert" alt="icon"
src="/assets/images/svg-icons/forward-arrow-yellow.svg">
</div>
</div>
Expand Down Expand Up @@ -215,7 +215,7 @@
<div class="info"><img class="icon" src="/assets/images/svg-icons/carbon_calendar.svg"
alt="Calendar" />Discovered on
{{convertToDateYear(incident.discoveryDate)}}<img (click)="navigateToFullDetails(incident)"
class="arrow-button" src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
alt="icon" class="arrow-button" src="/assets/images/svg-icons/forward-arrow-grey.svg"></div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...app/components/saved/saved-location-full-details/saved-location-full-details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ export class SavedLocationFullDetailsComponent implements OnInit {
)
.then((response) => {
if (response?.stationName) {
this.stationName = response.stationName;
this.stationName = response.stationName;
}
for (const hours of response?.hourly) {
for (const hours of response.hourly) {
if (hours.temp !== null) {
this.station = hours;
if (this.station?.hour) {
Expand Down
4 changes: 2 additions & 2 deletions client/wfnews-war/src/main/angular/src/app/services/wf-map.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ function defineEsriBasemap(
const orig = clone(L.esri.BasemapLayer.TILES[bm.id].options);
const bmly = window['L'].esri.basemapLayer(
bm.id,
clone({ ...bm.option, wfnewsId: id } || {}),
clone({ ...bm.option, wfnewsId: id }),
);
L.esri.BasemapLayer.TILES[bm.id].options = { ...orig, wfnewsId: id };
return bmly;
Expand Down Expand Up @@ -824,7 +824,7 @@ function defineEsriVectoLayer(
}
};*/
return baseMaps.map((bm) => {
const opts = clone({ ...bm.option, wfnewsId: id } || {});
const opts = clone({ ...bm.option, wfnewsId: id });
opts.cacheToken = function() {
return baseMapCacheToken;
};
Expand Down
Loading