@steroidsjs/core 2.3.0-beta.1 → 2.3.0-beta.2

package/src/actions/auth.test.ts

@@ -1,155 +0,0 @@
-import configureMockStore from 'redux-mock-store';
-import {
-    AUTH_INIT,
-    AUTH_SET_DATA,
-    AUTH_INIT_USER,
-    AUTH_ADD_SOCIAL,
-    init,
-    login,
-    logout,
-    setUser,
-    addSocial,
-    setData,
-} from './auth';
-import prepareMiddleware from '../../tests/storeMiddlewareMock';
-import componentsMock from '../../tests/componentsMock';
-
-const mockStore = configureMockStore([prepareMiddleware]);
-const store = mockStore({});
-
-describe('auth actions', () => {
-    beforeEach(() => {
-        store.clearActions();
-    });
-
-    describe('init', () => {
-        it('without skipInitialized', () => {
-            const expectedActions = [{
-                type: AUTH_INIT,
-            }];
-
-            store.dispatch(init());
-            expect(store.getActions()).toEqual(expectedActions);
-        });
-
-        it('with skipInitialized', () => {
-            const mockedStore = mockStore({
-                auth: {
-                    isInitialized: true,
-                },
-            });
-
-            const expectedActions = [];
-
-            mockedStore.dispatch(init(true));
-            expect(mockedStore.getActions()).toEqual(expectedActions);
-        });
-    });
-
-    describe('login', () => {
-        it('without redirectPageId', () => {
-            const token = 'token';
-            const expectedActions = [
-                {
-                    type: AUTH_INIT,
-                    redirectPageId: null,
-                },
-            ];
-
-            store.dispatch(login(token, false));
-            expect(componentsMock.http.setAccessToken).toHaveBeenCalledWith(token);
-            expect(store.getActions()).toEqual(expectedActions);
-        });
-
-        it('with redirectPageId', () => {
-            const redirectPageId = 'foo';
-            const token = 'token';
-            const expectedActions = [
-                {
-                    type: AUTH_INIT,
-                    redirectPageId,
-                },
-            ];
-
-            store.dispatch(login(token, redirectPageId));
-            expect(componentsMock.http.setAccessToken).toHaveBeenCalledWith(token);
-            expect(store.getActions()).toEqual(expectedActions);
-        });
-    });
-
-    describe('logout', () => {
-        it('without redirectPageId', () => {
-            const expectedActions = [
-                {
-                    type: AUTH_INIT_USER,
-                    user: null,
-                },
-            ];
-
-            store.dispatch(logout(false));
-            expect(componentsMock.http.onLogout).toHaveBeenCalled();
-            expect(store.getActions()).toEqual(expectedActions);
-        });
-
-        it('with redirectPageId', () => {
-            const expectedActions = [
-                {
-                    type: AUTH_INIT_USER,
-                    user: null,
-                },
-                {
-                    type: '@@router/CALL_HISTORY_METHOD',
-                    payload: {
-                        args: [null],
-                        method: 'push',
-                    },
-                },
-            ];
-
-            store.dispatch(logout());
-            expect(componentsMock.http.onLogout).toHaveBeenCalled();
-            expect(store.getActions()).toEqual(expectedActions);
-        });
-    });
-
-    describe('setUser', () => {
-        it('with user', () => {
-            const user = {
-                name: 'John',
-            };
-            const expectedAction = {
-                type: AUTH_INIT_USER,
-                user,
-            };
-
-            expect(setUser(user)).toEqual(expectedAction);
-        });
-
-        it('with null user', () => {
-            const expectedAction = {
-                type: AUTH_INIT_USER,
-                user: null,
-            };
-
-            expect(setUser(null)).toEqual(expectedAction);
-        });
-    });
-
-    it('addSocial', () => {
-        const expectedAction = {
-            type: AUTH_ADD_SOCIAL,
-            social: 'foo',
-        };
-
-        expect(addSocial('foo')).toEqual(expectedAction);
-    });
-
-    it('setData', () => {
-        const expectedAction = {
-            type: AUTH_SET_DATA,
-            data: 'foo',
-        };
-
-        expect(setData('foo')).toEqual(expectedAction);
-    });
-});

