@carbonorm/carbonreact 3.4.2 → 3.4.5

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@carbonorm/carbonreact",
-  "version": "3.4.2",
+  "version": "3.4.5",
   "browser": "dist/index.umd.js",
   "module": "dist/index.esm.js",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@carbonorm/carbonnode": "^1.2.5",
+    "@carbonorm/carbonnode": "^1.2.14",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
@@ -70,7 +70,7 @@
   "scripts": {
     "prepublishOnly": "npm run build",
     "c6": "wget https://raw.githubusercontent.com/RichardTMiles/CarbonPHP/lts/view/C6.tsx -O src/variables/C6.tsx",
-    "build": "rm -rf ./dist/ && npm run build:css && npm run build:index && rollup -c && npm run build:compileValidSQL",
+    "build": "rm -rf ./dist/ ./src/api/rest/ && npm run build:css && npm run build:index && rollup -c && npm run build:compileValidSQL",
     "dev": "rollup -c -w",
     "test": "node test/test.js",
     "pretest": "npm run build",

package/src/api/hoc/getStatefulObjectWithWhere.tsx

@@ -0,0 +1,17 @@
+import {iAPI} from "@carbonorm/carbonnode";
+
+
+interface iWHERE {
+    [key: string]: any|iWHERE
+}
+
+export interface iGetStatefulObjectWithWhere {
+    WHERE: iWHERE | iWHERE[]
+}
+
+export default ({request}: { request: iAPI<any> & iWHERE }) => {
+
+
+
+
+}

package/src/api/hoc/watchInputElementChangeEvent.tsx

@@ -0,0 +1,24 @@
+import {ChangeEvent} from "react";
+import {timeout} from "@carbonorm/carbonnode";
+
+export default function watchInputElementChangeEvent(event: ChangeEvent<HTMLInputElement>, cb: (event: ChangeEvent<HTMLInputElement>) => (Promise<boolean> | boolean), timeoutMs: number = 3000) {
+
+    const target = event.target;
+
+    const value = target.value;
+
+    event.target.style.color = "orange";
+
+    timeout(() => value === ((() => target.value)()),
+        async () => {
+
+            const callbackResult = await cb(event);
+
+            console.log('User provided input callbackResult passed to WatchInputElementChangeEvent (will cause green or red) value (' + value + ')', callbackResult)
+
+            target.style.color = false === callbackResult ? "red" : "green"
+
+        },
+        timeoutMs)
+
+}

package/src/components/WebSocket/CarbonWebSocket.tsx

@@ -4,11 +4,22 @@ import {useEffectOnce} from "../../api/hoc/useEffectOnce";
 import {tC6Tables} from "@carbonorm/carbonnode";
 
 
+export interface iCarbonWebSocketProps {
+    url?: string,
+    timeoutSeconds?: number,
+    heartbeatSeconds?: number,
+    TABLES?: tC6Tables
+}
+
 /**
  * @function connect
  * This function establishes a connection with the websocket and also ensures constant reconnection if connection closes
  **/
-export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {}) {
+export function initiateWebsocket({TABLES = undefined,
+                                      url = 'ws://localhost:8080/ws',
+                                      timeoutSeconds = 250,
+                                      heartbeatSeconds = 60
+}: iCarbonWebSocketProps = {}) {
 
     const {websocket} = CarbonReact.instance.state;
 
@@ -32,9 +43,9 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
 
     let connectInterval;
 
-    const connection = new WebSocket(CarbonReact.websocketUrl);
+    const connection = new WebSocket(url);
 
-    console.log("Connecting websocket url", CarbonReact.websocketUrl);
+    console.log("Connecting websocket url", url);
 
     CarbonReact.instance.setState({
         websocket: connection
@@ -42,7 +53,7 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
 
         connection.onopen = () => {
 
-            console.log('WebSocket Client Connected To :: ' + CarbonReact.websocketUrl);
+            console.log('WebSocket Client Connected To :: ' + url);
 
             clearTimeout(connectInterval); // clear Interval on open of websocket connection
 
@@ -56,7 +67,7 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
 
                 websocket.send("ping");
 
-                setTimeout(heartbeat, CarbonReact.websocketHeartbeatSeconds * 1000);
+                setTimeout(heartbeat, heartbeatSeconds * 1000);
 
             }
 
@@ -64,7 +75,7 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
 
         };
 
-        connection.onmessage = (message: MessageEvent<string> ) => {
+        connection.onmessage = (message: MessageEvent<string>) => {
 
             const parsedData = isJsonString(message?.data) ? JSON.parse(message?.data) : message?.data;
 
@@ -73,7 +84,7 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
                 websocketData: prevState.websocketData.concat(parsedData), // JSON.parse no good - base64?
             }));
 
-            console.log('going to impl TABLES', TABLES)
+            console.info('todo - going to impl TABLES', TABLES)
 
             /*if (undefined !== TABLES) {
 
@@ -97,9 +108,9 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
 
             const retry = () => {
 
-                const retrySeconds = Math.min(5000, (CarbonReact.websocketTimeoutSeconds + CarbonReact.websocketTimeoutSeconds) * 1000)
+                const retrySeconds = Math.min(5000, (timeoutSeconds + timeoutSeconds) * 1000)
 
-                CarbonReact.websocketTimeoutSeconds = retrySeconds;
+                timeoutSeconds = retrySeconds;
 
                 console.log(`WebSocket reconnect will be attempted in ${retrySeconds} second(s).`)
 
@@ -168,11 +179,11 @@ export function initiateWebsocket({TABLES = undefined}: {TABLES?: tC6Tables} = {
 
 }
 
-export default function () {
+export default function (props: iCarbonWebSocketProps) {
 
     useEffectOnce(() => {
 
-        initiateWebsocket()
+        initiateWebsocket(props)
 
     })
 

package/src/index.ts

@@ -4,7 +4,11 @@
 
 export { default as CarbonReact } from "./CarbonReact";
 export * from "./CarbonReact";
+export { default as getStatefulObjectWithWhere } from "./api/hoc/getStatefulObjectWithWhere";
+export * from "./api/hoc/getStatefulObjectWithWhere";
 export * from "./api/hoc/useEffectOnce";
+export { default as watchInputElementChangeEvent } from "./api/hoc/watchInputElementChangeEvent";
+export * from "./api/hoc/watchInputElementChangeEvent";
 export { default as Alert } from "./components/Alert/Alert";
 export * from "./components/Alert/Alert";
 export { default as AccessDenied } from "./components/Errors/AccessDenied";