fix: Fix styling and severity in status bar (#2352)
This commit is contained in:
@@ -48,7 +48,9 @@ export class StatusBarItemManager {
|
|||||||
: null;
|
: null;
|
||||||
const engineIcon = cameraMetadata?.engineIcon ?? null;
|
const engineIcon = cameraMetadata?.engineIcon ?? null;
|
||||||
const selectedResult = options?.view?.queryResults?.getSelectedResult();
|
const selectedResult = options?.view?.queryResults?.getSelectedResult();
|
||||||
const severity = selectedResult?.getSeverity() ?? null;
|
const severity = options?.view?.isViewerView()
|
||||||
|
? selectedResult?.getSeverity() ?? null
|
||||||
|
: null;
|
||||||
const title = options?.view?.is('live')
|
const title = options?.view?.is('live')
|
||||||
? cameraMetadata?.title ?? null
|
? cameraMetadata?.title ?? null
|
||||||
: options?.view?.isViewerView()
|
: options?.view?.isViewerView()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@use 'dark.scss';
|
@import 'dark.scss';
|
||||||
@use 'light.scss';
|
@import 'light.scss';
|
||||||
@use 'traditional.scss';
|
@import 'traditional.scss';
|
||||||
|
|
||||||
:host {
|
:host {
|
||||||
/*********
|
/*********
|
||||||
|
|||||||
@@ -241,26 +241,51 @@ describe('StatusBarItemManager', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should have severity', () => {
|
describe('severity', () => {
|
||||||
const manager = new StatusBarItemManager(createCardAPI());
|
it('should have severity in a viewer view', () => {
|
||||||
const selectedResult = new TestViewMedia({
|
const manager = new StatusBarItemManager(createCardAPI());
|
||||||
cameraID: 'camera-1',
|
const selectedResult = new TestViewMedia({
|
||||||
});
|
cameraID: 'camera-1',
|
||||||
vi.spyOn(selectedResult, 'getSeverity').mockReturnValue('high');
|
});
|
||||||
|
vi.spyOn(selectedResult, 'getSeverity').mockReturnValue('high');
|
||||||
|
|
||||||
const queryResults = new QueryResults({
|
const queryResults = new QueryResults({
|
||||||
results: [selectedResult],
|
results: [selectedResult],
|
||||||
selectedIndex: 0,
|
selectedIndex: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(
|
||||||
|
manager.calculateItems({
|
||||||
|
view: createView({ view: 'media', queryResults: queryResults }),
|
||||||
|
}),
|
||||||
|
).toContainEqual({
|
||||||
|
type: 'custom:advanced-camera-card-status-bar-icon' as const,
|
||||||
|
icon: 'mdi:circle-medium',
|
||||||
|
severity: 'high',
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(
|
it('should not have severity in live view', () => {
|
||||||
manager.calculateItems({
|
const manager = new StatusBarItemManager(createCardAPI());
|
||||||
view: createView({ queryResults: queryResults }),
|
const selectedResult = new TestViewMedia({
|
||||||
}),
|
cameraID: 'camera-1',
|
||||||
).toContainEqual({
|
});
|
||||||
type: 'custom:advanced-camera-card-status-bar-icon' as const,
|
vi.spyOn(selectedResult, 'getSeverity').mockReturnValue('high');
|
||||||
icon: 'mdi:circle-medium',
|
|
||||||
severity: 'high',
|
const queryResults = new QueryResults({
|
||||||
|
results: [selectedResult],
|
||||||
|
selectedIndex: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(
|
||||||
|
manager.calculateItems({
|
||||||
|
view: createView({ view: 'live', queryResults: queryResults }),
|
||||||
|
}),
|
||||||
|
).not.toContainEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
icon: 'mdi:circle-medium',
|
||||||
|
}),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user