@antscorp/antsomi-ui 1.3.5-beta.482 → 1.3.5-beta.484

package/es/components/organism/DataTable/components/Filter/FilterItem.js

@@ -18,16 +18,16 @@ import { Icon, Typography } from '@antscorp/antsomi-ui/es/components/atoms';
 import { StyledFilterItem } from './styled';
 // Constants
 import { DATE_TIME_FORMAT, METRIC_TYPE, OPERATORS_CODE, OPERATORS_OPTION, } from '@antscorp/antsomi-ui/es/constants';
-const { MATCHES_ANY, MATCHES, NOT_MATCHES, IS, BETWEEN, AFTER_DATE, BEFORE_DATE, ON } = OPERATORS_CODE;
+const { MATCHES_ANY, MATCHES, NOT_MATCHES, IS, AFTER, BEFORE, AFTER_DATE, BEFORE_DATE, ON } = OPERATORS_CODE;
 const { DATE, DATE_TIME } = METRIC_TYPE;
 const { Text } = Typography;
 export const FilterItem = props => {
     const { name, operator, datatype, value, onClickRemove } = props, restProps = __rest(props, ["name", "operator", "datatype", "value", "onClickRemove"]);
-    console.log('🚀 ~ datatype:', datatype);
     // Memo
     const serializeValue = useMemo(() => {
         // Check type of value is valid date
-        if (dayjs(value).isValid() && [DATE, DATE_TIME].includes(datatype)) {
+        if (dayjs(value).isValid() &&
+            [AFTER_DATE, BEFORE_DATE, ON, AFTER, BEFORE].includes(operator)) {
             return dayjs(value).format(DATE_TIME_FORMAT.FILTER_CONDITION);
         }
         // Check value is an array
@@ -35,7 +35,7 @@ export const FilterItem = props => {
             return value.map(item => item.title || item).join(', ');
         }
         return value;
-    }, [value, datatype]);
+    }, [value, operator]);
     const serializeOperator = useMemo(() => {
         var _a;
         const operatorLabel = ((_a = Object.values(OPERATORS_OPTION).find(({ value }) => value === operator)) === null || _a === void 0 ? void 0 : _a.label) || '';
@@ -57,7 +57,7 @@ export const FilterItem = props => {
             serializeOperator && React.createElement(Text, null,
                 serializeOperator,
                 " \u00A0"),
-            React.createElement(Text, { strong: true, className: "filter-item__value" }, serializeValue)),
+            React.createElement(Text, { strong: true, className: "filter-item__value" }, `${serializeValue}`)),
         React.createElement("div", { className: "filter-item__close-btn", onClick: e => {
                 e.stopPropagation();
                 if (onClickRemove) {

package/es/tests/DataTableTest.js

@@ -107,6 +107,17 @@ export const DataTableTest = () => {
                     },
                 },
             },
+            formatFilterValue: {
+                matches(value) {
+                    return Array.isArray(value) && value.map(item => item.key).join(',');
+                },
+                matches_any(value) {
+                    return Array.isArray(value) && value.map(item => item.key).join(',');
+                },
+                not_matches(value) {
+                    return Array.isArray(value) && value.map(item => item.key).join(',');
+                },
+            },
         },
     });
     return (React.createElement(BrowserRouter, null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.5-beta.482",
+  "version": "1.3.5-beta.484",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",
@@ -19,7 +19,6 @@
   "unpkg": "dist/index.js",
   "types": "es/index.d.ts",
   "scripts": {
-    "prepublishOnly": "yarn && yarn build:es && git commit -am \"chore: update antsomi-ui version\" && git push",
     "build:es": "npm run clean && npm run copy-files && npm run ts-compile",
     "clean": "rimraf dist lib es",
     "dev": "vite",