awing-library 2.1.97-beta → 2.1.99-beta

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.d.ts

@@ -1,3 +1,3 @@
 import { IFiltersProps } from '../../interface';
-declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
+declare const Filters: ({ campaigns, handleFilters, loadingFlags, placeMultiSelectComponent: PlaceMultiSelect, handleExportExcel, disabledCampaignFilter, isFutureDate }: IFiltersProps) => import("react/jsx-runtime").JSX.Element;
 export default Filters;

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/Filter.js

@@ -78,7 +78,7 @@ var useStyles = (0, styles_1.makeStyles)(function () { return ({
 }); });
 var Filters = function (_a) {
     var _b, _c;
-    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel, _d = _a.disabledCampaignFilter, disabledCampaignFilter = _d === void 0 ? false : _d;
+    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, loadingFlags = _a.loadingFlags, PlaceMultiSelect = _a.placeMultiSelectComponent, handleExportExcel = _a.handleExportExcel, _d = _a.disabledCampaignFilter, disabledCampaignFilter = _d === void 0 ? false : _d, isFutureDate = _a.isFutureDate;
     var t = (0, react_i18next_1.useTranslation)().t;
     var campaignOptions = __assign(__assign({}, campaigns), { 0: { campaignId: 0, name: t('Common.SelectAll') } });
     var classes = useStyles();
@@ -86,7 +86,7 @@ var Filters = function (_a) {
         handleFilters('startDate', value.startDate);
         handleFilters('endDate', value.endDate);
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: disabledCampaignFilter ? 6 : 4, className: classes.dateRangePicker, children: (0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { isShowCalendarInfo: true, isFutureDate: isFutureDate !== null && isFutureDate !== void 0 ? isFutureDate : true, label: "".concat(t('Common.StartDate'), " - ").concat(t('Common.EndDate')), callback: handleChangeDateRange, initialStartDate: (0, moment_1.default)(), initialEndDate: (0, moment_1.default)(), variant: "outlined", textFieldProps: {
                         fullWidth: true,
                         className: classes.outlinedInput,
                     }, isDayBlocked: function (day) {

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.d.ts

@@ -1,3 +1,3 @@
 import { IControlPanelProps } from '../../interface';
-declare const ControlPanel: ({ campaigns, handleFilters, unGroupField, onDragStart, onDragOver, onDrop, handleView, handleExportExcel, loadingFlags, panels, placeMultiSelectComponent, disabledCampaignFilter, }: IControlPanelProps) => import("react/jsx-runtime").JSX.Element;
+declare const ControlPanel: ({ campaigns, handleFilters, unGroupField, onDragStart, onDragOver, onDrop, handleView, handleExportExcel, loadingFlags, panels, placeMultiSelectComponent, disabledCampaignFilter, isFutureDate }: IControlPanelProps) => import("react/jsx-runtime").JSX.Element;
 export default ControlPanel;

package/lib/ACM-AXN/CampaignSchedule/Components/ControlPanel/index.js

@@ -10,8 +10,8 @@ var react_i18next_1 = require("react-i18next");
 var Filter_1 = __importDefault(require("./Filter"));
 var GroupPanel_1 = __importDefault(require("./GroupPanel"));
 var ControlPanel = function (_a) {
-    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, unGroupField = _a.unGroupField, onDragStart = _a.onDragStart, onDragOver = _a.onDragOver, onDrop = _a.onDrop, handleView = _a.handleView, handleExportExcel = _a.handleExportExcel, loadingFlags = _a.loadingFlags, panels = _a.panels, placeMultiSelectComponent = _a.placeMultiSelectComponent, disabledCampaignFilter = _a.disabledCampaignFilter;
+    var campaigns = _a.campaigns, handleFilters = _a.handleFilters, unGroupField = _a.unGroupField, onDragStart = _a.onDragStart, onDragOver = _a.onDragOver, onDrop = _a.onDrop, handleView = _a.handleView, handleExportExcel = _a.handleExportExcel, loadingFlags = _a.loadingFlags, panels = _a.panels, placeMultiSelectComponent = _a.placeMultiSelectComponent, disabledCampaignFilter = _a.disabledCampaignFilter, isFutureDate = _a.isFutureDate;
     var t = (0, react_i18next_1.useTranslation)().t;
-    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "flex-start", spacing: 2, children: (0, jsx_runtime_1.jsx)(Filter_1.default, { loadingFlags: loadingFlags, campaigns: campaigns, handleFilters: handleFilters, handleExportExcel: handleExportExcel, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "flex-end", item: true, xs: 12, spacing: 2, sx: { marginTop: '0.125rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { id: "wrap-group-panel", item: true, style: { flexGrow: 1, position: 'relative' }, children: (0, jsx_runtime_1.jsx)(GroupPanel_1.default, { panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, sx: { display: 'flex' }, children: (0, jsx_runtime_1.jsx)(material_1.Button, { sx: { height: '40px' }, variant: "contained", color: "primary", onClick: handleView, children: t('Common.View') }) })] })] }) }));
+    return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, sx: { padding: '1rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { container: true, item: true, xs: 12, justifyContent: "flex-start", spacing: 2, children: (0, jsx_runtime_1.jsx)(Filter_1.default, { loadingFlags: loadingFlags, campaigns: campaigns, handleFilters: handleFilters, handleExportExcel: handleExportExcel, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter, isFutureDate: isFutureDate }) }), (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, justifyContent: "flex-end", item: true, xs: 12, spacing: 2, sx: { marginTop: '0.125rem' }, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { id: "wrap-group-panel", item: true, style: { flexGrow: 1, position: 'relative' }, children: (0, jsx_runtime_1.jsx)(GroupPanel_1.default, { panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, sx: { display: 'flex' }, children: (0, jsx_runtime_1.jsx)(material_1.Button, { sx: { height: '40px' }, variant: "contained", color: "primary", onClick: handleView, children: t('Common.View') }) })] })] }) }));
 };
 exports.default = ControlPanel;

package/lib/ACM-AXN/CampaignSchedule/Components/RowAdvance/component.js

@@ -126,7 +126,9 @@ var RowAdvanceComponent = function (_a) {
                                 : '', sx: { padding: '0px !important' }, children: (0, jsx_runtime_1.jsxs)("div", { className: classes.wrapFrirstCell, children: [!expandDisabled && ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: open ? ((0, jsx_runtime_1.jsx)(ArrowDropUp_1.default, {})) : ((0, jsx_runtime_1.jsx)(ArrowDropDown_1.default, {})) })), (0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "subtitle2", children: stt })] }) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.PLACE:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.PLACE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (_a = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _a === void 0 ? void 0 : _a.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
+                                Enum_1.HEAD_CELL_NAMES.PLACE ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledPlaceField, children: (options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId])
+                                    ? (_a = options === null || options === void 0 ? void 0 : options.places[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _a === void 0 ? void 0 : _a.name
+                                    : row === null || row === void 0 ? void 0 : row.groupKeyId })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: 
                                 // Nếu field hiện tại ko phải groupName đang showOn thì 3Th
                                 // TH1: field nằm trong groupNames nhưng đúng trước fieldNameShowOn hiển thị name
                                 // TH2: field nằm sau fieldNameShowOn trong groupNames hiển thi total
@@ -146,7 +148,9 @@ var RowAdvanceComponent = function (_a) {
                                 (0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledCampaignField, children: generateCampaignTotalCount(options === null || options === void 0 ? void 0 : options.campaigns, row, t('Schedule.CampaignDefault')) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.DOMAIN:
                         return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: fieldNameShowOn ===
-                                Enum_1.HEAD_CELL_NAMES.DOMAIN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (_c = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _c === void 0 ? void 0 : _c.name })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
+                                Enum_1.HEAD_CELL_NAMES.DOMAIN ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: (options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId])
+                                    ? (_c = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.groupKeyId]) === null || _c === void 0 ? void 0 : _c.name
+                                    : row === null || row === void 0 ? void 0 : row.groupKeyId })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: groupNames
                                     .slice(0, priorityGroupLevel - 1)
                                     .indexOf(Enum_1.HEAD_CELL_NAMES.DOMAIN) === -1 ? ((0, jsx_runtime_1.jsx)(material_1.TableCell, { className: classes.styledDomainField, children: ((_d = options === null || options === void 0 ? void 0 : options.domains[row === null || row === void 0 ? void 0 : row.domainId]) === null || _d === void 0 ? void 0 : _d.name) || (row === null || row === void 0 ? void 0 : row.totalDomain) })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {})) })) }, item.id));
                     case Enum_1.HEAD_CELL_NAMES.DATE:

