Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/data/script.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const showScriptEditor = (
data?: Partial<ScriptConfig>
) => {
inititialScriptEditorData = data;
navigate(el, "/config/script/new");
navigate(el, "/config/script/edit/new");
};

export const getScriptEditorInitData = () => {
Expand Down
113 changes: 0 additions & 113 deletions src/panels/config/script/ha-config-script.js

This file was deleted.

77 changes: 77 additions & 0 deletions src/panels/config/script/ha-config-script.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import { HassEntities, HassEntity } 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";
import {
HassRouterPage,
RouterOptions,
} from "../../../layouts/hass-router-page";
import { HomeAssistant } from "../../../types";
import "./ha-script-editor";
import "./ha-script-picker";

@customElement("ha-config-script")
class HaConfigScript extends HassRouterPage {
@property() public hass!: HomeAssistant;
@property() public narrow!: boolean;
@property() public isWide!: boolean;
@property() public showAdvanced!: boolean;
@property() public scripts: HassEntity[] = [];

protected routerOptions: RouterOptions = {
defaultPage: "dashboard",
routes: {
dashboard: {
tag: "ha-script-picker",
cache: true,
},
edit: {
tag: "ha-script-editor",
},
},
};

private _computeScripts = memoizeOne((states: HassEntities) => {
const scripts: HassEntity[] = [];
Object.values(states).forEach((state) => {
if (computeStateDomain(state) === "script" && !state.attributes.hidden) {
scripts.push(state);
}
});

return scripts;
});

protected updatePageEl(pageEl, changedProps: PropertyValues) {
pageEl.hass = this.hass;
pageEl.narrow = this.narrow;
pageEl.isWide = this.isWide;
pageEl.route = this.routeTail;
pageEl.showAdvanced = this.showAdvanced;

if (this.hass) {
pageEl.scripts = this._computeScripts(this.hass.states);
}

if (
(!changedProps || changedProps.has("route")) &&
this._currentPage === "edit"
) {
pageEl.creatingNew = undefined;
const scriptEntityId = this.routeTail.path.substr(1);
pageEl.creatingNew = scriptEntityId === "new" ? true : false;
pageEl.script =
scriptEntityId === "new"
? undefined
: pageEl.scripts.find(
(entity: HassEntity) => entity.entity_id === scriptEntityId
);
}
}
}

declare global {
interface HTMLElementTagNameMap {
"ha-config-script": HaConfigScript;
}
}
2 changes: 1 addition & 1 deletion src/panels/config/script/ha-script-picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class HaScriptPicker extends LitElement {
@click=${this._showHelp}
></paper-icon-button>
</hass-tabs-subpage-data-table>
<a href="/config/script/new">
<a href="/config/script/edit/new">
<ha-fab
?is-wide=${this.isWide}
?narrow=${this.narrow}
Expand Down