Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: minor

Rich Turnerf65e53c03cab
diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.ts
index 3518b942f..e602f8465 100644
--- a/ui/component/or-input/src/index.ts
+++ b/ui/component/or-input/src/index.ts
@@ -112,12 +112,11 @@ const style = css`
}
#component {
- width: inherit;
max-width: 100%;
}
#menu-anchor {
- width: inherit;
+ max-width: 100%;
}
.or-input--rounded {
@@ -363,7 +362,7 @@ export class OrInput extends LitElement {
"mdc-select--outlined": outlined,
"mdc-select--disabled": this.disabled,
"mdc-select--required": this.required,
- "mdc-select--dense": this.dense,
+ "mdc-select--dense": false, // this.dense,
"mdc-select--no-label": !this.label,
"mdc-select--with-leading-icon": !!this.icon
};
@@ -427,12 +426,12 @@ export class OrInput extends LitElement {
"mdc-icon-button": isIconButton,
"mdc-fab": !isIconButton && this.action,
"mdc-fab--extended": !isIconButton && this.action && !!this.label,
- "mdc-fab--mini": !isIconButton && this.action && this.dense,
+ "mdc-fab--mini": !isIconButton && this.action, // && this.dense,
"mdc-button": !isIconButton && !this.action,
"mdc-button--raised": !isIconButton && !this.action && this.raised,
"mdc-button--unelevated": !isIconButton && !this.action && this.unElevated,
"mdc-button--outlined": !isIconButton && !this.action && this.outlined,
- "mdc-button--dense": !isIconButton && !this.action && this.dense,
+ "mdc-button--dense": false, // !isIconButton && !this.action && this.dense,
"or-input--rounded": !isIconButton && !this.action && this.rounded
};
return html`
@@ -449,8 +448,8 @@ export class OrInput extends LitElement {
}
case InputType.CHECKBOX:
return html`
- <div id="field" class="mdc-form-field ${this.dense ? "mdc-form-field--dense" : ""}">
- <div id="component" class="mdc-checkbox ${this.dense ? "mdc-checkbox--dense" : ""}">
+ <div id="field" class="mdc-form-field">
+ <div id="component" class="mdc-checkbox">
<input type="checkbox"
?checked="${this.value}"
?required="${this.required}"
@@ -509,7 +508,7 @@ export class OrInput extends LitElement {
"mdc-text-field--textarea": this.type === InputType.TEXTAREA || this.type === InputType.JSON,
"mdc-text-field--disabled": this.disabled,
"mdc-text-field--fullwidth": this.fullWidth,
- "mdc-text-field--dense": this.type !== InputType.TEXTAREA && this.type !== InputType.JSON && this.dense,
+ "mdc-text-field--dense": false, // this.type !== InputType.TEXTAREA && this.type !== InputType.JSON && this.dense,
"mdc-text-field--no-label": !this.label,
"mdc-text-field--with-leading-icon": !!this.icon,
"mdc-text-field--with-trailing-icon": !!this.iconTrailing
diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.ts
index b6ee4eb10..070f005ff 100644
--- a/ui/component/or-log-viewer/src/index.ts
+++ b/ui/component/or-log-viewer/src/index.ts
@@ -201,6 +201,7 @@ export class OrLogViewer extends translate(i18next)(LitElement) {
protected _refresh?: number;
protected _pageCount?: number;
protected _currentPage: number = 1;
+ protected _pendingCategories?: Model.SyslogCategory[];
connectedCallback() {
super.connectedCallback();
@@ -232,10 +233,6 @@ export class OrLogViewer extends translate(i18next)(LitElement) {
this.interval = OrLogViewer.DEFAULT_INTERVAL;
}
- if (!this.level) {
- this.level = OrLogViewer.DEFAULT_LEVEL;
- }
-
if (!this.limit) {
this.limit = OrLogViewer.DEFAULT_LIMIT;
}
@@ -248,12 +245,16 @@ export class OrLogViewer extends translate(i18next)(LitElement) {
}
}
- if (this.config && this.config.initialFilter) {
+ if (this.filter === undefined && this.config && this.config.initialFilter) {
this.filter = this.config.initialFilter;
}
- if (this.config && this.config.initialLevel) {
- this.level = this.config.initialLevel;
+ if (!this.level) {
+ if (this.config && this.config.initialLevel) {
+ this.level = this.config.initialLevel;
+ } else {
+ this.level = OrLogViewer.DEFAULT_LEVEL;
+ }
}
if (!this.live && !this.timestamp) {
@@ -291,9 +292,10 @@ export class OrLogViewer extends translate(i18next)(LitElement) {
this._getCategoryMenuItems(),
this.categories,
(v) => this._onCategoriesChanged(v as Model.SyslogCategory[]),
+ () => this._onCategoriesClosed(),
true
)}
- <or-input ?hidden="${hideFilter}" .type="${InputType.TEXT}" outlined ?disabled="${disabled}" icontrailing="magnify" .label="${i18next.t("subCategoryFilters")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onFilterChanged(evt.detail.value)}"></or-input>
+ <or-input ?hidden="${hideFilter}" .type="${InputType.TEXT}" outlined ?disabled="${disabled}" icontrailing="magnify" .label="${i18next.t("subCategoryFilters")}" .value="${this.filter}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onFilterChanged(evt.detail.value)}"></or-input>
<or-input ?hidden="${hideLevel}" .type="${InputType.SELECT}" id="level-select" outlined ?disabled="${disabled}" .label="${i18next.t("level")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onLevelChanged(evt.detail.value)}" .value="${this.level}" .options="${this._getLevelOptions()}"></or-input>
<or-input .type="${ InputType.SELECT}" id="limit-select" outlined ?disabled="${disabled}" .label="${i18next.t("limit")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onLimitChanged(evt.detail.value)}" .value="${this.limit}" .options="${this._getLimitOptions()}"></or-input>
</div>
@@ -341,11 +343,21 @@ export class OrLogViewer extends translate(i18next)(LitElement) {
}
protected _onCategoriesChanged(values: Model.SyslogCategory[]) {
- this.categories = [...values];
+ this._pendingCategories = values;
+ }
+
+ protected _onCategoriesClosed() {
+ if (!this._pendingCategories) {
+ return;
+ }
+
+ this.categories = [...this._pendingCategories];
if (this.categories && this.live) {
this._data = this._data!.filter((e) => this.categories!.find((c) => c === e.category));
}
+
+ this._pendingCategories = undefined;
}
protected _onLiveChanged(live: boolean) {
diff --git a/ui/component/or-mwc-components/src/or-mwc-menu.ts b/ui/component/or-mwc-components/src/or-mwc-menu.ts
index 8d1d44896..a961831a6 100644
--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts
@@ -40,13 +40,26 @@ export class OrMwcMenuChangedEvent extends CustomEvent<string | string[]> {
}
}
+export class OrMwcMenuClosedEvent extends CustomEvent<void> {
+
+ public static readonly NAME = "or-mwc-menu-closed";
+
+ constructor() {
+ super(OrMwcMenuClosedEvent.NAME, {
+ bubbles: true,
+ composed: true
+ });
+ }
+}
+
declare global {
export interface HTMLElementEventMap {
[OrMwcMenuChangedEvent.NAME]: OrMwcMenuChangedEvent;
+ [OrMwcMenuClosedEvent.NAME]: OrMwcMenuClosedEvent;
}
}
-export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (MenuItem | MenuItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, multiSelect = false): TemplateResult {
+export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (MenuItem | MenuItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, closedCallback?: () => void, multiSelect = false): TemplateResult {
const openMenu = (evt: Event) => {
if (!menuItems) {
@@ -59,7 +72,7 @@ export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (
return html`
<span>
<span @click="${openMenu}">${content}</span>
- ${menuItems ? html`<or-mwc-menu ?multiselect="${multiSelect}" @or-mwc-menu-changed="${(evt: OrMwcMenuChangedEvent) => valueChangedCallback(evt.detail)}" .values="${selectedValues}" .menuItems="${menuItems}" id="menu"></or-mwc-menu>` : ``}
+ ${menuItems ? html`<or-mwc-menu ?multiselect="${multiSelect}" @or-mwc-menu-closed="${() => {if (closedCallback) { closedCallback(); }} }" @or-mwc-menu-changed="${(evt: OrMwcMenuChangedEvent) => {if (valueChangedCallback) { valueChangedCallback(evt.detail); }} }" .values="${selectedValues}" .menuItems="${menuItems}" id="menu"></or-mwc-menu>` : ``}
</span>
`;
}
@@ -139,7 +152,7 @@ export class OrMwcMenu extends LitElement {
return html`
<div id="wrapper" class="mdc-menu-surface--anchor">
- <div class="mdc-menu mdc-menu-surface" id="menu">
+ <div class="mdc-menu mdc-menu-surface" id="menu" @MDCMenuSurface:closed="${this._onMenuClosed}">
<ul class="mdc-list ${this.twoLine ? "mdc-list--two-line" : ""}" role="menu" aria-hidden="true" aria-orientation="vertical" tabindex="-1">
${this.getItemsTemplate(this.menuItems)}
</ul>
@@ -233,6 +246,10 @@ export class OrMwcMenu extends LitElement {
}
}
+ protected _onMenuClosed() {
+ this.dispatchEvent(new OrMwcMenuClosedEvent());
+ }
+
private _itemClicked(e: MouseEvent, item: MenuItem) {
const value = item.value;