@carbonorm/carbonreact 3.4.8 → 3.5.1

package/README.md

@@ -204,7 +204,7 @@ stateful operations must be wrapped in a function and thus must not be run durin
 Updating state is as simple as calling `CarbonORM.instance.setState({})`. The class name `CarbonORM` can be replaced with
 any name of your liking. Typically, you will want to use the name of your project. 
 
-(ui.tsx)[https://github.com/CarbonORM/CarbonORM.dev/blob/www/src/state/ui.tsx]
+[ui.tsx](https://github.com/CarbonORM/CarbonORM.dev/blob/www/src/state/ui.tsx)
 ```typescript jsx
 import CarbonORM from "CarbonORM";
 
@@ -229,4 +229,4 @@ export const switchDarkAndLightTheme = () => {
         darkMode: !CarbonORM.instance.state.darkMode
     });
 };
-```
+```

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

@@ -1,13 +1,14 @@
-import { tC6Tables } from "@carbonorm/carbonnode";
+import { tC6Tables, tWsLiveUpdate } from "@carbonorm/carbonnode";
 export interface iCarbonWebSocketProps {
     url?: string;
     timeoutSeconds?: number;
     heartbeatSeconds?: number;
     TABLES?: tC6Tables;
+    WsLiveUpdates?: tWsLiveUpdate;
 }
 /**
  * @function connect
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
-export declare function initiateWebsocket({ TABLES, url, timeoutSeconds, heartbeatSeconds }?: iCarbonWebSocketProps): void;
+export declare function initiateWebsocket({ TABLES, WsLiveUpdates, url, timeoutSeconds, heartbeatSeconds }?: iCarbonWebSocketProps): void;
 export default function (props: iCarbonWebSocketProps): null;

package/dist/index.cjs.js

@@ -4045,7 +4045,7 @@ const useEffectOnce = (effect) => {
  * @function connect
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
-function initiateWebsocket({ TABLES = undefined, url = 'ws://localhost:8080/ws', timeoutSeconds = 250, heartbeatSeconds = 60 } = {}) {
+function initiateWebsocket({ TABLES = undefined, WsLiveUpdates = undefined, url = 'ws://localhost:8080/ws', timeoutSeconds = 250, heartbeatSeconds = 60 } = {}) {
     const { websocket } = CarbonReact.instance.state;
     if (!("WebSocket" in window)) {
         // todo - store that this has been shown in the state
@@ -4080,17 +4080,66 @@ function initiateWebsocket({ TABLES = undefined, url = 'ws://localhost:8080/ws',
         };
         connection.onmessage = (message) => {
             const parsedData = isJsonString(message?.data) ? JSON.parse(message?.data) : message?.data;
+            if (message.data === 'pong') {
+                return;
+            }
             CarbonReact.instance.setState((prevState) => ({
                 websocketEvents: prevState.websocketEvents.concat(message),
                 websocketData: prevState.websocketData.concat(parsedData), // JSON.parse no good - base64?
-            }));
-            console.info('todo - going to impl TABLES', TABLES);
-            /*if (undefined !== TABLES) {
-
-                TABLES.
-
-
-            }*/
+            }), () => {
+                if (undefined === TABLES) {
+                    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;
+                    const METHOD = parsedData?.REST?.METHOD;
+                    const REQUEST = parsedData?.REST?.REQUEST;
+                    const REQUEST_PRIMARY_KEY = parsedData?.REST?.REQUEST_PRIMARY_KEY ?? null;
+                    if (null === REQUEST_PRIMARY_KEY) {
+                        console.log('WebSocket updates without a primary key are not yet supported.');
+                        return;
+                    }
+                    console.log('todo - going to impl REST', TABLE_NAME, METHOD, REQUEST_PRIMARY_KEY, parsedData?.REST);
+                    const TABLE_NAME_SHORT = TABLE_NAME.substring(TABLE_PREFIX.length);
+                    const currentCache = CarbonReact.instance.state[TABLE_NAME_SHORT];
+                    // just because we have a websocket update, doesn't mean we need the update
+                    // check to see if the primary key is in the current cache
+                    const c6Table = TABLES[TABLE_NAME_SHORT] ?? null;
+                    if (null === c6Table) {
+                        console.error('WebSocket update could not find (' + TABLE_NAME_SHORT + ') in the TABLES property passed.', TABLES);
+                        return;
+                    }
+                    const primaryKeyKeys = Object.keys(REQUEST_PRIMARY_KEY);
+                    const elementsToUpdate = currentCache.filter((row) => {
+                        for (const element of primaryKeyKeys) {
+                            console.log('element', element, REQUEST_PRIMARY_KEY[element], row[element]);
+                            if (REQUEST_PRIMARY_KEY[element] !== row[element]) {
+                                return false;
+                            }
+                        }
+                        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);
+                        return;
+                    }
+                    const updatedElements = elementsToUpdate.map((row) => {
+                        return {
+                            ...row,
+                            ...REQUEST
+                        };
+                    });
+                    console.log('updatedElements', updatedElements);
+                    WsLiveUpdates[TABLE_NAME_SHORT][METHOD]({}, updatedElements);
+                }
+            });
         };
         window.addEventListener("focus", () => initiateWebsocket());
         // websocket onclose event listener