@antscorp/antsomi-ui 1.3.5-beta.464 → 1.3.5-beta.466

package/es/components/molecules/MatchAnySelect/MatchesAnySelect.js

@@ -252,5 +252,5 @@ export const MatchesAnySelect = props => {
     };
     return (React.createElement(Popover, { open: isOpenPopover, arrow: false, placement: "bottomLeft", content: React.createElement(MatchesAny, { items: items, selectedItems: selectedItems, isLoading: isLoading, objectName: objectName, style: { margin: '-8px 0px' }, onApply: onApplyMatchesAny, onCancel: () => setState(prev => (Object.assign(Object.assign({}, prev), { isOpenPopover: false }))) }), overlayStyle: { width: 700 }, trigger: ['click'], destroyTooltipOnHide: true, onOpenChange: () => setState(prev => (Object.assign(Object.assign({}, prev), { isOpenPopover: !isOpenPopover }))) },
         React.createElement(Tooltip, { mouseEnterDelay: 0.5, title: `${selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.map(item => item.title).join(', ')}` },
-            React.createElement(Select, Object.assign({}, restProps, { title: "", value: value, placeholder: placeholder, popupMatchSelectWidth: 700, dropdownStyle: Object.assign(Object.assign({}, dropdownStyle), { display: 'none', padding: 0 }) })))));
+            React.createElement(Select, Object.assign({ title: "", value: value, placeholder: placeholder, popupMatchSelectWidth: 700, dropdownStyle: Object.assign(Object.assign({}, dropdownStyle), { display: 'none', padding: 0 }) }, restProps)))));
 };

package/es/components/organism/AccountSharing/AccountSharing.js

@@ -221,12 +221,14 @@ export const AccountSharing = props => {
     });
     // const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
     const onClickButtonLogout = () => {
-        removeCookie(`uogs_${networkId}`);
+        removeCookie(`uogs_${networkId}`, {
+            secure: true,
+        });
         if (callbackLogout)
             callbackLogout();
         setTimeout(() => {
             window.location.href = urlLogout;
-        }, 300);
+        }, 1000);
     };
     function urlDomain(data) {
         const a = document.createElement('a');

package/es/components/organism/DataTable/components/Toolbar/SearchPopover.d.ts

@@ -4,7 +4,7 @@ import { TSearchActionButton, TSearchItem } from '../../types';
 interface SearchPopoverProps extends PopoverProps, TSearchActionButton {
     onAddFilter?: (value: string) => void;
     onSearch?: (value: string) => void;
-    onClick?: (searchItem: TSearchItem) => void;
+    onClick?: (searchItem: TSearchItem, index: number) => void;
 }
 export declare const SearchPopover: React.FC<SearchPopoverProps>;
 export {};

package/es/components/organism/DataTable/components/Toolbar/SearchPopover.js

@@ -75,7 +75,7 @@ export const SearchPopover = props => {
                 icon && React.createElement(IconWrapper, null, icon),
                 React.createElement(Typography.Text, Object.assign({ ellipsis: { tooltip: label } }, searchItemProps, { className: clsx(`${link ? 'text-link' : ''}`, searchItemProps === null || searchItemProps === void 0 ? void 0 : searchItemProps.className) }), link && !itemSearchRender && !onClickSearchItem && !isAddFilterFromSearchItem ? (React.createElement(Link, { to: link }, label)) : (label))));
             return (React.createElement(StyledSearchItem, { key: id, align: "center", gap: 6, onClick: () => {
-                    onClick(searchItem);
+                    onClick(searchItem, index);
                     setState(prev => (Object.assign(Object.assign({}, prev), { isOpenPopover: false })));
                 } }, itemSearchRender ? itemSearchRender(searchItem, index, Label) : Label));
         });

package/es/components/organism/DataTable/components/Toolbar/ToolbarActionButtons.js

