@irontec/ivoz-ui 1.4.6 → 1.5.1

package/components/List/Content/FastSearchField.js

@@ -9,9 +9,7 @@ import useFirstColumn from './hook/useFirstColumn';
 import useFirstColumnCriteria from './hook/useFirstColumnCriteria';
 const FastSearchField = (props, ref) => {
     const { className, path, entityService, ignoreColumn } = props;
-    const queryStringCriteria = useStoreState((state) => [
-        ...state.route.queryStringCriteria,
-    ]);
+    const storeQueryStringCriteria = useStoreState((state) => state.route.queryStringCriteria);
     const setQueryStringCriteria = useStoreActions((actions) => {
         return actions.route.setQueryStringCriteria;
     });
@@ -43,6 +41,7 @@ const FastSearchField = (props, ref) => {
         }
         let match = false;
         let matchIdx;
+        const queryStringCriteria = [...storeQueryStringCriteria];
         for (const idx in queryStringCriteria) {
             if (queryStringCriteria[idx].name !== firstColumnCriteria.name) {
                 continue;
@@ -61,7 +60,8 @@ const FastSearchField = (props, ref) => {
         else if (value === '' && matchIdx) {
             queryStringCriteria.splice(parseInt(matchIdx, 10), 1);
         }
-        setQueryStringCriteria(queryStringCriteria);
+        const queryStringCriteriaWithoutPagination = queryStringCriteria.filter((criteria) => criteria.name !== '_page');
+        setQueryStringCriteria(queryStringCriteriaWithoutPagination);
     };
     const changeHandler = ({ target, }) => {
         const { value } = target;

package/components/List/Content/hook/useFirstColumnCriteria.js

@@ -4,9 +4,7 @@ import { getI18n } from 'react-i18next';
 const useFirstColumnCriteria = (props) => {
     const { entityService, ignoreColumn, path } = props;
     const [firstColumnCriteria, setFirstColumnCriteria] = useState(undefined);
-    const queryStringCriteria = useStoreState((state) => [
-        ...state.route.queryStringCriteria,
-    ]);
+    const queryStringCriteria = useStoreState((state) => state.route.queryStringCriteria);
     const storeState = useStoreState((state) => state, () => {
         return true;
     });

package/components/List/Filter/ContentFilterSelector/ContentFilterSelector.js

@@ -67,6 +67,7 @@ export default function ContentFilterSelector(props) {
                             type: defaultFilter,
                             value: '',
                         }, columns: columns, fkChoices: fkChoices, fieldNames: fieldNames, isLast: true, setRow: setRow, removeRow: removeRow }, criteria.length)] })), mobile && (_jsx(Box, { children: _jsx(FilterCriteria, { entityService: entityService, fkChoices: fkChoices, removeFilter: removeRow, path: path, criteriaOverride: criteria }) })), _jsxs(Box, Object.assign({ className: 'actions' }, { children: [_jsx(Box, { children: _jsx("a", Object.assign({ href: '#', onClick: resetCriteria, className: 'link' }, { children: _('Clear all filters') })) }), _jsxs(Box, Object.assign({ className: 'buttons' }, { children: [_jsx(OutlinedButton, Object.assign({ variant: 'contained', onClick: close }, { children: _('Cancel') })), _jsx(SolidButton, Object.assign({ variant: 'contained', disabled: criteria.length < 1, onClick: () => {
-                                    commitCriteria(criteria);
+                                    const queryStringCriteriaWithoutPagination = criteria.filter((criteria) => criteria.name !== '_page');
+                                    commitCriteria(queryStringCriteriaWithoutPagination);
                                 } }, { children: _('Apply') }))] }))] }))] })));
 }

package/components/List/List.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { foreignKeyResolverType } from '../../entities/EntityInterface';
+import EntityInterface, { foreignKeyResolverType } from '../../entities/EntityInterface';
 import { RouteMap } from '../../router/routeMapParser';
 import EntityService from '../../services/entity/EntityService';