package/src/actions/auth.ts

@@ -1,55 +0,0 @@
-import {goToRoute} from './router';
-
-export const AUTH_INIT = 'AUTH_INIT';
-export const AUTH_INIT_USER = 'AUTH_INIT_USER';
-export const AUTH_SET_DATA = 'AUTH_SET_DATA';
-export const AUTH_ADD_SOCIAL = 'AUTH_ADD_SOCIAL';
-
-export const init = (skipInitialized = false) => (dispatch, getState) => {
-    if (skipInitialized) {
-        const state = getState();
-        if (state.auth && state.auth.isInitialized) {
-            return [];
-        }
-    }
-    return dispatch({
-        type: AUTH_INIT,
-    });
-};
-
-export const reInit = () => init();
-
-export const login = (token, redirectPageId: string | boolean = 'root') => (
-    dispatch,
-    getState,
-    {http},
-) => {
-    http.setAccessToken(token);
-    return dispatch({
-        type: AUTH_INIT,
-        redirectPageId: redirectPageId || null,
-    });
-};
-
-export const addSocial = social => ({
-    type: AUTH_ADD_SOCIAL,
-    social,
-});
-
-export const setUser = user => ({
-    type: AUTH_INIT_USER,
-    user: user || null,
-});
-
-export const setData = data => ({
-    type: AUTH_SET_DATA,
-    data,
-});
-
-export const logout = (routeId: string | boolean = 'root', routeParams: any = null) => (dispatch, getState, {http}) => {
-    http.onLogout();
-    return dispatch([
-        setUser(null),
-        routeId && goToRoute(routeId, routeParams),
-    ].filter(Boolean));
-};

package/src/actions/fields.ts

@@ -1,13 +0,0 @@
-export const FIELDS_SET_META = 'FIELDS_SET_META';
-export const FIELDS_DATA_PROVIDER_SET_ITEMS = '@fields/data_provider_set_items';
-
-export const setMeta = meta => ({
-    type: FIELDS_SET_META,
-    meta,
-});
-
-export const fieldsDataProviderSetItems = (dataProviderId, items) => ({
-    type: FIELDS_DATA_PROVIDER_SET_ITEMS,
-    dataProviderId,
-    items,
-});

package/src/actions/form.ts

@@ -1,106 +0,0 @@
-export const FORM_INITIALIZE = '@form/initialize';
-export const FORM_CHANGE = '@form/change';
-export const FORM_RESET = '@form/reset';
-export const FORM_HARD_RESET = '@form/hard_reset';
-export const FORM_DESTROY = '@form/destroy';
-export const FORM_SET_ERRORS = '@form/set_errors';
-export const FORM_SUBMIT = '@form/submit';
-export const FORM_SET_SUBMITTING = '@form/set_submitting';
-export const FORM_ARRAY_ADD = '@form/array_add';
-export const FORM_ARRAY_REMOVE = '@form/array_remove';
-
-/**
- * Инициализация формы, сохранение первоначальных данных
- * @param formId
- * @param values
- */
-export const formInitialize = (formId, values) => ({
-    type: FORM_INITIALIZE,
-    formId,
-    values,
-});
-
-/**
- * Изменение значения поля
- * @param formId
- * @param nameOrObject
- * @param value
- */
-export const formChange = (formId, nameOrObject, value = null) => ({
-    type: FORM_CHANGE,
-    formId,
-    nameOrObject,
-    value,
-});
-
-/**
- * Задать ошибки
- * @param formId
- * @param errors
- */
-export const formSetErrors = (formId, errors) => ({
-    type: FORM_SET_ERRORS,
-    formId,
-    errors,
-});
-
-/**
- * Сабмит формы
- * @param formId
- */
-export const formSubmit = (formId) => ({
-    type: FORM_SUBMIT,
-    formId,
-});
-/**
- * Установить состояние отправки формы
- * @param formId
- * @param isSubmitting
- */
-export const formSetSubmitting = (formId, isSubmitting) => ({
-    type: FORM_SET_SUBMITTING,
-    formId,
-    isSubmitting,
-});
-
-/**
- * Сброс данных формы к первоначальному состоянию (к initialValues)
- * @param formId
- */
-export const formReset = (formId) => ({
-    type: FORM_RESET,
-    formId,
-});
-
-/**
- * Сброс данных формы, включая первоначальное состояние (initialValues)
- * @param formId
- */
-export const formHardReset = (formId) => ({
-    type: FORM_HARD_RESET,
-    formId,
-});
-
-/**
- * Удаление данных формы из redux хранилища
- * @param formId
- */
-export const formDestroy = (formId) => ({
-    type: FORM_DESTROY,
-    formId,
-});
-
-export const formArrayAdd = (formId, name, rowsCount, initialValues) => ({
-    type: FORM_ARRAY_ADD,
-    formId,
-    name,
-    rowsCount,
-    initialValues,
-});
-
-export const formArrayRemove = (formId, name, index) => ({
-    type: FORM_ARRAY_REMOVE,
-    formId,
-    name,
-    index,
-});

