nuudel-core 0.1.166 → 0.1.168
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/index.d.ts +2 -2
- package/build/main/index.js +1 -1
- package/build/main/lib/common/Interfaces.d.ts +10 -0
- package/build/main/lib/hocs/withApollo/index.js +2 -2
- package/build/main/lib/hocs/withRedux/index.js +19 -7
- package/build/main/lib/redux/reducers/User.d.ts +1 -1
- package/build/main/lib/services/fetcher.js +7 -3
- package/build/module/index.d.ts +2 -2
- package/build/module/index.js +1 -1
- package/build/module/lib/common/Interfaces.d.ts +10 -0
- package/build/module/lib/hocs/withApollo/index.js +2 -2
- package/build/module/lib/hocs/withRedux/index.js +21 -9
- package/build/module/lib/redux/reducers/User.d.ts +1 -1
- package/build/module/lib/services/fetcher.js +9 -2
- package/package.json +1 -1
package/build/main/index.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { coreComponent, IBaseState, ICoreState, IDisplayType } from './lib/commo
|
|
|
7
7
|
import { IBaseProps, ICoreProps } from './lib/common/ICoreProps';
|
|
8
8
|
import IDataProvider from './lib/common/IDataProvider';
|
|
9
9
|
import DataProvider from './lib/common/DataProvider';
|
|
10
|
-
import { IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps } from './lib/common/Interfaces';
|
|
10
|
+
import { IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps, ReduxProps } from './lib/common/Interfaces';
|
|
11
11
|
import { IListBaseState, IProviderBase, IProviderItems } from './lib/common/IListBaseState';
|
|
12
12
|
import { createClient } from './lib/hocs/withApollo';
|
|
13
13
|
export { withRedux, withApollo, withContext, withUser, useAuth, Context, initStore, store, QUERY, typeDefs, resolvers, } from './lib/hocs';
|
|
@@ -16,7 +16,7 @@ export * from './lib/forms/';
|
|
|
16
16
|
export * from './lib/library/';
|
|
17
17
|
export * from './lib/widgets/';
|
|
18
18
|
export * from './lib/components/index';
|
|
19
|
-
export type { IListFormService, IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps, IDataProvider, IBaseState, ICoreState, IDisplayType, IBaseProps, ICoreProps, IListBaseState, IProviderBase, IProviderItems, };
|
|
19
|
+
export type { IListFormService, IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps, IDataProvider, IBaseState, ICoreState, IDisplayType, IBaseProps, ICoreProps, IListBaseState, IProviderBase, IProviderItems, ReduxProps, };
|
|
20
20
|
export * from './lib/components/index';
|
|
21
21
|
export * from './lib/common/helper';
|
|
22
22
|
export * from './lib/common/UI';
|
package/build/main/index.js
CHANGED
|
@@ -55,4 +55,4 @@ var redux_1 = require("redux");
|
|
|
55
55
|
Object.defineProperty(exports, "compose", { enumerable: true, get: function () { return redux_1.compose; } });
|
|
56
56
|
var react_redux_1 = require("react-redux");
|
|
57
57
|
Object.defineProperty(exports, "connect", { enumerable: true, get: function () { return react_redux_1.connect; } });
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLG9FQUFpRTtBQStDL0QsZ0dBL0NPLGlDQUFlLE9BK0NQO0FBN0NqQiw0REFBeUQ7QUFrRHZELDZGQWxETywyQkFBWSxPQWtEUDtBQWpEZCxnRUFBeUQ7QUE2Q3ZELDBGQTdDTyx5QkFBUyxPQTZDUDtBQTVDWCx3Q0FBcUM7QUE2Q25DLG1GQTdDTyxPQUFFLE9BNkNQO0FBNUNKLDhEQUtvQztBQXdDbEMsOEZBNUNBLDZCQUFhLE9BNENBO0FBckNmLDZFQUFxRDtBQXNDbkQsdUJBdENLLHNCQUFZLENBc0NMO0FBckJkLHNEQUFxRDtBQXVCbkQsNkZBdkJPLHlCQUFZLE9BdUJQO0FBcEJkLG1DQVlvQjtBQVhsQixpR0FBQSxTQUFTLE9BQUE7QUFDVCxrR0FBQSxVQUFVLE9BQUE7QUFDVixtR0FBQSxXQUFXLE9BQUE7QUFDWCxnR0FBQSxRQUFRLE9BQUE7QUFDUiwrRkFBQSxPQUFPLE9BQUE7QUFDUCwrRkFBQSxPQUFPLE9BQUE7QUFDUCxpR0FBQSxTQUFTLE9BQUE7QUFDVCw2RkFBQSxLQUFLLE9BQUE7QUFDTCw2RkFBQSxLQUFLLE9BQUE7QUFDTCxnR0FBQSxRQUFRLE9BQUE7QUFDUixpR0FBQSxTQUFTLE9BQUE7QUFhWCwrQ0FBNkI7QUFHN0IsaURBQStCO0FBRy9CLGlEQUErQjtBQUcvQix5REFBdUM7QUEwQnZDLHlEQUF1QztBQUd2QyxzREFBb0M7QUFHcEMsa0RBQWdDO0FBR2hDLCtEQUE2QztBQUc3QyxvREFBa0M7QUFDbEMsd0RBQXNDO0FBQ3RDLDJEQUF5QztBQUV6QywrQkFBZ0M7QUFBdkIsZ0dBQUEsT0FBTyxPQUFBO0FBRWhCLDJDQUFzQztBQUE3QixzR0FBQSxPQUFPLE9BQUEifQ==
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Permission, Language, Currency } from 'nuudel-utils';
|
|
2
|
+
import { Dispatch } from 'redux';
|
|
3
|
+
import { IRootState } from '../redux/store';
|
|
2
4
|
export interface IWarehouse {
|
|
3
5
|
_id: string;
|
|
4
6
|
name: string;
|
|
@@ -47,3 +49,11 @@ export interface IAppProps {
|
|
|
47
49
|
user?: ICurrentUser;
|
|
48
50
|
IsDlg?: boolean;
|
|
49
51
|
}
|
|
52
|
+
export interface ReduxProps {
|
|
53
|
+
dispatch: Dispatch<any>;
|
|
54
|
+
store: IRootState;
|
|
55
|
+
sign_out?(): void;
|
|
56
|
+
sign_in?(obj: any): void;
|
|
57
|
+
updateProp(prop: string, value: any): void;
|
|
58
|
+
updateProps(obj: any): void;
|
|
59
|
+
}
|
|
@@ -117,7 +117,7 @@ exports.default = (0, next_with_apollo_1.default)(({ initialState, headers }) =>
|
|
|
117
117
|
return (0, exports.createClient)(headers);
|
|
118
118
|
}, {
|
|
119
119
|
render: ({ Page, props }) => {
|
|
120
|
-
return ((0, jsx_runtime_1.jsx)(react_hooks_1.ApolloProvider, Object.assign({ client: props.apollo }, { children: (0, jsx_runtime_1.jsx)(Page, Object.assign({}, props), void 0) }), void 0));
|
|
120
|
+
return ((0, jsx_runtime_1.jsx)(react_hooks_1.ApolloProvider, Object.assign({ client: props === null || props === void 0 ? void 0 : props.apollo }, { children: (0, jsx_runtime_1.jsx)(Page, Object.assign({}, props), void 0) }), void 0));
|
|
121
121
|
},
|
|
122
122
|
});
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aEFwb2xsby9pbmRleC50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFBQSxpQ0FBd0M7QUFDeEMsMkNBUXdCO0FBQ3hCLHlEQUF5RDtBQUN6RCxxREFBcUQ7QUFDckQscURBQW9EO0FBRXBELHlEQUFpQztBQUNqQywrQ0FBd0M7QUFFeEMsd0VBQTBDO0FBQzFDLDJDQUF5RDtBQUN6RCx3REFBNkQ7QUFDN0QsK0NBQXVEO0FBQ3ZELCtDQUF3QztBQUUzQixRQUFBLEtBQUssR0FBRyxJQUFJLHNCQUFhLENBQUMsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7QUFFM0UsYUFBSyxDQUFDLFVBQVUsQ0FBQztJQUNmLEtBQUssRUFBRSxpQkFBSztJQUNaLElBQUksRUFBRTtRQUNKLGdCQUFnQixFQUFFLEtBQUs7UUFDdkIsUUFBUSxFQUFFLFNBQVM7UUFDbkIsU0FBUyxFQUFFLFNBQVM7UUFDcEIsWUFBWSxFQUFFLEtBQUs7UUFDbkIsZUFBZSxFQUFFLEdBQUc7UUFDcEIsV0FBVyxFQUFFLElBQUk7S0FDbEI7Q0FDRixDQUFDLENBQUM7QUFFSCxNQUFNLEVBQUUsMkJBQTJCLEdBQUcsT0FBTyxFQUFFLEdBQUcsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLEdBQUcsQ0FBQztBQUV4RCxNQUFNLE1BQU0sR0FBRyxHQUFXLEVBQUU7O0lBQ2pDLE9BQU8sQ0FBQSxNQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxHQUFHLDBDQUFFLEdBQUcsTUFBSyxhQUFhO1FBQ3hDLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQSxNQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxHQUFHLDBDQUFFLElBQUksS0FBSSxNQUFNLElBQUksdUJBQVEsRUFB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
|
|
@@ -13,20 +13,32 @@ const nuudel_utils_1 = require("nuudel-utils");
|
|
|
13
13
|
const i18n_1 = require("../../loc/i18n");
|
|
14
14
|
const UI_1 = __importDefault(require("../../common/UI"));
|
|
15
15
|
const nuudel_utils_2 = require("nuudel-utils");
|
|
16
|
+
const Query_1 = require("../../../lib/hocs/withUser/Query");
|
|
16
17
|
exports.store = (0, store_1.createStore)();
|
|
17
|
-
const initStore = async (lfs, user
|
|
18
|
-
var _a;
|
|
18
|
+
const initStore = async (lfs, user) => {
|
|
19
|
+
var _a, _b;
|
|
19
20
|
const state = exports.store.getState();
|
|
20
21
|
if (typeof state.user === 'undefined' || !state.user.token) {
|
|
21
22
|
const token = UI_1.default.getItem(nuudel_utils_1.USER_TOKEN);
|
|
22
23
|
const userId = ((_a = (0, nuudel_utils_1.tokenObj)(token)) === null || _a === void 0 ? void 0 : _a._id) || null;
|
|
23
24
|
if (userId !== null) {
|
|
24
25
|
let usr = state.user || User_1.initialState;
|
|
25
|
-
if (userId) {
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
if (userId && !!(lfs === null || lfs === void 0 ? void 0 : lfs.itemById)) {
|
|
27
|
+
try {
|
|
28
|
+
if (!user) {
|
|
29
|
+
user = await lfs.itemById('User', userId);
|
|
30
|
+
}
|
|
31
|
+
else if (!user && token && (lfs === null || lfs === void 0 ? void 0 : lfs.client)) {
|
|
32
|
+
const r = await lfs.client.query({
|
|
33
|
+
query: Query_1.currentUserQuery,
|
|
34
|
+
variables: {},
|
|
35
|
+
fetchPolicy: 'no-cache',
|
|
36
|
+
});
|
|
37
|
+
user = (_b = r === null || r === void 0 ? void 0 : r.data) === null || _b === void 0 ? void 0 : _b.currentUser;
|
|
38
|
+
}
|
|
28
39
|
}
|
|
29
|
-
|
|
40
|
+
catch (_c) { }
|
|
41
|
+
usr = Object.assign(Object.assign({}, usr), { type: (user === null || user === void 0 ? void 0 : user.type) || 'Guest', currency: !(user === null || user === void 0 ? void 0 : user.settings) ? 'MNT' : user.settings.currency, locale: !(user === null || user === void 0 ? void 0 : user.settings) ? 'mn-MN' : user.settings.locale, status: (user === null || user === void 0 ? void 0 : user._status) || 'Active' });
|
|
30
42
|
}
|
|
31
43
|
const locale = !usr.locale ? 'mn-MN' : nuudel_utils_2.Language[usr.locale];
|
|
32
44
|
if (i18n_1.I8.language !== locale) {
|
|
@@ -56,4 +68,4 @@ exports.initStore = initStore;
|
|
|
56
68
|
const withRedux = (WrappedComponent) => (props) => ((0, jsx_runtime_1.jsx)(react_redux_1.Provider, Object.assign({ store: exports.store }, { children: (0, jsx_runtime_1.jsx)(WrappedComponent, Object.assign({}, props), void 0) }), void 0));
|
|
57
69
|
exports.withRedux = withRedux;
|
|
58
70
|
exports.default = exports.withRedux;
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aFJlZHV4L2luZGV4LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQ0EsNkNBQXVDO0FBQ3ZDLDhDQUFpRDtBQUNqRCxtREFBK0Q7QUFDL0Qsb0RBQXlEO0FBQ3pELCtDQUFvRDtBQUNwRCx5Q0FBb0Q7QUFDcEQseURBQWlDO0FBQ2pDLCtDQUF3QztBQUN4Qyw0REFBb0U7QUFFdkQsUUFBQSxLQUFLLEdBQUcsSUFBQSxtQkFBVyxHQUFFLENBQUM7QUFFNUIsTUFBTSxTQUFTLEdBQUcsS0FBSyxFQUFFLEdBQVEsRUFBRSxJQUFVLEVBQUUsRUFBRTs7SUFDdEQsTUFBTSxLQUFLLEdBQUcsYUFBSyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQy9CLElBQUksT0FBTyxLQUFLLENBQUMsSUFBSSxLQUFLLFdBQVcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1FBQzFELE1BQU0sS0FBSyxHQUFHLFlBQUUsQ0FBQyxPQUFPLENBQUMseUJBQVUsQ0FBQyxDQUFDO1FBQ3JDLE1BQU0sTUFBTSxHQUFrQixDQUFBLE1BQUEsSUFBQSx1QkFBUSxFQUFDLEtBQUssQ0FBQywwQ0FBRSxHQUFHLEtBQUksSUFBSSxDQUFDO1FBQzNELElBQUksTUFBTSxLQUFLLElBQUksRUFBRTtZQUNuQixJQUFJLEdBQUcsR0FBUSxLQUFLLENBQUMsSUFBSSxJQUFJLG1CQUFZLENBQUM7WUFDMUMsSUFBSSxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUEsR0FBRyxhQUFILEdBQUcsdUJBQUgsR0FBRyxDQUFFLFFBQVEsQ0FBQSxFQUFFO2dCQUM3QixJQUFJO29CQUNGLElBQUksQ0FBQyxJQUFJLEVBQUU7d0JBQ1QsSUFBSSxHQUFHLE1BQU0sR0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7cUJBQzNDO3lC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
|
|
@@ -9,7 +9,7 @@ const UI_1 = require("../common/UI");
|
|
|
9
9
|
const nuudel_utils_1 = require("nuudel-utils");
|
|
10
10
|
const pathname = 'api/graphql';
|
|
11
11
|
const fetcher = async (query, variables = {}, headers = {}) => {
|
|
12
|
-
var _a;
|
|
12
|
+
var _a, _b;
|
|
13
13
|
return (0, axios_1.default)({
|
|
14
14
|
url: `${((_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.WEB) || ''}/${pathname}`,
|
|
15
15
|
method: 'post',
|
|
@@ -17,8 +17,12 @@ const fetcher = async (query, variables = {}, headers = {}) => {
|
|
|
17
17
|
query: query,
|
|
18
18
|
variables: variables,
|
|
19
19
|
},
|
|
20
|
-
headers: Object.assign(Object.assign({}, (!nuudel_utils_1.isServer
|
|
20
|
+
headers: Object.assign(Object.assign({}, (!nuudel_utils_1.isServer
|
|
21
|
+
? await UI_1.UI.headers()
|
|
22
|
+
: !((_b = process === null || process === void 0 ? void 0 : process.env) === null || _b === void 0 ? void 0 : _b.TOKEN)
|
|
23
|
+
? {}
|
|
24
|
+
: { Authorization: `Bearer ${process.env.TOKEN}` })), headers),
|
|
21
25
|
}).then((res) => res.data);
|
|
22
26
|
};
|
|
23
27
|
exports.fetcher = fetcher;
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvc2VydmljZXMvZmV0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrREFBMEI7QUFDMUIscUNBQWtDO0FBQ2xDLCtDQUF3QztBQUV4QyxNQUFNLFFBQVEsR0FBVyxhQUFhLENBQUM7QUFFaEMsTUFBTSxPQUFPLEdBQUcsS0FBSyxFQUMxQixLQUFhLEVBQ2IsWUFBaUIsRUFBRSxFQUNuQixVQUFlLEVBQUUsRUFDakIsRUFBRTs7SUFDRixPQUFBLElBQUEsZUFBSyxFQUFDO1FBQ0osR0FBRyxFQUFFLEdBQUcsQ0FBQSxNQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxHQUFHLDBDQUFFLEdBQUcsS0FBSSxFQUFFLElBQUksUUFBUSxFQUFFO1FBQzdDLE1BQU0sRUFBRSxNQUFNO1FBQ2QsSUFBSSxFQUFFO1lBQ0osS0FBSyxFQUFFLEtBQUs7WUFDWixTQUFTLEVBQUUsU0FBUztTQUNyQjtRQUNELE9BQU8sa0NBQ0YsQ0FBQyxDQUFDLHVCQUFRO1lBQ1gsQ0FBQyxDQUFDLE1BQU0sT0FBRSxDQUFDLE9BQU8sRUFBRTtZQUNwQixDQUFDLENBQUMsQ0FBQyxDQUFBLE1BQUEsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLEdBQUcsMENBQUUsS0FBSyxDQUFBO2dCQUN0QixDQUFDLENBQUMsRUFBRTtnQkFDSixDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsVUFBVSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsR0FDbEQsT0FBTyxDQUNYO0tBQ0YsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO0NBQUEsQ0FBQztBQXBCaEIsUUFBQSxPQUFPLFdBb0JTIn0=
|
package/build/module/index.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { coreComponent, IBaseState, ICoreState, IDisplayType } from './lib/commo
|
|
|
7
7
|
import { IBaseProps, ICoreProps } from './lib/common/ICoreProps';
|
|
8
8
|
import IDataProvider from './lib/common/IDataProvider';
|
|
9
9
|
import DataProvider from './lib/common/DataProvider';
|
|
10
|
-
import { IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps } from './lib/common/Interfaces';
|
|
10
|
+
import { IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps, ReduxProps } from './lib/common/Interfaces';
|
|
11
11
|
import { IListBaseState, IProviderBase, IProviderItems } from './lib/common/IListBaseState';
|
|
12
12
|
import { createClient } from './lib/hocs/withApollo';
|
|
13
13
|
export { withRedux, withApollo, withContext, withUser, useAuth, Context, initStore, store, QUERY, typeDefs, resolvers, } from './lib/hocs';
|
|
@@ -16,7 +16,7 @@ export * from './lib/forms/';
|
|
|
16
16
|
export * from './lib/library/';
|
|
17
17
|
export * from './lib/widgets/';
|
|
18
18
|
export * from './lib/components/index';
|
|
19
|
-
export type { IListFormService, IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps, IDataProvider, IBaseState, ICoreState, IDisplayType, IBaseProps, ICoreProps, IListBaseState, IProviderBase, IProviderItems, };
|
|
19
|
+
export type { IListFormService, IWarehouse, IImage, IPermission, IPartner, ICurrentUser, IAppProps, IDataProvider, IBaseState, ICoreState, IDisplayType, IBaseProps, ICoreProps, IListBaseState, IProviderBase, IProviderItems, ReduxProps, };
|
|
20
20
|
export * from './lib/components/index';
|
|
21
21
|
export * from './lib/common/helper';
|
|
22
22
|
export * from './lib/common/UI';
|
package/build/module/index.js
CHANGED
|
@@ -20,4 +20,4 @@ export * from './lib/redux/reduxCore';
|
|
|
20
20
|
export * from './lib/redux/actions/user';
|
|
21
21
|
export { compose } from 'redux';
|
|
22
22
|
export { connect } from 'react-redux';
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRWpFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDekQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3JDLE9BQU8sRUFDTCxhQUFhLEdBSWQsTUFBTSw0QkFBNEIsQ0FBQztBQUdwQyxPQUFPLFlBQVksTUFBTSwyQkFBMkIsQ0FBQztBQWlCckQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3JELE9BQU8sRUFDTCxTQUFTLEVBQ1QsVUFBVSxFQUNWLFdBQVcsRUFDWCxRQUFRLEVBQ1IsT0FBTyxFQUNQLE9BQU8sRUFDUCxTQUFTLEVBQ1QsS0FBSyxFQUNMLEtBQUssRUFDTCxRQUFRLEVBQ1IsU0FBUyxHQUNWLE1BQU0sWUFBWSxDQUFDO0FBQ3BCLE9BQU8sRUFDTCxlQUFlLEVBQ2YsU0FBUyxFQUNULEVBQUUsRUFDRixhQUFhLEVBQ2IsWUFBWSxFQUNaLFlBQVksRUFDWixZQUFZLEdBQ2IsQ0FBQztBQUdGLGNBQWMsY0FBYyxDQUFDO0FBRzdCLGNBQWMsZ0JBQWdCLENBQUM7QUFHL0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUcvQixjQUFjLHdCQUF3QixDQUFDO0FBMEJ2QyxjQUFjLHdCQUF3QixDQUFDO0FBR3ZDLGNBQWMscUJBQXFCLENBQUM7QUFHcEMsY0FBYyxpQkFBaUIsQ0FBQztBQUdoQyxjQUFjLDhCQUE4QixDQUFDO0FBRzdDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLDBCQUEwQixDQUFDO0FBRXpDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUM7QUFFaEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGFBQWEsQ0FBQyJ9
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Permission, Language, Currency } from 'nuudel-utils';
|
|
2
|
+
import { Dispatch } from 'redux';
|
|
3
|
+
import { IRootState } from '../redux/store';
|
|
2
4
|
export interface IWarehouse {
|
|
3
5
|
_id: string;
|
|
4
6
|
name: string;
|
|
@@ -47,3 +49,11 @@ export interface IAppProps {
|
|
|
47
49
|
user?: ICurrentUser;
|
|
48
50
|
IsDlg?: boolean;
|
|
49
51
|
}
|
|
52
|
+
export interface ReduxProps {
|
|
53
|
+
dispatch: Dispatch<any>;
|
|
54
|
+
store: IRootState;
|
|
55
|
+
sign_out?(): void;
|
|
56
|
+
sign_in?(obj: any): void;
|
|
57
|
+
updateProp(prop: string, value: any): void;
|
|
58
|
+
updateProps(obj: any): void;
|
|
59
|
+
}
|
|
@@ -109,7 +109,7 @@ export default withApollo(({ initialState, headers }) => {
|
|
|
109
109
|
return createClient(headers);
|
|
110
110
|
}, {
|
|
111
111
|
render: ({ Page, props }) => {
|
|
112
|
-
return (_jsx(ApolloProvider, { client: props
|
|
112
|
+
return (_jsx(ApolloProvider, { client: props?.apollo, children: _jsx(Page, { ...props }, void 0) }, void 0));
|
|
113
113
|
},
|
|
114
114
|
});
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aEFwb2xsby9pbmRleC50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxPQUFPLENBQUM7QUFDeEMsT0FBTyxFQUNMLFlBQVksRUFFWixhQUFhLEVBRWIsSUFBSSxFQUNKLEtBQUssRUFDTCxRQUFRLEdBQ1QsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNqQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXhDLE9BQU8sVUFBVSxNQUFNLGtCQUFrQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV4QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsSUFBSSxhQUFhLENBQUMsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7QUFFM0UsS0FBSyxDQUFDLFVBQVUsQ0FBQztJQUNmLEtBQUssRUFBRSxLQUFLO0lBQ1osSUFBSSxFQUFFO1FBQ0osZ0JBQWdCLEVBQUUsS0FBSztRQUN2QixRQUFRLEVBQUUsU0FBUztRQUNuQixT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
|
|
@@ -7,24 +7,36 @@ import { USER_TOKEN, tokenObj } from 'nuudel-utils';
|
|
|
7
7
|
import { I8, changeLanguage } from '../../loc/i18n';
|
|
8
8
|
import UI from '../../common/UI';
|
|
9
9
|
import { Language } from 'nuudel-utils';
|
|
10
|
+
import { currentUserQuery } from '../../../lib/hocs/withUser/Query';
|
|
10
11
|
export const store = createStore();
|
|
11
|
-
export const initStore = async (lfs, user
|
|
12
|
+
export const initStore = async (lfs, user) => {
|
|
12
13
|
const state = store.getState();
|
|
13
14
|
if (typeof state.user === 'undefined' || !state.user.token) {
|
|
14
15
|
const token = UI.getItem(USER_TOKEN);
|
|
15
16
|
const userId = tokenObj(token)?._id || null;
|
|
16
17
|
if (userId !== null) {
|
|
17
18
|
let usr = state.user || initialState;
|
|
18
|
-
if (userId) {
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
if (userId && !!lfs?.itemById) {
|
|
20
|
+
try {
|
|
21
|
+
if (!user) {
|
|
22
|
+
user = await lfs.itemById('User', userId);
|
|
23
|
+
}
|
|
24
|
+
else if (!user && token && lfs?.client) {
|
|
25
|
+
const r = await lfs.client.query({
|
|
26
|
+
query: currentUserQuery,
|
|
27
|
+
variables: {},
|
|
28
|
+
fetchPolicy: 'no-cache',
|
|
29
|
+
});
|
|
30
|
+
user = r?.data?.currentUser;
|
|
31
|
+
}
|
|
21
32
|
}
|
|
33
|
+
catch { }
|
|
22
34
|
usr = {
|
|
23
35
|
...usr,
|
|
24
|
-
type: user
|
|
25
|
-
currency: !user
|
|
26
|
-
locale: !user
|
|
27
|
-
status: user
|
|
36
|
+
type: user?.type || 'Guest',
|
|
37
|
+
currency: !user?.settings ? 'MNT' : user.settings.currency,
|
|
38
|
+
locale: !user?.settings ? 'mn-MN' : user.settings.locale,
|
|
39
|
+
status: user?._status || 'Active',
|
|
28
40
|
};
|
|
29
41
|
}
|
|
30
42
|
const locale = !usr.locale ? 'mn-MN' : Language[usr.locale];
|
|
@@ -53,4 +65,4 @@ export const initStore = async (lfs, user = undefined) => {
|
|
|
53
65
|
};
|
|
54
66
|
export const withRedux = (WrappedComponent) => (props) => (_jsx(Provider, { store: store, children: _jsx(WrappedComponent, { ...props }, void 0) }, void 0));
|
|
55
67
|
export default withRedux;
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aFJlZHV4L2luZGV4LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDakQsT0FBTyxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEQsT0FBTyxFQUFFLEVBQUUsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNqQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRXBFLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxXQUFXLEVBQUUsQ0FBQztBQUVuQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsS0FBSyxFQUFFLEdBQVEsRUFBRSxJQUFVLEVBQUUsRUFBRTtJQUN0RCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDL0IsSUFBSSxPQUFPLEtBQUssQ0FBQyxJQUFJLEtBQUssV0FBVyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUU7UUFDMUQsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNyQyxNQUFNLE1BQU0sR0FBa0IsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLEdBQUcsSUFBSSxJQUFJLENBQUM7UUFD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
|
|
@@ -9,6 +9,13 @@ export const fetcher = async (query, variables = {}, headers = {}) => axios({
|
|
|
9
9
|
query: query,
|
|
10
10
|
variables: variables,
|
|
11
11
|
},
|
|
12
|
-
headers: {
|
|
12
|
+
headers: {
|
|
13
|
+
...(!isServer
|
|
14
|
+
? await UI.headers()
|
|
15
|
+
: !process?.env?.TOKEN
|
|
16
|
+
? {}
|
|
17
|
+
: { Authorization: `Bearer ${process.env.TOKEN}` }),
|
|
18
|
+
...headers,
|
|
19
|
+
},
|
|
13
20
|
}).then((res) => res.data);
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvc2VydmljZXMvZmV0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNsQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXhDLE1BQU0sUUFBUSxHQUFXLGFBQWEsQ0FBQztBQUV2QyxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsS0FBSyxFQUMxQixLQUFhLEVBQ2IsWUFBaUIsRUFBRSxFQUNuQixVQUFlLEVBQUUsRUFDakIsRUFBRSxDQUNGLEtBQUssQ0FBQztJQUNKLEdBQUcsRUFBRSxHQUFHLE9BQU8sRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJLEVBQUUsSUFBSSxRQUFRLEVBQUU7SUFDN0MsTUFBTSxFQUFFLE1BQU07SUFDZCxJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsS0FBSztRQUNaLFNBQVMsRUFBRSxTQUFTO0tBQ3JCO0lBQ0QsT0FBTyxFQUFFO1FBQ1AsR0FBRyxDQUFDLENBQUMsUUFBUTtZQUNYLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxPQUFPLEVBQUU7WUFDcEIsQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLO2dCQUN0QixDQUFDLENBQUMsRUFBRTtnQkFDSixDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsVUFBVSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUM7UUFDckQsR0FBRyxPQUFPO0tBQ1g7Q0FDRixDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMifQ==
|