@@ -64,11 +64,11 @@ export const ToolbarActionButtons = memo(() => {
         switch (key) {
             case 'SEARCH': {
                 const _a = action, { addFilterInfo, onClickSearchItem, isAddFilterFromSearchItem } = _a, restOfAction = __rest(_a, ["addFilterInfo", "onClickSearchItem", "isAddFilterFromSearchItem"]);
-                return (React.createElement(SearchPopover, Object.assign({ key: key }, restOfAction, { isAddFilterFromSearchItem: isAddFilterFromSearchItem, onClickSearchItem: onClickSearchItem, onClick: searchItem => {
+                return (React.createElement(SearchPopover, Object.assign({ key: key }, restOfAction, { isAddFilterFromSearchItem: isAddFilterFromSearchItem, onClickSearchItem: onClickSearchItem, onClick: (searchItem, index) => {
                         if (isAddFilterFromSearchItem) {
                             onAddFilterFromSearch(searchItem.label, addFilterInfo);
                         }
-                        onClickSearchItem === null || onClickSearchItem === void 0 ? void 0 : onClickSearchItem(searchItem);
+                        onClickSearchItem === null || onClickSearchItem === void 0 ? void 0 : onClickSearchItem(searchItem, index);
                     }, onAddFilter: value => onAddFilterFromSearch(value, addFilterInfo) }), actionButton));
             }
             case 'COLUMN': {

package/es/components/organism/DataTable/hooks/useDataTableListing/types.d.ts

@@ -10,7 +10,7 @@ import { TGetColumnMetrics, TGetFilterMetricList, TGetModifyColumnList, TGetSave
 export type TApiGlobal = AxiosRequestConfig<any> & {
     enabled?: boolean;
 };
-export type TConfig = {
+export type TConfig<TTableType = any> = {
     env?: TEnv;
     auth?: TServiceAuth;
     api?: {
@@ -18,6 +18,9 @@ export type TConfig = {
         column?: TApiGlobal;
         filter?: TApiGlobal;
         search?: TApiGlobal;
+        matchesAny?: {
+            general: TApiGlobal;
+        } & Partial<Record<keyof TTableType, TApiGlobal>>;
     };
     object?: {
         type: number;
@@ -35,11 +38,12 @@ type TToggleColumnType<TTableType> = TGeneralTableColumnType<TTableType> & {
     onChange?: (checked: boolean, record: TTableType) => void;
 };
 type TTableColumnType<TTableType, K extends keyof TTableType | 'toggle'> = K extends 'toggle' ? TToggleColumnType<TTableType> : TGeneralTableColumnType<TTableType>;
-type TSearchProps<TSearchType> = Partial<Pick<TSearchActionButton, 'addFilterInfo' | 'isClientSearch' | 'isAddFilterFromSearchItem' | 'onClickSearchItem' | 'searchItemProps'>> & {
+type TSearchProps<TSearchType> = Partial<Pick<TSearchActionButton, 'addFilterInfo' | 'isClientSearch' | 'isAddFilterFromSearchItem' | 'searchItemProps'>> & {
     link?: ((record: Partial<TSearchType>) => string) | string;
     icon?: (record: Partial<TSearchType>) => ReactNode | ReactNode;
     itemMapKeys: Record<keyof Omit<TSearchItem, 'icon' | 'link'>, keyof TSearchType>;
     render?: (record: TSearchType, index: number, node: ReactNode) => ReactNode;
+    onClickSearchItem?: (record?: Partial<TSearchType>) => void;
     formatData?: (response: any) => Partial<TSearchType>[];
 };
 export interface UseDataTableListingProps<TTableType = any, TSearchType = any> {

package/es/components/organism/DataTable/hooks/useDataTableListing/useDataTableListing.js

@@ -510,7 +510,7 @@ export function useDataTableListing(props) {
         selectedRowKeys,
         selectedRow,
         /* Search */
-        search: Object.assign(Object.assign(Object.assign({ loading: isSearchListingLoading || isSearchListingFetching, searchList }, (!!(searchProps === null || searchProps === void 0 ? void 0 : searchProps.render) && {
+        search: Object.assign(Object.assign(Object.assign(Object.assign({ loading: isSearchListingLoading || isSearchListingFetching, searchList }, (!!(searchProps === null || searchProps === void 0 ? void 0 : searchProps.render) && {
             itemSearchRender(_item, index, node) {
                 var _a;
                 return (((_a = searchProps === null || searchProps === void 0 ? void 0 : searchProps.render) === null || _a === void 0 ? void 0 : _a.call(searchProps, ((searchListingBody === null || searchListingBody === void 0 ? void 0 : searchListingBody[index]) || {}), index, node)) ||
@@ -520,11 +520,15 @@ export function useDataTableListing(props) {
                 if (!(searchProps === null || searchProps === void 0 ? void 0 : searchProps.isClientSearch)) {
                     setState(prev => (Object.assign(Object.assign({}, prev), { searchValue: valueSearch })));
                 }
-            } }), pick(searchProps, [
+            } }), ((searchProps === null || searchProps === void 0 ? void 0 : searchProps.onClickSearchItem) && {
+            onClickSearchItem(item, index) {
+                var _a;
+                (_a = searchProps === null || searchProps === void 0 ? void 0 : searchProps.onClickSearchItem) === null || _a === void 0 ? void 0 : _a.call(searchProps, searchListingBody === null || searchListingBody === void 0 ? void 0 : searchListingBody[index]);
+            },
+        })), pick(searchProps, [
             'isClientSearch',
             'addFilterInfo',
             'isAddFilterFromSearchItem',
-            'onClickSearchItem',
             'searchItemProps',
         ])),
         /* Queries */

package/es/components/organism/DataTable/types/toolbar.d.ts

@@ -40,7 +40,7 @@ export type TSearchActionButton = TActionButton & {
     loading?: boolean;
     itemSearchRender?: (item: TSearchItem, index: number, node: ReactNode) => React.ReactNode;
     onSearch?: (valueSearch: string) => void;
-    onClickSearchItem?: (item: TSearchItem) => void;
+    onClickSearchItem?: (item: TSearchItem, index: number) => void;
 };
 export type TColumnActionButton = TActionButton & {
     modalTitle?: string;

package/es/components/organism/DataTable/utils/filter.js

@@ -12,6 +12,7 @@ import { OPERATORS_CODE } from '@antscorp/antsomi-ui/es/constants/condition';
 // Translations
 import { translations } from '@antscorp/antsomi-ui/es/locales/translations';
 import { METRIC_MAP_NUMBER_TYPE, METRIC_MAP_STRING_TYPE } from '../constants/filter';
+import { MatchesAnySelect } from '../../../molecules';
 const { t } = i18nInstance;
 const { Text } = Typography;
 /* Filter */
@@ -103,6 +104,7 @@ export const flatFilterMetrics = (filterMetrics) => filterMetrics.reduce((acc, c
 /* Render Value Field */
 export const renderValueField = ({ filterMetric, operator, value, onChangeValue = () => { }, }) => {
     const { dataType } = filterMetric;
+    console.log('🚀 ~ filterMetric:', filterMetric);
     switch (operator) {
         case OPERATORS_CODE.GREATER_THAN:
         case OPERATORS_CODE.GREATER_THAN_EQUAL:
@@ -138,6 +140,11 @@ export const renderValueField = ({ filterMetric, operator, value, onChangeValue
         case OPERATORS_CODE.NOT_START_WITH: {
             return (React.createElement(Input, { value: value, placeholder: t(translations.inputYourValue.title), onChange: e => onChangeValue(e.target.value) }));
         }
+        case OPERATORS_CODE.MATCHES:
+        case OPERATORS_CODE.MATCHES_ANY:
+        case OPERATORS_CODE.NOT_MATCHES: {
+            return React.createElement(MatchesAnySelect, null);
+        }
         default:
             return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.5-beta.464",
+  "version": "1.3.5-beta.466",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",