Skip to content

Optimize script editor #5650

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
bramkragten merged 1 commit into from
Apr 30, 2020
Merged

Optimize script editor #5650

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
16 changes: 8 additions & 8 deletions src/panels/config/automation/ha-config-automation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ import "./ha-automation-editor";
import "./ha-automation-picker";
import { debounce } from "../../../common/util/debounce";

const equal = (a: AutomationEntity[], b: AutomationEntity[]): boolean => {
if (a.length !== b.length) {
return false;
}
return a.every((automation, index) => automation === b[index]);
};

@customElement("ha-config-automation")
class HaConfigAutomation extends HassRouterPage {
@property() public hass!: HomeAssistant;
Expand All @@ -26,7 +33,7 @@ class HaConfigAutomation extends HassRouterPage {

private _debouncedUpdateAutomations = debounce((pageEl) => {
const newAutomations = this._getAutomations(this.hass.states);
if (!this._equal(newAutomations, pageEl.automations)) {
if (!equal(newAutomations, pageEl.automations)) {
pageEl.automations = newAutomations;
}
}, 10);
Expand Down Expand Up @@ -82,13 +89,6 @@ class HaConfigAutomation extends HassRouterPage {
pageEl.automationId = automationId === "new" ? null : automationId;
}
}

private _equal(a: AutomationEntity[], b: AutomationEntity[]): boolean {
if (a.length !== b.length) {
return false;
}
return a.every((automation, index) => automation === b[index]);
}
}

declare global {
Expand Down
46 changes: 28 additions & 18 deletions src/panels/config/script/ha-config-script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HassEntities, HassEntity } from "home-assistant-js-websocket";
import { HassEntities } from "home-assistant-js-websocket";
import { customElement, property, PropertyValues } from "lit-element";
import memoizeOne from "memoize-one";
import { computeStateDomain } from "../../../common/entity/compute_state_domain";
Expand All @@ -9,6 +9,15 @@ import {
import { HomeAssistant } from "../../../types";
import "./ha-script-editor";
import "./ha-script-picker";
import { debounce } from "../../../common/util/debounce";
import { ScriptEntity } from "../../../data/script";

const equal = (a: ScriptEntity[], b: ScriptEntity[]): boolean => {
if (a.length !== b.length) {
return false;
}
return a.every((enityA, index) => enityA === b[index]);
};

@customElement("ha-config-script")
class HaConfigScript extends HassRouterPage {
Expand All @@ -20,7 +29,7 @@ class HaConfigScript extends HassRouterPage {

@property() public showAdvanced!: boolean;

@property() public scripts: HassEntity[] = [];
@property() public scripts: ScriptEntity[] = [];

protected routerOptions: RouterOptions = {
defaultPage: "dashboard",
Expand All @@ -35,15 +44,18 @@ class HaConfigScript extends HassRouterPage {
},
};

private _computeScripts = memoizeOne((states: HassEntities) => {
const scripts: HassEntity[] = [];
Object.values(states).forEach((state) => {
if (computeStateDomain(state) === "script" && !state.attributes.hidden) {
scripts.push(state);
}
});
private _debouncedUpdateScripts = debounce((pageEl) => {
const newScript = this._getScripts(this.hass.states);
if (!equal(newScript, pageEl.scripts)) {
pageEl.scripts = newScript;
}
}, 10);

return scripts;
private _getScripts = memoizeOne((states: HassEntities): ScriptEntity[] => {
return Object.values(states).filter(
(entity) =>
computeStateDomain(entity) === "script" && !entity.attributes.hidden
) as ScriptEntity[];
});

protected firstUpdated(changedProps) {
Expand All @@ -59,7 +71,11 @@ class HaConfigScript extends HassRouterPage {
pageEl.showAdvanced = this.showAdvanced;

if (this.hass) {
pageEl.scripts = this._computeScripts(this.hass.states);
if (!pageEl.scripts || !changedProps) {
pageEl.scripts = this._getScripts(this.hass.states);
} else if (changedProps && changedProps.has("hass")) {
this._debouncedUpdateScripts(pageEl);
}
}

if (
Expand All @@ -68,13 +84,7 @@ class HaConfigScript extends HassRouterPage {
) {
pageEl.creatingNew = undefined;
const scriptEntityId = this.routeTail.path.substr(1);
pageEl.creatingNew = scriptEntityId === "new";
pageEl.script =
scriptEntityId === "new"
? undefined
: pageEl.scripts.find(
(entity: HassEntity) => entity.entity_id === scriptEntityId
);
pageEl.scriptEntityId = scriptEntityId === "new" ? null : scriptEntityId;
}
}
}
Expand Down
37 changes: 19 additions & 18 deletions src/panels/config/script/ha-script-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
deleteScript,
getScriptEditorInitData,
ScriptConfig,
ScriptEntity,
} from "../../../data/script";
import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
import "../../../layouts/ha-app-layout";
Expand All @@ -36,16 +35,14 @@ import { configSections } from "../ha-panel-config";
export class HaScriptEditor extends LitElement {
@property() public hass!: HomeAssistant;

@property() public script!: ScriptEntity;
@property() public scriptEntityId!: string;

@property() public route!: Route;

@property() public isWide?: boolean;

@property() public narrow!: boolean;

@property() public route!: Route;

@property() public creatingNew?: boolean;

@property() private _config?: ScriptConfig;

@property() private _dirty?: boolean;
Expand All @@ -61,7 +58,7 @@ export class HaScriptEditor extends LitElement {
.backCallback=${() => this._backTapped()}
.tabs=${configSections.automation}
>
${this.creatingNew
${!this.scriptEntityId
? ""
: html`
<paper-icon-button
Expand Down Expand Up @@ -161,18 +158,18 @@ export class HaScriptEditor extends LitElement {
protected updated(changedProps: PropertyValues): void {
super.updated(changedProps);

const oldScript = changedProps.get("script") as ScriptEntity;
const oldScript = changedProps.get("scriptEntityId");
if (
changedProps.has("script") &&
this.script &&
changedProps.has("scriptEntityId") &&
this.scriptEntityId &&
this.hass &&
// Only refresh config if we picked a new script. If same ID, don't fetch it.
(!oldScript || oldScript.entity_id !== this.script.entity_id)
(!oldScript || oldScript !== this.scriptEntityId)
) {
this.hass
.callApi<ScriptConfig>(
"GET",
`config/script/config/${computeObjectId(this.script.entity_id)}`
`config/script/config/${computeObjectId(this.scriptEntityId)}`
)
.then(
(config) => {
Expand Down Expand Up @@ -202,7 +199,11 @@ export class HaScriptEditor extends LitElement {
);
}

if (changedProps.has("creatingNew") && this.creatingNew && this.hass) {
if (
changedProps.has("scriptEntityId") &&
!this.scriptEntityId &&
this.hass
) {
const initData = getScriptEditorInitData();
this._dirty = !!initData;
this._config = {
Expand Down Expand Up @@ -259,19 +260,19 @@ export class HaScriptEditor extends LitElement {
}

private async _delete() {
await deleteScript(this.hass, computeObjectId(this.script.entity_id));
await deleteScript(this.hass, computeObjectId(this.scriptEntityId));
history.back();
}

private _saveScript(): void {
const id = this.creatingNew
? "" + Date.now()
: computeObjectId(this.script.entity_id);
const id = this.scriptEntityId
? computeObjectId(this.scriptEntityId)
: Date.now();
this.hass!.callApi("POST", "config/script/config/" + id, this._config).then(
() => {
this._dirty = false;

if (this.creatingNew) {
if (!this.scriptEntityId) {
navigate(this, `/config/script/edit/${id}`, true);
}
},
Expand Down