@carbonorm/carbonreact 4.0.12 → 4.0.14

package/dist/components/WebSocket/CarbonWebSocket.d.ts

@@ -1,12 +1,11 @@
 import CarbonReact, { iCarbonReactState } from "CarbonReact";
-import { tC6Tables, tC6RestApi } from "@carbonorm/carbonnode";
+import { iC6Object } from "@carbonorm/carbonnode";
 export interface iCarbonWebSocketProps<P, S extends iCarbonReactState> {
     url?: string;
     timeoutSeconds?: number;
     heartbeatSeconds?: number;
     instance: CarbonReact<P, S>;
-    TABLES?: tC6Tables;
-    WsLiveUpdates?: tC6RestApi;
+    C6?: iC6Object;
 }
 /**
  * @function connect

package/dist/index.cjs.js

@@ -4066,7 +4066,8 @@ const useEffectOnce = (effect) => {
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
 function initiateWebsocket(props) {
-    let { instance, TABLES = undefined, WsLiveUpdates = undefined, url = 'ws' + (window.location.protocol === 'https:' ? 's' : '') + '://' + window.location.host + '/carbonorm/websocket', timeoutSeconds = 250, heartbeatSeconds = 60 } = props;
+    let { instance, url = 'ws' + (window.location.protocol === 'https:' ? 's' : '') + '://' + window.location.host + '/carbonorm/websocket', timeoutSeconds = 250, heartbeatSeconds = 60, C6 } = props;
+    const { TABLES = undefined, IMPORT = undefined, } = C6 ?? {};
     const { websocket } = instance.state;
     if (!("WebSocket" in window)) {
         // todo - store that this has been shown in the state
@@ -4113,10 +4114,6 @@ function initiateWebsocket(props) {
                     console.log('WebSocket updates without the TABLES property passed will not automatically update the state.');
                     return;
                 }
-                if (undefined === WsLiveUpdates) {
-                    console.log('WebSocket updates without the WsLiveUpdates property passed will not automatically update the state.');
-                    return;
-                }
                 if (parsedData?.REST) {
                     const TABLE_NAME = parsedData?.REST?.TABLE_NAME;
                     const TABLE_PREFIX = parsedData?.REST?.TABLE_PREFIX;
@@ -4138,7 +4135,8 @@ function initiateWebsocket(props) {
                         return;
                     }
                     const primaryKeyKeys = Object.keys(REQUEST_PRIMARY_KEY);
-                    const elementsToUpdate = currentCache.filter((row) => {
+                    // todo - which direction should we filter
+                    const elementsToUpdate = currentCache?.filter((row) => {
                         for (const element of primaryKeyKeys) {
                             // remove the table name from the column name
                             const column = element.split('.')[1];
@@ -4148,7 +4146,7 @@ function initiateWebsocket(props) {
                             }
                         }
                         return true;
-                    });
+                    }) ?? [];
                     console.log('elementsToUpdate', elementsToUpdate);
                     if (elementsToUpdate.length === 0) {
                         console.error('Could not find any elements to update in the cache.', elementsToUpdate, primaryKeyKeys, REQUEST_PRIMARY_KEY, currentCache);
@@ -4160,8 +4158,22 @@ function initiateWebsocket(props) {
                             ...REQUEST
                         };
                     });
-                    updatedElements.forEach((row) => {
-                        WsLiveUpdates[TABLE_NAME_SHORT][METHOD]({}, row);
+                    updatedElements.forEach(async (row) => {
+                        const RestRequests = await IMPORT?.(TABLE_NAME_SHORT);
+                        const { postState, deleteState, putState, } = RestRequests;
+                        switch (METHOD) {
+                            case 'POST':
+                                postState({}, row);
+                                break;
+                            case 'DELETE':
+                                deleteState({}, row);
+                                break;
+                            case 'PUT':
+                                putState({}, row);
+                                break;
+                            default:
+                                console.error('Method not supported', METHOD);
+                        }
                     });
                 }
             });