Fix prettier that keeps messing with merging dev (#7412)

This commit is contained in:
Zack Barett 2020-10-21 06:14:10 -05:00 committed by GitHub
parent 7e2dc04123
commit fb9bd0eb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 37 deletions

View File

@ -21,11 +21,11 @@ import { fetchHassioStats, HassioStats } from "../../../src/data/hassio/common";
import { HassioHostInfo } from "../../../src/data/hassio/host"; import { HassioHostInfo } from "../../../src/data/hassio/host";
import { haStyle } from "../../../src/resources/styles"; import { haStyle } from "../../../src/resources/styles";
import { HomeAssistant } from "../../../src/types"; import { HomeAssistant } from "../../../src/types";
import { bytesToString } from "../../../src/util/bytes-to-string";
import { import {
getValueInPercentage, getValueInPercentage,
roundWithOneDecimal, roundWithOneDecimal,
} from "../../../src/util/calculate"; } from "../../../src/util/calculate";
import { bytesToString } from "../../../src/util/bytes-to-string";
import { hassioStyle } from "../resources/hassio-style"; import { hassioStyle } from "../resources/hassio-style";
@customElement("hassio-system-metrics") @customElement("hassio-system-metrics")
@ -65,9 +65,7 @@ class HassioSystemMetrics extends LitElement {
{ {
description: "Used Space", description: "Used Space",
value: this._getUsedSpace(this.hostInfo), value: this._getUsedSpace(this.hostInfo),
tooltip: `${ tooltip: `${this.hostInfo.disk_used} GB/${this.hostInfo.disk_total} GB`,
this.hostInfo.disk_used
} GB/${this.hostInfo.disk_total} GB`,
}, },
]; ];

View File

@ -6,9 +6,9 @@ import {
CSSResult, CSSResult,
customElement, customElement,
html, html,
internalProperty,
LitElement, LitElement,
property, property,
internalProperty,
TemplateResult, TemplateResult,
} from "lit-element"; } from "lit-element";
import { fireEvent } from "../common/dom/fire_event"; import { fireEvent } from "../common/dom/fire_event";
@ -98,8 +98,7 @@ class HaMenuButton extends LitElement {
return; return;
} }
this.style.display = this.style.display = newNarrow || this._alwaysVisible ? "initial" : "none";
newNarrow || this._alwaysVisible ? "initial" : "none";
if (!newNarrow) { if (!newNarrow) {
this._hasNotifications = false; this._hasNotifications = false;

View File

@ -1,7 +1,7 @@
import "@material/mwc-fab";
import { mdiPlus } from "@mdi/js"; import { mdiPlus } from "@mdi/js";
import "@polymer/paper-item/paper-icon-item"; import "@polymer/paper-item/paper-icon-item";
import "@polymer/paper-item/paper-item-body"; import "@polymer/paper-item/paper-item-body";
import "@material/mwc-fab";
import { import {
css, css,
CSSResult, CSSResult,
@ -24,8 +24,8 @@ import {
} from "../../../data/person"; } from "../../../data/person";
import { fetchUsers, User } from "../../../data/user"; import { fetchUsers, User } from "../../../data/user";
import { import {
showConfirmationDialog,
showAlertDialog, showAlertDialog,
showConfirmationDialog,
} from "../../../dialogs/generic/show-dialog-box"; } from "../../../dialogs/generic/show-dialog-box";
import "../../../layouts/hass-loading-screen"; import "../../../layouts/hass-loading-screen";
import "../../../layouts/hass-tabs-subpage"; import "../../../layouts/hass-tabs-subpage";
@ -89,20 +89,14 @@ class HaConfigPerson extends LitElement {
: ""} : ""}
<a <a
href=${documentationUrl( href=${documentationUrl(this.hass, "/integrations/person/")}
this.hass,
"/integrations/person/"
)}
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
> >
${this.hass.localize( ${this.hass.localize("ui.panel.config.person.learn_more")}
"ui.panel.config.person.learn_more"
)}
</a> </a>
</span> </span>
<ha-card class="storage"> <ha-card class="storage">
${this._storageItems.map((entry) => { ${this._storageItems.map((entry) => {
return html` return html`

View File

@ -1,6 +1,12 @@
import "@material/mwc-fab"; import "@material/mwc-fab";
import "@material/mwc-icon-button"; import "@material/mwc-icon-button";
import { mdiCog, mdiContentDuplicate, mdiPlus, mdiRobot, mdiHelpCircle } from "@mdi/js"; import {
mdiCog,
mdiContentDuplicate,
mdiHelpCircle,
mdiPlus,
mdiRobot,
} from "@mdi/js";
import { import {
customElement, customElement,
html, html,
@ -24,15 +30,18 @@ import {
updateTag, updateTag,
UpdateTagParams, UpdateTagParams,
} from "../../../data/tag"; } from "../../../data/tag";
import { showConfirmationDialog, showAlertDialog } from "../../../dialogs/generic/show-dialog-box"; import {
showAlertDialog,
showConfirmationDialog,
} from "../../../dialogs/generic/show-dialog-box";
import { getExternalConfig } from "../../../external_app/external_config"; import { getExternalConfig } from "../../../external_app/external_config";
import "../../../layouts/hass-tabs-subpage-data-table"; import "../../../layouts/hass-tabs-subpage-data-table";
import { SubscribeMixin } from "../../../mixins/subscribe-mixin"; import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { HomeAssistant, Route } from "../../../types"; import { HomeAssistant, Route } from "../../../types";
import { documentationUrl } from "../../../util/documentation-url";
import { configSections } from "../ha-panel-config"; import { configSections } from "../ha-panel-config";
import { showTagDetailDialog } from "./show-dialog-tag-detail"; import { showTagDetailDialog } from "./show-dialog-tag-detail";
import "./tag-image"; import "./tag-image";
import { documentationUrl } from "../../../util/documentation-url";
export interface TagRowData extends Tag { export interface TagRowData extends Tag {
last_scanned_datetime: Date | null; last_scanned_datetime: Date | null;

View File

@ -34,7 +34,7 @@ const compareTokenLastUsedAt = (tokenA: RefreshToken, tokenB: RefreshToken) => {
return -1; return -1;
} }
return 0; return 0;
} };
@customElement("ha-refresh-tokens-card") @customElement("ha-refresh-tokens-card")
class HaRefreshTokens extends LitElement { class HaRefreshTokens extends LitElement {
@ -44,7 +44,9 @@ class HaRefreshTokens extends LitElement {
private _refreshTokens = memoizeOne( private _refreshTokens = memoizeOne(
(refreshTokens: RefreshToken[]): RefreshToken[] => (refreshTokens: RefreshToken[]): RefreshToken[] =>
refreshTokens?.filter((token) => token.type === "normal").sort(compareTokenLastUsedAt) refreshTokens
?.filter((token) => token.type === "normal")
.sort(compareTokenLastUsedAt)
); );
protected render(): TemplateResult { protected render(): TemplateResult {