Merge branch 'development' of https://github.com/wrappid/core into WR…

…PD-enhancement-421
wrappid · Nov 20, 2024 · cbb72f6 · cbb72f6
2 parents a826458 + ab3e23b
commit cbb72f6
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.587](https://github.com/wrappid/core/compare/v0.0.586...v0.0.587) (2024-11-19)
+
+
+### Bug Fixes
+
+* **core:** :bug: some basic fix ([3d562c1](https://github.com/wrappid/core/commit/3d562c1e883de26dc52b603e562d0ca44a711240))
+
 ### [0.0.586](https://github.com/wrappid/core/compare/v0.0.585...v0.0.586) (2024-11-18)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wrappid/core",
-  "version": "0.0.586",
+  "version": "0.0.587",
   "description": "Multi platform app builder core package.",
   "main": "index.js",
   "scripts": {

diff --git a/package/components/dataDisplay/CoreIconText.js b/package/components/dataDisplay/CoreIconText.js
@@ -88,7 +88,8 @@ export default function CoreIconText(props) {
     >
       <CoreIcon
         size={size}
-        styleClasses={getIconStyleClass(iconColor)}
+        color={iconColor}
+        // styleClasses={getIconStyleClass(iconColor)}
         type={type}
       >
         {icon}

diff --git a/package/components/inputs/CoreOtpInput.js b/package/components/inputs/CoreOtpInput.js
@@ -15,12 +15,12 @@ import { apiRequestAction } from "../../store/action/appActions";
 import { SEND_OTP_ERROR, SEND_OTP_LOADING, SEND_OTP_SUCCESS } from "../../store/types/appTypes";
 import CoreClasses from "../../styles/CoreClasses";
 import CoreTimer from "../dataDisplay/CoreTimer";
-import CoreSkeleton from "../feedback/CoreSkeleton";
 import CoreBox from "../layouts/CoreBox";
 
 export default function CoreOtpInput(props) {
   const dispatch = useDispatch();
-  const { sendOtpLoading } = useSelector((state) => state?.app);
+  // eslint-disable-next-line etc/no-commented-out-code
+  // const { sendOtpLoading } = useSelector((state) => state?.app);
   const { navData: { userID }, accessToken } = useSelector((state) => state?.auth);
   let { config: appConfig } = React.useContext(WrappidDataContext);
 
@@ -68,9 +68,11 @@ export default function CoreOtpInput(props) {
     }
   };
 
-  return sendOtpLoading ? (
+  /* sendOtpLoading ? (
     <CoreSkeleton variant="rectangular" />
-  ) : (
+  ) :
+  */
+  return (
     <CoreBox>
       <NativeOtpInput {...props} />
 

diff --git a/package/components/utils/CoreProfilePopOver.js b/package/components/utils/CoreProfilePopOver.js
@@ -34,6 +34,16 @@ export default function CoreProfilePopOver(props) {
       phoneVerified = false,
     } 
   } = useSelector((state) => state?.auth || {});
+
+  const {
+    basic: {
+      firstName = null,
+      middleName = null,
+      lastName = null,
+      photo: basicPhoto = null
+    } 
+  } = useSelector((state) => state?.profile || {});
+  const basicName = [firstName, middleName, lastName].filter((item) => item).join(" ");
 
   const { onClose } = props;
   const profileCardMenu = [
@@ -75,16 +85,16 @@ export default function CoreProfilePopOver(props) {
               <CoreAvatar
                 gridProps={{ gridSize: { md: 4, sm: 3, xs: 3 } }}
                 styleClasses={[CoreClasses.DATA_DISPLAY.AVATAR_MEDIUM]}
-                src={photo}
+                src={basicPhoto || photo}
               />
             ) : (
               <CoreAvatar
                 gridProps={{ gridSize: { md: 4, sm: 3, xs: 3 } }}
                 styleClasses={[CoreClasses.DATA_DISPLAY.AVATAR_MEDIUM]}
-              >{(name || "Unknown User").at(0)}</CoreAvatar>
+              >{(basicName || name || "Unknown User").at(0)}</CoreAvatar>
             ) 
           }
-          title={name || "Unknown User"}
+          title={basicName || name || "Unknown User"}
           subheader={
             <>              
               <CoreEmailLink email={email} verified={emailVerified} limitChars={15} />

diff --git a/package/middleware/axiosInterceptor.js b/package/middleware/axiosInterceptor.js
@@ -46,7 +46,10 @@ async function tempFetch(apiConfig) {
         },
       };
     } else if (res.status === 204) {
-      return { data: {}, status: res.status };
+      return {
+        data  : { message: res?.message || "No Content" },
+        status: res.status 
+      };
     } else {
       let data = await res.json();
 

diff --git a/package/package-lock.json b/package/package-lock.json
diff --git a/package/package.json b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wrappid/core",
-  "version": "0.0.586",
+  "version": "0.0.587",
   "description": "Multi platform app builder core package.",
   "main": "index.js",
   "scripts": {},

diff --git a/package/styles/DefaultCoreStyles.js b/package/styles/DefaultCoreStyles.js
@@ -47,7 +47,7 @@ export default class DefaultCoreStyles extends BaseStyle {
         // eslint-disable-next-line etc/no-commented-out-code
         // ...this.defaultUtilityStyles.overflowYAuto,
         // ...this.defaultUtilityStyles.mxN1,
-        ...this.defaultUtilityStyles.pt1,
+        // ...this.defaultUtilityStyles.pt1,
         marginTop: HEADING_TOP_MARGIN + IMPORTANT,
       },
 
@@ -108,7 +108,7 @@ export default class DefaultCoreStyles extends BaseStyle {
         ...this.defaultUtilityStyles.positionSticky,
         ...this.defaultUtilityStyles.overflowYAuto,
         ...this.defaultUtilityStyles.overflowXHidden,
-        height: "calc(100vh - 118px)" + IMPORTANT,
+        height: "calc(100vh - 108px)" + IMPORTANT,
         top   : "64px" + IMPORTANT
       },
 

diff --git a/package/styles/MediumCoreStyles.js b/package/styles/MediumCoreStyles.js
@@ -1,17 +1,17 @@
 import {
-  DefaultUtilityStyles,
   DEFAULT_PADDING,
   IMPORTANT,
-  BaseStyle,
   MediumUtilityStyles
-// eslint-disable-next-line import/no-unresolved
+  // eslint-disable-next-line import/no-unresolved
 } from "@wrappid/styles";
 
+import DefaultCoreStyles from "./DefaultCoreStyles";
+
 // -- const MIN_WIDTH = MEDIUM_WINDOW_WIDTH;
 // -- const MAX_WIDTH = LARGE_WINDOW_WIDTH - 1;
 // const HEADING_TOP_MARGIN = "64px";
 
-export default class MediumCoreStyles extends BaseStyle {
+export default class MediumCoreStyles extends DefaultCoreStyles {
   mediumUtilityStyles = new MediumUtilityStyles().style;
 
   constructor() {
@@ -28,44 +28,32 @@ export default class MediumCoreStyles extends BaseStyle {
       contentContainer: {},
 
       dataTable: {
-        ...new DefaultUtilityStyles().style.mtN1,
-        ...new DefaultUtilityStyles().style.mlN1,
+        ...this.defaultUtilityStyles.mtN1,
+        ...this.defaultUtilityStyles.mlN1,
         width: "calc(100% + 8px)" + IMPORTANT,
       },
 
       dataTableBody         : {},
       // ----------Data Table Styles Starts----------
-      dataTableContainer    : { /* -- ...new DefaultUtilityStyles().style.bgWarningLight, */ },
+      dataTableContainer    : { /* -- ...this.defaultUtilityStyles.bgWarningLight, */ },
       dataTableFoot         : {},
       dataTableFullWidthPane: {},
-      dataTableHead         : { top: "-8px" + IMPORTANT },
-      dataTableHeadTop      : { top: "53px" + IMPORTANT },
-      dataTableMiniWidthPane: {
-        ...new DefaultUtilityStyles().style.border,
-        ...new DefaultUtilityStyles().style.borderRight,
-        ...new DefaultUtilityStyles().style.borderPrimaryLight,
-        ...new DefaultUtilityStyles().style.positionSticky,
-        ...new DefaultUtilityStyles().style.overflowYAuto,
-        ...new DefaultUtilityStyles().style.overflowXHidden,
-        height: "calc(100vh - 118px)" + IMPORTANT,
-        top   : "53px" + IMPORTANT,
-      },
-      dataTableToolbar: {
-        ...new DefaultUtilityStyles().style.mtN2,
-        ...new DefaultUtilityStyles().style.pr0,
-      },
-      dataTableToolbarContainer: {
-        ...new DefaultUtilityStyles().style.stickyTop,
-        zIndex: "1025" + IMPORTANT,
+      dataTableHead         : { top: "0px" + IMPORTANT },
+      dataTableHeadTop      : { top: "64px" + IMPORTANT },
+      dataTableMiniWidthPane: {},
+      dataTableToolbar      : {
+        ...this.defaultUtilityStyles.mtN2,
+        ...this.defaultUtilityStyles.pr0,
       },
+      dataTableToolbarContainer: { zIndex: "1025" + IMPORTANT },
 
       devBorder: { boxShadow: "inset 0px 0px 1px 1px cyan" },
 
       menuPopover: { minWidth: "25vw" },
 
       profileBarWidth: { maxWidth: "40vw" + IMPORTANT },
 
-      tableCell: { ...new DefaultUtilityStyles().style.px1 },
+      tableCell: { ...this.defaultUtilityStyles.px1 },
 
       tableFilterColumnBox: {
         maxHeight: "70vh" + IMPORTANT,
@@ -77,9 +65,9 @@ export default class MediumCoreStyles extends BaseStyle {
        * Table
        */
       tableHeadCell: {
-        ...new DefaultUtilityStyles().style.bgSecondaryLight,
-        ...new DefaultUtilityStyles().style.textPrimaryDark,
-        ...new DefaultUtilityStyles().style.px1,
+        ...this.defaultUtilityStyles.bgSecondaryLight,
+        ...this.defaultUtilityStyles.textPrimaryDark,
+        ...this.defaultUtilityStyles.px1,
       },
 
       /**