node-red-contrib-mobius-flow-base 3.0.0-beta.19 → 3.0.0-rc.2

package/dist/engine-api-calls.d.ts

@@ -17,3 +17,5 @@ export declare const filterObjectsByRIDValue: (apiClient: AxiosInstance, uri: st
 export declare const getHubId: (apiClient: AxiosInstance, callback: Function) => Promise<void>;
 export declare const getNodeConfig: (apiClient: AxiosInstance, uri: string, callback: Function) => Promise<void>;
 export declare const changeAdminPassword: (apiClient: AxiosInstance, password: string, callback: Function) => Promise<void>;
+export declare const getNodeConfigTree: (apiClient: AxiosInstance, hid: string, callback: Function) => Promise<void>;
+export declare const getProfileByPid: (apiClient: AxiosInstance, hid: string, pid: string, callback: Function) => Promise<void>;

package/dist/engine-api-calls.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeAdminPassword = exports.getNodeConfig = exports.getHubId = exports.filterObjectsByRIDValue = exports.updateObject = exports.getServiceConfig = exports.sendDirectCommand = exports.sendBroadcastCommand = exports.readObject = exports.readResource = exports.clearResource = exports.writeMultiResource = exports.writeResource = exports.discover = void 0;
+exports.getProfileByPid = exports.getNodeConfigTree = exports.changeAdminPassword = exports.getNodeConfig = exports.getHubId = exports.filterObjectsByRIDValue = exports.updateObject = exports.getServiceConfig = exports.sendDirectCommand = exports.sendBroadcastCommand = exports.readObject = exports.readResource = exports.clearResource = exports.writeMultiResource = exports.writeResource = exports.discover = void 0;
 const discover = async (apiClient, uri, callback) => {
     try {
         const response = await apiClient({
@@ -232,3 +232,29 @@ const changeAdminPassword = async (apiClient, password, callback) => {
     }
 };
 exports.changeAdminPassword = changeAdminPassword;
+const getNodeConfigTree = async (apiClient, hid, callback) => {
+    try {
+        const response = await apiClient({
+            method: 'get',
+            url: `/mobius/node/configtree/${hid}`,
+        });
+        callback(null, response.data);
+    }
+    catch (err) {
+        callback(err);
+    }
+};
+exports.getNodeConfigTree = getNodeConfigTree;
+const getProfileByPid = async (apiClient, hid, pid, callback) => {
+    try {
+        const response = await apiClient({
+            method: 'get',
+            url: `/mobius/profile/object/${hid}/${pid}`,
+        });
+        callback(null, response.data);
+    }
+    catch (err) {
+        callback(err);
+    }
+};
+exports.getProfileByPid = getProfileByPid;

package/dist/engine-api-client.d.ts

@@ -4,6 +4,6 @@ export declare let tokens: null | {
     refreshToken: string;
 };
 export declare let loggedIn: boolean;
-export declare const getApiClient: (protocol: 'http' | 'https', host: string, port: number, username: string, password: string) => AxiosInstance;
+export declare const getApiClient: (protocol: 'http' | 'https', host: string, username: string, password: string) => AxiosInstance;
 export declare const setLoggedIn: (value: boolean) => void;
 export declare const closeApiClient: () => void;

package/dist/engine-api-client.js

@@ -11,7 +11,7 @@ exports.loggedIn = false;
 let reloginInterval = null;
 let client = null;
 let refreshLoop = null;
-const getApiClient = (protocol, host, port, username, password) => {
+const getApiClient = (protocol, host, username, password) => {
     if (client) {
         try {
             (0, engine_websocket_1.disconnectFromWebSocket)();
@@ -23,20 +23,27 @@ const getApiClient = (protocol, host, port, username, password) => {
         clearInterval(refreshLoop);
         refreshLoop = null;
     }
-    (0, engine_websocket_1.setWebSocketConnectParams)(host, port, protocol);
+    (0, engine_websocket_1.setWebSocketConnectParams)(host, protocol);
     //const baseURL = `http://localhost:8443/api/v1`;
-    const baseURL = `${protocol}://${host}:${port}/api/v1`;
+    const baseURL = `${protocol}://${host}/api/v1`;
     client = axios_1.default.create({
         baseURL: baseURL,
         headers: {
             'Content-Type': 'application/json',
         },
     });
-    reloginInterval = setInterval(() => {
-        if (!exports.loggedIn) {
-            login();
-        }
-    }, 30000);
+    if (username && password && host) {
+        reloginInterval = setInterval(() => {
+            if (!exports.loggedIn) {
+                login();
+            }
+        }, 30000);
+    }
+    else {
+        console.log('No username, password, host, or port provided. Not attempting to login to Mobius Engine API.');
+        clearInterval(reloginInterval);
+        reloginInterval = null;
+    }
     // Add auth headers to all axios calls
     client.interceptors.request.use((config) => {
         if (!config.url?.endsWith('/auth/login')) {
@@ -71,7 +78,14 @@ const getApiClient = (protocol, host, port, username, password) => {
             exports.loggedIn = false;
         }
     };
-    login();
+    if (username && password && host) {
+        login();
+    }
+    else {
+        console.log('No username, password, host, or port provided. Not attempting to login to Mobius Engine API.');
+        clearInterval(reloginInterval);
+        reloginInterval = null;
+    }
     const refresh = async () => {
         if (!exports.tokens) {
             return;

package/dist/engine-websocket.d.ts

@@ -1,6 +1,6 @@
 type WebSocketTopics = 'authorize' | 'subscribe' | 'unsubscribe' | 'connected' | 'authorized' | 'object-cov' | 'resource-cov' | 'service-status' | 'broadcast-command' | 'error' | 'ping' | 'pong';
 type Events = 'connected' | 'disconnected';
-export declare const setWebSocketConnectParams: (hostname: string, port: number, protocol: 'http' | 'https') => void;
+export declare const setWebSocketConnectParams: (hostname: string, protocol: 'http' | 'https') => void;
 export declare const on: (eventName: Events, callback: Function) => void;
 export declare function registerCallback(topic: WebSocketTopics, callback: Function): void;
 export declare function clearAllCallbacks(): void;

package/dist/engine-websocket.js

@@ -15,8 +15,8 @@ let eventListeners = [];
 let reconnectInterval = null;
 let attemptReconnect = false;
 let connectParams = null;
-const setWebSocketConnectParams = (hostname, port, protocol) => {
-    connectParams = { hostname, port, protocol };
+const setWebSocketConnectParams = (hostname, protocol) => {
+    connectParams = { hostname, protocol };
 };
 exports.setWebSocketConnectParams = setWebSocketConnectParams;
 const on = (eventName, callback) => {
@@ -107,7 +107,7 @@ const connectToWebSocket = () => {
     if (connectParams.protocol === 'http') {
         webSocketProtocol = 'ws';
     }
-    webSocket = new ws_1.default(`${webSocketProtocol}://${connectParams.hostname}:${connectParams.port}/api/v1/mobius/subscribe/connect`);
+    webSocket = new ws_1.default(`${webSocketProtocol}://${connectParams.hostname}/api/v1/mobius/subscribe/connect`);
     webSocket.onopen = () => {
         attemptReconnect = true;
         console.log('Engine API Subscription WebSocket Client Connected');

package/dist/node-red-ui-funcs.js

@@ -70,6 +70,32 @@ module.exports = {
     });
   },
 
+  // Promisified version of getNodeConfigTree
+  getNodeConfigTree (connection, hid) {
+    return new Promise((resolve, reject) => {
+      connection.getNodeConfigTree(hid, (err, response) => {
+        if (!err) {
+          resolve(response);
+        } else {
+          reject(err);
+        }
+      });
+    });
+  },
+
+  // Promisified version of getProfileByPid
+  getProfileByPid (connection, hid, pid) {
+    return new Promise((resolve, reject) => {
+      connection.getProfileByPid(hid, pid, (err, response) => {
+        if (!err) {
+          resolve(response);
+        } else {
+          reject(err);
+        }
+      });
+    });
+  },
+
   // Discover object by By PID
   async discoverDevicesByPID (RED, connection, hid, spids, pid) {
     let devices = [];
@@ -172,9 +198,75 @@ module.exports = {
           objectList.push(objResponse.data[0]);
         }
       }
+      console.log(objectList[0]);
+      console.log(objectList[0].resources);
       return objectList;
     } catch (err) {
       throw JSON.stringify(err);
     }
   },
+
+  async getConfigObjectsList(connection, hid, sid) {
+    try {
+      let objectList = [];
+      const configTreeResponse = await this.getNodeConfigTree(connection, hid);
+      const service = configTreeResponse.data.find((service) => service.sid === sid);
+      for (let i = 0; i < service.objects.length; i++) {
+        objectList = objectList.concat(service.objects[i].objects);
+      }
+      let formattedObjectList = [];
+      for (let i = 0; i < objectList.length; i++) {
+        const getProfileResponse = await this.getProfileByPid(connection, hid, objectList[i].pid);
+        const profile = getProfileResponse.data;
+        const profileName = profile.header.uiname;
+        const rids = objectList[i].rids;
+        let resources = [];
+        for (let j = 0; j < rids.length; j++) {
+          let resourceName = '';
+          const resKeys = Object.keys(profile.resources);
+          const resValues = Object.values(profile.resources);
+          for (let k = 0; k < resKeys.length; k++) {
+            if (resValues[k].rid === `${parseInt(rids[j].rid)}`) {
+              resourceName = resKeys[k];
+            }
+          }
+          resources.push({
+            rid: rids[j].rid,
+            name: resourceName,
+            pv: rids[j].pv,
+          })
+        }
+        const foundObjectName = objectList[i].rids.filter((rid) => rid.rid === '01');
+        const objName = foundObjectName.length > 0 ? foundObjectName[0].settings.pv : '';
+        formattedObjectList.push({
+          pid: objectList[i].pid,
+          ins: objectList[i].ins,
+          profileName,
+          resources,
+          name: objName,
+        });
+      }
+      return formattedObjectList;
+    } catch (err) {
+      throw JSON.stringify(err);
+    }
+  },
+
+  async getResourceOptions(connection, hid, pid) {
+    const getProfileResponse = await this.getProfileByPid(connection, hid, pid);
+    const profile = getProfileResponse.data;
+    const result = [];
+    const resValues = Object.values(profile.resources);
+    for (let i = 0; i < resValues.length; i++) {
+      let rid = parseInt(resValues[i].rid).toString(16).toUpperCase();
+      rid = rid.length === 1 ? `0${rid}` : rid;
+      result.push({
+        name: resValues[i].uiname,
+        rid,
+      });
+    }
+    return result;
+  }
+
 };
+

package/dist/nodes/common/mobsearch.js

@@ -145,13 +145,6 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   </div>
   `;
 
-  if (!listed) {
-    //Add search button
-    document.getElementById(opts.inputRowId).innerHTML += `
-    <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
-    `;
-  }
-
   // * END HTML INJECTION * //
 
   // * INIT SETUP * //
@@ -160,7 +153,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   $.getJSON(`mgetconnected?mobius=${mobiusSrvc}`, function (response) {
     mobConnected = response;
     if (!mobConnected) {
-      $('#node-lookup-instance').css('color', '#CCCCCC');
+      $(`#${opts.searchButtonId}`).css('color', '#CCCCCC');
       $('#bad-connection-alert').show();
     } else {
       $('#bad-connection-alert').hide();
@@ -199,15 +192,15 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   // * END INIT SETUP * //
 
   /**
-   * Search for INSs present on selected PID
+   * Search for RIDs options for a given PID
    * @param {object} objects - Response from call to Mobiu, list of mobius objects
    * @param {string} pid - The chosen PID
    */
   function ridSearch(objects, ins) {
     $.getJSON(
-      `mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`,
+      `mgetresourceoptions?mobius=${mobiusSrvc}&hid=${searchObject.hid}&pid=${searchObject.pid}`,
       (response) => {
-        resList = response.data[0].resources;
+        resList = response;
         ress = opts.removeWildcards ? [] : ['#'];
         for (let j = 0; j < resList.length; j++) {
           ress.push(`${resList[j].rid} - ${resList[j].name}`);
@@ -238,7 +231,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     let inss = opts.removeWildcards ? [] : ['#', '+'];
     for (let i = 0; i < objects.length; i++) {
       if (objects[i].pid === pid) {
-        const name = objects[i].resources[1].pv;
+        const name = objects[i].name ? objects[i].name : '';
         if (name === '') {
           inss.push(objects[i].ins);
         } else {
@@ -400,14 +393,16 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       tempList = JSON.parse(JSON.stringify(opts.list));
       tempList[selectionIndex].uri = uri;
       updateList();
+      opts.list = JSON.parse(JSON.stringify(tempList));
     } else {
       $(`#${opts.uriFieldName}`).val(uri);
+      document.getElementById(opts.uriFieldName).dispatchEvent(new Event('change'));
     }
     $('#node-search-accept').css('color', '#CCCCCC');
     readyToAccept = false;
     $('#node-search-return').addClass('disabled');
     $('#node-search-accept').addClass('disabled');
-    $('#node-lookup-instance').removeClass('disabled');
+    $(`#${opts.searchButtonId}`).removeClass('disabled');
     $('#instance-search-row').hide();
     $('#instance-row').show();
   }
@@ -492,7 +487,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       .each(function (i) {
         let item = $(this);
         let secondField = item.find(`.${opts.containerSecondFieldName}`).val();
-        tempList[i][Object.keys(tempList[i])[1]] = secondField;
+        tempList[i][Object.keys(tempList[i])[1]] = JSON.parse(JSON.stringify(secondField));
       });
     $(`#${opts.containerName}`).editableList('empty');
     for (let i = 0; i < tempList.length; i++) {
@@ -504,7 +499,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
 
   // * CLICK RESPONSE * //
 
-  $('#node-lookup-instance').click(function () {
+  $(`#${opts.searchButtonId}`).click(function () {
     if (mobConnected) {
       //When search button is clicked
       $('#instance-search-sid').val('');
@@ -513,7 +508,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       if (useRid) {
         $('#instance-search-rid').val('');
       }
-      $('#node-lookup-instance').addClass('disabled');
+      $(`#${opts.searchButtonId}`).addClass('disabled');
       $('#node-search-return').removeClass('disabled');
       $('#node-search-accept').removeClass('disabled');
       $('#instance-row').hide();
@@ -576,7 +571,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     //Return/Back button clicked
     $('#node-search-return').addClass('disabled');
     $('#node-search-accept').addClass('disabled');
-    $('#node-lookup-instance').removeClass('disabled');
+    $(`#${opts.searchButtonId}`).removeClass('disabled');
     $('#instance-search-row').hide();
     $('#instance-row').show();
     $(`#${opts.containerRowName}`).show();

package/dist/nodes/mobius-clear-resource.html

@@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="form-row" id="input-row">
       <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" id="node-input-resource" style="width:61%;" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
   <div id="mobsearch"></div>
@@ -111,7 +112,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },

package/dist/nodes/mobius-connection.html

@@ -27,23 +27,25 @@ POSSIBILITY OF SUCH DAMAGE.
 <script type="text/x-red" data-template-name="mobius connection">
   <div class="form-row">
     <div style="white-space: nowrap; display: inline-block;"><label for="node-config-input-host" style="width: 100px;" ><i class="fa fa-globe"></i> Host <span id="hostLabel" style="color: grey;">?</span></label></div>
-    <input class="input-append-left" type="text" id="node-config-input-host" placeholder="e.g. localhost" style="width: 40%;" >
-    <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
-    <input type="text" id="node-config-input-port" placeholder="1890" style="width:50px">
+    <input class="input-append-left" type="text" id="node-config-input-host" placeholder="e.g. localhost" style="width: 70%;" >
   </div>
+  <p style="text-align:center"> Ensure port number is included in host path</p>
+  <p style="text-align:center"> e.g. <b>myHostname:8443</b></p>
+  <hr>
   <div class="form-row">
     <label for="node-config-input-username"><i class="fa fa-user"></i> Username</label>
-    <input class="input-append-left" type="text" id="node-config-input-username" style="width: 40%;" >
+    <input class="input-append-left" type="text" id="node-config-input-username" style="width: 70%;" >
   </div>
   <div class="form-row">
     <label for="node-config-input-password"><i class="fa fa-key"></i> Password</label>
-    <input class="input-append-left" type="text" id="node-config-input-password" style="width: 40%;" >
+    <input class="input-append-left" type="text" id="node-config-input-password" style="width: 70%;" >
   </div>
   <div class="form-row">
     <label for="node-config-input-secure" style="width: 100px;"> Use SSL/TLS</label>
     <input type="checkbox" id="node-config-input-secure" style="display: inline-block; width: auto; vertical-align: top;">
-
   </div>
+  <hr>
+  <p style="text-align:center; color:blue;"><u><a style="color:blue;" href="https://docs.mobiusflow.com/help/technical-docs/flows/connecting-to-flows-to-mobiusflow-engine">Link to MobiusFlow connection help article</a></u></p>
 </script>
 
 <script type="text/javascript">
@@ -51,14 +53,13 @@ POSSIBILITY OF SUCH DAMAGE.
   RED.nodes.registerType('mobius connection', {
     category: 'config',
     defaults: {
-      host: { required: true, value: 'localhost' },
-      port: { required: true, value: 8443, validate: RED.validators.number() },
-      username: { required: true, value: 'admin' },
-      password: { required: true, value: 'adm123' },
-      secure: { required: true, value: true },
+      host: { required: true, value: 'mobius:8443' },
+      username: { required: true, value: '' },
+      password: { required: true, value: '' },
+      secure: { required: true, value: false },
     },
     label: function () {
-      return `${this.host}:${this.port}`;
+      return `${this.host}`;
     },
     oneditprepare: function () {
       $('#node-config-input-secure').change(function () {

package/dist/nodes/mobius-connection.js

@@ -65,14 +65,12 @@ module.exports = function (RED) {
   function MobiusConnectionNode(n) {
     RED.nodes.createNode(this, n);
     this.host = n.host;
-    this.port = n.port;
     this.username = n.username;
     this.password = n.password;
     this.secure = n.secure;
     this.apiClient = getApiClient(
       this.secure ? 'https' : 'http',
       this.host,
-      this.port,
       this.username,
       this.password
     );
@@ -101,7 +99,7 @@ module.exports = function (RED) {
     // Connected to the mobius TCPIP spoke
     // Update the status indicators
     webSocket.on('connected', () => {
-      this.log(`Connected to ${n.host} : ${n.port}`);
+      this.log(`Connected to ${n.host}`);
       apiCalls.getHubId(this.apiClient, (err, hubId) => {
         if (err) {
           node.error('Mobius error getting hub ID' + JSON.stringify(err));
@@ -144,7 +142,7 @@ module.exports = function (RED) {
     // Disconnected from the mobius TCPIP spoke
     // Update the status indicators
     webSocket.on('disconnected', () => {
-      this.log(`Disconnected from ${n.host} : ${n.port}`);
+      this.log(`Disconnected from ${n.host}`);
       node.connected = false;
       for (var id in node.users) {
         if (node.users.hasOwnProperty(id)) {
@@ -566,6 +564,24 @@ module.exports = function (RED) {
     node.getNodeConfig = function (uri, callback) {
       apiCalls.getNodeConfig(this.apiClient, uri, callback);
     }
+
+    /**
+     * Get the list of services on a hub
+     * @param {string} hid - The hub ID of the hub to get the service list from
+     * @param {Function} callback - Callback when complete
+     */
+    node.getNodeConfigTree = function (hid, callback) {
+      apiCalls.getNodeConfigTree(this.apiClient, hid, callback);
+    }
+
+    /**
+     * Get the list of services on a hub
+     * @param {string} hid - The hub ID of the hub to get the service list from
+     * @param {Function} callback - Callback when complete
+     */
+    node.getProfileByPid = function (hid, pid, callback) {
+      apiCalls.getProfileByPid(this.apiClient, hid, pid, callback);
+    }
   }
 
   RED.nodes.registerType('mobius connection', MobiusConnectionNode);
@@ -645,6 +661,26 @@ module.exports = function (RED) {
           });
       }
     });
+
+    // Register the endpoint for node-red get resource options for object type
+    RED.httpAdmin.get('/mgetresourceoptions', RED.auth.needsPermission('serial.read'), function (req, res) {
+      let conn = RED.nodes.getNode(req.query.mobius);
+      let hid = req.query.hid;
+      let pid = req.query.pid;
+      if (conn === null || !conn.connected) {
+        RED.log.error('Fetching resource options failed - could not to connect to MOBiUS hub.');
+        throw new Error('Fetching resource options failed - could not to connect to MOBiUS hub.');
+      } else {
+        uiFuncs
+          .getResourceOptions(conn, hid, pid)
+          .then((response) => {
+            res.json(response);
+          })
+          .catch((err) => {
+            throw err;
+          });
+      }
+    });
   
     // Register the endpoint for node-red mobius discovery in node-red node config pages
     RED.httpAdmin.get('/mgetservices', RED.auth.needsPermission('serial.read'), function (req, res) {
@@ -674,12 +710,12 @@ module.exports = function (RED) {
         throw new Error('Get objects failed - could not to connect to MOBiUS hub.');
       } else {
         uiFuncs
-          .getObjectList(conn, hid, sid)
+          .getConfigObjectsList(conn, hid, sid)
           .then((response) => {
             res.json(response);
           })
           .catch((err) => {
-            RED.log.warn(`Get objects failed on service ${req.query.sid} ${err ? ` - ${err}` : ''}`);
+            RED.log.warn(`Get objects failed on service ${req.query.sid} ${err ? ` - ${JSON.stringify(err)}` : ''}`);
           });
       }
     });

package/dist/nodes/mobius-get-object.html

@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="form-row" id="input-row">
       <label for="node-input-mobject"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" id="node-input-mobject" style="width:61%;" placeholder="Object URI (hid/sid/pid/ins)">
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
 
@@ -116,7 +117,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-mobject',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },

package/dist/nodes/mobius-get-resource.html

@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="form-row" id="input-row">
       <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" id="node-input-resource" style="width:61%;" placeholder="HID/SID/PID/INS/RID">
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
 
@@ -109,7 +110,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
       };
       initMobsearch.toRid(mobiusSrvc, opts);
 

package/dist/nodes/mobius-object-cov.html

@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="form-row" id="input-row">
       <label for="node-input-object"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" id="node-input-object" style="width:61%;" placeholder="Object URI (hid/sid/pid/ins)">
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
 
@@ -125,7 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-object',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },

package/dist/nodes/mobius-resource-cov.html

@@ -35,7 +35,8 @@ POSSIBILITY OF SUCH DAMAGE.
   <div id="instance-row">
     <div class="form-row" id="input-row">
       <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
-      <input type="text" id="node-input-resource" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+      <input type="text" id="node-input-resource" style="width:61%;" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
   <div id="mobsearch"></div>
@@ -106,7 +107,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },

package/dist/nodes/mobius-set-multi-resource.html

@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="form-row" id="input-row">
       <label for="node-input-mobject"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" style="width:61%;" id="node-input-mobject" placeholder="Object URI (hid/sid/pid/ins)">
-      
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
   <div id="mobsearch"></div>
@@ -105,7 +105,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-mobject',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
         removeWildcards: true,
       };
       initMobsearch.toIns(mobiusSrvc, opts);

package/dist/nodes/mobius-set-resource.html

@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="form-row" id="input-row">
       <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" id="node-input-resource" style="width:61%;" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+      <a id="node-lookup-instance" class="searchbutton" style="margin-left: 13px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
 
@@ -113,7 +114,7 @@ POSSIBILITY OF SUCH DAMAGE.
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
-        inputRowId: 'input-row',
+        searchButtonId: 'node-lookup-instance',
         removeWildcards: true,
       };
       initMobsearch.toRid(mobiusSrvc, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "3.0.0-beta.19",
+  "version": "3.0.0-rc.2",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",