@steroidsjs/core 2.1.0-beta.7 → 2.1.0-beta.9.1

package/hooks/useComponents.js

@@ -1,12 +1,12 @@
 "use strict";
-//import {useContext} from 'react';
 exports.__esModule = true;
+var react_1 = require("react");
+var ComponentsProvider_1 = require("../providers/ComponentsProvider");
 function useComponents() {
-    if (typeof window !== 'undefined' && window.SteroidsComponents) {
+    var components = react_1.useContext(ComponentsProvider_1.ComponentsContext);
+    if (!process.env.IS_SSR) {
         return window.SteroidsComponents;
     }
-    // TODO Get components from context
-    //return useContext(ComponentsContext);
-    return null;
+    return components;
 }
 exports["default"] = useComponents;

package/hooks/useDataProvider.js

@@ -58,6 +58,7 @@ var data_1 = require("../utils/data");
 var index_1 = require("./index");
 var fields_1 = require("../reducers/fields");
 var text_1 = require("../utils/text");
+var react_use_1 = require("react-use");
 var defaultProps = {
     autoComplete: {
         enable: false,
@@ -88,6 +89,7 @@ function useDataProvider(config) {
     // Fetch data
     var delayTimerRef = react_1.useRef(null);
     var isAutoFetchedRef = react_1.useRef(false);
+    var prevQuery = react_use_1.usePrevious(config.query);
     react_1.useEffect(function () {
         var fetchRemote = function () { return __awaiter(_this, void 0, void 0, function () {
             var searchHandler, result, newItems;
@@ -129,8 +131,8 @@ function useDataProvider(config) {
             if (delayTimerRef.current) {
                 clearTimeout(delayTimerRef.current);
             }
-            // Min length query logic
-            if (config.query && config.query.length >= autoComplete.minLength) {
+            // Changed query logic
+            if (prevQuery !== config.query) {
                 // Search with delay
                 delayTimerRef.current = setTimeout(fetchRemote, autoComplete.delay);
             }

package/hooks/useDataSelect.d.ts

@@ -1,3 +1,8 @@
+interface IDataSelectItem {
+    id: number | string | boolean;
+    label?: string;
+    [key: string]: unknown;
+}
 export interface IDataSelectConfig {
     /**
      * Возможность множественного выбора
@@ -5,14 +10,10 @@ export interface IDataSelectConfig {
      */
     multiple?: boolean;
     /**
-     * Список с элементами
+     * Список с видимыми элементами
      * @example [{id: 1, label: 'Krasnoyarsk'}, {id: 2, label: 'Moscow'}]
      */
-    items: {
-        id: number | string | boolean;
-        label?: string;
-        [key: string]: unknown;
-    }[];
+    items: IDataSelectItem[];
     /**
      * Сделать активным первый элемент в списке
      * @example true
@@ -32,6 +33,10 @@ export interface IDataSelectConfig {
      * Значение поля в форме
      */
     inputValue: any;
+    /**
+     *  Список со всеми элементами
+     */
+    sourceItems?: IDataSelectItem[];
 }
 export interface IDataSelectResult {
     isOpened: boolean;
@@ -44,3 +49,4 @@ export interface IDataSelectResult {
     setSelectedIds: (ids: PrimaryKey | PrimaryKey[], skipToggle?: boolean) => void;
 }
 export default function useDataSelect(config: IDataSelectConfig): IDataSelectResult;
+export {};

package/hooks/useDataSelect.js

@@ -80,9 +80,9 @@ function useDataSelect(config) {
     // Update selected items on change value
     var prevConfigSelectedIds = react_use_1.usePrevious(config.selectedIds || []);
     react_use_1.useUpdateEffect(function () {
-        // console.log(config.selectedIds, prevConfigSelectedIds);
+        var itemsForSelect = config.sourceItems || config.items;
         var newSelectedIds = config.selectedIds && config.selectedIds.length > 0
-            ? config.items.map(function (item) { return item[primaryKey]; }).filter(function (id) { return config.selectedIds.includes(id); })
+            ? itemsForSelect.map(function (item) { return item[primaryKey]; }).filter(function (id) { return config.selectedIds.includes(id); })
             : [];
         if (!isEqual_1["default"](prevConfigSelectedIds, newSelectedIds) && newSelectedIds.length !== 0) {
             setSelectedIdsInternal(newSelectedIds);

package/hooks/useFetch.d.ts

@@ -1,5 +1,10 @@
-import { IComponents } from './useComponents';
+import { IComponents } from '../providers/ComponentsProvider';
 import { IApiMethod } from '../components/ApiComponent';
+declare global {
+    interface Window {
+        APP_PRELOADED_DATA: any;
+    }
+}
 export interface IFetchConfig {
     id?: string | number;
     url?: string | IApiMethod;
@@ -18,6 +23,10 @@ export interface IFetchResult {
     isLoading: boolean;
     fetch?: (newParams?: Record<string, unknown>) => void;
 }
+export declare const normalizeConfig: (config: any) => any;
+export declare const getConfigId: (config: any) => any;
+export declare const defaultFetchHandler: (config: any, components: any, addCancelToken: any) => any;
+export declare const fetchData: (config: any, components: any, addCancelToken: any) => any;
 /**
  * Fetch
  * Используется для подгрузки данных с бекенда перед рендером компонента, на котором он применяется.
@@ -25,7 +34,6 @@ export interface IFetchResult {
  * которые описывают откуда нужно подтянуть данные.
  *
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
- * ключ `key`. Все данные сохраняются в Redux Store, что позволяет избежать дополнительных запросов при использовании
- * SSR.
+ * ключ `key`.
  */
 export default function useFetch(rawConfig?: IFetchConfig): IFetchResult;

package/hooks/useFetch.js

@@ -50,12 +50,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+exports.fetchData = exports.defaultFetchHandler = exports.getConfigId = exports.normalizeConfig = void 0;
 var react_1 = require("react");
 var react_use_1 = require("react-use");
+var trim_1 = __importDefault(require("lodash-es/trim"));
 var axios_1 = __importDefault(require("axios"));
+var hooks_1 = require("@steroidsjs/core/hooks");
 var index_1 = require("./index");
 var normalizeConfig = function (config) { return (config
     ? __assign({ id: null, url: '', method: 'get', params: {}, options: null, onFetch: null }, config) : null); };
+exports.normalizeConfig = normalizeConfig;
+var getConfigId = function (config) {
+    var result = trim_1["default"](config.id || config.url, '/');
+    if (!result) {
+        // eslint-disable-next-line no-console
+        console.warn('Please set id for fetch config, it`s necessary for SSR to work properly');
+    }
+    return result;
+};
+exports.getConfigId = getConfigId;
 var defaultFetchHandler = function (config, components, addCancelToken) {
     var cancelToken = new axios_1["default"].CancelToken(function (cancel) {
         addCancelToken(cancel);
@@ -67,6 +80,9 @@ var defaultFetchHandler = function (config, components, addCancelToken) {
         .send(config.method, config.url, config.params, __assign(__assign({}, config.options), { cancelToken: cancelToken }))
         .then(function (result) { return result.data; });
 };
+exports.defaultFetchHandler = defaultFetchHandler;
+var fetchData = function (config, components, addCancelToken) { return ((config.onFetch || exports.defaultFetchHandler).call(null, config, components, addCancelToken)); };
+exports.fetchData = fetchData;
 /**
  * Fetch
  * Используется для подгрузки данных с бекенда перед рендером компонента, на котором он применяется.
@@ -74,26 +90,26 @@ var defaultFetchHandler = function (config, components, addCancelToken) {
  * которые описывают откуда нужно подтянуть данные.
  *
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
- * ключ `key`. Все данные сохраняются в Redux Store, что позволяет избежать дополнительных запросов при использовании
- * SSR.
+ * ключ `key`.
  */
 function useFetch(rawConfig) {
     var _this = this;
     if (rawConfig === void 0) { rawConfig = null; }
     var components = index_1.useComponents();
     // Store config in state
-    var _a = react_1.useState(normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
+    var _a = react_1.useState(exports.normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
     // Update config in state on raw config updated
     react_use_1.useUpdateEffect(function () {
         setConfig(rawConfig);
     }, [rawConfig]);
-    // Resolve config id
-    // TODO Get initial state from HttpComponent (for SSR) by configId
-    //const idRef = useRef(_uniqueId('fetch'));
-    //const configId = config ? _trim(config.id || config.url || idRef.current, '/') : null;
+    // Get preloaded data
+    var configId = exports.getConfigId(config);
+    var ssrValueContext = hooks_1.useSsr();
+    var preloadedData = process.env.IS_SSR ? ssrValueContext.preloadedData : window.APP_PRELOADED_DATA;
+    var preloadedDataByConfigId = (preloadedData && configId) ? preloadedData[configId] : null;
     // State for data and loading flag
-    var _b = react_1.useState(null), data = _b[0], setData = _b[1];
-    var _c = react_1.useState(!!config), isLoading = _c[0], setIsLoading = _c[1];
+    var _b = react_1.useState(preloadedDataByConfigId || null), data = _b[0], setData = _b[1];
+    var _c = react_1.useState(!!config && !data), isLoading = _c[0], setIsLoading = _c[1];
     // Cancel tokens
     var cancelTokens = react_1.useRef([]);
     var addCancelToken = function (token) { return cancelTokens.current.push(token); };
@@ -109,10 +125,11 @@ function useFetch(rawConfig) {
                         if (newConfig) {
                             setConfig(__assign(__assign(__assign({}, config), newConfig), { params: __assign(__assign({}, config === null || config === void 0 ? void 0 : config.params), newConfig === null || newConfig === void 0 ? void 0 : newConfig.params) }));
                         }
+                        setData(null);
                         if (!config) return [3 /*break*/, 2];
                         setIsLoading(true);
                         _a = setData;
-                        return [4 /*yield*/, (config.onFetch || defaultFetchHandler).call(null, config, components, addCancelToken)];
+                        return [4 /*yield*/, exports.fetchData(config, components, addCancelToken)];
                     case 1:
                         _a.apply(void 0, [_b.sent()]);
                         setIsLoading(false);
@@ -122,28 +139,15 @@ function useFetch(rawConfig) {
             });
         });
     }, [components, config]);
+    react_use_1.useEffectOnce(function () {
+        if (!data) {
+            fetch();
+        }
+    });
     // Fetch data on config update
-    react_1.useLayoutEffect(function () {
-        var fetchData = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        setData(null);
-                        if (!config) return [3 /*break*/, 2];
-                        setIsLoading(true);
-                        _a = setData;
-                        return [4 /*yield*/, (config.onFetch || defaultFetchHandler).call(null, config, components, addCancelToken)];
-                    case 1:
-                        _a.apply(void 0, [_b.sent()]);
-                        setIsLoading(false);
-                        _b.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        }); };
-        fetchData();
-    }, [components, config]);
+    react_use_1.useUpdateEffect(function () {
+        fetch();
+    }, [fetch]);
     return { data: data, isLoading: isLoading, fetch: fetch };
 }
 exports["default"] = useFetch;

package/hooks/useLayout.d.ts

@@ -1,3 +1,5 @@
+import { IComponents } from '@steroidsjs/core/providers/ComponentsProvider';
+import { Dispatch } from 'redux';
 export interface ILayout {
     status?: string;
     error?: any;
@@ -9,4 +11,11 @@ export declare const STATUS_RENDER_ERROR = "render_error";
 export declare const STATUS_HTTP_ERROR = "render_error";
 export declare const STATUS_ACCESS_DENIED = "access_denied";
 export declare const STATUS_OK = "ok";
+export declare const HTTP_STATUS_CODES: {
+    not_found: number;
+    access_denied: number;
+    ok: number;
+    render_error: number;
+};
+export declare const runInitAction: (initAction: (...args: any[]) => Promise<any>, components: IComponents, dispatch: Dispatch<any>) => Promise<void>;
 export default function useLayout(initAction?: any): ILayout;

package/hooks/useLayout.js

@@ -2,8 +2,9 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 exports.__esModule = true;
-exports.STATUS_OK = exports.STATUS_ACCESS_DENIED = exports.STATUS_HTTP_ERROR = exports.STATUS_RENDER_ERROR = exports.STATUS_NOT_FOUND = exports.STATUS_LOADING = void 0;
+exports.runInitAction = exports.HTTP_STATUS_CODES = exports.STATUS_OK = exports.STATUS_ACCESS_DENIED = exports.STATUS_HTTP_ERROR = exports.STATUS_RENDER_ERROR = exports.STATUS_NOT_FOUND = exports.STATUS_LOADING = void 0;
 var react_1 = require("react");
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
@@ -11,6 +12,7 @@ var upperFirst_1 = __importDefault(require("lodash-es/upperFirst"));
 var merge_1 = __importDefault(require("lodash-es/merge"));
 var intersection_1 = __importDefault(require("lodash-es/intersection"));
 var react_use_1 = require("react-use");
+var useSsr_1 = __importDefault(require("@steroidsjs/core/hooks/useSsr"));
 var useComponents_1 = __importDefault(require("./useComponents"));
 var router_1 = require("../reducers/router");
 var auth_1 = require("../reducers/auth");
@@ -25,6 +27,58 @@ exports.STATUS_RENDER_ERROR = 'render_error';
 exports.STATUS_HTTP_ERROR = 'render_error';
 exports.STATUS_ACCESS_DENIED = 'access_denied';
 exports.STATUS_OK = 'ok';
+exports.HTTP_STATUS_CODES = (_a = {},
+    _a[exports.STATUS_NOT_FOUND] = 404,
+    _a[exports.STATUS_ACCESS_DENIED] = 403,
+    _a[exports.STATUS_OK] = 200,
+    _a[exports.STATUS_RENDER_ERROR] = 500,
+    _a[exports.STATUS_HTTP_ERROR] = 500,
+    _a);
+var runInitAction = function (initAction, components, dispatch) { return (initAction(null, dispatch, components)
+    .then(function (result) {
+    // Configure components
+    if (isObject_1["default"](result.config)) {
+        Object.keys(result.config).forEach(function (name) {
+            if (!components[name]) {
+                return;
+            }
+            Object.keys(result.config[name]).forEach(function (key) {
+                var value = result.config[name][key];
+                var setter = 'set' + upperFirst_1["default"](key);
+                if (isFunction_1["default"](components[name][setter])) {
+                    components[name][setter](value);
+                }
+                else if (isObject_1["default"](components[name][key])
+                    && isObject_1["default"](value)) {
+                    merge_1["default"](components[name][key], value);
+                }
+                else {
+                    components[name][key] = value;
+                }
+            });
+        });
+    }
+    var resultMeta = result.meta;
+    var resultUser = result.user;
+    delete result.user;
+    delete result.meta;
+    if (resultMeta) {
+        Object.keys(resultMeta).forEach(function (modelName) {
+            if (resultMeta[modelName].attributes) {
+                components.meta.setModel(modelName, resultMeta[modelName]);
+            }
+        });
+    }
+    dispatch([
+        // Meta models & enums
+        Boolean(resultMeta) && fields_1.setMeta(resultMeta),
+        // User auth
+        auth_2.setData(result),
+        // User auth
+        auth_2.setUser(resultUser),
+    ].filter(Boolean));
+})); };
+exports.runInitAction = runInitAction;
 function useLayout(initAction) {
     if (initAction === void 0) { initAction = null; }
     var _a = useSelector_1["default"](function (state) { return ({
@@ -52,50 +106,11 @@ function useLayout(initAction) {
         if (!isFunction_1["default"](initAction) || initializeCounter <= initializeCounterPrev) {
             return;
         }
-        initAction(null, dispatch)
-            .then(function (result) {
-            // Configure components
-            if (isObject_1["default"](result.config)) {
-                Object.keys(result.config).forEach(function (name) {
-                    if (!components[name]) {
-                        return;
-                    }
-                    Object.keys(result.config[name]).forEach(function (key) {
-                        var value = result.config[name][key];
-                        var setter = 'set' + upperFirst_1["default"](key);
-                        if (isFunction_1["default"](components[name][setter])) {
-                            components[name][setter](value);
-                        }
-                        else if (isObject_1["default"](components[name][key])
-                            && isObject_1["default"](value)) {
-                            merge_1["default"](components[name][key], value);
-                        }
-                        else {
-                            components[name][key] = value;
-                        }
-                    });
-                });
+        exports.runInitAction(initAction, components, dispatch)
+            .then(function () {
+            if (redirectPageId) {
+                dispatch(router_2.goToRoute(redirectPageId));
             }
-            var resultMeta = result.meta;
-            var resultUser = result.user;
-            delete result.user;
-            delete result.meta;
-            if (resultMeta) {
-                Object.keys(resultMeta).forEach(function (modelName) {
-                    if (resultMeta[modelName].attributes) {
-                        components.meta.setModel(modelName, resultMeta[modelName]);
-                    }
-                });
-            }
-            dispatch([
-                // Meta models & enums
-                Boolean(resultMeta) && fields_1.setMeta(resultMeta),
-                // User auth
-                auth_2.setData(result),
-                // User auth
-                auth_2.setUser(resultUser),
-                redirectPageId && router_2.goToRoute(redirectPageId),
-            ].filter(Boolean));
         })["catch"](function (e) {
             setError(e);
             throw e;
@@ -125,6 +140,11 @@ function useLayout(initAction) {
             }
         }
     }
+    //save status code for ssr
+    var ssrContextValue = useSsr_1["default"]();
+    if (process.env.IS_SSR) {
+        ssrContextValue.staticContext.statusCode = exports.HTTP_STATUS_CODES[status];
+    }
     return {
         status: status,
         error: error,

package/hooks/useList.d.ts

@@ -145,6 +145,51 @@ export interface IListOutput {
     onFetch: (params?: Record<string, unknown>) => void;
     onSort: (value: any) => void;
 }
+export declare const defaultConfig: {
+    actionMethod: string;
+    primaryKey: string;
+    autoDestroy: boolean;
+    sort: {
+        enable: boolean;
+        attribute: string;
+        defaultValue: any;
+    };
+    addressBar: {
+        enable: boolean;
+        useHash: boolean;
+    };
+};
+export declare const normalizeSortProps: (props: IListConfig['sort']) => {
+    enable: boolean;
+    attribute: string;
+    defaultValue: any;
+};
+export declare const getDefaultSearchModel: ({ paginationProps, paginationSizeProps, sort, layoutNamesProps, }: {
+    paginationProps: any;
+    paginationSizeProps: any;
+    sort: any;
+    layoutNamesProps: any;
+}) => {
+    attributes: ({
+        type: string;
+        attribute: any;
+        defaultValue: any;
+        jsType?: undefined;
+    } | {
+        type: string;
+        jsType: string;
+        attribute: any;
+        defaultValue: any;
+    })[];
+};
+export declare const createInitialValues: ({ paginationProps, paginationSizeProps, sort, layoutNamesProps, initialQuery, configQuery, }: {
+    paginationProps: any;
+    paginationSizeProps: any;
+    sort: any;
+    layoutNamesProps: any;
+    initialQuery: any;
+    configQuery: any;
+}) => any;
 /**
  * useList
  * Добавляет массу возможностей для взаимодействия с коллекциями. Коллекции можно получать как с бекенда,