@steroidsjs/core 3.0.68 → 3.0.70

package/actions/list.d.ts

@@ -110,9 +110,10 @@ export declare const LIST_TOGGLE_ITEM = "@list/toggle_item";
 export declare const LIST_TOGGLE_ALL = "@list/toggle_all";
 export declare const LIST_SET_LAYOUT = "@list/set_layout";
 export declare const LIST_CHANGE_ACTION = "@list/change_action";
+export declare const LIST_SELECT_ITEM = "@list/select_item";
 export declare const httpFetchHandler: (list: IList, query: any, { http }: {
     http: any;
-}) => any;
+}, options?: any) => any;
 export declare const localFetchHandler: (list: IList, query: Record<string, unknown>) => {
     items: any[];
     total: number;
@@ -192,3 +193,8 @@ export declare const toggleAll: (listId: any) => {
     listId: any;
     type: string;
 };
+export declare const selectItem: (listId: any, itemId: any) => {
+    listId: any;
+    itemId: any;
+    type: string;
+};

package/actions/list.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.toggleAll = exports.toggleItem = exports.deleteItem = exports.update = exports.add = exports.listDestroy = exports.listRefresh = exports.listLazyFetch = exports.listFetch = exports.listChangeAction = exports.listSetLayout = exports.listSetItems = exports.listInit = exports.localFetchHandler = exports.httpFetchHandler = exports.LIST_CHANGE_ACTION = exports.LIST_SET_LAYOUT = exports.LIST_TOGGLE_ALL = exports.LIST_TOGGLE_ITEM = exports.LIST_DESTROY = exports.LIST_ITEM_DELETE = exports.LIST_ITEM_UPDATE = exports.LIST_ITEM_ADD = exports.LIST_AFTER_FETCH = exports.LIST_BEFORE_FETCH = exports.LIST_SET_ITEMS = exports.LIST_INIT = void 0;
+exports.selectItem = exports.toggleAll = exports.toggleItem = exports.deleteItem = exports.update = exports.add = exports.listDestroy = exports.listRefresh = exports.listLazyFetch = exports.listFetch = exports.listChangeAction = exports.listSetLayout = exports.listSetItems = exports.listInit = exports.localFetchHandler = exports.httpFetchHandler = exports.LIST_SELECT_ITEM = exports.LIST_CHANGE_ACTION = exports.LIST_SET_LAYOUT = exports.LIST_TOGGLE_ALL = exports.LIST_TOGGLE_ITEM = exports.LIST_DESTROY = exports.LIST_ITEM_DELETE = exports.LIST_ITEM_UPDATE = exports.LIST_ITEM_ADD = exports.LIST_AFTER_FETCH = exports.LIST_BEFORE_FETCH = exports.LIST_SET_ITEMS = exports.LIST_INIT = void 0;
 var get_1 = __importDefault(require("lodash-es/get"));
 var isArray_1 = __importDefault(require("lodash-es/isArray"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
@@ -23,6 +23,7 @@ var trimStart_1 = __importDefault(require("lodash-es/trimStart"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
 var isNil_1 = __importDefault(require("lodash-es/isNil"));
+var axios_1 = __importDefault(require("axios"));
 var form_1 = require("../reducers/form");
 var form_2 = require("../actions/form");
 var data_1 = require("../utils/data");
@@ -38,6 +39,7 @@ exports.LIST_TOGGLE_ITEM = '@list/toggle_item';
 exports.LIST_TOGGLE_ALL = '@list/toggle_all';
 exports.LIST_SET_LAYOUT = '@list/set_layout';
 exports.LIST_CHANGE_ACTION = '@list/change_action';
+exports.LIST_SELECT_ITEM = '@list/select_item';
 //const STORAGE_LAYOUT_KEY_PREFIX = 'listLayout_';
 var lazyTimers = {};
 var createList = function (listId, props) { return ({
@@ -60,19 +62,22 @@ var createList = function (listId, props) { return ({
     sortAttribute: (0, get_1["default"])(props, '_sort.attribute') || null,
     layoutAttribute: (0, get_1["default"])(props, '_layout.attribute') || null
 }); };
-var httpFetchHandler = function (list, query, _a) {
+var httpFetchHandler = function (list, query, _a, options) {
     var http = _a.http;
+    if (options === void 0) { options = {}; }
     var url = list.action;
     if (list.scope) {
-        url
-            += (url.indexOf('?') !== -1 ? '&' : '?') + 'scope=' + list.scope.join(',');
+        url += (url.indexOf('?') !== -1 ? '&' : '?') + 'scope=' + list.scope.join(',');
     }
+    // options поддерживает { cancelToken } или { signal } (если использовать AbortController)
     return http
-        .send(list.actionMethod, url || window.location.pathname, query)
+        .send(list.actionMethod, url || window.location.pathname, query, options)
         .then(function (response) { return response.data; })["catch"](function (error) {
         if (typeof list.onError === 'function') {
             list.onError(error);
         }
+        // rethrow чтобы внешняя логика могла отловить отмену/ошибку
+        throw error;
     });
 };
 exports.httpFetchHandler = httpFetchHandler;
@@ -149,31 +154,6 @@ var listChangeAction = function (listId, action) { return ({
     action: action
 }); };
 exports.listChangeAction = listChangeAction;
-/*export const initSSR = (listId, props) => (dispatch, getState, {http, clientStorage}) => {
-    const state = getState()
-    const stateList = _get(state, ['list', 'lists', listId]);
-    const list = {
-        ...createList(listId, props, clientStorage),
-        ...stateList
-    };
-    if ((!list.action && list.action !== '') || list.items) {
-        if (!stateList) {
-            return dispatch({
-                ...list,
-                type: LIST_INIT
-            });
-        }
-        return;
-    }
-    const onFetch = list.onFetch || httpFetchHandler;
-    return dispatch(
-        onFetch(list, VALUES, http).then(data => ({
-            ...list,
-            ...data,
-            type: LIST_INIT
-        }))
-    );
-};*/
 /**
  * Update query values and send request
  * @param listId
@@ -198,53 +178,91 @@ var listFetch = function (listId, query) {
             formValues[key] = query[key];
             toDispatch.push((0, form_2.formChange)(list.formId, key, query[key]));
         });
+        // Отменяем предыдущий запрос для этого listId (если есть)
+        components.http._promises = components.http._promises || {};
+        var prev = components.http._promises[listId];
+        if (prev && typeof prev.cancel === 'function') {
+            // для axios.CancelToken.source()
+            prev.cancel('Cancelled by new request for list ' + listId);
+        }
+        else if (prev && typeof prev.abort === 'function') {
+            // для AbortController
+            prev.abort();
+        }
+        // Создаем новый источник отмены
+        var source = axios_1["default"].CancelToken.source();
+        components.http._promises[listId] = source;
+        var options = { cancelToken: source.token };
+        // Set `Loading...`
         if (list.isRemote) {
-            // Set `Loading...`
             toDispatch.push({
                 listId: listId,
                 type: exports.LIST_BEFORE_FETCH
             });
         }
-        // Send request
-        toDispatch.push(Promise.resolve(onFetch(list, formValues, components)).then(function (data) {
-            var _a;
-            // Skip on empty
-            if (!data) {
-                return [];
-            }
-            // Check list is not destroy
-            if (!getState().list.lists[listId]) {
+        toDispatch.push([
+            Promise.resolve(onFetch(list, formValues, components, options))
+                .then(function (data) {
+                var _a;
+                // Skip on empty
+                if (!data) {
+                    return [];
+                }
+                // Check list is not destroy
+                if (!getState().list.lists[listId]) {
+                    return [];
+                }
+                if ((0, isArray_1["default"])(data)) {
+                    data = {
+                        items: data,
+                        total: data.length,
+                        meta: null
+                    };
+                }
+                var items = data.items || [];
+                var total = data.total || items.length || null;
+                var page = formValues[list.pageAttribute];
+                var pageSize = formValues[list.pageSizeAttribute];
+                var totalPages = Math.ceil(((list === null || list === void 0 ? void 0 : list.total) || 0) / (pageSize || 1));
+                var hasNextPage = (_a = data === null || data === void 0 ? void 0 : data.hasNextPage) !== null && _a !== void 0 ? _a : (page !== totalPages || null);
+                return [
+                    (0, form_2.formSetErrors)(list.formId, data.errors || null),
+                    {
+                        items: items,
+                        total: total,
+                        hasNextPage: hasNextPage,
+                        meta: data.meta || null,
+                        page: page,
+                        pageSize: pageSize,
+                        listId: listId,
+                        defaultPageValue: list.defaultPageValue,
+                        type: exports.LIST_AFTER_FETCH
+                    },
+                ];
+            })["catch"](function (error) {
+                // Если это отмена — просто игнорируем ошибку
+                if (axios_1["default"].isCancel && axios_1["default"].isCancel(error)) {
+                    return [];
+                }
+                // Handle cancellation quietly
+                // axios v0.x: axios.isCancel(error)
+                var isAxiosCancel = typeof axios_1["default"].isCancel === 'function' && axios_1["default"].isCancel(error);
+                if (isAxiosCancel) {
+                    // игнорируем, это отмена запроса
+                    return [];
+                }
+                // прочие ошибки — можно пробросить или обработать
+                if (typeof list.onError === 'function') {
+                    list.onError(error);
+                }
                 return [];
-            }
-            if ((0, isArray_1["default"])(data)) {
-                data = {
-                    items: data,
-                    total: data.length,
-                    meta: null
-                };
-            }
-            var items = data.items || [];
-            var total = data.total || items.length || null;
-            var page = formValues[list.pageAttribute];
-            var pageSize = formValues[list.pageSizeAttribute];
-            var totalPages = Math.ceil(((list === null || list === void 0 ? void 0 : list.total) || 0) / (pageSize || 1));
-            var hasNextPage = (_a = data === null || data === void 0 ? void 0 : data.hasNextPage) !== null && _a !== void 0 ? _a : (page !== totalPages || null);
-            return [
-                // Check has errors
-                (0, form_2.formSetErrors)(list.formId, data.errors || null),
-                {
-                    items: items,
-                    total: total,
-                    hasNextPage: hasNextPage,
-                    meta: data.meta || null,
-                    page: page,
-                    pageSize: pageSize,
-                    listId: listId,
-                    defaultPageValue: list.defaultPageValue,
-                    type: exports.LIST_AFTER_FETCH
-                },
-            ];
-        }));
+            })["finally"](function () {
+                // убрать сохранённый источник если он тот же
+                if (components.http._promises[listId] === source) {
+                    delete components.http._promises[listId];
+                }
+            }),
+        ]);
         return dispatch(toDispatch);
     };
 };
@@ -318,6 +336,12 @@ var toggleAll = function (listId) { return ({
     type: exports.LIST_TOGGLE_ALL
 }); };
 exports.toggleAll = toggleAll;
+var selectItem = function (listId, itemId) { return ({
+    listId: listId,
+    itemId: itemId,
+    type: exports.LIST_SELECT_ITEM
+}); };
+exports.selectItem = selectItem;
 // TODO local storage save?
 /*export const setLayoutName = (listId, layoutName) => (
     dispatch,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steroidsjs/core",
-    "version": "3.0.68",
+    "version": "3.0.70",
     "description": "",
     "author": "Vladimir Kozhin <hello@kozhindev.com>",
     "repository": {

package/reducers/list.js

@@ -129,6 +129,10 @@ var reducerMap = (_a = {},
         }
         return [];
     },
+    _a[list_1.LIST_SELECT_ITEM] = function (state, action) {
+        var _a;
+        return (__assign(__assign({}, state), { selectedIds: __assign(__assign({}, state.selectedIds), (_a = {}, _a[action.listId] = action.itemId ? [action.itemId] : [], _a)) }));
+    },
     _a[list_1.LIST_SET_LAYOUT] = function (state, action) {
         var _a;
         return (__assign(__assign({}, state), { lists: __assign(__assign({}, state.lists), (_a = {}, _a[action.listId] = __assign(__assign({}, state.lists[action.listId]), { layoutName: action.layoutName }), _a)) }));