Merge branch 'beta' into develop

# Conflicts:
#	webui/src/Triggers/index.jsx

.dockerignore

@@ -12,5 +12,4 @@ dist
 */dist
 module-legacy/entrypoints
 module-legacy/manifests
-launcher
 .cache

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-bullseye as companion-builder
+FROM node:18.16.1-bullseye as companion-builder
 
 # Installation Prep
 RUN apt-get update && apt-get install -y \

lib/Instance/Modules.js

@@ -44,7 +44,7 @@ class InstanceModules extends CoreBase {
 			const moduleInfo = this.known_modules[module_id]
 			if (moduleInfo && moduleInfo.helpPath && moduleInfo.basePath) {
 				const fullpath = path.join(moduleInfo.basePath, 'companion', file)
-				if (file.match(/\.(jpe?g|gif|png|pdf)$/) && fs.existsSync(fullpath)) {
+				if (file.match(/\.(jpe?g|gif|png|pdf|companionconfig)$/) && fs.existsSync(fullpath)) {
 					// Send the file, then stop
 					res.sendFile(fullpath)
 					return

module-legacy/package.json

@@ -25,7 +25,6 @@
     "companion-module-allenheath-qu": "github:bitfocus/companion-module-allenheath-qu#v1.0.9",
     "companion-module-allenheath-sq": "github:bitfocus/companion-module-allenheath-sq#v1.3.12",
     "companion-module-analogway-eks500": "github:bitfocus/companion-module-analogway-eks500#v1.0.2",
-    "companion-module-analogway-midra": "github:bitfocus/companion-module-analogway-midra#v1.0.6",
     "companion-module-analogway-pls300": "github:bitfocus/companion-module-analogway-pls300#v1.0.5",
     "companion-module-analogway-vertige": "github:bitfocus/companion-module-analogway-vertige#v1.0.2",
     "companion-module-analogway-vio": "github:bitfocus/companion-module-analogway-vio#v1.0.3",
@@ -45,7 +44,6 @@
     "companion-module-barco-hdx": "github:bitfocus/companion-module-barco-hdx#v1.1.6",
     "companion-module-barco-imagepro": "github:bitfocus/companion-module-barco-imagepro#v1.0.3",
     "companion-module-barco-matrixpro": "github:bitfocus/companion-module-barco-matrixpro#v1.1.1",
-    "companion-module-barco-pds": "github:bitfocus/companion-module-barco-pds#v1.1.7",
     "companion-module-behringer-wing": "github:bitfocus/companion-module-behringer-wing#v1.0.8",
     "companion-module-biamp-tesira": "github:bitfocus/companion-module-biamp-tesira#v1.0.0",
     "companion-module-birddog-central": "github:bitfocus/companion-module-birddog-central#v1.0.0",
@@ -62,7 +60,6 @@
     "companion-module-brightsign-player": "github:bitfocus/companion-module-brightsign-player#v1.1.2",
     "companion-module-brompton-tessera": "github:bitfocus/companion-module-brompton-tessera#v1.0.5",
     "companion-module-christie-pandorasbox": "github:bitfocus/companion-module-christie-pandorasbox#v2.0.3",
-    "companion-module-christie-spyder": "github:bitfocus/companion-module-christie-spyder#v1.0.2",
     "companion-module-christie-wd": "github:bitfocus/companion-module-christie-wd#v1.0.8",
     "companion-module-cisco-cms": "github:bitfocus/companion-module-cisco-cms#v1.0.2",
     "companion-module-classx-liveboard": "github:bitfocus/companion-module-classx-liveboard#v1.0.1",
@@ -75,7 +72,6 @@
     "companion-module-dahuasecurity-ptz": "github:bitfocus/companion-module-dahuasecurity-ptz#v1.0.3",
     "companion-module-dalite-scb": "github:bitfocus/companion-module-dalite-scb#v1.0.2",
     "companion-module-danielnoethen-butt": "github:bitfocus/companion-module-danielnoethen-butt#v1.2.0",
-    "companion-module-dashare-multiplay": "github:bitfocus/companion-module-dashare-multiplay#v1.0.2",
     "companion-module-datapath-fx4": "github:bitfocus/companion-module-datapath-fx4#v1.0.1",
     "companion-module-dataprobe-iboot-pdu": "github:bitfocus/companion-module-dataprobe-iboot-pdu#v1.0.0",
     "companion-module-datavideo-dvip": "github:bitfocus/companion-module-datavideo-dvip#v1.0.0",
@@ -134,7 +130,6 @@
     "companion-module-kramer-vp734": "github:bitfocus/companion-module-kramer-vp734#v1.0.1",
     "companion-module-kramer-vp773a": "github:bitfocus/companion-module-kramer-vp773a#v1.0.1",
     "companion-module-kramer-vs41h": "github:bitfocus/companion-module-kramer-vs41h#v1.0.1",
-    "companion-module-lea-amplifier": "github:bitfocus/companion-module-lea-amplifier#v1.0.0",
     "companion-module-leadled-clockotron": "github:bitfocus/companion-module-leadled-clockotron#v1.0.3",
     "companion-module-leafcoders-titler": "github:bitfocus/companion-module-leafcoders-titler#v1.0.1",
     "companion-module-lectrosonics-aspen": "github:bitfocus/companion-module-lectrosonics-aspen#v1.0.1",
@@ -229,13 +224,10 @@
     "companion-module-teradek-prismflex": "github:bitfocus/companion-module-teradek-prismflex#v1.0.0",
     "companion-module-teradek-vidiu": "github:bitfocus/companion-module-teradek-vidiu#v1.0.5",
     "companion-module-teradek-vidiux": "github:bitfocus/companion-module-teradek-vidiux#v1.0.1",
-    "companion-module-tesla-smart": "github:bitfocus/companion-module-tesla-smart#v1.0.5",
-    "companion-module-tesmart-hdmimatrix": "github:bitfocus/companion-module-tesmart-hdmimatrix#v1.0.4",
     "companion-module-theatrixx-xpresscue": "github:bitfocus/companion-module-theatrixx-xpresscue#v1.2.1",
     "companion-module-thelightingcontroller": "github:bitfocus/companion-module-thelightingcontroller#v1.1.4",
     "companion-module-tplink-kasasmartstrip": "github:bitfocus/companion-module-tplink-kasasmartstrip#v1.0.0",
     "companion-module-tplink-taposmartplug": "github:bitfocus/companion-module-tplink-taposmartplug#v1.0.2",
-    "companion-module-tslproducts-umd": "github:bitfocus/companion-module-tslproducts-umd#v1.2.5",
     "companion-module-tvone-corio": "github:bitfocus/companion-module-tvone-corio#v1.0.1",
     "companion-module-utahscientific-bpspanel": "github:bitfocus/companion-module-utahscientific-bpspanel#v1.0.2",
     "companion-module-vdwall-lvp615": "github:bitfocus/companion-module-vdwall-lvp615#v1.0.0",

module-legacy/yarn.lock

@@ -1626,10 +1626,6 @@ commist@^1.0.0:
   version "1.0.2"
   resolved "https://codeload.github.com/bitfocus/companion-module-analogway-eks500/tar.gz/00d06031b84d8e149d4024f729fd26e79ae30dbd"
 
-"companion-module-analogway-midra@github:bitfocus/companion-module-analogway-midra#v1.0.6":
-  version "1.0.6"
-  resolved "https://codeload.github.com/bitfocus/companion-module-analogway-midra/tar.gz/b5136e8a8c18245e144ab78be7fa49072d673468"
-
 "companion-module-analogway-pls300@github:bitfocus/companion-module-analogway-pls300#v1.0.5":
   version "1.0.5"
   resolved "https://codeload.github.com/bitfocus/companion-module-analogway-pls300/tar.gz/dae9384f0c6abf303d9633fa89c1871ce9e2d354"
@@ -1711,10 +1707,6 @@ commist@^1.0.0:
   version "1.1.1"
   resolved "https://codeload.github.com/bitfocus/companion-module-barco-matrixpro/tar.gz/bbf30a9744fb338c41c6876703d8b9213270ea54"
 
-"companion-module-barco-pds@github:bitfocus/companion-module-barco-pds#v1.1.7":
-  version "1.1.7"
-  resolved "https://codeload.github.com/bitfocus/companion-module-barco-pds/tar.gz/88558ccb69afc194b55457aae2cc7a49fc322e4d"
-
 "companion-module-behringer-wing@github:bitfocus/companion-module-behringer-wing#v1.0.8":
   version "1.0.8"
   resolved "https://codeload.github.com/bitfocus/companion-module-behringer-wing/tar.gz/0fd459ee7144490bbc86b76ee475f35823628374"
@@ -1790,10 +1782,6 @@ commist@^1.0.0:
   version "2.0.3"
   resolved "https://codeload.github.com/bitfocus/companion-module-christie-pandorasbox/tar.gz/cd76d317ac5f612afdc863007b87e003b4baa10a"
 
-"companion-module-christie-spyder@github:bitfocus/companion-module-christie-spyder#v1.0.2":
-  version "1.0.2"
-  resolved "https://codeload.github.com/bitfocus/companion-module-christie-spyder/tar.gz/dcf26ecd7d117890a6c630a274a3b9788913eb03"
-
 "companion-module-christie-wd@github:bitfocus/companion-module-christie-wd#v1.0.8":
   version "1.0.8"
   resolved "https://codeload.github.com/bitfocus/companion-module-christie-wd/tar.gz/cae2b858f2949a6d303fb89e42a8a8a6035eacae"
@@ -1848,10 +1836,6 @@ commist@^1.0.0:
   dependencies:
     buttjs "^0.1.0"
 
-"companion-module-dashare-multiplay@github:bitfocus/companion-module-dashare-multiplay#v1.0.2":
-  version "1.0.2"
-  resolved "https://codeload.github.com/bitfocus/companion-module-dashare-multiplay/tar.gz/9d74a609a261fffc5832bc668ef66b1114f193b2"
-
 "companion-module-datapath-fx4@github:bitfocus/companion-module-datapath-fx4#v1.0.1":
   version "1.0.1"
   resolved "https://codeload.github.com/bitfocus/companion-module-datapath-fx4/tar.gz/994893a3dffb5674809ac056540889e85332ceea"
@@ -2121,10 +2105,6 @@ commist@^1.0.0:
   version "1.0.1"
   resolved "https://codeload.github.com/bitfocus/companion-module-kramer-vs41h/tar.gz/7d66ba1a6545dac1f7f5d0a664d53f5e371419e3"
 
-"companion-module-lea-amplifier@github:bitfocus/companion-module-lea-amplifier#v1.0.0":
-  version "1.0.0"
-  resolved "https://codeload.github.com/bitfocus/companion-module-lea-amplifier/tar.gz/762f48d16f8a592a71530aefe09cea6772f8cd9f"
-
 "companion-module-leadled-clockotron@github:bitfocus/companion-module-leadled-clockotron#v1.0.3":
   version "1.0.3"
   resolved "https://codeload.github.com/bitfocus/companion-module-leadled-clockotron/tar.gz/a739944141be9485b20a9c6da137aee16e01cd9f"
@@ -2561,14 +2541,6 @@ commist@^1.0.0:
   dependencies:
     mqtt "^4.3.5"
 
-"companion-module-tesla-smart@github:bitfocus/companion-module-tesla-smart#v1.0.5":
-  version "1.0.5"
-  resolved "https://codeload.github.com/bitfocus/companion-module-tesla-smart/tar.gz/9a8187d53ee3e40556f066350776071234486d4a"
-
-"companion-module-tesmart-hdmimatrix@github:bitfocus/companion-module-tesmart-hdmimatrix#v1.0.4":
-  version "1.0.4"
-  resolved "https://codeload.github.com/bitfocus/companion-module-tesmart-hdmimatrix/tar.gz/8873ef7b745ac7800866bcdd9e2662a54d7607ea"
-
 "companion-module-theatrixx-xpresscue@github:bitfocus/companion-module-theatrixx-xpresscue#v1.2.1":
   version "1.2.1"
   resolved "https://codeload.github.com/bitfocus/companion-module-theatrixx-xpresscue/tar.gz/c288db84fa0454912ed86c98e7b9b342f95047e3"
@@ -2596,12 +2568,6 @@ commist@^1.0.0:
   dependencies:
     tp-link-tapo-connect "^1.0.6"
 
-"companion-module-tslproducts-umd@github:bitfocus/companion-module-tslproducts-umd#v1.2.5":
-  version "1.2.5"
-  resolved "https://codeload.github.com/bitfocus/companion-module-tslproducts-umd/tar.gz/39850b8e387c84c479f224190e15e12ded8ae9e7"
-  dependencies:
-    tsl-umd-v5 "^1.0.5"
-
 "companion-module-tvone-corio@github:bitfocus/companion-module-tvone-corio#v1.0.1":
   version "1.0.1"
   resolved "https://codeload.github.com/bitfocus/companion-module-tvone-corio/tar.gz/0f1adbe3241f177d5b97c78286561b6a87ddb9fc"
@@ -2882,11 +2848,6 @@ destroy@^1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-dgram@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dgram/-/dgram-1.0.1.tgz#37f3b200f8033a5ff759303089c81ce361b651c3"
-  integrity sha1-N/OyAPgDOl/3WTAwicgc42G2UcM=
-
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -4693,11 +4654,6 @@ net-snmp@^3.5.2:
     asn1-ber "*"
     smart-buffer "^4.1.0"
 
-net@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/net/-/net-1.0.2.tgz#d1757ec9a7fb2371d83cf4755ce3e27e10829388"
-  integrity sha1-0XV+yaf7I3HYPPR1XOPifhCCk4g=
-
 netmask@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
@@ -5985,15 +5941,6 @@ ts-node@^10.5.0:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-tsl-umd-v5@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tsl-umd-v5/-/tsl-umd-v5-1.0.5.tgz#f5f0ed82df7f558bb31ea75e88f004c645e31a04"
-  integrity sha512-3SfKpMCS0jx1Tn/KBqIG1SsnnPHuqFbn8DkuloA7YqiOYyr8TwoWMosMOYG2QHRz05dZ2Bx48Sx/dl6VeSOd5Q==
-  dependencies:
-    debug "^4.3.2"
-    dgram "^1.0.1"
-    net "^1.0.2"
-
 tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"

webui/src/Instances/InstanceList.jsx

@@ -19,8 +19,9 @@ import { GenericConfirmModal } from '../Components/GenericConfirmModal'
 import CSwitch from '../CSwitch'
 import { useDrag, useDrop } from 'react-dnd'
 import { windowLinkOpen } from '../Helpers/Window'
+import classNames from 'classnames'
 
-export function InstancesList({ showHelp, doConfigureInstance, instanceStatus }) {
+export function InstancesList({ showHelp, doConfigureInstance, instanceStatus, selectedInstanceId }) {
 	const socket = useContext(SocketContext)
 	const instancesContext = useContext(InstancesContext)
 
@@ -109,6 +110,7 @@ export function InstancesList({ showHelp, doConfigureInstance, instanceStatus })
 					deleteModalRef={deleteModalRef}
 					configureInstance={doConfigureInstance}
 					moveRow={moveRow}
+					isSelected={id === selectedInstanceId}
 				/>
 			)
 		})
@@ -226,6 +228,7 @@ function InstancesTableRow({
 	configureInstance,
 	deleteModalRef,
 	moveRow,
+	isSelected,
 }) {
 	const socket = useContext(SocketContext)
 	const modules = useContext(ModulesContext)
@@ -297,7 +300,14 @@ function InstancesTableRow({
 	}
 
 	return (
-		<tr ref={ref} className={isDragging ? 'instancelist-dragging' : 'instancelist-notdragging'}>
+		<tr
+			ref={ref}
+			className={classNames({
+				'instancelist-dragging': isDragging,
+				'instancelist-notdragging': !isDragging,
+				'instancelist-selected': isSelected,
+			})}
+		>
 			<td ref={drag} className="td-reorder">
 				<FontAwesomeIcon icon={faSort} />
 			</td>

webui/src/Instances/index.jsx

@@ -79,7 +79,12 @@ export const InstancesPage = memo(function InstancesPage() {
 			<HelpModal ref={helpModalRef} />
 
 			<CCol xl={6} className="instances-panel primary-panel">
-				<InstancesList instanceStatus={instanceStatus} showHelp={showHelp} doConfigureInstance={doConfigureInstance} />
+				<InstancesList
+					instanceStatus={instanceStatus}
+					showHelp={showHelp}
+					doConfigureInstance={doConfigureInstance}
+					selectedInstanceId={selectedInstanceId}
+				/>
 			</CCol>
 
 			<CCol xl={6} className="instances-panel secondary-panel add-instances-panel">

webui/src/Triggers/index.jsx

@@ -31,6 +31,7 @@ import { EditTriggerPanel } from './EditPanel'
 import { GenericConfirmModal } from '../Components/GenericConfirmModal'
 import { ParseControlId } from '@companion/shared/ControlId'
 import { ConfirmExportModal } from '../Components/ConfirmExportModal'
+import classNames from 'classnames'
 
 export const Triggers = memo(function Triggers() {
 	const socket = useContext(SocketContext)
@@ -97,7 +98,7 @@ export const Triggers = memo(function Triggers() {
 					</CButton>
 				</CButtonGroup>
 
-				<TriggersTable triggersList={triggersList} editItem={doEditItem} />
+				<TriggersTable triggersList={triggersList} editItem={doEditItem} selectedControlId={editItemId} />
 
 				<CButton
 					color="light"
@@ -145,7 +146,7 @@ export const Triggers = memo(function Triggers() {
 })
 
 const tableDateFormat = 'MM/DD HH:mm:ss'
-function TriggersTable({ triggersList, editItem }) {
+function TriggersTable({ triggersList, editItem, selectedControlId }) {
 	const socket = useContext(SocketContext)
 
 	const triggersRef = useRef(triggersList)
@@ -199,6 +200,7 @@ function TriggersTable({ triggersList, editItem }) {
 								item={item}
 								editItem={editItem}
 								moveTrigger={moveTrigger}
+								isSelected={controlId === selectedControlId}
 							/>
 						))
 				) : (
@@ -212,7 +214,7 @@ function TriggersTable({ triggersList, editItem }) {
 		</table>
 	)
 }
-function TriggersTableRow({ controlId, item, editItem, moveTrigger }) {
+function TriggersTableRow({ controlId, item, editItem, moveTrigger, isSelected }) {
 	const socket = useContext(SocketContext)
 
 	const confirmRef = useRef(null)
@@ -281,7 +283,14 @@ function TriggersTableRow({ controlId, item, editItem, moveTrigger }) {
 	const exportId = parsedId?.type === 'trigger' ? parsedId?.trigger : undefined
 
 	return (
-		<tr ref={ref} className={isDragging ? 'instancelist-dragging' : 'instancelist-notdragging'}>
+		<tr
+			ref={ref}
+			className={classNames({
+				'instancelist-dragging': isDragging,
+				'instancelist-notdragging': !isDragging,
+				'instancelist-selected': isSelected,
+			})}
+		>
 			<td ref={drag} className="td-reorder" style={{ maxWidth: 20 }}>
 				<FontAwesomeIcon icon={faSort} />
 			</td>

webui/src/scss/_instances.scss

@@ -21,6 +21,14 @@
 	opacity: 0.5;
 }
 
+.instancelist-selected {
+	background-color: rgba(200, 200, 200, 0.35);
+
+	&:hover {
+		background-color: rgba(200, 200, 200, 0.3) !important;
+	}
+}
+
 .instancelist-notdragging:hover {
 	background-color: rgba(200, 200, 200, 0.1);
 }