@carbonorm/carbonreact 3.4.4 → 3.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonreact",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "browser": "dist/index.umd.js",
   "module": "dist/index.esm.js",
   "main": "dist/index.cjs.js",
@@ -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/CarbonReact.tsx

@@ -53,6 +53,9 @@ const CarbonReact= class <P = {}, S = {}> extends Component<{
     } & any, any & iCarbonReactState>;
 
     static lastLocation = window.location.pathname;
+    static websocketUrl = (window.location.protocol === 'https:' ? 'wss://' : 'ws://') + window.location.host + ':8888/ws';
+    static websocketTimeoutSeconds : number = 250;
+    static websocketHeartbeatSeconds : number = 250;
 
     // @link https://github.com/welldone-software/why-did-you-render
     // noinspection JSUnusedGlobalSymbols

package/src/api/hoc/getStatefulObjectWithWhere.tsx

@@ -12,6 +12,8 @@ export interface iGetStatefulObjectWithWhere {
 export default ({request}: { request: iAPI<any> & iWHERE }) => {
 
 
+    console.log('request', request)
+
 
 
 }

package/src/components/Popup/Popup.tsx

@@ -1,7 +1,7 @@
 import classNames from "classnames";
 import OutsideClickHandler from 'react-outside-click-handler';
 import getStyles from "hoc/getStyles";
-import {PropsWithChildren} from "react";
+import {PropsWithChildren, ReactElement} from "react";
 
 
 interface iPopupProperties {
@@ -18,12 +18,12 @@ export default function Popup({
                                   handleClose,
                                   children,
                                   maxWidth,
-                              }: PropsWithChildren<iPopupProperties>) {
+                              }: PropsWithChildren<iPopupProperties>) : ReactElement {
 
     if (false === open) {
 
         // @link https://legacy.reactjs.org/docs/conditional-rendering.html#preventing-component-from-rendering
-        return null;
+        return <></>;
 
     }
 

package/src/index.ts

@@ -9,55 +9,6 @@ export * from "./api/hoc/getStatefulObjectWithWhere";
 export * from "./api/hoc/useEffectOnce";
 export { default as watchInputElementChangeEvent } from "./api/hoc/watchInputElementChangeEvent";
 export * from "./api/hoc/watchInputElementChangeEvent";
-export * from "./api/rest/C6";
-export { default as Carbons } from "./api/rest/Carbons";
-export * from "./api/rest/Carbons";
-export { default as Chat_Messages } from "./api/rest/Chat_Messages";
-export * from "./api/rest/Chat_Messages";
-export { default as Documentation } from "./api/rest/Documentation";
-export * from "./api/rest/Documentation";
-export { default as Feature_Group_References } from "./api/rest/Feature_Group_References";
-export * from "./api/rest/Feature_Group_References";
-export { default as Features } from "./api/rest/Features";
-export * from "./api/rest/Features";
-export { default as Group_References } from "./api/rest/Group_References";
-export * from "./api/rest/Group_References";
-export { default as Groups } from "./api/rest/Groups";
-export * from "./api/rest/Groups";
-export { default as History_Logs } from "./api/rest/History_Logs";
-export * from "./api/rest/History_Logs";
-export { default as Likes } from "./api/rest/Likes";
-export * from "./api/rest/Likes";
-export { default as Location_References } from "./api/rest/Location_References";
-export * from "./api/rest/Location_References";
-export { default as Locations } from "./api/rest/Locations";
-export * from "./api/rest/Locations";
-export { default as Photos } from "./api/rest/Photos";
-export * from "./api/rest/Photos";
-export { default as Posts } from "./api/rest/Posts";
-export * from "./api/rest/Posts";
-export { default as Projects } from "./api/rest/Projects";
-export * from "./api/rest/Projects";
-export { default as Reports } from "./api/rest/Reports";
-export * from "./api/rest/Reports";
-export { default as Sessions } from "./api/rest/Sessions";
-export * from "./api/rest/Sessions";
-export { default as Subscription } from "./api/rest/Subscription";
-export * from "./api/rest/Subscription";
-export { default as User_Followers } from "./api/rest/User_Followers";
-export * from "./api/rest/User_Followers";
-export { default as User_Groups } from "./api/rest/User_Groups";
-export * from "./api/rest/User_Groups";
-export { default as User_Messages } from "./api/rest/User_Messages";
-export * from "./api/rest/User_Messages";
-export { default as User_Sessions } from "./api/rest/User_Sessions";
-export * from "./api/rest/User_Sessions";
-export { default as User_Tasks } from "./api/rest/User_Tasks";
-export * from "./api/rest/User_Tasks";
-export { default as Users } from "./api/rest/Users";
-export * from "./api/rest/Users";
-export { default as WsLiveUpdates } from "./api/rest/WsLiveUpdates";
-export * from "./api/rest/WsLiveUpdates";
 export { default as Alert } from "./components/Alert/Alert";
 export * from "./components/Alert/Alert";
 export { default as AccessDenied } from "./components/Errors/AccessDenied";