From 9a8087b1806dd6be763a07e23e4e6e31387bbbf6 Mon Sep 17 00:00:00 2001
From: Ralph Wessel <ralph@speckle.systems>
Date: Thu, 29 Aug 2024 23:29:50 +0100
Subject: [PATCH] TriggerEvent tests working

---
 .../Browser/Bridge/Config/Arg/ConnectorConfig.cpp         | 8 --------
 .../Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h | 2 +-
 .../Interface/Browser/Bridge/BridgeArgumentWrap.cpp       | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.cpp
index f605e19..65ffacb 100644
--- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.cpp
+++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.cpp
@@ -12,13 +12,11 @@ namespace {
 
 		///Serialisation fields
 	enum FieldIndex {
-		arg0,
 		darkTheme,
 	};
 
 		///Serialisation field IDs
 	static std::array fieldID = {
-		Identity{"0"},
 		Identity{"darkTheme"},
 	};
 
@@ -33,9 +31,6 @@ namespace {
   --------------------------------------------------------------------*/
 bool ConnectorConfig::fillInventory(Inventory& inventory) const {
 	using enum Entry::Type;
-		//When used as an argument template, this wrapper is expected to be first in the list
-	if (isArgumentTemplate())
-		inventory.merge({ fieldID[arg0], arg0, element, true, &typeid(ConnectorConfig) });
 	inventory.merge(Inventory{
 		{
 			{ fieldID[darkTheme], darkTheme, element },
@@ -57,9 +52,6 @@ Cargo::Unique ConnectorConfig::getCargo(const Inventory::Item& item) const {
 		return nullptr;
 	using namespace active::serialise;
 	switch (item.index) {
-		case arg0:
-				//This structure is the first argument
-			return std::make_unique<PackageWrap>(*this);
 		case darkTheme:
 			return std::make_unique<ValueWrap<bool>>(isDarkTheme);
 		default:
diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h
index b1c43f2..39076dd 100644
--- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h
+++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h
@@ -9,7 +9,7 @@ namespace connector::interfac::browser::bridge {
 	/*!
 	 Configuration settings class
 	 */
-	class ConnectorConfig : public active::serialise::Package, virtual public speckle::interfac::browser::bridge::ArgumentBase {
+	class ConnectorConfig : public active::serialise::Package {
 	public:
 
 		// MARK: - Types
diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/BridgeArgumentWrap.cpp b/SpeckleLib/Speckle/Interface/Browser/Bridge/BridgeArgumentWrap.cpp
index 7ab331c..89c3f72 100644
--- a/SpeckleLib/Speckle/Interface/Browser/Bridge/BridgeArgumentWrap.cpp
+++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/BridgeArgumentWrap.cpp
@@ -141,7 +141,7 @@ std::unique_ptr<BridgeArgument> BridgeArgumentWrap::makeArgument(const String& m
 				if (args.size() != result->parameterCount())
 					throw Exception{"Function called with wrong number of parameters"};
 				String unifiedArgument;
-				if (dynamic_cast<Package*>(result) != nullptr) {
+				if ((args.size() > 1) && dynamic_cast<Package*>(result) != nullptr) {
 						//Unify the argument strings into a single JSON argument
 					unifiedArgument = "{";
 					int32_t argIndex = 0;