move fetchCustomActionsFromFile back to a class function and make dup…

…licate (yuck) copy in the editor
Nerwyn · Nov 8, 2024 · 8b41ff1 · 8b41ff1
1 parent 7e7b6d6
commit 8b41ff1
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 65 deletions.
diff --git a/dist/universal-remote-card.min.js b/dist/universal-remote-card.min.js
diff --git a/src/universal-remote-card-editor.ts b/src/universal-remote-card-editor.ts
@@ -39,13 +39,7 @@ import {
 	Row,
 } from './models/interfaces';
 import { defaultIcons } from './models/maps';
-import {
-	deepGet,
-	deepSet,
-	fetchCustomActionsFromFile,
-	getDefaultActions,
-	mergeDeep,
-} from './utils';
+import { deepGet, deepSet, getDefaultActions, mergeDeep } from './utils';
 
 export class UniversalRemoteCardEditor extends LitElement {
 	@property() hass!: HomeAssistant;
@@ -2195,17 +2189,52 @@ export class UniversalRemoteCardEditor extends LitElement {
 		}
 	}
 
+	fetchCustomActionsFromFile() {
+		if (!this.customActionsFromFile && this.config.custom_actions_file) {
+			const filename = `${
+				this.config.custom_actions_file.startsWith('/') ? '' : '/'
+			}${this.config.custom_actions_file}`;
+			try {
+				const extension = filename.split('.').pop()?.toLowerCase();
+				switch (extension) {
+					case 'json':
+						this.hass
+							.fetchWithAuth(filename)
+							.then((r) => r.json())
+							.then((json) => {
+								this.customActionsFromFile = json;
+								this.requestUpdate();
+							});
+						break;
+					case 'yaml':
+					case 'yml':
+					default:
+						this.hass
+							.fetchWithAuth(filename)
+							.then((r) => r.text())
+							.then((text) => {
+								this.customActionsFromFile = load(
+									text,
+								) as IElementConfig[];
+								this.requestUpdate();
+							});
+						break;
+				}
+			} catch (e) {
+				console.error(
+					`File ${this.config.custom_actions_file} is not a valid JSON or YAML\n${e}`,
+				);
+			}
+		}
+	}
+
 	render() {
 		if (!this.hass || !this.config) {
 			return html``;
 		}
 
 		this.buildPeopleList();
-		fetchCustomActionsFromFile(
-			this.hass,
-			this.config.custom_actions_file,
-			this.customActionsFromFile,
-		);
+		this.fetchCustomActionsFromFile();
 
 		const context = {
 			config: {

diff --git a/src/universal-remote-card.ts b/src/universal-remote-card.ts
@@ -31,8 +31,6 @@ import {
 	REPEAT_DELAY,
 } from './models/constants';
 
-import { fetchCustomActionsFromFile } from './utils';
-
 console.info(
 	`%c UNIVERSAL-REMOTE-CARD v${packageInfo.version}`,
 	'color: white; font-weight: bold; background: green',
@@ -500,17 +498,7 @@ class UniversalRemoteCard extends LitElement {
 		return html`<keyboard-dialog .hass=${this.hass}></keyboard-dialog>`;
 	}
 
-	render() {
-		if (!this.config || !this.hass) {
-			return html``;
-		}
-
-		fetchCustomActionsFromFile(
-			this.hass,
-			this.config.custom_actions_file,
-			this.customActionsFromFile,
-		);
-
+	fetchCustomActionsFromFile() {
 		if (!this.customActionsFromFile && this.config.custom_actions_file) {
 			const filename = `${
 				this.config.custom_actions_file.startsWith('/') ? '' : '/'
@@ -547,6 +535,14 @@ class UniversalRemoteCard extends LitElement {
 				);
 			}
 		}
+	}
+
+	render() {
+		if (!this.config || !this.hass) {
+			return html``;
+		}
+
+		this.fetchCustomActionsFromFile();
 
 		this.editMode = Boolean(
 			document

diff --git a/src/utils/fetchCustomActionsFromFile.ts b/src/utils/fetchCustomActionsFromFile.ts
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,3 +1,2 @@
 export * from './deepKeys';
 export * from './defaultActions';
-export * from './fetchCustomActionsFromFile';