@steroidsjs/core 2.2.104 → 2.2.106

package/actions/modal.d.ts

@@ -9,13 +9,13 @@ export declare const openModal: (modal: any, props?: IModalProps) => {
     group: any;
     props: IModalProps;
 };
-export declare const modalMarkClosing: (id: any, group?: any) => {
+export declare const modalMarkClosing: (id: string, group?: string | null) => {
     type: string;
-    id: any;
-    group: any;
+    id: string;
+    group: string;
 };
-export declare const closeModal: (id: any, group?: any) => {
+export declare const closeModal: (id: string, group?: string | null) => {
     type: string;
-    id: any;
-    group: any;
+    id: string;
+    group: string;
 };

package/actions/notifications.d.ts

@@ -5,9 +5,9 @@ export interface IShowNotificationParameters {
     position?: 'top-right' | 'bottom-right' | 'top-left' | 'bottom-left' | string;
     timeOut?: number;
 }
-export declare const closeNotification: (id?: any) => {
+export declare const closeNotification: (id?: string | null) => {
     type: string;
-    id: any;
+    id: string;
 };
 export declare const showNotification: (message: string, level?: ColorName, params?: IShowNotificationParameters) => (dispatch: any) => void;
 export declare const setFlashes: (flashes: any) => ((dispatch: any) => void)[][];

package/actions/router.d.ts

@@ -1,3 +1,4 @@
+declare type TParams = Record<string, any> | null;
 export declare const ROUTER_INIT_ROUTES = "ROUTER_INIT_ROUTES";
 export declare const ROUTER_SET_PARAMS = "ROUTER_SET_PARAMS";
 export declare const ROUTER_SET_DATA = "ROUTER_SET_DATA";
@@ -9,7 +10,8 @@ export declare const initParams: (params: any) => {
     type: string;
     params: any;
 };
-export declare const goToRoute: (routeId: any, params?: any, isReplace?: boolean) => (dispatch: any, getState: any, { store }: {
+export declare const goToRoute: (routeId: any, params?: TParams, isReplace?: boolean) => (dispatch: any, getState: any, { store }: {
     store: any;
 }) => any;
 export declare const goToParent: (level?: number) => (dispatch: any, getState: any) => any;
+export {};

package/components/JwtHttpComponent.js

@@ -102,34 +102,40 @@ var JwtHttpComponent = /** @class */ (function (_super) {
     JwtHttpComponent.prototype.setRefreshTokenInterceptor = function (axiosInstance) {
         var _this = this;
         axiosInstance.interceptors.response.use(function (config) { return config; }, function (error) { return __awaiter(_this, void 0, void 0, function () {
-            var originalRequest, store, response, accessToken;
-            var _a;
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var originalRequest, store, response, accessToken, _a;
+            var _b;
+            var _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         originalRequest = error.config;
                         if (!(error.response.status === 401
                             && error.config
                             && !error.config._isRetry
-                            && originalRequest.url !== this.getUrl((_b = this.refreshTokenRequest) === null || _b === void 0 ? void 0 : _b.url))) return [3 /*break*/, 2];
+                            && originalRequest.url !== this.getUrl((_c = this.refreshTokenRequest) === null || _c === void 0 ? void 0 : _c.url))) return [3 /*break*/, 4];
                         this.removeAccessToken();
                         store = this._components.store;
-                        return [4 /*yield*/, this.send(this.refreshTokenRequest.method, this.refreshTokenRequest.url, (_a = {},
-                                _a[this.refreshTokenKey] = this._refreshToken,
-                                _a))];
+                        _e.label = 1;
                     case 1:
-                        response = _d.sent();
-                        accessToken = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c[this.accessTokenKey];
+                        _e.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.send(this.refreshTokenRequest.method, this.refreshTokenRequest.url, (_b = {},
+                                _b[this.refreshTokenKey] = this._refreshToken,
+                                _b))];
+                    case 2:
+                        response = _e.sent();
+                        accessToken = (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d[this.accessTokenKey];
                         if (accessToken) {
                             this.setAccessToken(accessToken);
                             originalRequest._isRetry = true;
                             originalRequest.headers.Authorization = 'Bearer ' + accessToken;
                             return [2 /*return*/, axiosInstance.request(originalRequest)];
                         }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a = _e.sent();
                         store.dispatch(auth_1.logout());
-                        _d.label = 2;
-                    case 2: throw error;
+                        return [3 /*break*/, 4];
+                    case 4: throw error;
                 }
             });
         }); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.2.104",
+  "version": "2.2.106",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {
@@ -28,7 +28,7 @@
     "connected-react-router": "^6.9.1",
     "domready": "^1.0.8",
     "dot-prop-immutable": "^2.1.0",
-    "fileup-core": "^1.2.6",
+    "fileup-core": "^1.2.7",
     "history": "^4.10.1",
     "intl-messageformat": "^9.11.0",
     "js-cookie": "^2.2.1",

package/reducers/notifications.d.ts

@@ -1,7 +1,8 @@
-declare const _default: (state: {
+export declare type TNotificationsState = {
     items: any[];
     position: string;
-}, action: any) => {
+};
+declare const _default: (state: TNotificationsState, action: any) => {
     items: any[];
     position: any;
 };

package/reducers/screen.d.ts

@@ -1,14 +1,14 @@
-export declare const SCREE_PHONE = "phone";
+export declare const SCREEN_PHONE = "phone";
 export declare const SCREEN_TABLET = "tablet";
 export declare const SCREEN_DESKTOP = "desktop";
-declare const _default: (state: {
+export declare type TMediaDevice = typeof SCREEN_PHONE | typeof SCREEN_TABLET | typeof SCREEN_DESKTOP;
+export interface IScreenInitialState {
     width: number;
     media: {
-        phone: number;
-        tablet: number;
-        desktop: number;
+        [key in TMediaDevice]: number;
     };
-}, action: any) => {
+}
+declare const _default: (state: IScreenInitialState, action: any) => {
     width: any;
     media: {
         phone: number;

package/reducers/screen.js

@@ -12,15 +12,15 @@ var __assign = (this && this.__assign) || function () {
 };
 var _a;
 exports.__esModule = true;
-exports.isDesktop = exports.isTablet = exports.isPhone = exports.getDeviceType = exports.SCREEN_DESKTOP = exports.SCREEN_TABLET = exports.SCREE_PHONE = void 0;
+exports.isDesktop = exports.isTablet = exports.isPhone = exports.getDeviceType = exports.SCREEN_DESKTOP = exports.SCREEN_TABLET = exports.SCREEN_PHONE = void 0;
 var screen_1 = require("../actions/screen");
-exports.SCREE_PHONE = 'phone';
+exports.SCREEN_PHONE = 'phone';
 exports.SCREEN_TABLET = 'tablet';
 exports.SCREEN_DESKTOP = 'desktop';
 var initialState = {
     width: 1280,
     media: (_a = {},
-        _a[exports.SCREE_PHONE] = 320,
+        _a[exports.SCREEN_PHONE] = 320,
         _a[exports.SCREEN_TABLET] = 768,
         _a[exports.SCREEN_DESKTOP] = 1024,
         _a)
@@ -38,7 +38,7 @@ exports["default"] = (function (state, action) {
 });
 var getDeviceType = function (state) {
     if (state.screen.width < state.screen.media[exports.SCREEN_TABLET]) {
-        return exports.SCREE_PHONE;
+        return exports.SCREEN_PHONE;
     }
     if (state.screen.width < state.screen.media[exports.SCREEN_DESKTOP]) {
         return exports.SCREEN_TABLET;
@@ -46,7 +46,7 @@ var getDeviceType = function (state) {
     return exports.SCREEN_DESKTOP;
 };
 exports.getDeviceType = getDeviceType;
-var isPhone = function (state) { return exports.getDeviceType(state) === exports.SCREE_PHONE; };
+var isPhone = function (state) { return exports.getDeviceType(state) === exports.SCREEN_PHONE; };
 exports.isPhone = isPhone;
 var isTablet = function (state) { return exports.getDeviceType(state) === exports.SCREEN_TABLET; };
 exports.isTablet = isTablet;