@fixefy/fixefy-ui-components 0.2.12 → 0.2.13

package/dist/FxAsyncDropdown/FxAsyncDropdown.js

@@ -133,29 +133,28 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
     const [prevPage, setPrevPage] = (0, _react.useState)(0);
     const pageSize = 20;
     const { method_name } = variables;
-    const { where } = fetcher.queryOptions.variables;
     const ws = (0, _nookies.parseCookies)().ws;
     const isLocal = fetcher.query.loc;
     const getWhere = ()=>{
-        if (method_name == 'workspace') {
-            return searchValue ? _object_spread_props(_object_spread({}, where), {
+        if (variables.method_name == 'workspace') {
+            return searchValue ? _object_spread_props(_object_spread({}, fetcher.queryOptions.variables.where), {
                 _id: ws,
                 [search_path]: {
                     $regex: searchValue
                 }
-            }) : _object_spread_props(_object_spread({}, where), {
+            }) : _object_spread_props(_object_spread({}, fetcher.queryOptions.variables.where), {
                 _id: ws
             });
         } else {
-            return searchValue ? _object_spread_props(_object_spread({}, where), {
+            return searchValue ? _object_spread_props(_object_spread({}, fetcher.queryOptions.variables.where), {
                 [search_path]: {
                     $regex: searchValue
                 }
-            }) : _object_spread({}, where);
+            }) : _object_spread({}, fetcher.queryOptions.variables.where);
         }
     };
     const [fetch, { data, loading }] = (0, _client.useLazyQuery)((0, _graphqltag.gql)(isLocal ? fetcher.query.loc.source.body : fetcher.query), _object_spread_props(_object_spread({}, fetcher.queryOptions), {
-        variables: _object_spread_props(_object_spread({}, where), {
+        variables: _object_spread_props(_object_spread({}, fetcher.queryOptions.variables), {
             where: getWhere(),
             skip: page * pageSize - pageSize,
             limit: pageSize
@@ -183,8 +182,7 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
     ]);
     (0, _react.useEffect)(()=>{
         if (data && !isLastPage && prevPage < page) {
-            //raaya todo: this is too messy clean it
-            const newOptions = method_name == 'workspace' ? data.workspace[search_path === null || search_path === void 0 ? void 0 : search_path.split('.')[1]] : data[method_name];
+            const newOptions = method_name == 'workspace' ? data.workspace[search_path === null || search_path === void 0 ? void 0 : search_path.split('.')[1]] : (0, _helpers.getJPart)(data, method_name);
             if (newOptions == null || newOptions.length < pageSize) {
                 setIsLastPage(true);
             }
@@ -249,7 +247,7 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
         }
     };
     const handleOptionClick = (option)=>{
-        let clicked = getClicked(option);
+        let clicked = getOption(option);
         switch(multiple){
             case true:
                 if (displayed.map((item)=>{
@@ -289,7 +287,7 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
         removeOneFromStoredDisplayed(item);
     };
     const isChecked = (option)=>{
-        const clicked = getClicked(option);
+        const clicked = getOption(option);
         if (typeof displayed === 'string') {
             return false;
         } else {
@@ -353,13 +351,13 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
         setPage((prevPage)=>prevPage + 1);
         setPrevPage((prevPage)=>prevPage + 1);
     };
-    const getClicked = (option)=>{
+    const getOption = (option)=>{
         if (option != '') {
-            let clicked = (0, _helpers.getJPart)(option, search_path, 0) || option.title;
-            if (clicked !== null && typeof clicked === 'object') {
-                clicked = clicked[0];
+            let curOption = (0, _helpers.getJPart)(option, search_path, 0) || option.title;
+            if (curOption !== null && (0, _helpers.isArrayValid)(curOption)) {
+                curOption = curOption[0];
             }
-            return clicked;
+            return curOption;
         }
         return null;
     };
@@ -385,7 +383,7 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
                 break;
             case false:
             default:
-                if (displayed[search_path] === getClicked(option)) {
+                if (displayed[search_path] === getOption(option)) {
                     rv = /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
                         onClick: ()=>{
                             deleteOneItem(option);
@@ -399,7 +397,7 @@ const FxAsyncDropdown = /*#__PURE__*/ _react.default.forwardRef((props)=>{
     };
     const getSingleValueByModalType = (option, modal)=>{
         let rv = null;
-        const clicked = getClicked(option);
+        const clicked = getOption(option);
         switch(modal_type){
             case 'chip':
                 rv = modal === 'displayed' ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_FxChip.FxChip, {

package/dist/FxChip/FxChip.d.ts

@@ -1,10 +1,14 @@
 import React from 'react';
 import { EntityStatusType, ChargeStateType, InvoiceStateType, RecoStateType } from '@fixefy/fixefy-ui-utils';
+type ChipType = {
+    score: string;
+    status: EntityStatusType | ChargeStateType | InvoiceStateType | RecoStateType;
+};
 export interface ChipPropsType {
     status?: EntityStatusType | ChargeStateType | InvoiceStateType | RecoStateType;
     label: string | number;
     variant?: 'outlined' | 'filled';
-    type?: 'status' | 'priority' | 'score';
+    type?: ChipType;
     scoreValue?: number;
     minimized?: boolean;
     [x: string]: any;
@@ -12,3 +16,4 @@ export interface ChipPropsType {
     onDelete?: (e: any) => void;
 }
 export declare const FxChip: (props: ChipPropsType) => React.JSX.Element;
+export {};

package/dist/FxChip/FxChip.js

@@ -22,34 +22,24 @@ const FxChip = (props)=>{
     const { status, label, type = 'status', scoreValue = 0, minimized = false, variant = 'outlined', onClick, onDelete } = props;
     const newStatus = status ? status.split(' ').join('_') : status;
     const value = typeof label === 'number' ? label.toFixed(2) : label;
-    if (type === 'status') {
-        return /*#__PURE__*/ (0, _jsxruntime.jsx)(_chipstyles.StatusChipStyled, {
-            status: newStatus,
-            label: (0, _fixefyuiutils.titleCase)(value),
-            variant: variant,
-            onClick: onClick,
-            onDelete: onDelete,
-            deleteIcon: onDelete ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_iconsmaterial.CloseRounded, {
-                sx: {
-                    width: 11,
-                    height: 11
-                }
-            }) : null
-        });
-    } else if (type === 'priority') {
-        return /*#__PURE__*/ (0, _jsxruntime.jsx)(_chipstyles.PriorityChipStyled, {
-            status: newStatus,
-            label: (0, _fixefyuiutils.titleCase)(value),
-            variant: variant
-        });
-    } else {
-        return /*#__PURE__*/ (0, _jsxruntime.jsx)(_chipstyles.ScoreChipStyled, {
-            score: scoreValue,
-            scoreLabel: (0, _fixefyuiutils.getScoreColor)(scoreValue),
-            label: (0, _fixefyuiutils.titleCase)(value),
-            minimized: minimized,
-            variant: variant,
-            onClick: onClick
-        });
-    }
+    return type === 'status' ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_chipstyles.StatusChipStyled, {
+        status: newStatus,
+        label: (0, _fixefyuiutils.titleCase)(value),
+        variant: variant,
+        onClick: onClick,
+        onDelete: onDelete,
+        deleteIcon: onDelete ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_iconsmaterial.CloseRounded, {
+            sx: {
+                width: 11,
+                height: 11
+            }
+        }) : null
+    }) : /*#__PURE__*/ (0, _jsxruntime.jsx)(_chipstyles.ScoreChipStyled, {
+        score: scoreValue,
+        scoreLabel: (0, _fixefyuiutils.getScoreColor)(scoreValue),
+        label: (0, _fixefyuiutils.titleCase)(value),
+        minimized: minimized,
+        variant: variant,
+        onClick: onClick
+    });
 };

package/dist/FxChip/styles/chip.styles.d.ts

@@ -1,3 +1,2 @@
 export declare const ScoreChipStyled: StyledComponent<ComponentProps & AdditionalProps, SpecificComponentProps, JSXProps>;
 export declare const StatusChipStyled: StyledComponent<ComponentProps & AdditionalProps, SpecificComponentProps, JSXProps>;
-export declare const PriorityChipStyled: StyledComponent<ComponentProps & AdditionalProps, SpecificComponentProps, JSXProps>;

package/dist/FxChip/styles/chip.styles.js

@@ -9,9 +9,6 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    PriorityChipStyled: function() {
-        return PriorityChipStyled;
-    },
     ScoreChipStyled: function() {
         return ScoreChipStyled;
     },
@@ -62,21 +59,3 @@ const StatusChipStyled = (0, _styles.styled)(_material.Chip)(({ theme, status, v
         border: `1px solid ${border}`
     };
 });
-const PriorityChipStyled = (0, _styles.styled)(_material.Chip)(({ theme, status })=>{
-    const backgroundColor = theme.palette.chipPriority[status].background;
-    const labelColor = theme.palette.chipPriority[status].label;
-    const border = theme.palette.chipPriority[status].border;
-    return {
-        height: 20,
-        minWidth: 80,
-        maxWidth: 120,
-        ['& .MuiChip-label']: {
-            fontSize: 9,
-            fontWeight: 600,
-            lineHeight: '12px',
-            color: labelColor ? labelColor : theme.palette.statistics.label
-        },
-        backgroundColor,
-        border: `1px solid ${border}`
-    };
-});

package/package.json

@@ -70,5 +70,5 @@
       "require": "./dist/index.js"
     }
   },
-  "version": "0.2.12"
+  "version": "0.2.13"
 }