@campxdev/react-blueprint 1.3.3 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/react-blueprint",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "main": "./export.ts",
   "private": false,
   "dependencies": {

package/src/components/Input/SingleSelect/SingleSelect.tsx

@@ -14,6 +14,11 @@ import { Spinner } from '../../Feedback/Spinner/Spinner';
 import { TextField } from '../TextField/TextField';
 import { OptionsLoader } from '../components/OptionsLoader';
 import { OptionContainer } from '../styles';
+import {
+  SingleSelectActionsTypes,
+  singleSelectReducer,
+  SingleSelectState,
+} from './singleSelectReducer';
 
 function sleep(duration: number): Promise<void> {
   return new Promise<void>((resolve) => {
@@ -23,13 +28,6 @@ function sleep(duration: number): Promise<void> {
   });
 }
 
-declare module '@mui/material/Autocomplete' {
-  interface AutocompletePaperSlotPropsOverrides {
-    loadingOptions: boolean;
-    isSearch: boolean;
-  }
-}
-
 export type SingleSelectProps = {
   options?: { label: string; subLabel?: string; value: any }[] | any[];
   optionsApiEndPoint?: string;
@@ -42,6 +40,8 @@ export type SingleSelectProps = {
   dbValueProps?: {
     valueKey: string;
     isObjectId?: boolean;
+    isInt?: boolean;
+    isFloat?: boolean;
   };
   dbLabelProps?: { labelKey: string; subLabelKey?: string };
   onChange: (value: any) => void;
@@ -77,101 +77,6 @@ const CustomPaper = (props: any) => (
   </Paper>
 );
 
-enum SingleSelectActionsTypes {
-  OPEN = 'open',
-  CLOSE = 'close',
-  LOAD_INTERNAL_OPTIONS_START = 'load_internal_options_start',
-  LOAD_INTERNAL_OPTIONS_END = 'load_internal_options_end',
-  LOAD_SELECTED_OPTIONS_START = 'load_selected_options_start',
-  LOAD_SELECTED_OPTIONS_END = 'load_selected_options_end',
-  SET_NETWORK_ERROR = 'set_network_error',
-  SET_INTERNAL_OPTIONS = 'set_internal_options',
-  APPEND_INTERNAL_OPTIONS = 'append_internal_options',
-  CHANGE_HAS_MORE_FLAG = 'change_has_more_flag',
-  SET_SEARCH = 'set_search',
-  CLEAR_SEARCH = 'clear_search',
-}
-const singleSelectReducer = (
-  state: any,
-  {
-    actionType,
-    stateChanges,
-  }: { actionType: SingleSelectActionsTypes; stateChanges?: any },
-) => {
-  switch (actionType) {
-    case SingleSelectActionsTypes.OPEN: {
-      return { ...state, open: true };
-    }
-    case SingleSelectActionsTypes.CLOSE: {
-      return {
-        ...state,
-        open: false,
-        loadingInternalOptions: false,
-      };
-    }
-    case SingleSelectActionsTypes.LOAD_INTERNAL_OPTIONS_START: {
-      return { ...state, loadingInternalOptions: true };
-    }
-    case SingleSelectActionsTypes.LOAD_INTERNAL_OPTIONS_END: {
-      return { ...state, loadingInternalOptions: false };
-    }
-    case SingleSelectActionsTypes.LOAD_SELECTED_OPTIONS_START: {
-      return { ...state, loadingInitialInternalOptions: true };
-    }
-    case SingleSelectActionsTypes.LOAD_SELECTED_OPTIONS_END: {
-      return { ...state, loadingInitialInternalOptions: false };
-    }
-    case SingleSelectActionsTypes.SET_NETWORK_ERROR: {
-      return { ...state, ...stateChanges };
-    }
-    case SingleSelectActionsTypes.SET_SEARCH: {
-      return {
-        ...state,
-        search: stateChanges.search,
-        hasMore: true,
-      };
-    }
-    case SingleSelectActionsTypes.CLEAR_SEARCH: {
-      return {
-        ...state,
-        search: null,
-        offset: 0,
-        internalOptions: stateChanges.internalOptions,
-        internalOptionsMap: stateChanges.internalOptionsMap,
-      };
-    }
-    case SingleSelectActionsTypes.SET_INTERNAL_OPTIONS: {
-      return {
-        ...state,
-        internalOptions: stateChanges.internalOptions,
-        internalOptionsMap: stateChanges.internalOptionsMap,
-        loadingInternalOptions: false,
-      };
-    }
-    case SingleSelectActionsTypes.APPEND_INTERNAL_OPTIONS: {
-      return {
-        ...state,
-        internalOptions: [...state.internalOptions, ...stateChanges.newOptions],
-        internalOptionsMap: {
-          ...state.internalOptionsMap,
-          ...stateChanges.internalOptionsMap,
-        },
-        loadingInternalOptions: false,
-        limit: state.limit,
-        offset: state.offset + (stateChanges?.persistOffset ? 0 : 10),
-      };
-    }
-    case SingleSelectActionsTypes.CHANGE_HAS_MORE_FLAG: {
-      return {
-        ...state,
-        hasMore: !state.hasMore,
-      };
-    }
-    default:
-      return { ...state, ...stateChanges };
-  }
-};
-
 export const SingleSelect = ({
   options,
   optionsApiEndPoint,
@@ -188,6 +93,8 @@ export const SingleSelect = ({
   dbValueProps = {
     valueKey: 'id',
     isObjectId: false,
+    isInt: false,
+    isFloat: false,
   },
   dbLabelProps,
   onOpen,
@@ -198,7 +105,7 @@ export const SingleSelect = ({
     return _.keyBy(options ?? [], getValue ? getValue : (o) => o.value);
   };
 
-  const [state, dispatch] = useReducer(singleSelectReducer, {
+  const initialState: SingleSelectState = {
     open: false,
     loadingInternalOptions: false,
     loadingInitialInternalOptions: false,
@@ -208,7 +115,9 @@ export const SingleSelect = ({
     offset: 0,
     hasMore: true,
     search: null,
-  });
+  };
+
+  const [state, dispatch] = useReducer(singleSelectReducer, initialState);
   const {
     open,
     loadingInternalOptions,
@@ -237,8 +146,10 @@ export const SingleSelect = ({
               limit,
               offset,
               dbValueProps: {
-                ...dbValueProps,
+                valueKey: dbValueProps.valueKey,
                 ...(dbValueProps.isObjectId && { isObjectId: true }),
+                ...(dbValueProps.isInt && { isInt: true }),
+                ...(dbValueProps.isFloat && { isFloat: true }),
                 selectedValueData: value,
               },
               dbLabelProps,
@@ -328,8 +239,10 @@ export const SingleSelect = ({
             offset: offset + 10,
 
             dbValueProps: {
-              ...dbValueProps,
+              valueKey: dbValueProps.valueKey,
               ...(dbValueProps.isObjectId && { isObjectId: true }),
+              ...(dbValueProps.isInt && { isInt: true }),
+              ...(dbValueProps.isFloat && { isFloat: true }),
               selectedValueData: value,
             },
             dbLabelProps: {
@@ -385,8 +298,10 @@ export const SingleSelect = ({
               limit,
               offset: 0,
               dbValueProps: {
-                ...dbValueProps,
+                valueKey: dbValueProps.valueKey,
                 ...(dbValueProps.isObjectId && { isObjectId: true }),
+                ...(dbValueProps.isInt && { isInt: true }),
+                ...(dbValueProps.isFloat && { isFloat: true }),
                 selectedValueData: value,
               },
               dbLabelProps: {
@@ -449,12 +364,15 @@ export const SingleSelect = ({
           limit,
           offset,
           dbValueProps: {
-            ...dbValueProps,
+            valueKey: dbValueProps.valueKey,
             ...(dbValueProps.isObjectId && { isObjectId: true }),
+            ...(dbValueProps.isInt && { isInt: true }),
+            ...(dbValueProps.isFloat && { isFloat: true }),
             selectedValueData: value,
             filterBySelectedValues: true,
           },
           dbLabelProps,
+          ...optionsApiEndpointParams,
         },
       });
       dispatch({

package/src/components/Input/SingleSelect/singleSelectReducer.ts

@@ -0,0 +1,125 @@
+import { Reducer } from 'react';
+
+export enum SingleSelectActionsTypes {
+  OPEN = 'open',
+  CLOSE = 'close',
+  LOAD_INTERNAL_OPTIONS_START = 'load_internal_options_start',
+  LOAD_INTERNAL_OPTIONS_END = 'load_internal_options_end',
+  LOAD_SELECTED_OPTIONS_START = 'load_selected_options_start',
+  LOAD_SELECTED_OPTIONS_END = 'load_selected_options_end',
+  SET_NETWORK_ERROR = 'set_network_error',
+  SET_INTERNAL_OPTIONS = 'set_internal_options',
+  APPEND_INTERNAL_OPTIONS = 'append_internal_options',
+  CHANGE_HAS_MORE_FLAG = 'change_has_more_flag',
+  SET_SEARCH = 'set_search',
+  CLEAR_SEARCH = 'clear_search',
+}
+
+export type Option = {
+  label: string;
+  subLabel?: string;
+  value: any;
+};
+
+export type SingleSelectState = {
+  open: boolean;
+  loadingInternalOptions: boolean;
+  loadingInitialInternalOptions: boolean;
+  internalOptions: Option[];
+  internalOptionsMap: { [x: string]: Option };
+  limit: number;
+  offset: number;
+  hasMore: boolean;
+  search: string | null;
+  error?: any;
+};
+
+export type SingleSelectAction = {
+  actionType: SingleSelectActionsTypes;
+  stateChanges?: Partial<SingleSelectState> & {
+    persistOffset?: boolean;
+    newOptions?: Option[];
+  };
+};
+
+export const singleSelectReducer: Reducer<
+  SingleSelectState,
+  SingleSelectAction
+> = (state: SingleSelectState, action: SingleSelectAction) => {
+  const { actionType, stateChanges } = action;
+  switch (actionType) {
+    case SingleSelectActionsTypes.OPEN: {
+      return { ...state, open: true };
+    }
+    case SingleSelectActionsTypes.CLOSE: {
+      return {
+        ...state,
+        open: false,
+        loadingInternalOptions: false,
+      };
+    }
+    case SingleSelectActionsTypes.LOAD_INTERNAL_OPTIONS_START: {
+      return { ...state, loadingInternalOptions: true };
+    }
+    case SingleSelectActionsTypes.LOAD_INTERNAL_OPTIONS_END: {
+      return { ...state, loadingInternalOptions: false };
+    }
+    case SingleSelectActionsTypes.LOAD_SELECTED_OPTIONS_START: {
+      return { ...state, loadingInitialInternalOptions: true };
+    }
+    case SingleSelectActionsTypes.LOAD_SELECTED_OPTIONS_END: {
+      return { ...state, loadingInitialInternalOptions: false };
+    }
+    case SingleSelectActionsTypes.SET_NETWORK_ERROR: {
+      return { ...state, ...stateChanges };
+    }
+    case SingleSelectActionsTypes.SET_SEARCH: {
+      return {
+        ...state,
+        search: stateChanges?.search ?? null,
+        hasMore: true,
+      };
+    }
+    case SingleSelectActionsTypes.CLEAR_SEARCH: {
+      return {
+        ...state,
+        search: null,
+        offset: 0,
+        internalOptions: stateChanges?.internalOptions ?? [],
+        internalOptionsMap: stateChanges?.internalOptionsMap ?? {},
+      };
+    }
+    case SingleSelectActionsTypes.SET_INTERNAL_OPTIONS: {
+      return {
+        ...state,
+        internalOptions: stateChanges?.internalOptions ?? [],
+        internalOptionsMap: stateChanges?.internalOptionsMap ?? {},
+        loadingInternalOptions: false,
+      };
+    }
+    case SingleSelectActionsTypes.APPEND_INTERNAL_OPTIONS: {
+      return {
+        ...state,
+        internalOptions: [
+          ...state.internalOptions,
+          ...(stateChanges?.newOptions ?? []),
+        ],
+        internalOptionsMap: {
+          ...state.internalOptionsMap,
+          ...stateChanges?.internalOptionsMap,
+        },
+        loadingInternalOptions: false,
+        limit: state.limit,
+        offset: state.offset + (stateChanges?.persistOffset ? 0 : 10),
+      };
+    }
+    case SingleSelectActionsTypes.CHANGE_HAS_MORE_FLAG: {
+      return {
+        ...state,
+        hasMore: !state.hasMore,
+      };
+    }
+    default:
+      return { ...state, ...stateChanges };
+  }
+};

package/src/utils/logout.ts

@@ -1,6 +1,3 @@
-// import axios, {
-//   axiosErrorToast,
-// } from "@campxdev/campx-web-utils/src/config/axios";
 import { axios } from '@campxdev/campx-web-utils';
 import Cookies from 'js-cookie';
 

package/types/theme.d.ts

@@ -61,3 +61,10 @@ declare module '@mui/material/Typography' {
     button1: true;
   }
 }
+
+declare module '@mui/material/Autocomplete' {
+  interface AutocompletePaperSlotPropsOverrides {
+    loadingOptions: boolean;
+    isSearch: boolean;
+  }
+}