Handle (invalid) null hass objects.
This commit is contained in:
@@ -16,7 +16,7 @@ export class HASSManager {
|
||||
return this._hass;
|
||||
}
|
||||
|
||||
public setHASS(hass: ExtendedHomeAssistant): void {
|
||||
public setHASS(hass?: ExtendedHomeAssistant | null): void {
|
||||
const getSelectedCameraConfig = (): CameraConfig | null => {
|
||||
const view = this._api.getViewManager().getView();
|
||||
const cameraManager = this._api.getCameraManager();
|
||||
@@ -26,13 +26,8 @@ export class HASSManager {
|
||||
: null;
|
||||
};
|
||||
|
||||
const oldHass = this._hass;
|
||||
this._hass = hass;
|
||||
|
||||
const selectedCamera = getSelectedCameraConfig();
|
||||
|
||||
if (hasHAConnectionStateChanged(oldHass, hass)) {
|
||||
if (!this._hass?.connected) {
|
||||
if (hasHAConnectionStateChanged(this._hass, hass)) {
|
||||
if (!hass?.connected) {
|
||||
this._api.getMessageManager().setMessageIfHigherPriority({
|
||||
message: localize('error.reconnecting'),
|
||||
icon: 'mdi:lan-disconnect',
|
||||
@@ -40,9 +35,18 @@ export class HASSManager {
|
||||
dotdotdot: true,
|
||||
});
|
||||
} else {
|
||||
this._api.getViewManager().setViewDefault();
|
||||
this._api.getMessageManager().resetType('connection');
|
||||
}
|
||||
} else if (
|
||||
}
|
||||
|
||||
if (!hass) {
|
||||
return;
|
||||
}
|
||||
|
||||
const oldHass = this._hass;
|
||||
this._hass = hass;
|
||||
|
||||
if (
|
||||
// Home Assistant pumps a lot of updates through. Re-rendering the card is
|
||||
// necessary at times (e.g. to update the 'clip' view as new clips
|
||||
// arrive), but also is a jarring experience for the user (e.g. if they
|
||||
@@ -52,7 +56,7 @@ export class HASSManager {
|
||||
this._isAutomatedViewUpdateAllowed() &&
|
||||
isHassDifferent(this._hass, oldHass, [
|
||||
...(this._api.getConfigManager().getConfig()?.view.update_entities ?? []),
|
||||
...(selectedCamera?.triggers.entities ?? []),
|
||||
...(getSelectedCameraConfig()?.triggers.entities ?? []),
|
||||
])
|
||||
) {
|
||||
// If entities being monitored have changed then reset the view to the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FrigateCardError, MESSAGE_TYPE_PRIORITIES, Message } from '../types';
|
||||
import { FrigateCardError, MESSAGE_TYPE_PRIORITIES, Message, MessageType } from '../types';
|
||||
import { errorToConsole } from '../utils/basic';
|
||||
import { CardMessageAPI } from './types';
|
||||
|
||||
@@ -31,6 +31,12 @@ export class MessageManager {
|
||||
}
|
||||
}
|
||||
|
||||
public resetType(type: MessageType): void {
|
||||
if (this._message?.type === type) {
|
||||
this.reset();
|
||||
}
|
||||
}
|
||||
|
||||
public setErrorIfHigherPriority(error: unknown): void {
|
||||
// This object should accept unknown objects to be able to seamlessly
|
||||
// process arguments to catch() which can only be unknown/any.
|
||||
|
||||
@@ -375,8 +375,5 @@ export const hasHAConnectionStateChanged = (
|
||||
oldHass: HomeAssistant | undefined | null,
|
||||
newHass: HomeAssistant | undefined | null,
|
||||
): boolean => {
|
||||
return (
|
||||
(!oldHass && !newHass?.connected) ||
|
||||
(!!oldHass && oldHass.connected !== !!newHass?.connected)
|
||||
);
|
||||
return oldHass?.connected !== newHass?.connected;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user