Skip to content

Fix generic http url overlap on chromium and webkit browsers #92

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
merged 1 commit into from
May 25, 2022
Merged

Fix generic http url overlap on chromium and webkit browsers #92

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
2 changes: 1 addition & 1 deletion ...ices/iot-device-detail/iot-device-detail-generic/iot-device-detail-generic.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h3>{{ 'IOTDEVICE.DETAIL' | translate }}</h3>
<mat-divider></mat-divider>
<p>
<strong>{{ 'IOTDEVICE.GENERIC_HTTP.APIKEY' | translate }}</strong>
<span class="pre">{{ getGenericHttpDeviceUrl(device) }}</span>
<span class="pre text-break">{{ httpDeviceUrl }}</span>
</p>
</ng-container>
<!-- Comment -->
Expand Down
8 changes: 5 additions & 3 deletions ...evices/iot-device-detail/iot-device-detail-generic/iot-device-detail-generic.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class IotDeviceDetailGenericComponent
@Input() longitude = 0;
deleteDevice = new EventEmitter();
baseUrl: string = environment.baseUrl;
httpDeviceUrl: string;

private readonly CHIRPSTACK_BATTERY_NOT_AVAILIBLE = 255;

Expand All @@ -43,6 +44,7 @@ export class IotDeviceDetailGenericComponent

ngOnChanges(changes: SimpleChanges): void {
this.batteryStatusPercentage = this.getBatteryProcentage();
this.httpDeviceUrl = this.getGenericHttpDeviceUrl();

if (
changes?.device?.previousValue?.metadata !==
Expand All @@ -66,7 +68,7 @@ export class IotDeviceDetailGenericComponent
};
}

getBatteryProcentage(): number {
private getBatteryProcentage(): number {
if (
this.device?.lorawanSettings?.deviceStatusBattery ===
this.CHIRPSTACK_BATTERY_NOT_AVAILIBLE
Expand All @@ -76,8 +78,8 @@ export class IotDeviceDetailGenericComponent
return Math.round(this.device?.lorawanSettings?.deviceStatusBattery);
}

getGenericHttpDeviceUrl(device: IotDevice): string {
return `${this.baseUrl}receive-data?apiKey=${device.apiKey}`;
private getGenericHttpDeviceUrl(): string {
return `${this.baseUrl}receive-data?apiKey=${this.device.apiKey}`;
}

ngOnDestroy(): void {}
Expand Down