@carbonorm/carbonreact 1.3.1 → 2.0.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@carbonorm/carbonreact",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@carbonorm/carbonnode": "^1.0.3",
+    "@carbonorm/carbonnode": "^1.0.8",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
@@ -20,6 +20,7 @@
     "react-outside-click-handler": "^1.3.0",
     "react-router-dom": "^6.14.2",
     "react-toastify": "^9.1.3",
+    "typed-css-modules": "^0.7.2",
     "typed-scss-modules": "^7.1.2"
   },
   "devDependencies": {
@@ -61,7 +62,7 @@
     "dev": "rollup -c -w",
     "test": "node test/test.js",
     "pretest": "npm run build",
-    "build:index": "npx barrelsby -d ./src --delete --exclude '(jestHoc|\\.test|\\.d).(js|tsx?)$' --exportDefault --verbose",
+    "build:index": "npx barrelsby --directory ./src --delete --exclude '(jestHoc|\\.test|\\.d).(js|tsx?)$' --exportDefault --verbose --mode top",
     "build:css": "sass ./src:./src && typed-scss-modules 'src/**/*.?(s)css' --nameFormat all --exportType default src"
   },
   "files": [

package/src/CarbonReact.tsx

@@ -8,38 +8,35 @@ import {ToastContainer} from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.min.css';
 import BackendThrowable from 'components/Errors/BackendThrowable';
 import Nest from 'components/Nest/Nest';
-import {iCarbons} from "variables/C6";
+import {initialRestfulObjectArrayTypes, iRestfulObjectArrayTypes} from "variables/C6";
 
 
-export type tStatefulApiData<T> = T[] | undefined | null;
-
-
-// this refers to the value types of the keys above, aka values in the state
-export interface iRestfulObjectArrayTypes {
-    carbons: tStatefulApiData<iCarbons>,
-}
-
-export type tRestfulObjectArrayKeys = keyof iRestfulObjectArrayTypes
-
-export type tRestfulObjectArrayValues = iRestfulObjectArrayTypes[tRestfulObjectArrayKeys];
-
-// @ts-ignore
-export type tRestfulObjectValues = tRestfulObjectArrayValues[number];
 
 // our central container, single page application is best with the DigApi
-export interface iCarbonORMState extends iRestfulObjectArrayTypes {
+export interface iCarbonORMState {
+    alertsWaiting: any[],
     websocketEvents: MessageEvent[],
     websocketData: any[],
     websocket?: WebSocket,
-    websocketMounted: boolean,
-    alert?: boolean,
-    alertsWaiting: any[],
     backendThrowable: any[],
 }
 
+export const initialRequiredState: iCarbonORMState = {
+    alertsWaiting: [],
+    backendThrowable: [],
+    websocketData: [],
+    websocketEvents: [],
+}
+
+export const initialCarbonORMState: iCarbonORMState = {
+    ...initialRestfulObjectArrayTypes,
+    ...initialRequiredState,
+
+}
+
 export default class CarbonReact<P = {}, S = {}> extends React.Component<{
     children?: ReactNode | ReactNode[],
-} & P, iCarbonORMState & S> {
+} & P, ( iRestfulObjectArrayTypes |& S ) & iCarbonORMState> {
 
     static instance: CarbonReact;
 
@@ -53,14 +50,7 @@ export default class CarbonReact<P = {}, S = {}> extends React.Component<{
 
         super(props);
 
-        this.state = {
-            carbons: undefined,
-            alertsWaiting: [],
-            backendThrowable: [],
-            websocketData: [],
-            websocketEvents: [],
-            websocketMounted: false,
-        } as unknown as iCarbonORMState & S;
+        this.state = initialCarbonORMState as unknown as iCarbonORMState & S;
 
         CarbonReact.instance = this;
 

package/src/hoc/axiosInstance.tsx

@@ -271,7 +271,7 @@ function axiosInterceptors(axios: AxiosInstance): void {
 
                     if (isTest) {
 
-                        throw new Error(error?.response.data['CarbonPHP\\Error\\PublicAlert'] ?? error?.response.data['DropInGaming\\PHP\\Errors\\DropException'] ?? JSON.stringify(error?.response.data, undefined, 4))
+                        throw new Error(error?.response.data['CarbonPHP\\Error\\PublicAlert'] ?? error?.response.data['TRACE'] ?? JSON.stringify(error?.response.data, undefined, 4))
 
                     }
 

package/src/hoc/getStyles.tsx

@@ -1,6 +1,6 @@
 import classNames from "classnames";
 import BootstrapStyle from "variables/bootstrap.module.css"
-import DropInGamingStyles from "style.module.css"
+import Styles from "style.module.css"
 
 export const getRootStyleValue = (property = '--dig_primary_color') : string => {
 
@@ -27,13 +27,13 @@ function mergeStyles<iStyleA extends iStyle, iStyleB extends iStyle>(styleA : iS
 
 }
 
-const dropStyles = mergeStyles(BootstrapStyle, DropInGamingStyles);
+const dropStyles = mergeStyles(BootstrapStyle, Styles);
 
 type tBootstrap = typeof BootstrapStyle
 
-type tDropInGaming = typeof DropInGamingStyles
+type tStyles = typeof Styles
 
-export default function getStyles<iCSS extends {}>(overrides: iCSS = {} as iCSS): tBootstrap & tDropInGaming & iCSS {
+export default function getStyles<iCSS extends {}>(overrides: iCSS = {} as iCSS): tBootstrap & tStyles & iCSS {
 
     if (0 === Object.keys(overrides).length) {
         return dropStyles as (typeof dropStyles) & iCSS

package/src/hoc/setUrl.tsx

@@ -5,7 +5,7 @@ export default function setUrl() {
 
     const isGitHubActions = process.env.REACT_APP_TEST_REMOTE === 'true'
 
-    const host = ( isGitHubActions ? process.env.REACT_APP_REMOTE_SUBDOMAIN : process.env.REACT_APP_LOCAL_SUBDOMAIN ) + '.dropingaming.com' + (isGitHubActions ? '' : ':8080')
+    const host = ( isGitHubActions ? process.env.REACT_APP_REMOTE_SUBDOMAIN : process.env.REACT_APP_LOCAL_SUBDOMAIN ) + '.example.com' + (isGitHubActions ? '' : ':8080')
 
     console.log("test host:: ", host, isGitHubActions)