From 6f7bd66a2dead037571fd323c0645339ecd97c57 Mon Sep 17 00:00:00 2001 From: Ralph Wessel Date: Thu, 19 Sep 2024 10:20:03 +0100 Subject: [PATCH] "Send" method argument updated Serialisation tag for server URL of ModelCard fixed --- .../Connector/Interface/Browser/Bridge/Send/Send.cpp | 2 +- .../Connector/Interface/Browser/Bridge/Send/Send.h | 11 +++++++---- SpeckleConnector/Connector/Record/Model/ModelCard.cpp | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp index b0278b3..a037058 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.cpp @@ -11,7 +11,7 @@ using namespace speckle::utility; /*-------------------------------------------------------------------- Default constructor --------------------------------------------------------------------*/ -Send::Send() : BridgeMethod{"Send", [&](UpdateArgs args) { +Send::Send() : BridgeMethod{"Send", [&](const SendArgs& args) { run(args); }} {} diff --git a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h index 6ab3a91..60ab477 100644 --- a/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h +++ b/SpeckleConnector/Connector/Interface/Browser/Bridge/Send/Send.h @@ -2,6 +2,7 @@ #define CONNECTOR_INTERFACE_BRIDGE_SEND #include "Active/Serialise/CargoHold.h" +#include "Active/Serialise/Item/Wrapper/ValueWrap.h" #include "Connector/Interface/Browser/Bridge/Config/Arg/ConnectorConfig.h" #include "Speckle/Interface/Browser/Bridge/BridgeMethod.h" @@ -9,13 +10,15 @@ namespace connector::interfac::browser::bridge { class ConnectorConfig; - ///Argument for a JS call to update the configuration - using UpdateArgs = speckle::interfac::browser::bridge::JSArgType; + ///Argument parameter for a string + using StringHold = active::serialise::CargoHold, speckle::utility::String>; + ///Argument type for this method + using SendArgs = speckle::interfac::browser::bridge::JSArgType; /*! - JS Function class to retrieve the names of the methods supported by the bridge + JS Function class to send a specified model */ - class Send : public speckle::interfac::browser::bridge::BridgeMethod { + class Send : public speckle::interfac::browser::bridge::BridgeMethod { public: // MARK: - Constructors diff --git a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp index 8cd90ac..d97a542 100644 --- a/SpeckleConnector/Connector/Record/Model/ModelCard.cpp +++ b/SpeckleConnector/Connector/Record/Model/ModelCard.cpp @@ -27,7 +27,7 @@ namespace { Identity{"modelId"}, Identity{"projectId"}, Identity{"accountId"}, - Identity{"serverURL"}, + Identity{"serverUrl"}, Identity{"settings"}, Identity{"expired"}, };