prioritize custom actions from config over from file, include custom …

…actions from file in layout editor list, autofill using custom actions from file for custom actions in config

src/universal-remote-card-editor.ts

@@ -39,7 +39,13 @@ import {
 	Row,
 } from './models/interfaces';
 import { defaultIcons } from './models/maps';
-import { deepGet, deepSet, getDefaultActions, mergeDeep } from './utils';
+import {
+	deepGet,
+	deepSet,
+	fetchCustomActionsFromFile,
+	getDefaultActions,
+	mergeDeep,
+} from './utils';
 
 export class UniversalRemoteCardEditor extends LitElement {
 	@property() hass!: HomeAssistant;
@@ -63,6 +69,8 @@ export class UniversalRemoteCardEditor extends LitElement {
 	DEFAULT_SOURCES: IElementConfig[] = [];
 	DEFAULT_ACTIONS: IElementConfig[] = [];
 
+	customActionsFromFile?: IElementConfig[];
+
 	static get properties() {
 		return { hass: {}, config: {} };
 	}
@@ -1898,8 +1906,14 @@ export class UniversalRemoteCardEditor extends LitElement {
 	}
 
 	buildLayoutEditor() {
-		const customActionNames =
-			this.config.custom_actions?.map((entry) => entry.name) ?? [];
+		const customActionNames = Array.from(
+			new Set([
+				...(this.config.custom_actions?.map((entry) => entry.name) ??
+					[]),
+				...(this.customActionsFromFile?.map((entry) => entry.name) ??
+					[]),
+			]),
+		);
 		const defaultKeys = this.DEFAULT_KEYS.filter(
 			(entry) => !customActionNames.includes(entry.name),
 		);
@@ -2187,6 +2201,11 @@ export class UniversalRemoteCardEditor extends LitElement {
 		}
 
 		this.buildPeopleList();
+		fetchCustomActionsFromFile(
+			this.hass,
+			this.config.custom_actions_file,
+			this.customActionsFromFile,
+		);
 
 		const context = {
 			config: {
@@ -2456,7 +2475,10 @@ export class UniversalRemoteCardEditor extends LitElement {
 			if (parentName && childName) {
 				const parentActions =
 					structuredClone(
-						this.DEFAULT_ACTIONS.filter(
+						[
+							...(this.customActionsFromFile ?? []),
+							...this.DEFAULT_ACTIONS,
+						].filter(
 							(defaultActions) =>
 								defaultActions.name == parentName,
 						)[0],
@@ -2469,13 +2491,12 @@ export class UniversalRemoteCardEditor extends LitElement {
 				};
 			} else {
 				const defaultActions =
-					structuredClone(
-						this.DEFAULT_ACTIONS.filter(
-							(defaultActions) =>
-								defaultActions.name ==
-								this.renderTemplate(entry.name, context),
-						)[0],
-					) ?? {};
+					[
+						...(this.customActionsFromFile ?? []),
+						...this.DEFAULT_ACTIONS,
+					].filter(
+						(defaultActions) => defaultActions.name == parentName,
+					)[0] ?? {};
 				entry = {
 					...defaultActions,
 					...entry,

src/universal-remote-card.ts

@@ -31,6 +31,8 @@ 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',
@@ -283,8 +285,8 @@ class UniversalRemoteCard extends LitElement {
 
 	getElementConfig(name: string): IElementConfig {
 		const customActionsList = [
-			...(this.customActionsFromFile ?? []),
 			...(this.config.custom_actions ?? []),
+			...(this.customActionsFromFile ?? []),
 		];
 		const customActions = customActionsList.filter(
 			(customActions) => customActions.name == name,
@@ -503,6 +505,12 @@ class UniversalRemoteCard extends LitElement {
 			return html``;
 		}
 
+		fetchCustomActionsFromFile(
+			this.hass,
+			this.config.custom_actions_file,
+			this.customActionsFromFile,
+		);
+
 		if (!this.customActionsFromFile && this.config.custom_actions_file) {
 			const filename = `${
 				this.config.custom_actions_file.startsWith('/') ? '' : '/'

src/utils/fetchCustomActionsFromFile.ts

@@ -0,0 +1,36 @@
+import { load } from 'js-yaml';
+
+import { HomeAssistant, IElementConfig } from '../models/interfaces';
+
+export function fetchCustomActionsFromFile(
+	hass: HomeAssistant,
+	filename: string | undefined = undefined,
+	output: IElementConfig[] | undefined = undefined,
+) {
+	if (!output && filename) {
+		filename = `${filename.startsWith('/') ? '' : '/'}${filename}`;
+		try {
+			const extension = filename.split('.').pop()?.toLowerCase();
+			switch (extension) {
+				case 'json':
+					hass.fetchWithAuth(filename)
+						.then((r) => r.json())
+						.then((json) => {
+							output = json;
+						});
+					break;
+				case 'yaml':
+				case 'yml':
+				default:
+					hass.fetchWithAuth(filename)
+						.then((r) => r.text())
+						.then((text) => {
+							output = load(text) as IElementConfig[];
+						});
+					break;
+			}
+		} catch (e) {
+			console.error(`File ${filename} is not a valid JSON or YAML\n${e}`);
+		}
+	}
+}

src/utils/index.ts

@@ -1,2 +1,3 @@
 export * from './deepKeys';
 export * from './defaultActions';
+export * from './fetchCustomActionsFromFile';