@steroidsjs/core 2.1.0-beta.27 → 2.1.0-beta.28

package/components/SocialComponent.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var social_1 = __importDefault(require("./social"));
+var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 /**
  * Social Component
  * Провайдер для социальных сетей. Обеспечивает вызов окна соц сети для oauth авторизации
@@ -17,11 +17,15 @@ var SocialComponent = /** @class */ (function () {
     SocialComponent.prototype.init = function () {
         var _this = this;
         Object.keys(this.providers).forEach(function (name) {
-            if (social_1["default"][name]) {
-                var config = _this.providers[name] || {};
-                _this.providers[name] = new social_1["default"][name](_this._components);
-                Object.assign(_this.providers[name], config);
+            if (isFunction_1["default"](_this.providers[name])) {
+                _this.providers[name] = { className: _this.providers[name] };
             }
+            var ProviderClass = _this.providers[name].className;
+            delete _this.providers[name].className;
+            if (!ProviderClass) {
+                throw new Error('Not found class for social provider: ' + name);
+            }
+            _this.providers[name] = new ProviderClass(_this._components, _this.providers[name]);
         });
         Object.keys(this.providers).forEach(function (name) {
             _this._initializing[name] = _this.providers[name].init();
@@ -32,9 +36,7 @@ var SocialComponent = /** @class */ (function () {
         if (!this._initializing[socialName]) {
             return Promise.reject();
         }
-        return this._initializing[socialName].then(function () {
-            return _this.providers[socialName].start();
-        });
+        return this._initializing[socialName].then(function () { return _this.providers[socialName].start(); });
     };
     return SocialComponent;
 }());

package/components/social/FacebookProvider.d.ts

@@ -2,7 +2,7 @@ export default class FacebookProvider {
     _components: any;
     clientId: string;
     language: string;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<any>;
     start(): Promise<unknown>;
 }

package/components/social/FacebookProvider.js

@@ -37,13 +37,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var FacebookProvider = /** @class */ (function () {
-    function FacebookProvider(components) {
+    function FacebookProvider(components, config) {
         this._components = components;
-        this.clientId = '';
-        this.language =
-            this._components.locale.language +
-                '_' +
-                this._components.locale.language.toUpperCase();
+        this.clientId = config.clientId || '';
+        this.language = this._components.locale.language
+            + '_'
+            + this._components.locale.language.toUpperCase();
     }
     FacebookProvider.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {

package/components/social/GitlabProvider.d.ts

@@ -2,7 +2,7 @@ export default class GitlabProvider {
     _components: any;
     url: string;
     redirectUrl: any;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<void>;
     start(): Promise<unknown>;
 }

package/components/social/GitlabProvider.js

@@ -37,10 +37,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var GitlabProvider = /** @class */ (function () {
-    function GitlabProvider(components) {
+    function GitlabProvider(components, config) {
         this._components = components;
-        this.url = '';
-        this.redirectUrl = this._components.http.getUrl('/api/v1/auth/social/proxy');
+        this.url = config.url || '';
+        this.redirectUrl = config.redirectUrl || this._components.http.getUrl('/api/v1/auth/social/proxy');
     }
     GitlabProvider.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -78,9 +78,9 @@ var GitlabProvider = /** @class */ (function () {
                             .join(','));
                         popup.onbeforeunload = function () { return reject(); };
                         // This is a handler which is used by child window to pass auth result
-                        // @ts-ignore
                         window.authCallback = function (link) {
-                            // link: http://127.0.0.1:9424/api/v1/auth/social/proxy?provider=gitlab_kozhindev#access_token=7b87e3de0000000111111122222223333333d1b4ff3ee3f040085518198d885d&token_type=Bearer
+                            // link: http://127.0.0.1:9424/api/v1/auth/social/proxy
+                            // ?provider=gitlab_kozhindev#access_token=7b87e3de0...5518198d885d&token_type=Bearer
                             var token = (/access_token=(\w+)/.exec(link) || [])[1];
                             if (token) {
                                 resolve({ token: token });

package/components/social/GoogleProvider.d.ts

@@ -1,7 +1,7 @@
 export default class GoogleProvider {
     _components: any;
     clientId: string;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<any>;
     start(): Promise<{
         token: any;

package/components/social/GoogleProvider.js

@@ -37,9 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var GoogleProvider = /** @class */ (function () {
-    function GoogleProvider(components) {
+    function GoogleProvider(components, config) {
         this._components = components;
-        this.clientId = '';
+        this.clientId = config.clientId;
     }
     GoogleProvider.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {

package/components/social/SteamProvider.d.ts

@@ -1,7 +1,7 @@
 export default class Vk {
     _components: any;
     clientId: string;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<void>;
     start(): Promise<unknown>;
 }

package/components/social/SteamProvider.js

@@ -57,9 +57,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 var queryString = __importStar(require("qs"));
 var Vk = /** @class */ (function () {
-    function Vk(components) {
+    function Vk(components, config) {
         this._components = components;
-        this.clientId = '';
+        this.clientId = config.clientId;
     }
     Vk.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -74,14 +74,14 @@ var Vk = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         // Generate url
-                        var url = 'https://steamcommunity.com/openid/login?' +
-                            queryString.stringify({
+                        var url = 'https://steamcommunity.com/openid/login?'
+                            + queryString.stringify({
                                 'openid.mode': 'checkid_setup',
                                 'openid.ns': 'http://specs.openid.net/auth/2.0',
                                 'openid.identity': 'http://specs.openid.net/auth/2.0/identifier_select',
                                 'openid.claimed_id': 'http://specs.openid.net/auth/2.0/identifier_select',
                                 'openid.return_to': _this._components.http.getUrl('/api/v1/auth/social/proxy'),
-                                'openid.realm': location.origin
+                                'openid.realm': window.location.origin
                             });
                         // Open popup auth window
                         var width = 900;
@@ -107,14 +107,13 @@ var Vk = /** @class */ (function () {
                             .join(','));
                         popup.onbeforeunload = function () { return reject(); };
                         // This is a handler which is used by child window to pass auth result
-                        // @ts-ignore
                         window.authCallback = function (link) {
-                            var params = queryString.parse(new URL(link).search);
-                            if (!params['openid.mode']) {
+                            var query = queryString.parse(new URL(link).search);
+                            if (!query['openid.mode']) {
                                 reject();
                             }
                             else {
-                                resolve(params);
+                                resolve(query);
                             }
                         };
                     })];

package/components/social/VkProvider.d.ts

@@ -2,7 +2,7 @@ export default class VkProvider {
     _components: any;
     clientId: string;
     redirectUrl: any;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<void>;
     start(): Promise<unknown>;
 }

package/components/social/VkProvider.js

@@ -57,10 +57,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 var queryString = __importStar(require("qs"));
 var VkProvider = /** @class */ (function () {
-    function VkProvider(components) {
+    function VkProvider(components, config) {
         this._components = components;
-        this.clientId = '';
-        this.redirectUrl = this._components.http.getUrl('/api/v1/auth/social/proxy');
+        this.clientId = config.clientId;
+        this.redirectUrl = config.redirectUrl || this._components.http.getUrl('/api/v1/auth/social/proxy');
     }
     VkProvider.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -75,8 +75,8 @@ var VkProvider = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         // Generate url
-                        var url = 'https://oauth.vk.com/authorize/?' +
-                            queryString.stringify({
+                        var url = 'https://oauth.vk.com/authorize/?'
+                            + queryString.stringify({
                                 client_id: _this.clientId,
                                 redirect_uri: _this.redirectUrl,
                                 scope: 'offline,public_profile',
@@ -106,16 +106,15 @@ var VkProvider = /** @class */ (function () {
                             .join(','));
                         popup.onbeforeunload = function () { return reject(); };
                         // This is a handler which is used by child window to pass auth result
-                        // @ts-ignore
                         window.authCallback = function (link) {
-                            var params = new URL(link).searchParams;
-                            var error = params.get('error');
+                            var query = new URL(link).searchParams;
+                            var error = query.get('error');
                             if (error) {
                                 reject(error);
                             }
                             else {
                                 resolve({
-                                    token: params.get('code')
+                                    token: query.get('code')
                                 });
                             }
                         };

package/hooks/useDataSelect.js

@@ -34,7 +34,9 @@ function useDataSelect(config) {
     }, [config.items, config.selectFirst, config.selectedIds, primaryKey, config.inputValue]);
     var initialSelectedItems = react_1.useMemo(function () { return config.items.length > 0
         && initialSelectedIds.length > 0
-        ? initialSelectedIds.map(function (selectedId) { return config.items.find(function (item) { return item.id === selectedId; }); })
+        ? initialSelectedIds
+            .map(function (selectedId) { return config.items.find(function (item) { return item.id === selectedId; }); })
+            .filter(Boolean)
         : []; }, [initialSelectedIds, config.items]);
     // State
     var _a = react_1.useState(false), isOpened = _a[0], setIsOpened = _a[1];
@@ -81,7 +83,7 @@ function useDataSelect(config) {
         var hasChanges = false;
         selectedIds.forEach(function (selectedId) {
             var finedItem = config.items.find(function (item) { return item[primaryKey] === selectedId; });
-            if (!finedItem) {
+            if (!finedItem && config.sourceItems) {
                 finedItem = config.sourceItems.find(function (item) { return item[primaryKey] === selectedId; });
             }
             var selectedItem = selectedItems.find(function (item) { return item[primaryKey] === selectedId; });

package/hooks/useFetch.js

@@ -60,6 +60,9 @@ 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) {
+    if (config === null) {
+        return null;
+    }
     var result = trim_1["default"](config.id || config.url, '/');
     if (!result) {
         // eslint-disable-next-line no-console

package/hooks/useLayout.js

@@ -81,14 +81,18 @@ var runInitAction = function (initAction, components, dispatch) { return (initAc
 exports.runInitAction = runInitAction;
 function useLayout(initAction) {
     if (initAction === void 0) { initAction = null; }
-    var _a = useSelector_1["default"](function (state) { return ({
-        route: router_1.getRoute(state),
-        user: auth_1.getUser(state),
-        data: auth_1.getData(state),
-        isInitialized: auth_1.isInitialized(state),
-        initializeCounter: auth_1.getInitializeCounter(state),
-        redirectPageId: state.auth.redirectPageId
-    }); }), route = _a.route, user = _a.user, data = _a.data, isInitialized = _a.isInitialized, initializeCounter = _a.initializeCounter, redirectPageId = _a.redirectPageId;
+    var _a = useSelector_1["default"](function (state) {
+        var routesMap = router_1.getRoutesMap(state);
+        return {
+            route: router_1.getRoute(state),
+            user: auth_1.getUser(state),
+            data: auth_1.getData(state),
+            isInitialized: auth_1.isInitialized(state),
+            initializeCounter: auth_1.getInitializeCounter(state),
+            redirectPageId: state.auth.redirectPageId,
+            loginRouteId: Object.keys(routesMap).find(function (name) { return routesMap[name].role === 'login'; })
+        };
+    }), route = _a.route, user = _a.user, data = _a.data, isInitialized = _a.isInitialized, initializeCounter = _a.initializeCounter, redirectPageId = _a.redirectPageId, loginRouteId = _a.loginRouteId;
     var _b = react_1.useState(null), error = _b[0], setError = _b[1];
     var dispatch = useDispatch_1["default"]();
     var components = useComponents_1["default"]();
@@ -133,10 +137,15 @@ function useLayout(initAction) {
             userRoles.push(null); // Guest
         }
         if (intersection_1["default"](pageRoles, userRoles).length === 0) {
-            status = exports.STATUS_ACCESS_DENIED;
-            if (process.env.NODE_ENV !== 'production') {
-                // eslint-disable-next-line no-console
-                console.log('Access denied. Page roles: ', pageRoles, 'User roles:', userRoles.join(), 'Route:', route);
+            if (loginRouteId && route.id !== loginRouteId) {
+                dispatch(router_2.goToRoute(loginRouteId));
+            }
+            else {
+                status = exports.STATUS_ACCESS_DENIED;
+                if (process.env.NODE_ENV !== 'production') {
+                    // eslint-disable-next-line no-console
+                    console.log('Access denied. Page roles: ', pageRoles, 'User roles:', userRoles.join(), 'Route:', route);
+                }
             }
         }
     }

package/hooks/useList.d.ts

@@ -134,6 +134,10 @@ export interface IListConfig {
      * и последующие запросы на бекенд для 2-й и следующих страниц
      */
     initialItems?: Array<any>;
+    /**
+     * Количество элементов всего в списке (для отрисовки пагинации), заданное вручную
+     */
+    initialTotal?: number;
 }
 export interface IListOutput {
     list: IList;

package/hooks/useList.js

@@ -193,6 +193,7 @@ function useList(config) {
                     scope: config.scope,
                     items: null,
                     sourceItems: config.items || null,
+                    total: config.initialTotal,
                     isRemote: !config.items,
                     primaryKey: config.primaryKey || exports.defaultConfig.primaryKey,
                     formId: formId,

package/package.json

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

package/ui/content/Detail/Detail.d.ts

@@ -74,7 +74,7 @@ export interface IDetailProps {
     /**
      * Дочерние компоненты
      */
-    children: React.ReactNode | React.ReactNode[];
+    children?: React.ReactNode | React.ReactNode[];
     [key: string]: any;
 }
 export interface IDetailItemOutputProps extends IDetailItemProps {

package/ui/crud/Crud/Crud.js

@@ -150,13 +150,15 @@ function Crud(props) {
         model: props.model,
         restUrl: props.restUrl,
         restApi: props.restApi,
+        grid: props.grid,
+        form: props.form,
         goToAction: goToAction,
         items: items,
         itemsToControls: itemsToControls,
         record: record,
         recordId: recordId
-    }); }, [crudId, goToAction, items, itemsToControls, props.model, props.primaryKey,
-        props.queryKey, props.restUrl, props.restApi, record, recordId]);
+    }); }, [crudId, props.queryKey, props.primaryKey, props.model, props.restUrl, props.restApi, props.grid,
+        props.form, goToAction, items, itemsToControls, record, recordId]);
     // Open modal on route change
     react_1.useEffect(function () {
         if (mode === MODE_MODAL && routeAction !== utils_1.CRUD_ACTION_INDEX) {

package/ui/crud/Crud/CrudContent.d.ts

@@ -1,4 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
+import { IGridProps } from '@steroidsjs/core/ui/list/Grid/Grid';
+import { IFormProps } from '@steroidsjs/core/ui/form/Form/Form';
 import { ICrudItem } from './Crud';
 import { IApiRest } from '../../../components/ApiComponent';
 export interface ICrudContentProps {
@@ -14,5 +16,7 @@ export interface ICrudContentProps {
     record?: Record<string, unknown>;
     recordId?: PrimaryKey;
     action?: string;
+    grid?: IGridProps | React.ReactNode;
+    form?: IFormProps | React.ReactNode;
 }
 export default function CrudContent(props: ICrudContentProps): JSX.Element;

package/ui/crud/Crud/CrudContent.js

@@ -68,23 +68,23 @@ function CrudContent(props) {
                 ItemComponent = Grid_1["default"];
             }
             return (React.createElement(ItemComponent // Grid
-            , { key: props.crudId, listId: props.crudId, action: props.restApi ? props.restApi.index : props.restUrl, scope: ['model', 'permission'], primaryKey: props.primaryKey, model: props.model, 
+            , __assign({ key: props.crudId, listId: props.crudId, action: props.restApi ? props.restApi.index : props.restUrl, scope: ['model', 'permission'], primaryKey: props.primaryKey, model: props.model, 
                 //searchModel={props.searchModel}
                 controls: controlsGetter, columns: [props.primaryKey], pagination: {
                     loadMore: false
-                } }));
+                } }, props.grid)));
         case utils_1.CRUD_ACTION_CREATE:
         case utils_1.CRUD_ACTION_UPDATE:
             if (!ItemComponent) {
                 ItemComponent = Form_1["default"];
             }
-            if (props.action === utils_1.CRUD_ACTION_UPDATE && !props.record) {
+            if (props.action === utils_1.CRUD_ACTION_UPDATE && (props.restUrl || props.restApi) && !props.record) {
                 return null;
             }
             return (React.createElement(ItemComponent // Form
-            , { key: formId, formId: formId, action: props.restApi
+            , __assign({ key: formId, formId: formId, action: props.restApi
                     ? (props.recordId ? props.restApi.update : props.restApi.create)
-                    : [props.restUrl, props.recordId].filter(Boolean).join('/'), model: props.model, autoFocus: true, submitLabel: props.recordId ? __('Сохранить') : __('Добавить'), layout: 'horizontal', onComplete: onFormComplete, initialValues: formInitialValues }));
+                    : [props.restUrl, props.recordId].filter(Boolean).join('/'), model: props.model, autoFocus: true, submitLabel: props.recordId ? __('Сохранить') : __('Добавить'), layout: 'horizontal', onComplete: onFormComplete }, props.form, { initialValues: formInitialValues })));
         default:
             if (ItemComponent) {
                 return (React.createElement(ItemComponent, __assign({ key: props.crudId + '_' + props.action }, props, crudItem.componentProps)));

package/ui/crud/index.d.ts

@@ -26,6 +26,7 @@ export declare const generateCrud: (routeId: string, props: ICrudGeneratorProps)
     isNavVisible?: boolean;
     models: string | string[];
     enums: string | string[];
+    role?: string;
     roles?: string[];
     fetch?: import("../../hoc/fetch").IFetchHocConfigFunc;
     items?: IRouteItem[] | {

package/ui/list/Grid/Grid.js

@@ -63,7 +63,8 @@ function Grid(props) {
         model: props.model,
         searchModel: props.searchModel,
         items: props.items,
-        initialItems: props.initialItems
+        initialItems: props.initialItems,
+        initialTotal: props.initialTotal
     }), list = _a.list, model = _a.model, searchModel = _a.searchModel, paginationPosition = _a.paginationPosition, paginationSizePosition = _a.paginationSizePosition, layoutNamesPosition = _a.layoutNamesPosition, renderList = _a.renderList, renderEmpty = _a.renderEmpty, renderPagination = _a.renderPagination, renderPaginationSize = _a.renderPaginationSize, renderLayoutNames = _a.renderLayoutNames, renderSearchForm = _a.renderSearchForm, onFetch = _a.onFetch, onSort = _a.onSort;
     var renderLabel = react_1.useCallback(function (column) {
         if (column.headerView) {

package/ui/list/List/List.js

@@ -58,7 +58,8 @@ function List(props) {
         model: props.model,
         searchModel: props.searchModel,
         items: props.items,
-        initialItems: props.initialItems
+        initialItems: props.initialItems,
+        initialTotal: props.initialTotal
     }), list = _a.list, paginationPosition = _a.paginationPosition, paginationSizePosition = _a.paginationSizePosition, layoutNamesPosition = _a.layoutNamesPosition, renderList = _a.renderList, renderEmpty = _a.renderEmpty, renderPagination = _a.renderPagination, renderPaginationSize = _a.renderPaginationSize, renderLayoutNames = _a.renderLayoutNames, renderSearchForm = _a.renderSearchForm;
     var ItemView = props.itemView || components.ui.getView('list.ListItemView');
     var content = ((list === null || list === void 0 ? void 0 : list.items) || []).map(function (item, index) { return (React.createElement(ItemView, __assign({}, props.itemProps, { key: item[props.primaryKey] || index, primaryKey: props.primaryKey, item: item, index: index, layoutSelected: list.layoutName }))); });

package/ui/nav/Router/Router.d.ts

@@ -73,6 +73,11 @@ export interface IRouteItem {
      * Название или список с названиями перечислений, полученных с бэкенда
      */
     enums?: string | string[];
+    /**
+     * Назначение страницы, указывается, чтобы приложение автоматически могло найти страницу авторизации или 404-ю..
+     * @example 'login'
+     */
+    role?: 'login' | '404' | string;
     /**
      * Список с ролями, который показывает, кому из пользователей будет доступен просмотр страницы
      * @example ['user', 'admin']

package/components/social/index.d.ts

@@ -1,13 +0,0 @@
-import facebook from './FacebookProvider';
-import google from './GoogleProvider';
-import steam from './SteamProvider';
-import vk from './VkProvider';
-import gitlab from './GitlabProvider';
-declare const _default: {
-    facebook: typeof facebook;
-    google: typeof google;
-    steam: typeof steam;
-    vk: typeof vk;
-    gitlab: typeof gitlab;
-};
-export default _default;

package/components/social/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-var FacebookProvider_1 = __importDefault(require("./FacebookProvider"));
-var GoogleProvider_1 = __importDefault(require("./GoogleProvider"));
-var SteamProvider_1 = __importDefault(require("./SteamProvider"));
-var VkProvider_1 = __importDefault(require("./VkProvider"));
-var GitlabProvider_1 = __importDefault(require("./GitlabProvider"));
-exports["default"] = {
-    facebook: FacebookProvider_1["default"],
-    google: GoogleProvider_1["default"],
-    steam: SteamProvider_1["default"],
-    vk: VkProvider_1["default"],
-    gitlab: GitlabProvider_1["default"]
-};