@carbonorm/carbonreact 4.0.13 → 4.0.15

package/dist/index.esm.js

@@ -1,8 +1,8 @@
 import react, { useRef, useState, useEffect, Component, createContext, lazy } from 'react';
-import { toastOptions, clearCache, timeout, axiosInstance, isVerbose, checkAllRequestsComplete } from '@carbonorm/carbonnode';
 import { useNavigate } from 'react-router-dom';
 import { toast, ToastContainer } from 'react-toastify';
 import OutsideClickHandler from 'react-outside-click-handler';
+import { toastOptions, timeout, axiosInstance, isVerbose, checkAllRequestsComplete } from '@carbonorm/carbonnode';
 import classNames from 'classnames';
 import { faClose } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -4064,7 +4064,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
@@ -4111,10 +4112,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;
@@ -4136,7 +4133,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];
@@ -4146,7 +4144,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);
@@ -4158,8 +4156,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);
+                        }
                     });
                 }
             });
@@ -4358,12 +4370,22 @@ function isJsonString(str) {
     return true;
 }
 class CarbonReact extends Component {
-    static persistentStateMap = new Map();
+    static allInstances = new Map();
     static activeInstances = new Map();
     context = createContext(this.state);
     target;
     static _instance;
-    static getInstance() {
+    static getInstance(instanceId) {
+        const identifier = this.generateIdentifier(instanceId);
+        if (undefined !== instanceId) {
+            if (CarbonReact.activeInstances.has(identifier)) {
+                return CarbonReact.activeInstances.get(identifier);
+            }
+            throw new Error(`No instance has been instantiated yet for class (${this.name}) with instanceId (${instanceId})`);
+        }
+        if (!this._instance) {
+            throw new Error(`No instance has been instantiated yet for class (${this.name})`);
+        }
         return this._instance;
     }
     static get instance() {
@@ -4384,32 +4406,39 @@ class CarbonReact extends Component {
     static whyDidYouRender = true;
     constructor(props) {
         super(props);
-        const target = new.target;
-        const identifier = props.instanceId || target.name;
+        const identifier = this.generateIdentifier();
         if (CarbonReact.activeInstances.has(identifier)) {
-            throw new Error(`Instance with ID ${identifier} already exists! CarbonReact extended classes can only be referenced once in DOM with the same identifier.`);
+            throw new Error(`${identifier} instance already exists in the DOM! Each instance should have a unique instanceId.`);
         }
+        // Register the new instance
         CarbonReact.activeInstances.set(identifier, this);
-        this.target = target;
-        console.log('CarbonORM TSX CONSTRUCTOR');
-        Object.assign(target, {
-            _instance: this
-        });
-        if (CarbonReact.persistentStateMap.has(identifier)) {
-            this.state = CarbonReact.persistentStateMap.get(identifier);
+        if (props.persistentState && CarbonReact.allInstances.has(identifier)) {
+            // Reuse the state from the existing instance
+            this.state = CarbonReact.allInstances.get(identifier).state;
         }
         else {
-            clearCache({
-                ignoreWarning: true
-            });
             this.state = initialCarbonReactState;
+            CarbonReact.allInstances.set(identifier, this);
         }
-        // Save the initial state to the persistent state map with the identifier
-        CarbonReact.persistentStateMap.set(identifier, this.state);
+        this.target = new.target;
+        console.log('CarbonORM TSX CONSTRUCTOR');
+        Object.assign(this.target, {
+            _instance: this
+        });
+    }
+    static generateIdentifier(instanceId) {
+        const className = this.name;
+        return instanceId ? `${className}-${instanceId}` : className;
+    }
+    generateIdentifier() {
+        const className = this.constructor.name;
+        return this.props.instanceId ? `${className}-${this.props.instanceId}` : className;
+    }
+    componentWillUnmount() {
+        const identifier = this.generateIdentifier();
+        CarbonReact.activeInstances.delete(identifier);
     }
     shouldComponentUpdate(nextProps, nextState, _nextContext) {
-        const identifier = this.props.instanceId || this.constructor.name;
-        CarbonReact.persistentStateMap.set(identifier, nextState);
         changed(this.constructor.name + ' (C6Api)', 'props', this.props, nextProps);
         changed(this.constructor.name + ' (C6Api)', 'state', this.state, nextState);
         return true;
@@ -4436,10 +4465,6 @@ class CarbonReact extends Component {
         return jsxRuntime_2(jsxRuntime_3, { children: [jsxRuntime_1(GlobalHistory, {}), this.props.websocket &&
                     jsxRuntime_1(CarbonWebSocket, { ...(false !== this.props.websocket ? this.props.websocket : {}), instance: this }), jsxRuntime_1(Context, { value: this.state, children: this.props.children }), jsxRuntime_1(ToastContainer, {})] });
     }
-    componentWillUnmount() {
-        const identifier = this.props.instanceId || this.constructor.name;
-        CarbonReact.activeInstances.delete(identifier);
-    }
 }
 
 var getStatefulObjectWithWhere = ({ request }) => {