-declare type ListProps = {
+export declare type ListProps = EntityInterface & {
     path: string;
     routeMap: RouteMap;
     entityService: EntityService;

package/components/List/List.js

@@ -16,15 +16,14 @@ import useCancelToken from '../../hooks/useCancelToken';
 import useCurrentPathMatch from '../../hooks/useCurrentPathMatch';
 import useRouteChain from '../../hooks/useRouteChain';
 import findRoute from '../../router/findRoute';
+import { isPropertyFk } from '../../services';
 import { useStoreActions, useStoreState } from '../../store';
 import ErrorMessage from '../shared/ErrorMessage';
-import { ListContent } from './Content/';
+import useFirstColumn from './Content/hook/useFirstColumn';
 import { criteriaToArray, queryStringToCriteria } from './List.helpers';
 import useQueryStringParams from './useQueryStringParams';
-import useFirstColumn from './Content/hook/useFirstColumn';
-import { isPropertyFk } from '../../services';
 const List = function (props) {
-    const { path, foreignKeyResolver, entityService, routeMap, className } = props;
+    const { path, foreignKeyResolver, entityService, routeMap, className, List: EntityListDecorator } = props;
     const location = useLocation();
     const match = useCurrentPathMatch();
     const params = useParams();
@@ -234,6 +233,6 @@ const List = function (props) {
         return null;
     }
     const empty = (!rows || rows.length === 0) && queryStringCriteria.length === 0;
-    return (_jsx("div", Object.assign({ className: className }, { children: _jsxs(ErrorBoundary, { children: [_jsx(ListContent, { empty: empty, childEntities: (currentRoute === null || currentRoute === void 0 ? void 0 : currentRoute.children) || [], path: path, ignoreColumn: ignoreColumn, preloadData: preload, entityService: entityService, cancelToken: cancelToken, match: match, routeChain: routeChain, location: location }), reqError && _jsx(ErrorMessage, { message: reqError })] }) })));
+    return (_jsx("div", Object.assign({ className: className }, { children: _jsxs(ErrorBoundary, { children: [_jsx(EntityListDecorator, { empty: empty, childEntities: (currentRoute === null || currentRoute === void 0 ? void 0 : currentRoute.children) || [], path: path, ignoreColumn: ignoreColumn, preloadData: preload, entityService: entityService, cancelToken: cancelToken, match: match, routeChain: routeChain, location: location }), reqError && _jsx(ErrorMessage, { message: reqError })] }) })));
 };
 export default List;

package/components/List/List.styles.d.ts

@@ -1,5 +1,5 @@
 import { Theme } from '@mui/material';
-export declare const StyledList: import("@mui/styles").StyledComponent<Omit<{
+export declare const StyledList: import("@mui/styles").StyledComponent<Omit<import("../../entities/EntityInterface").default & {
     path: string;
     routeMap: import("../..").RouteMap<import("../..").RouteMapItem>;
     entityService: import("../../services/entity/EntityService").default<import("easy-peasy").StateMapper<import("easy-peasy").FilterActionTypes<import("../..").IvozStore>>>;

package/entities/DefaultEntityBehavior/List.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import { ListContentProps } from '../../components/List/Content/ListContent';
+declare const List: (props: ListContentProps) => JSX.Element | null;
+export default List;

package/entities/DefaultEntityBehavior/List.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ListContent } from '../../components/List/Content/';
+const List = (props) => {
+    return (_jsx(ListContent, Object.assign({}, props)));
+};
+export default List;

package/entities/DefaultEntityBehavior.d.ts

@@ -38,6 +38,7 @@ declare const DefaultEntityBehavior: {
     properties: {};
     acl: EntityAclType;
     calculateAclByParentRow: calculateAclType;
+    List: (props: import("../components/List/Content/ListContent").ListContentProps) => JSX.Element | null;
     ListDecorator: import("./EntityInterface").ListDecoratorType;
     ChildDecorator: React.NamedExoticComponent<React.PropsWithChildren<ChildDecoratorProps>>;
     customActions: {};

package/entities/DefaultEntityBehavior.js

@@ -22,6 +22,7 @@ import marshaller from './DefaultEntityBehavior/Marshaller';
 import unmarshaller from './DefaultEntityBehavior/Unmarshaller';
 import validator from './DefaultEntityBehavior/Validator';
 import View from './DefaultEntityBehavior/View';
+import List from './DefaultEntityBehavior/List';
 export const initialValues = {};
 export const columns = [];
 export const properties = {};
@@ -77,6 +78,7 @@ const DefaultEntityBehavior = {
     properties,
     acl,
     calculateAclByParentRow,
+    List,
     ListDecorator,
     ChildDecorator: ChildDecoratorMemo,
     customActions: {},

package/entities/EntityInterface.d.ts

@@ -8,6 +8,7 @@ import { PartialPropertyList, PropertySpec } from '../services/api/ParsedApiSpec
 import EntityService, { EntityValues, VisualToggleStates } from '../services/entity/EntityService';
 import { EntityFormProps, FkChoices, fetchFksType } from './DefaultEntityBehavior';
 import { IvozStoreState } from 'store';
+import { ListContentProps } from '../components/List/Content/ListContent';
 export declare type ListDecoratorPropsType = {
     field: string;
     row: any;
@@ -91,6 +92,7 @@ export default interface EntityInterface {
     selectOptions?: () => Promise<SelectOptionsType>;
     Form: () => Promise<React.FunctionComponent<EntityFormProps>>;
     View: () => Promise<ViewType>;
+    List: React.FunctionComponent<ListContentProps>;
     ListDecorator: ListDecoratorType;
     ChildDecorator: ChildDecoratorType;
     customActions: CustomActionsType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@irontec/ivoz-ui",
-  "version": "1.4.6",
+  "version": "1.5.1",
   "description": "UI library used in ivozprovider",
   "license": "GPL-3.0",
   "main": "index.js",

package/store/list.d.ts

@@ -8,6 +8,7 @@ export interface ListState {
     reloadTimestamp: number;
     parentRow: EntityValues | undefined;
     rows: Array<EntityValues>;
+    customData: undefined | unknown;
     headers: Record<string, string>;
     fkChoices: FkChoicesType;
 }
@@ -15,6 +16,7 @@ interface ListActions {
     reload: Action<ListState>;
     setParentRow: Action<ListState, undefined | EntityValues>;
     setRows: Action<ListState, Array<EntityValues>>;
+    setCustomData: Action<ListState, unknown>;
     setHeaders: Action<ListState, Record<string, string>>;
     setFkChoices: Action<ListState, FkChoicesType>;
     reset: Thunk<ListState, undefined, unknown>;

package/store/list.js

@@ -12,6 +12,7 @@ const list = {
     reloadTimestamp: 0,
     parentRow: undefined,
     rows: [],
+    customData: undefined,
     headers: {},
     fkChoices: {},
     // actions
@@ -24,6 +25,9 @@ const list = {
     setRows: action((state, rows) => {
         state.rows = [...rows];
     }),
+    setCustomData: action((state, customData) => {
+        state.customData = customData;
+    }),
     setHeaders: action((state, headers) => {
         state.headers = Object.assign({}, headers);
     }),
@@ -33,6 +37,7 @@ const list = {
     // thunks
     reset: thunk((actions) => __awaiter(void 0, void 0, void 0, function* () {
         actions.setRows([]);
+        actions.setCustomData(undefined);
         actions.setHeaders({});
         actions.setFkChoices({});
     })),