package/src/actions/list.ts

@@ -1,343 +0,0 @@
-import _get from 'lodash-es/get';
-import _isArray from 'lodash-es/isArray';
-import _isEmpty from 'lodash-es/isEmpty';
-import _orderBy from 'lodash-es/orderBy';
-import _trimStart from 'lodash-es/trimStart';
-import _isFunction from 'lodash-es/isFunction';
-import _isEqual from 'lodash-es/isEqual';
-import _isNil from 'lodash-es/isNil';
-import {formSelector} from '../reducers/form';
-import {formChange, formSetErrors} from '../actions/form';
-import {filterItems} from '../utils/data';
-import {IApiMethod} from '../components/ApiComponent';
-
-export interface IList {
-    action?: string | IApiMethod,
-    actionMethod?: string,
-    onFetch?: (list: IList, query: Record<string, unknown>, components: any) => Promise<any>,
-    condition?: (query: Record<string, unknown>) => any,
-    scope?: string[],
-    total?: number,
-    items?: Array<any>,
-    sourceItems?: Array<any>,
-    isRemote?: boolean,
-    loadMore?: boolean,
-    primaryKey?: string,
-    listId?: string,
-    formId?: string,
-    pageAttribute?: string,
-    pageSizeAttribute?: string,
-    sortAttribute?: string,
-    layoutAttribute?: string,
-    meta?: any,
-    isFetched?: boolean,
-    isLoading?: boolean,
-    layoutName?: null,
-}
-
-export const LIST_INIT = '@list/init';
-export const LIST_SET_ITEMS = '@list/set_items';
-export const LIST_BEFORE_FETCH = '@list/before_fetch';
-export const LIST_AFTER_FETCH = '@list/after_fetch';
-export const LIST_ITEM_ADD = '@list/item_add';
-export const LIST_ITEM_UPDATE = '@list/item_update';
-export const LIST_DESTROY = '@list/destroy';
-export const LIST_TOGGLE_ITEM = '@list/toggle_item';
-export const LIST_TOGGLE_ALL = '@list/toggle_all';
-export const LIST_SET_LAYOUT = '@list/set_layout';
-
-//const STORAGE_LAYOUT_KEY_PREFIX = 'listLayout_';
-
-const lazyTimers = {};
-
-const createList = (listId: string, props: any) => ({
-    action: props.action || props.action === '' ? props.action : null,
-    actionMethod: props.actionMethod || 'get',
-    onFetch: props.onFetch,
-    condition: props.condition,
-    scope: props.scope,
-    total: props.total || null,
-    items: null,
-    sourceItems: props.items || null,
-    isRemote: !props.items,
-    loadMore: props._pagination.loadMore,
-    primaryKey: props.primaryKey,
-    listId,
-    formId: _get(props, 'searchForm.formId') || listId,
-    pageAttribute: _get(props, '_pagination.attribute') || null,
-    pageSizeAttribute: _get(props, '_paginationSize.attribute') || null,
-    sortAttribute: _get(props, '_sort.attribute') || null,
-    layoutAttribute: _get(props, '_layout.attribute') || null,
-});
-
-export const httpFetchHandler = (list: IList, query, {api, http}) => {
-    if (typeof list.action === 'function') {
-        const params = {...query};
-        if (list.scope) {
-            params.scope = list.scope.join(',');
-        }
-        return list.action(api, params).then(response => response.data);
-    }
-
-    let url = list.action;
-    if (list.scope) {
-        url
-            += (url.indexOf('?') !== -1 ? '&' : '?') + 'scope=' + list.scope.join(',');
-    }
-    return http
-        .send(list.actionMethod, url || window.location.pathname, query)
-        .then(response => response.data);
-};
-
-export const localFetchHandler = (list: IList, query: Record<string, unknown>) => {
-    query = {...query};
-
-    // Get page
-    const page = parseInt(query[list.pageAttribute] as string, 10) || null;
-    delete query[list.pageAttribute];
-
-    // Get page size
-    const pageSize = parseInt(query[list.pageSizeAttribute] as string, 10) || null;
-    delete query[list.pageSizeAttribute];
-
-    // Get sort
-    const sort = query[list.sortAttribute] ? [].concat(query[list.sortAttribute]) : null;
-    delete query[list.sortAttribute];
-
-    // Delete layout param
-    delete query[list.layoutAttribute];
-
-    let items = [].concat(list.sourceItems || []);
-
-    // Remove null or undefined values from query
-    Object.keys(query).forEach(key => {
-        if (_isNil(query[key])) {
-            delete query[key];
-        }
-    });
-
-    // Filter items
-    if (!_isEmpty(query)) {
-        items = filterItems(
-            items,
-            list.condition
-                ? (_isFunction(list.condition) ? list.condition(query) : list.condition)
-                : query,
-        );
-    }
-
-    const total = items.length;
-
-    // Pagination
-    if (page && pageSize) {
-        const startIndex = (page - 1) * pageSize;
-        items = items.slice(startIndex, startIndex + pageSize);
-    }
-
-    // Sort
-    if (sort) {
-        items = _orderBy(
-            items,
-            sort.map(key => _trimStart(key, '-')),
-            sort.map(key => key.indexOf('-') === 0 ? 'desc' : 'asc'),
-        );
-    }
-
-    if (_isEqual(list.items, items)) {
-        items = list.items;
-    }
-
-    return {
-        items,
-        total,
-    };
-};
-
-/**
- * Init list
- * @param listId
- * @param payload
- */
-export const listInit = (listId, payload) => ({
-    type: LIST_INIT,
-    payload,
-});
-
-export const listSetItems = (listId, items) => ({
-    type: LIST_SET_ITEMS,
-    listId,
-    items,
-});
-
-export const listSetLayout = (listId, layoutName) => ({
-    type: LIST_SET_LAYOUT,
-    listId,
-    layoutName,
-});
-
-/*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
- * @param query
- */
-export const listFetch = (listId: string, query: any = {}) => (dispatch, getState, components) => {
-    const state = getState();
-
-    const list = _get(state, ['list', 'lists', listId]) as IList;
-
-    if (!list || (list.isRemote && !list.action && list.action !== '')) {
-        return [];
-    }
-
-    const toDispatch = [];
-    const formValues = formSelector(state, list.formId, ({values}) => values) || {};
-    const onFetch = list.onFetch || (list.isRemote ? httpFetchHandler : localFetchHandler);
-
-    // Change query
-    Object.keys(query || {}).forEach(key => {
-        formValues[key] = query[key];
-        toDispatch.push(formChange(list.formId, key, query[key]));
-    });
-
-    if (list.isRemote) {
-        // Set `Loading...`
-        toDispatch.push({
-            listId,
-            type: LIST_BEFORE_FETCH,
-        });
-    }
-
-    // Send request
-    toDispatch.push(
-        Promise.resolve(onFetch(list, formValues, components)).then(data => {
-            // Skip on empty
-            if (!data) {
-                return [];
-            }
-
-            // Check list is not destroy
-            if (!getState().list.lists[listId]) {
-                return [];
-            }
-
-            if (_isArray(data)) {
-                data = {
-                    items: data,
-                    total: data.length,
-                    meta: null,
-                };
-            }
-
-            return [
-                // Check has errors
-                formSetErrors(list.formId, data.errors || null),
-                {
-                    items: data.items || [],
-                    total: data.total || null,
-                    meta: data.meta || null,
-                    page: formValues[list.pageAttribute],
-                    pageSize: formValues[list.pageSizeAttribute],
-                    listId,
-                    type: LIST_AFTER_FETCH,
-                },
-            ];
-        }),
-    );
-
-    return dispatch(toDispatch);
-};
-
-/**
- * Lazy update query values and send request
- * @param listId
- * @param query
- */
-export const listLazyFetch = (listId: string, query: any = {}) => dispatch => {
-    if (lazyTimers[listId]) {
-        clearTimeout(lazyTimers[listId]);
-    }
-    lazyTimers[listId] = setTimeout(() => dispatch(listFetch(listId, query)), 200);
-};
-
-/**
- * Send request with same query
- * @param listId
- */
-export const listRefresh = (listId: string) => listFetch(listId);
-
-/**
- * Destroy list (remove from redux state)
- * @param listId
- */
-export const listDestroy = (listId: string) => {
-    if (lazyTimers[listId]) {
-        clearTimeout(lazyTimers[listId]);
-    }
-    return {
-        listId,
-        type: LIST_DESTROY,
-    };
-};
-
-export const add = (listId, item, prepend = false) => ({
-    item,
-    prepend,
-    listId,
-    type: LIST_ITEM_ADD,
-});
-export const update = (listId, item, condition) => ({
-    item,
-    condition,
-    listId,
-    type: LIST_ITEM_UPDATE,
-});
-export const toggleItem = (listId, itemId) => ({
-    listId,
-    itemId,
-    type: LIST_TOGGLE_ITEM,
-});
-export const toggleAll = listId => ({
-    listId,
-    type: LIST_TOGGLE_ALL,
-});
-
-// TODO local storage save?
-/*export const setLayoutName = (listId, layoutName) => (
-    dispatch,
-    getState,
-    {clientStorage}
-) => {
-    clientStorage.set(STORAGE_LAYOUT_KEY_PREFIX + listId, layoutName);
-    return dispatch({
-        listId,
-        layoutName,
-        type: LIST_SET_LAYOUT
-    });
-};
-*/

package/src/actions/modal.ts

@@ -1,34 +0,0 @@
-import _uniqueId from 'lodash-es/uniqueId';
-import {IModalProps} from '../ui/modal/Modal/Modal';
-
-export const MODAL_OPEN = '@modal/open';
-export const MODAL_MARK_CLOSING = '@modal/markClosing';
-export const MODAL_CLOSE = '@modal/close';
-
-export const openModal = (modal, props: IModalProps = {}) => {
-    let id = props ? props.modalId : null;
-    if (!id) {
-        modal._modalId = modal._modalId || _uniqueId('modal');
-        id = modal._modalId;
-    }
-
-    return {
-        type: MODAL_OPEN,
-        id,
-        modal,
-        group: props.modalGroup || null,
-        props,
-    };
-};
-
-export const modalMarkClosing = (id, group = null) => ({
-    type: MODAL_MARK_CLOSING,
-    id,
-    group,
-});
-
-export const closeModal = (id, group = null) => ({
-    type: MODAL_CLOSE,
-    id,
-    group,
-});