@carbonorm/carbonreact 1.3.1 → 2.0.1

package/src/CarbonReact.tsx

@@ -8,38 +8,34 @@ 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 {initialRestfulObjectsState, 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 initialRequiredCarbonORMState: iCarbonORMState = {
+    alertsWaiting: [],
+    backendThrowable: [],
+    websocketData: [],
+    websocketEvents: [],
+}
+
+export const initialCarbonORMState: iCarbonORMState = {
+    ...initialRequiredCarbonORMState,
+    ...initialRestfulObjectsState,
+}
+
 export default class CarbonReact<P = {}, S = {}> extends React.Component<{
     children?: ReactNode | ReactNode[],
-} & P, iCarbonORMState & S> {
+} & P, ( iRestfulObjectArrayTypes |& S ) & iCarbonORMState> {
 
     static instance: CarbonReact;
 
@@ -53,14 +49,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/deleteRestfulObjectArrays.tsx

@@ -1,18 +1,20 @@
-import CarbonReact, {iCarbonORMState, iRestfulObjectArrayTypes, tRestfulObjectValues} from "CarbonReact";
+import CarbonReact, {iCarbonORMState} from "CarbonReact";
+import {iRestfulObjectArrayTypes, tRestfulObjectValues} from "variables/C6";
 
 
 //ObjectType, UniqueIdType extends keyof ObjectType
-export default function deleteRestfulObjectArrays<ObjectType extends tRestfulObjectValues>
+export default function deleteRestfulObjectArrays<ObjectType = tRestfulObjectValues, ObjectArrayTypes = iRestfulObjectArrayTypes>
 (dataOrCallback: ((prev: Readonly<iCarbonORMState>) => ObjectType[]) | ObjectType[],
- stateKey: keyof iRestfulObjectArrayTypes,
+ stateKey: keyof ObjectArrayTypes,
  uniqueObjectId: keyof ObjectType,
  callback?: () => void): void {
 
-    return CarbonReact.instance.setState((previousBootstrapState): {} => {
+    return CarbonReact.instance.setState((previousBootstrapState ): {} => {
 
         let newOrReplacementData: ObjectType[] = dataOrCallback instanceof Function ? dataOrCallback(previousBootstrapState) : dataOrCallback;
 
-        const previousStateProperty = previousBootstrapState[stateKey] as ObjectType[];
+        // @ts-ignore
+        const previousStateProperty = previousBootstrapState[stateKey];
 
         return {
             [stateKey]: null === previousBootstrapState ? null : [

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)
 

package/src/hoc/updateRestfulObjectArrays.tsx

@@ -1,8 +1,7 @@
 import CarbonReact, {
-    iCarbonORMState,
-    iRestfulObjectArrayTypes,
-    tRestfulObjectValues
+    iCarbonORMState
 } from "CarbonReact";
+import {iRestfulObjectArrayTypes, tRestfulObjectValues} from "variables/C6";
 
 
 export enum eUpdateInsertMethod {
@@ -21,9 +20,9 @@ export enum eUpdateInsertMethod {
  * @param callback - if you want to do something with the updated state, you can pass a callback here. Run as the second
  *  parameter of setState.
  */
-export default function updateRestfulObjectArray<ObjectType extends tRestfulObjectValues>
+export default function updateRestfulObjectArray<ObjectType = tRestfulObjectValues, ObjectArrayTypes = iRestfulObjectArrayTypes>
 (dataOrCallback: ((prev: Readonly<iCarbonORMState>) => ObjectType[]) | ObjectType[],
- stateKey: keyof iRestfulObjectArrayTypes,
+ stateKey: keyof ObjectArrayTypes,
  uniqueObjectId: keyof ObjectType,
  insertUpdateOrder: eUpdateInsertMethod = eUpdateInsertMethod.LAST,
  callback?: () => void): void {
@@ -34,7 +33,8 @@ export default function updateRestfulObjectArray<ObjectType extends tRestfulObje
 
         let newOrReplacementData: ObjectType[] = dataOrCallback instanceof Function ? dataOrCallback(previousBootstrapState) : dataOrCallback;
 
-        const previousStateProperty = previousBootstrapState[stateKey] as ObjectType[];
+        // @ts-ignore
+        const previousStateProperty = previousBootstrapState[stateKey];
 
         let updatedData = newOrReplacementData.map(value => {
             return {

package/src/index.ts

@@ -12,8 +12,6 @@ export { default as BackendThrowable } from "./components/Errors/BackendThrowabl
 export * from "./components/Errors/BackendThrowable";
 export { default as ErrorHttpCode } from "./components/Errors/ErrorHttpCode";
 export * from "./components/Errors/ErrorHttpCode";
-export { default as Localhost } from "./components/Errors/Localhost";
-export * from "./components/Errors/Localhost";
 export { default as PageNotFound } from "./components/Errors/PageNotFound";
 export * from "./components/Errors/PageNotFound";
 export { default as Loading } from "./components/Loading/Loading";