package/lib/ACM-AXN/CampaignSchedule/container.d.ts

@@ -1,3 +1,3 @@
 import { ICampaignScheduleContainerProps } from './interface';
-declare const CampaignScheduleContainer: ({ initialFilters, initialHeadCells, placeMultiSelectComponent, serviceCampaignSchedule, typeSystemAXN, title, disabledCampaignFilter, }: ICampaignScheduleContainerProps) => import("react/jsx-runtime").JSX.Element;
+declare const CampaignScheduleContainer: ({ initialFilters, initialHeadCells, placeMultiSelectComponent, serviceCampaignSchedule, typeSystemAXN, title, disabledCampaignFilter, isFutureDate }: ICampaignScheduleContainerProps) => import("react/jsx-runtime").JSX.Element;
 export default CampaignScheduleContainer;

package/lib/ACM-AXN/CampaignSchedule/container.js

@@ -74,7 +74,7 @@ var Enum_1 = require("./Enum");
 var component_1 = __importDefault(require("./component"));
 var CampaignScheduleContainer = function (_a) {
     var _b;
-    var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c, title = _a.title, disabledCampaignFilter = _a.disabledCampaignFilter;
+    var initialFilters = _a.initialFilters, initialHeadCells = _a.initialHeadCells, placeMultiSelectComponent = _a.placeMultiSelectComponent, serviceCampaignSchedule = _a.serviceCampaignSchedule, _c = _a.typeSystemAXN, typeSystemAXN = _c === void 0 ? false : _c, title = _a.title, disabledCampaignFilter = _a.disabledCampaignFilter, isFutureDate = _a.isFutureDate;
     var t = (0, react_i18next_1.useTranslation)().t;
     var _d = (0, react_1.useState)(null), dragPlace = _d[0], setDragPlace = _d[1];
     var _e = (0, react_1.useState)(initialFilters), filters = _e[0], setFilters = _e[1];
@@ -316,7 +316,7 @@ var CampaignScheduleContainer = function (_a) {
         ], false), panels.slice(indexMatch + 1), true));
         setPanels(newPanels);
     }
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter }), loadingFlags.pages ||
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_helmet_async_1.HelmetProvider, { children: (0, jsx_runtime_1.jsx)(react_helmet_async_1.Helmet, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) }) }), (0, jsx_runtime_1.jsx)(ContentHeader_1.default, { title: title }), (0, jsx_runtime_1.jsxs)(material_1.Paper, { children: [(0, jsx_runtime_1.jsx)(ControlPanel_1.default, { campaigns: (_b = options === null || options === void 0 ? void 0 : options.campaigns) !== null && _b !== void 0 ? _b : {}, panels: panels, unGroupField: unGroupField, onDragStart: onDragStart, onDragOver: onDragOver, onDrop: onDrop, handleView: handleView, handleExportExcel: handleExportExcel, handleFilters: handleFilters, loadingFlags: loadingFlags, placeMultiSelectComponent: placeMultiSelectComponent, disabledCampaignFilter: disabledCampaignFilter, isFutureDate: isFutureDate }), loadingFlags.pages ||
                         loadingFlags.campaigns ||
                         loadingFlags.places ? ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(CircularProgress_1.CircularProgress, {}) })) : ((0, jsx_runtime_1.jsx)(component_1.default, { headCells: headCells, onDragOver: onDragOver, onDragStart: onDragStart, onDrop: onDrop, scheduleGroups: scheduleGroups, page: page, handleChangePage: handleChangePage, handleChangeRowsPerPage: handleChangeRowsPerPage, options: options, filters: filters, serviceCampaignSchedule: serviceCampaignSchedule }))] })] }));
 };

package/lib/ACM-AXN/CampaignSchedule/interface.d.ts

@@ -15,6 +15,7 @@ export interface ICampaignScheduleContainerProps {
     typeSystemAXN?: boolean;
     title: string;
     disabledCampaignFilter?: boolean;
+    isFutureDate?: boolean;
 }
 export interface ILoadingFlags {
     campaigns?: boolean;
@@ -184,6 +185,7 @@ export interface IControlPanelProps {
     loadingFlags: ILoadingFlags;
     placeMultiSelectComponent: (p?: any) => JSX.Element;
     disabledCampaignFilter?: boolean;
+    isFutureDate?: boolean;
 }
 export interface IGroupPanelProps {
     unGroupField: any;
@@ -199,6 +201,7 @@ export interface IFiltersProps {
     placeMultiSelectComponent: (p?: any) => JSX.Element;
     handleExportExcel: () => void;
     disabledCampaignFilter?: boolean;
+    isFutureDate?: boolean;
 }
 export interface IOptions {
     campaigns: any;

package/lib/ACM-AXN/PlaceFilter/DataTable/container.js

@@ -74,7 +74,6 @@ var DataTable = function (props) {
             return;
         if (isError)
             setIsError(function () { return false; });
-        console.log("query");
         if (isSelectedTagAll) {
             setIsLoading(function () { return true; });
             getTagAllPlaces()
@@ -105,7 +104,7 @@ var DataTable = function (props) {
     (0, react_1.useEffect)(function () {
         queryData();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [pageIndex, pageSize]);
+    }, [pageIndex, pageSize, isSelectedTagAll]);
     var getAllPlaces = function () {
         return getPlacesByFilter((tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || []);
     };

package/lib/ACM-AXN/PlaceFilter/Input/container.js

@@ -20,8 +20,9 @@ var recoil_1 = require("recoil");
 var component_1 = __importDefault(require("./component"));
 var common_1 = require("../common");
 var Enum_1 = require("../Enum");
+var react_1 = require("react");
 var FieldInput = function () {
-    var _a = (0, recoil_1.useRecoilState)(Atom_1.isSelectedTagAllState), setIsSelectedTagAll = _a[1];
+    var _a = (0, recoil_1.useRecoilState)(Atom_1.isSelectedTagAllState), isSelectedTagAll = _a[0], setIsSelectedTagAll = _a[1];
     var _b = (0, recoil_1.useRecoilState)(Atom_1.tagSelectedState), tagSelected = _b[0], setTagSelected = _b[1];
     var tagsAll = (0, recoil_1.useRecoilValue)(Atom_1.tagsAllState);
     var handleChange = function (newValue, index, isChangeOperator) {
@@ -55,6 +56,15 @@ var FieldInput = function () {
             setTagSelected(tagPrepare);
         }
     };
-    return ((0, jsx_runtime_1.jsx)(component_1.default, { inputFilters: (tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || [], onChange: handleChange }));
+    // console.log("defaultTagValue", defaultTagValue)
+    var inputFilters = (0, react_1.useMemo)(function () {
+        if (isSelectedTagAll) {
+            return ((tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || []).map(function (input, index) {
+                return __assign(__assign({}, input), { value: common_1.defaultTagValue[input.type] });
+            });
+        }
+        return (tagSelected === null || tagSelected === void 0 ? void 0 : tagSelected.filterFields) || [];
+    }, [isSelectedTagAll, tagSelected]);
+    return ((0, jsx_runtime_1.jsx)(component_1.default, { inputFilters: inputFilters, onChange: handleChange }));
 };
 exports.default = FieldInput;

package/lib/ACM-AXN/PlaceFilter/common.d.ts

@@ -1 +1,2 @@
 export declare const compareTwoArrayObject: (arrObj1: any, arrObj2: any) => any;
+export declare const defaultTagValue: Record<"text" | "select-area" | "select" | "multiple-hierarchical-choice" | "geo-fencing" | "auto-complete" | "multiple-select", any>;

package/lib/ACM-AXN/PlaceFilter/common.js

@@ -1,6 +1,18 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareTwoArrayObject = void 0;
+exports.defaultTagValue = exports.compareTwoArrayObject = void 0;
+var Enum_1 = require("./Enum");
 var isEqual = require("lodash/isEqual");
 var compareTwoArrayObject = function (arrObj1, arrObj2) {
     var result = (arrObj1 || []).filter(function (object1) {
@@ -23,3 +35,17 @@ var compareTwoArrayObject = function (arrObj1, arrObj2) {
     return result;
 };
 exports.compareTwoArrayObject = compareTwoArrayObject;
+exports.defaultTagValue = Object.entries(Enum_1.EnumFieldInputType).reduce(function (obj, _a) {
+    var _b;
+    var key = _a[0], value = _a[1];
+    return __assign(__assign({}, obj), (_b = {}, _b[value] = (function () {
+        switch (value) {
+            case Enum_1.EnumFieldInputType.TEXT:
+                return "";
+            case Enum_1.EnumFieldInputType.GEO_FENCING:
+                return undefined;
+            default:
+                return [];
+        }
+    })(), _b));
+}, {});

package/lib/AWING/ButtonSelect/index.js

@@ -59,9 +59,9 @@ var ButtonSelect = function (props) {
     var handleClose = function () {
         setAnchorEl(null);
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(material_1.Button, __assign({ id: "".concat(elementId, "-button-select"), "aria-controls": "".concat(elementId, "-menu"), "aria-haspopup": "true", "aria-expanded": open ? "true" : undefined, onClick: handleClick, endIcon: (0, jsx_runtime_1.jsx)(KeyboardArrowDown_1.default, {}), style: {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, __assign({ id: "".concat(elementId, "-button-select"), "aria-controls": "".concat(elementId, "-menu"), "aria-haspopup": "true", "aria-expanded": open ? "true" : undefined, onClick: handleClick, endIcon: (0, jsx_runtime_1.jsx)(KeyboardArrowDown_1.default, {}), sx: {
                     textTransform: "none",
-                    color: "white",
+                    color: function (theme) { return theme.palette.text.primary; },
                     fontWeight: "normal",
                 } }, other)), (0, jsx_runtime_1.jsx)(material_1.Menu, { id: "".concat(elementId, "-menu"), anchorEl: anchorEl, open: open, onClose: handleClose, MenuListProps: {
                     "aria-labelledby": "".concat(elementId, "-button-select"),

package/lib/AWING/LogicExpression/script.js

@@ -470,7 +470,6 @@ var validateExpression = function (oc, f, functionList, expression) {
         console.log("Look bad the expression is boolean: ".concat(expression));
         return false;
     }
-    debugger;
     var elements = expression.trim();
     var rootNode = (0, exports.getNewNode)();
     var currentNode = rootNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.97-beta",
+  "version": "2.1.99-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",