@zengenti/contensis-react-base 3.0.0-beta.1 → 3.0.0-beta.2
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/README.md +8 -2
- package/cjs/{App-fbd91490.js → App-581b6653.js} +20 -19
- package/cjs/App-581b6653.js.map +1 -0
- package/cjs/{RouteLoader-f99cd734.js → RouteLoader-282c03ab.js} +5 -5
- package/cjs/RouteLoader-282c03ab.js.map +1 -0
- package/cjs/ToJs-87edc45d.js +230 -0
- package/cjs/ToJs-87edc45d.js.map +1 -0
- package/cjs/{actions-e9f69947.js → actions-12871aca.js} +9 -13
- package/cjs/actions-12871aca.js.map +1 -0
- package/cjs/client.js +42 -61
- package/cjs/client.js.map +1 -1
- package/cjs/contensis-react-base.js +54 -55
- package/cjs/contensis-react-base.js.map +1 -1
- package/cjs/forms.js +1 -1
- package/cjs/fromJSLeaveImmer-9b550c8e.js +40 -0
- package/cjs/fromJSLeaveImmer-9b550c8e.js.map +1 -0
- package/cjs/{login-4f274c6a.js → login-81d7f9ef.js} +11 -10
- package/cjs/login-81d7f9ef.js.map +1 -0
- package/cjs/{reducers-cb531715.js → reducers-fde41d6b.js} +76 -31
- package/cjs/reducers-fde41d6b.js.map +1 -0
- package/cjs/redux.js +11 -8
- package/cjs/redux.js.map +1 -1
- package/cjs/routing.js +5 -5
- package/cjs/search.js +409 -233
- package/cjs/search.js.map +1 -1
- package/cjs/selectors-ed26ed97.js +141 -0
- package/cjs/selectors-ed26ed97.js.map +1 -0
- package/cjs/user.js +14 -14
- package/cjs/user.js.map +1 -1
- package/cjs/util.js +24 -10
- package/cjs/util.js.map +1 -1
- package/cjs/version-0c190929.js +20 -0
- package/cjs/version-0c190929.js.map +1 -0
- package/cjs/{version-3a808c12.js → version-f061e409.js} +154 -76
- package/cjs/version-f061e409.js.map +1 -0
- package/esm/{App-fbef99b3.js → App-122f28a3.js} +20 -19
- package/esm/App-122f28a3.js.map +1 -0
- package/esm/{RouteLoader-281d47e1.js → RouteLoader-c2faac87.js} +5 -5
- package/esm/RouteLoader-c2faac87.js.map +1 -0
- package/esm/ToJs-52fee252.js +199 -0
- package/esm/ToJs-52fee252.js.map +1 -0
- package/esm/{actions-ddd9c623.js → actions-3cc39599.js} +4 -7
- package/esm/actions-3cc39599.js.map +1 -0
- package/esm/client.js +43 -62
- package/esm/client.js.map +1 -1
- package/esm/contensis-react-base.js +53 -53
- package/esm/contensis-react-base.js.map +1 -1
- package/esm/forms.js +1 -1
- package/esm/fromJSLeaveImmer-e44d1a91.js +38 -0
- package/esm/fromJSLeaveImmer-e44d1a91.js.map +1 -0
- package/esm/{login-1f9ad133.js → login-92db44d1.js} +11 -10
- package/esm/login-92db44d1.js.map +1 -0
- package/esm/{reducers-feab84fc.js → reducers-d6c0edb1.js} +77 -31
- package/esm/reducers-d6c0edb1.js.map +1 -0
- package/esm/redux.js +9 -8
- package/esm/redux.js.map +1 -1
- package/esm/routing.js +5 -5
- package/esm/search.js +409 -235
- package/esm/search.js.map +1 -1
- package/esm/selectors-82e71d8e.js +116 -0
- package/esm/selectors-82e71d8e.js.map +1 -0
- package/esm/user.js +10 -10
- package/esm/user.js.map +1 -1
- package/esm/util.js +24 -10
- package/esm/util.js.map +1 -1
- package/esm/version-59c8f9be.js +15 -0
- package/esm/version-59c8f9be.js.map +1 -0
- package/esm/{version-64906b26.js → version-cb9cd09d.js} +133 -76
- package/esm/version-cb9cd09d.js.map +1 -0
- package/models/app/pages/VersionInfo/components/VersionInfo.d.ts +1 -1
- package/models/config.d.ts +2 -0
- package/models/redux/appstate.d.ts +85 -0
- package/models/redux/index.d.ts +1 -0
- package/models/redux/reducers/navigation.d.ts +6 -2
- package/models/redux/reducers/version.d.ts +5 -2
- package/models/redux/store/store.d.ts +4 -1
- package/models/redux/util.d.ts +2 -0
- package/models/routing/components/RouteLoader.d.ts +20 -2
- package/models/routing/redux/reducers.d.ts +21 -3
- package/models/routing/redux/selectors.d.ts +29 -25
- package/models/routing/routes.d.ts +10 -2
- package/models/search/hooks/useMinilist.hook.d.ts +5 -5
- package/models/search/models/Search.d.ts +8 -1
- package/models/search/models/SearchActions.d.ts +3 -4
- package/models/search/models/SearchState.d.ts +25 -9
- package/models/search/models/WithSearch.d.ts +61 -0
- package/models/search/redux/getIn.d.ts +3 -0
- package/models/search/redux/reducers.d.ts +346 -2
- package/models/search/redux/sagas.d.ts +2 -2
- package/models/search/redux/schema.d.ts +56 -8
- package/models/search/redux/selectors.d.ts +75 -66
- package/models/search/redux/util.d.ts +1 -1
- package/models/search/search/util.d.ts +2 -3
- package/models/user/components/Login.d.ts +10 -1
- package/models/user/containers/ChangePassword.container.d.ts +4 -1
- package/models/user/containers/ForgotPassword.container.d.ts +4 -1
- package/models/user/containers/Login.container.d.ts +4 -1
- package/models/user/containers/Registration.container.d.ts +4 -1
- package/models/user/hocs/withLogin.d.ts +9 -1
- package/models/user/hocs/withRegistration.d.ts +9 -1
- package/models/user/hooks/useChangePassword.d.ts +5 -5
- package/models/user/hooks/useForgotPassword.d.ts +6 -6
- package/models/user/hooks/useLogin.d.ts +45 -7
- package/models/user/hooks/useRegistration.d.ts +4 -4
- package/models/user/redux/reducers.d.ts +54 -3
- package/models/user/redux/selectors.d.ts +72 -27
- package/models/util/ToJs.d.ts +4 -1
- package/package-lock.json +1091 -21399
- package/package.json +9 -8
- package/cjs/App-fbd91490.js.map +0 -1
- package/cjs/RouteLoader-f99cd734.js.map +0 -1
- package/cjs/ToJs-d72e5b10.js +0 -167
- package/cjs/ToJs-d72e5b10.js.map +0 -1
- package/cjs/actions-e9f69947.js.map +0 -1
- package/cjs/login-4f274c6a.js.map +0 -1
- package/cjs/reducers-cb531715.js.map +0 -1
- package/cjs/selectors-1295124a.js +0 -139
- package/cjs/selectors-1295124a.js.map +0 -1
- package/cjs/version-2193b4a2.js +0 -24
- package/cjs/version-2193b4a2.js.map +0 -1
- package/cjs/version-3a808c12.js.map +0 -1
- package/esm/App-fbef99b3.js.map +0 -1
- package/esm/RouteLoader-281d47e1.js.map +0 -1
- package/esm/ToJs-6e7b247c.js +0 -136
- package/esm/ToJs-6e7b247c.js.map +0 -1
- package/esm/actions-ddd9c623.js.map +0 -1
- package/esm/login-1f9ad133.js.map +0 -1
- package/esm/reducers-feab84fc.js.map +0 -1
- package/esm/selectors-68799788.js +0 -117
- package/esm/selectors-68799788.js.map +0 -1
- package/esm/version-64906b26.js.map +0 -1
- package/esm/version-7fdbd2d5.js +0 -19
- package/esm/version-7fdbd2d5.js.map +0 -1
|
@@ -1,17 +1,38 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var immutable = require('immutable');
|
|
4
3
|
var redux = require('redux');
|
|
5
|
-
var reduxImmutable = require('redux-immutable');
|
|
6
4
|
var thunkMiddleware = require('redux-thunk');
|
|
7
5
|
var createSagaMiddleware = require('redux-saga');
|
|
8
6
|
var reduxInjectors = require('redux-injectors');
|
|
9
|
-
var
|
|
10
|
-
var
|
|
7
|
+
var immer = require('immer');
|
|
8
|
+
var actions = require('./actions-12871aca.js');
|
|
9
|
+
var reducers = require('./reducers-fde41d6b.js');
|
|
11
10
|
var effects = require('@redux-saga/core/effects');
|
|
11
|
+
var selectors = require('./selectors-ed26ed97.js');
|
|
12
12
|
|
|
13
13
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
14
14
|
|
|
15
|
+
function _interopNamespace(e) {
|
|
16
|
+
if (e && e.__esModule) { return e; } else {
|
|
17
|
+
var n = Object.create(null);
|
|
18
|
+
if (e) {
|
|
19
|
+
Object.keys(e).forEach(function (k) {
|
|
20
|
+
if (k !== 'default') {
|
|
21
|
+
var d = Object.getOwnPropertyDescriptor(e, k);
|
|
22
|
+
Object.defineProperty(n, k, d.get ? d : {
|
|
23
|
+
enumerable: true,
|
|
24
|
+
get: function () {
|
|
25
|
+
return e[k];
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
n['default'] = e;
|
|
32
|
+
return Object.freeze(n);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
15
36
|
var thunkMiddleware__default = /*#__PURE__*/_interopDefaultLegacy(thunkMiddleware);
|
|
16
37
|
var createSagaMiddleware__default = /*#__PURE__*/_interopDefaultLegacy(createSagaMiddleware);
|
|
17
38
|
|
|
@@ -27,59 +48,59 @@ var navigation = /*#__PURE__*/Object.freeze({
|
|
|
27
48
|
GET_NODE_TREE_ERROR: GET_NODE_TREE_ERROR
|
|
28
49
|
});
|
|
29
50
|
|
|
30
|
-
const initialState =
|
|
51
|
+
const initialState = {
|
|
31
52
|
root: null,
|
|
32
|
-
treeDepends:
|
|
53
|
+
treeDepends: [],
|
|
33
54
|
isError: false,
|
|
34
55
|
isReady: false
|
|
35
|
-
}
|
|
36
|
-
var NavigationReducer = ((state
|
|
56
|
+
};
|
|
57
|
+
var NavigationReducer = immer.produce((state, action) => {
|
|
37
58
|
switch (action.type) {
|
|
38
59
|
case SET_NODE_TREE:
|
|
39
60
|
{
|
|
40
|
-
|
|
61
|
+
state.root = action.nodes;
|
|
62
|
+
state.isReady = true;
|
|
63
|
+
return;
|
|
41
64
|
}
|
|
42
65
|
|
|
43
66
|
case GET_NODE_TREE_ERROR:
|
|
44
67
|
{
|
|
45
|
-
|
|
68
|
+
state.isError = true;
|
|
69
|
+
return;
|
|
46
70
|
}
|
|
47
71
|
|
|
48
72
|
default:
|
|
49
|
-
return
|
|
73
|
+
return;
|
|
50
74
|
}
|
|
51
|
-
});
|
|
75
|
+
}, initialState);
|
|
52
76
|
|
|
53
|
-
|
|
77
|
+
const initialState$1 = {
|
|
54
78
|
currentHostname: null,
|
|
55
79
|
contentTypeId: null,
|
|
56
80
|
currentPath: '/',
|
|
57
|
-
currentNode:
|
|
58
|
-
currentNodeAncestors:
|
|
81
|
+
currentNode: {},
|
|
82
|
+
currentNodeAncestors: [],
|
|
59
83
|
currentProject: 'unknown',
|
|
60
84
|
entryID: null,
|
|
61
85
|
entry: null,
|
|
62
86
|
currentTreeId: null,
|
|
63
|
-
entryDepends:
|
|
87
|
+
entryDepends: [],
|
|
64
88
|
error: undefined,
|
|
65
89
|
isError: false,
|
|
66
90
|
isLoading: false,
|
|
67
|
-
location:
|
|
91
|
+
location: {},
|
|
68
92
|
mappedEntry: null,
|
|
69
|
-
nodeDepends:
|
|
93
|
+
nodeDepends: [],
|
|
70
94
|
notFound: false,
|
|
71
95
|
staticRoute: null,
|
|
72
96
|
statusCode: 200
|
|
73
|
-
}
|
|
74
|
-
var RoutingReducer = ((state
|
|
97
|
+
};
|
|
98
|
+
var RoutingReducer = immer.produce((state, action) => {
|
|
75
99
|
switch (action.type) {
|
|
76
100
|
case actions.SET_ANCESTORS:
|
|
77
101
|
{
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
return state.set('currentNodeAncestors', immutable.fromJS(action.ancestors));
|
|
102
|
+
state.currentNodeAncestors = action.ancestors;
|
|
103
|
+
return;
|
|
83
104
|
}
|
|
84
105
|
|
|
85
106
|
case actions.SET_ENTRY:
|
|
@@ -96,33 +117,60 @@ var RoutingReducer = ((state = initialState$1, action) => {
|
|
|
96
117
|
} = action;
|
|
97
118
|
let defaultStatus = 200;
|
|
98
119
|
if (notFound === true && isError === false) defaultStatus = 404;else if (isError === true) defaultStatus = statusCode || 500;
|
|
99
|
-
let nextState;
|
|
100
120
|
|
|
101
121
|
if (!entry) {
|
|
102
|
-
|
|
122
|
+
state.entryID = null;
|
|
123
|
+
state.entry = null;
|
|
124
|
+
state.error = error;
|
|
125
|
+
state.mappedEntry = null;
|
|
126
|
+
state.isError = isError;
|
|
127
|
+
state.isLoading = isLoading;
|
|
128
|
+
state.notFound = notFound;
|
|
129
|
+
state.statusCode = statusCode || defaultStatus;
|
|
103
130
|
} else {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
131
|
+
state.entryID = action.id;
|
|
132
|
+
state.entry = entry;
|
|
133
|
+
state.error = error;
|
|
134
|
+
state.isError = isError;
|
|
135
|
+
state.isLoading = isLoading;
|
|
136
|
+
state.notFound = notFound;
|
|
137
|
+
state.statusCode = statusCode || defaultStatus;
|
|
138
|
+
|
|
139
|
+
if (mappedEntry && Object.keys(mappedEntry).length > 0) {
|
|
140
|
+
state.mappedEntry = mappedEntry;
|
|
141
|
+
state.entry = {
|
|
142
|
+
sys: entry.sys
|
|
143
|
+
};
|
|
144
|
+
}
|
|
108
145
|
}
|
|
109
146
|
|
|
110
147
|
if (!node) {
|
|
111
|
-
|
|
148
|
+
state.nodeDepends = null;
|
|
149
|
+
state.currentNode = null;
|
|
112
150
|
} else {
|
|
113
151
|
// On Set Node, we reset all dependants.
|
|
114
|
-
|
|
152
|
+
state.currentNode = node; // eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
153
|
+
|
|
154
|
+
const {
|
|
155
|
+
entry,
|
|
156
|
+
...nodeWithoutEntry
|
|
157
|
+
} = node; // We have the entry stored elsewhere, so lets not keep it twice.
|
|
158
|
+
|
|
159
|
+
state.currentNode = nodeWithoutEntry;
|
|
115
160
|
}
|
|
161
|
+
|
|
162
|
+
return;
|
|
116
163
|
}
|
|
117
164
|
|
|
118
165
|
case actions.UPDATE_LOADING_STATE:
|
|
119
166
|
{
|
|
120
|
-
|
|
167
|
+
state.isLoading = action.isLoading;
|
|
168
|
+
return;
|
|
121
169
|
}
|
|
122
170
|
|
|
123
171
|
case actions.SET_NAVIGATION_PATH:
|
|
124
172
|
{
|
|
125
|
-
let staticRoute =
|
|
173
|
+
let staticRoute = {};
|
|
126
174
|
|
|
127
175
|
if (action.staticRoute) {
|
|
128
176
|
staticRoute = { ...action.staticRoute
|
|
@@ -130,30 +178,37 @@ var RoutingReducer = ((state = initialState$1, action) => {
|
|
|
130
178
|
}
|
|
131
179
|
|
|
132
180
|
if (action.path) {
|
|
181
|
+
var _state$entry, _state$entry$sys;
|
|
182
|
+
|
|
133
183
|
// Don't run a path update on initial load as we allready should have it in redux
|
|
134
|
-
const entryUri = state.
|
|
184
|
+
const entryUri = state === null || state === void 0 ? void 0 : (_state$entry = state.entry) === null || _state$entry === void 0 ? void 0 : (_state$entry$sys = _state$entry.sys) === null || _state$entry$sys === void 0 ? void 0 : _state$entry$sys.uri;
|
|
135
185
|
|
|
136
|
-
if (entryUri
|
|
137
|
-
|
|
186
|
+
if (entryUri !== action.path) {
|
|
187
|
+
state.currentPath = action.path;
|
|
188
|
+
state.location = action.location;
|
|
189
|
+
state.staticRoute = { ...staticRoute,
|
|
138
190
|
route: { ...staticRoute.route,
|
|
139
191
|
component: null
|
|
140
192
|
}
|
|
141
|
-
}
|
|
193
|
+
};
|
|
194
|
+
state.isLoading = typeof window !== 'undefined';
|
|
142
195
|
} else {
|
|
143
|
-
|
|
196
|
+
state.location = action.location;
|
|
197
|
+
state.staticRoute = { ...staticRoute,
|
|
144
198
|
route: { ...staticRoute.route,
|
|
145
199
|
component: null
|
|
146
200
|
}
|
|
147
|
-
}
|
|
201
|
+
};
|
|
148
202
|
}
|
|
149
203
|
}
|
|
150
204
|
|
|
151
|
-
return
|
|
205
|
+
return;
|
|
152
206
|
}
|
|
153
207
|
|
|
154
208
|
case actions.SET_ROUTE:
|
|
155
209
|
{
|
|
156
|
-
|
|
210
|
+
state.nextPath = action.path;
|
|
211
|
+
return;
|
|
157
212
|
}
|
|
158
213
|
|
|
159
214
|
case actions.SET_SIBLINGS:
|
|
@@ -164,31 +219,37 @@ var RoutingReducer = ((state = initialState$1, action) => {
|
|
|
164
219
|
|
|
165
220
|
if (action.siblings && action.siblings.length > 0) {
|
|
166
221
|
currentNodeSiblingParent = action.siblings[0].parentId;
|
|
167
|
-
siblingIDs = action.siblings.map(node =>
|
|
168
|
-
return node.id;
|
|
169
|
-
});
|
|
222
|
+
siblingIDs = action.siblings.map(node => node.id);
|
|
170
223
|
}
|
|
171
224
|
|
|
172
|
-
|
|
173
|
-
const allNodeDepends =
|
|
174
|
-
|
|
225
|
+
const currentNodeDepends = state.nodeDepends;
|
|
226
|
+
const allNodeDepends = [...new Set([...new Set(siblingIDs), currentNodeDepends])];
|
|
227
|
+
state.nodeDepends = allNodeDepends;
|
|
228
|
+
state.currentNodeSiblings = action.siblings;
|
|
229
|
+
state.currentNodeSiblingsParent = currentNodeSiblingParent;
|
|
230
|
+
return;
|
|
175
231
|
}
|
|
176
232
|
|
|
177
233
|
case actions.SET_SURROGATE_KEYS:
|
|
178
234
|
{
|
|
179
|
-
|
|
235
|
+
state.surrogateKeys = action.keys;
|
|
236
|
+
return;
|
|
180
237
|
}
|
|
181
238
|
|
|
182
239
|
case actions.SET_TARGET_PROJECT:
|
|
183
240
|
{
|
|
184
|
-
|
|
185
|
-
.
|
|
241
|
+
state.currentProject = action.project;
|
|
242
|
+
state.currentTreeId = ''; // getTreeID(action.project))
|
|
243
|
+
|
|
244
|
+
state.allowedGroups = action.allowedGroups;
|
|
245
|
+
state.currentHostname = action.hostname;
|
|
246
|
+
return;
|
|
186
247
|
}
|
|
187
248
|
|
|
188
249
|
default:
|
|
189
250
|
return state;
|
|
190
251
|
}
|
|
191
|
-
});
|
|
252
|
+
}, initialState$1);
|
|
192
253
|
|
|
193
254
|
const VERSION_PREFIX = '@VERSION/';
|
|
194
255
|
const SET_VERSION = `${VERSION_PREFIX}SET_VERSION`;
|
|
@@ -200,27 +261,30 @@ var version = /*#__PURE__*/Object.freeze({
|
|
|
200
261
|
SET_VERSION_STATUS: SET_VERSION_STATUS
|
|
201
262
|
});
|
|
202
263
|
|
|
203
|
-
|
|
264
|
+
const initialState$2 = {
|
|
204
265
|
commitRef: null,
|
|
205
266
|
buildNo: null,
|
|
206
267
|
contensisVersionStatus: 'published'
|
|
207
|
-
}
|
|
208
|
-
var VersionReducer = ((state
|
|
268
|
+
};
|
|
269
|
+
var VersionReducer = immer.produce((state, action) => {
|
|
209
270
|
switch (action.type) {
|
|
210
271
|
case SET_VERSION_STATUS:
|
|
211
272
|
{
|
|
212
|
-
|
|
273
|
+
state.contensisVersionStatus = action.status;
|
|
274
|
+
return;
|
|
213
275
|
}
|
|
214
276
|
|
|
215
277
|
case SET_VERSION:
|
|
216
278
|
{
|
|
217
|
-
|
|
279
|
+
state.commitRef = action.commitRef;
|
|
280
|
+
state.buildNo = action.buildNo;
|
|
281
|
+
return;
|
|
218
282
|
}
|
|
219
283
|
|
|
220
284
|
default:
|
|
221
|
-
return
|
|
285
|
+
return;
|
|
222
286
|
}
|
|
223
|
-
});
|
|
287
|
+
}, initialState$2);
|
|
224
288
|
|
|
225
289
|
/**
|
|
226
290
|
* This middleware captures 'CALL_HISTORY_METHOD' actions to redirect to the
|
|
@@ -244,7 +308,8 @@ const routerMiddleware = history => store => next => action => {
|
|
|
244
308
|
};
|
|
245
309
|
|
|
246
310
|
/* eslint-disable no-underscore-dangle */
|
|
247
|
-
|
|
311
|
+
|
|
312
|
+
var createStore = (async (featureReducers, initialState, history, stateType) => {
|
|
248
313
|
let reduxDevToolsMiddleware = f => f;
|
|
249
314
|
|
|
250
315
|
if (typeof window != 'undefined') {
|
|
@@ -258,10 +323,29 @@ var createStore = ((featureReducers, initialState, history) => {
|
|
|
258
323
|
user: reducers.UserReducer,
|
|
259
324
|
version: VersionReducer,
|
|
260
325
|
...featureReducers
|
|
261
|
-
};
|
|
326
|
+
}; // Reassign the combiner and fromJS functions when
|
|
327
|
+
// stateType is 'immutable' with dynamic imports
|
|
328
|
+
|
|
329
|
+
let combiner = redux.combineReducers;
|
|
330
|
+
|
|
331
|
+
let fromJS = obj => obj;
|
|
332
|
+
|
|
333
|
+
globalThis.STATE_TYPE = stateType;
|
|
334
|
+
|
|
335
|
+
if (stateType === 'immutable') {
|
|
336
|
+
globalThis.immutable = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
|
|
337
|
+
/* webpackChunkName: "immutable" */
|
|
338
|
+
'immutable')); });
|
|
339
|
+
fromJS = (await Promise.resolve().then(function () { return require(
|
|
340
|
+
/* webpackChunkName: "from-js" */
|
|
341
|
+
'./fromJSLeaveImmer-9b550c8e.js'); })).default;
|
|
342
|
+
combiner = (await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
|
|
343
|
+
/* webpackChunkName: "redux-immutable" */
|
|
344
|
+
'redux-immutable')); })).combineReducers;
|
|
345
|
+
}
|
|
262
346
|
|
|
263
347
|
const createReducer = (injectedReducers = {}) => {
|
|
264
|
-
const rootReducer =
|
|
348
|
+
const rootReducer = combiner({ ...injectedReducers,
|
|
265
349
|
// other non-injected reducers go here
|
|
266
350
|
...reducers$1
|
|
267
351
|
});
|
|
@@ -282,19 +366,13 @@ var createStore = ((featureReducers, initialState, history) => {
|
|
|
282
366
|
return store;
|
|
283
367
|
};
|
|
284
368
|
|
|
285
|
-
exports.reduxStore = store(initialState);
|
|
369
|
+
exports.reduxStore = store(fromJS(initialState));
|
|
286
370
|
return exports.reduxStore;
|
|
287
371
|
});
|
|
288
372
|
|
|
289
|
-
const hasNavigationTree = state =>
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
const selectNavigationRoot = state => {
|
|
293
|
-
return state.getIn(['navigation', 'root']);
|
|
294
|
-
};
|
|
295
|
-
const selectNavigationDepends = state => {
|
|
296
|
-
return state.getIn(['navigation', 'treeDepends']);
|
|
297
|
-
};
|
|
373
|
+
const hasNavigationTree = state => selectors.getImmutableOrJS(state, ['navigation', 'isReady']);
|
|
374
|
+
const selectNavigationRoot = state => selectors.getImmutableOrJS(state, ['navigation', 'root']);
|
|
375
|
+
const selectNavigationDepends = state => selectors.getImmutableOrJS(state, ['navigation', 'treeDepends']);
|
|
298
376
|
|
|
299
377
|
var navigation$1 = /*#__PURE__*/Object.freeze({
|
|
300
378
|
__proto__: null,
|
|
@@ -360,11 +438,11 @@ const injectRedux = ({
|
|
|
360
438
|
};
|
|
361
439
|
const useInjectRedux = injectRedux;
|
|
362
440
|
|
|
363
|
-
const setVersion = (commitRef, buildNo) =>
|
|
441
|
+
const setVersion = (commitRef, buildNo) => selectors.action(SET_VERSION, {
|
|
364
442
|
commitRef,
|
|
365
443
|
buildNo
|
|
366
444
|
});
|
|
367
|
-
const setVersionStatus = status =>
|
|
445
|
+
const setVersionStatus = status => selectors.action(SET_VERSION_STATUS, {
|
|
368
446
|
status
|
|
369
447
|
});
|
|
370
448
|
|
|
@@ -390,4 +468,4 @@ exports.setVersionStatus = setVersionStatus;
|
|
|
390
468
|
exports.useInjectRedux = useInjectRedux;
|
|
391
469
|
exports.version = version;
|
|
392
470
|
exports.version$1 = version$1;
|
|
393
|
-
//# sourceMappingURL=version-
|
|
471
|
+
//# sourceMappingURL=version-f061e409.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version-f061e409.js","sources":["../src/redux/types/navigation.js","../src/redux/reducers/navigation.ts","../src/routing/redux/reducers.ts","../src/redux/types/version.js","../src/redux/reducers/version.ts","../src/redux/store/routerMiddleware.js","../src/redux/store/store.ts","../src/redux/selectors/navigation.js","../src/redux/store/injectors.js","../src/redux/actions/version.js"],"sourcesContent":["const ACTION_PREFIX = '@NAVIGATION/';\nexport const GET_NODE_TREE = `${ACTION_PREFIX}_GET_NODE_TREE`;\nexport const SET_NODE_TREE = `${ACTION_PREFIX}_SET_NODE_TREE`;\nexport const GET_NODE_TREE_ERROR = `${ACTION_PREFIX}_GET_NODE_TREE_ERROR`;\n","import { Draft, produce } from 'immer';\nimport { SET_NODE_TREE, GET_NODE_TREE_ERROR } from '~/redux/types/navigation';\n\nconst initialState = {\n root: null,\n treeDepends: [],\n isError: false,\n isReady: false,\n};\n\nexport default produce((state: Draft<any>, action) => {\n switch (action.type) {\n case SET_NODE_TREE: {\n state.root = action.nodes;\n state.isReady = true;\n return;\n }\n case GET_NODE_TREE_ERROR: {\n state.isError = true;\n return;\n }\n default:\n return;\n }\n}, initialState);\n","import { Draft, produce } from 'immer';\n\nimport {\n SET_ENTRY,\n SET_NAVIGATION_PATH,\n SET_ANCESTORS,\n SET_TARGET_PROJECT,\n SET_ROUTE,\n SET_SIBLINGS,\n SET_SURROGATE_KEYS,\n UPDATE_LOADING_STATE,\n} from './types';\n\nconst initialState = {\n currentHostname: null,\n contentTypeId: null,\n currentPath: '/',\n currentNode: {},\n currentNodeAncestors: [],\n currentProject: 'unknown',\n entryID: null,\n entry: null,\n currentTreeId: null,\n entryDepends: [],\n error: undefined,\n isError: false,\n isLoading: false,\n location: {},\n mappedEntry: null,\n nodeDepends: [],\n notFound: false,\n staticRoute: null,\n statusCode: 200,\n};\n\nexport default produce((state: Draft<any>, action) => {\n switch (action.type) {\n case SET_ANCESTORS: {\n state.currentNodeAncestors = action.ancestors;\n return;\n }\n case SET_ENTRY: {\n const {\n entry,\n error,\n mappedEntry,\n node = {},\n isError = false,\n isLoading = false,\n notFound = false,\n statusCode,\n } = action;\n\n let defaultStatus = 200;\n if (notFound === true && isError === false) defaultStatus = 404;\n else if (isError === true) defaultStatus = statusCode || 500;\n\n if (!entry) {\n state.entryID = null;\n state.entry = null;\n state.error = error;\n state.mappedEntry = null;\n state.isError = isError;\n state.isLoading = isLoading;\n state.notFound = notFound;\n state.statusCode = statusCode || defaultStatus;\n } else {\n state.entryID = action.id;\n state.entry = entry;\n state.error = error;\n state.isError = isError;\n state.isLoading = isLoading;\n state.notFound = notFound;\n state.statusCode = statusCode || defaultStatus;\n\n if (mappedEntry && Object.keys(mappedEntry).length > 0) {\n state.mappedEntry = mappedEntry;\n state.entry = { sys: entry.sys };\n }\n }\n\n if (!node) {\n state.nodeDepends = null;\n state.currentNode = null;\n } else {\n // On Set Node, we reset all dependants.\n state.currentNode = node;\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { entry, ...nodeWithoutEntry } = node; // We have the entry stored elsewhere, so lets not keep it twice.\n state.currentNode = nodeWithoutEntry;\n }\n return;\n }\n case UPDATE_LOADING_STATE: {\n state.isLoading = action.isLoading;\n return;\n }\n case SET_NAVIGATION_PATH: {\n let staticRoute = {} as any;\n if (action.staticRoute) {\n staticRoute = { ...action.staticRoute };\n }\n if (action.path) {\n // Don't run a path update on initial load as we allready should have it in redux\n const entryUri = state?.entry?.sys?.uri;\n if (entryUri !== action.path) {\n state.currentPath = action.path;\n state.location = action.location;\n state.staticRoute = {\n ...staticRoute,\n route: { ...staticRoute.route, component: null },\n };\n\n state.isLoading = typeof window !== 'undefined';\n } else {\n state.location = action.location;\n state.staticRoute = {\n ...staticRoute,\n route: { ...staticRoute.route, component: null },\n };\n }\n }\n return;\n }\n case SET_ROUTE: {\n state.nextPath = action.path;\n return;\n }\n case SET_SIBLINGS: {\n // Can be null in some cases like the homepage.\n let currentNodeSiblingParent = null;\n let siblingIDs = [];\n if (action.siblings && action.siblings.length > 0) {\n currentNodeSiblingParent = action.siblings[0].parentId;\n siblingIDs = action.siblings.map(node => node.id);\n }\n const currentNodeDepends = state.nodeDepends;\n const allNodeDepends = [\n ...new Set([...new Set(siblingIDs), currentNodeDepends]),\n ];\n state.nodeDepends = allNodeDepends;\n state.currentNodeSiblings = action.siblings;\n state.currentNodeSiblingsParent = currentNodeSiblingParent;\n return;\n }\n case SET_SURROGATE_KEYS: {\n state.surrogateKeys = action.keys;\n return;\n }\n case SET_TARGET_PROJECT: {\n state.currentProject = action.project;\n state.currentTreeId = ''; // getTreeID(action.project))\n state.allowedGroups = action.allowedGroups;\n state.currentHostname = action.hostname;\n return;\n }\n default:\n return state;\n }\n}, initialState);\n","const VERSION_PREFIX = '@VERSION/';\nexport const SET_VERSION = `${VERSION_PREFIX}SET_VERSION`;\nexport const SET_VERSION_STATUS = `${VERSION_PREFIX}SET_VERSION_STATUS`;\n","import { Draft, produce } from 'immer';\nimport { SET_VERSION, SET_VERSION_STATUS } from '~/redux/types/version';\n\nconst initialState = {\n commitRef: null,\n buildNo: null,\n contensisVersionStatus: 'published',\n};\n\nexport default produce((state: Draft<any>, action) => {\n switch (action.type) {\n case SET_VERSION_STATUS: {\n state.contensisVersionStatus = action.status;\n return;\n }\n case SET_VERSION: {\n state.commitRef = action.commitRef;\n state.buildNo = action.buildNo;\n return;\n }\n default:\n return;\n }\n}, initialState);\n","/**\n * This middleware captures 'CALL_HISTORY_METHOD' actions to redirect to the\n * provided history object. This will prevent these actions from reaching your\n * reducer or any middleware that comes after this one.\n */\n/* eslint-disable no-unused-vars */\nconst routerMiddleware = history => store => next => action => {\n if (action.type !== 'CALL_HISTORY_METHOD') {\n return next(action);\n }\n\n const {\n payload: { method, args },\n } = action;\n history[method](...args);\n};\n\nexport default routerMiddleware;\n","import {\n applyMiddleware,\n combineReducers,\n compose,\n createStore,\n Action,\n Store,\n StoreEnhancer,\n} from 'redux';\nimport thunkMiddleware from 'redux-thunk';\nimport createSagaMiddleware, { END } from 'redux-saga';\nimport { createInjectorsEnhancer } from 'redux-injectors';\n\n// Core reducers\nimport NavigationReducer from '../reducers/navigation';\nimport RoutingReducer from '~/routing/redux/reducers';\nimport UserReducer from '~/user/redux/reducers';\nimport VersionReducer from '../reducers/version';\nimport routerMiddleware from './routerMiddleware';\nimport { AppState } from '../appstate';\nimport { History, MemoryHistory } from 'history';\nimport { StateType } from '~/config';\n\nexport let reduxStore;\n\n/* eslint-disable no-underscore-dangle */\ndeclare let window: Window &\n typeof globalThis & {\n __REDUX_DEVTOOLS_EXTENSION__: any;\n };\n\nexport default async (\n featureReducers: any,\n initialState: AppState,\n history: History | MemoryHistory,\n stateType: StateType\n) => {\n let reduxDevToolsMiddleware = f => f;\n\n if (typeof window != 'undefined') {\n reduxDevToolsMiddleware = window.__REDUX_DEVTOOLS_EXTENSION__\n ? window.__REDUX_DEVTOOLS_EXTENSION__()\n : f => f;\n }\n\n const sagaMiddleware = createSagaMiddleware();\n\n const reducers = {\n navigation: NavigationReducer,\n routing: RoutingReducer,\n user: UserReducer,\n version: VersionReducer,\n ...featureReducers,\n };\n\n // Reassign the combiner and fromJS functions when\n // stateType is 'immutable' with dynamic imports\n let combiner = combineReducers;\n let fromJS: any = (obj: any) => obj;\n globalThis.STATE_TYPE = stateType;\n\n if (stateType === 'immutable') {\n globalThis.immutable = await import(\n /* webpackChunkName: \"immutable\" */ 'immutable'\n );\n\n fromJS = (\n await import(/* webpackChunkName: \"from-js\" */ '~/util/fromJSLeaveImmer')\n ).default;\n\n combiner = (\n await import(/* webpackChunkName: \"redux-immutable\" */ 'redux-immutable')\n ).combineReducers;\n }\n\n const createReducer = (injectedReducers = {}) => {\n const rootReducer = combiner<AppState>({\n ...injectedReducers,\n // other non-injected reducers go here\n ...reducers,\n });\n\n return rootReducer;\n };\n\n const store = (initialState: AppState) => {\n const runSaga = sagaMiddleware.run;\n\n const middleware: StoreEnhancer<\n {\n dispatch: unknown;\n },\n unknown\n > = compose(\n applyMiddleware(\n thunkMiddleware,\n sagaMiddleware,\n routerMiddleware(history)\n ),\n createInjectorsEnhancer({\n createReducer,\n runSaga,\n }),\n reduxDevToolsMiddleware\n );\n\n const store: Store<AppState, Action<any>> & {\n runSaga?: typeof runSaga;\n close?: () => void;\n } = createStore<AppState, Action<any>, unknown, unknown>(\n createReducer(),\n initialState,\n middleware\n );\n\n store.runSaga = runSaga;\n store.close = () => store.dispatch(END);\n\n return store;\n };\n\n reduxStore = store(fromJS(initialState));\n return reduxStore;\n};\n","import { getImmutableOrJS as getIn } from '~/redux/util';\n\nexport const hasNavigationTree = state =>\n getIn(state, ['navigation', 'isReady']);\n\nexport const selectNavigationRoot = state =>\n getIn(state, ['navigation', 'root']);\n\nexport const selectNavigationDepends = state =>\n getIn(state, ['navigation', 'treeDepends']);\n","import { all } from 'redux-saga/effects';\nimport { reduxStore as DefaultStore } from './store';\n\nexport const convertSagaArray = sagas => {\n if (Array.isArray(sagas))\n return function* rootSaga() {\n yield all(sagas);\n };\n return sagas;\n};\n\nexport const injectReducer = ({ key, reducer }, store = DefaultStore) => {\n if (\n Reflect.has(store.injectedReducers, key) &&\n store.injectedReducers[key] === reducer\n )\n return;\n store.injectedReducers[key] = reducer;\n\n store.replaceReducer(store.createReducer(store.injectedReducers));\n};\n\nexport const injectSaga = ({ key, saga }, store = DefaultStore) => {\n const rootSaga = convertSagaArray(saga);\n let hasSaga = Reflect.has(store.injectedSagas, key);\n\n if (process.env.NODE_ENV !== 'production') {\n const oldDescriptor = store.injectedSagas[key]; // enable hot reloading of daemon and once-till-unmount sagas\n\n if (hasSaga && oldDescriptor.saga !== rootSaga) {\n oldDescriptor.task.cancel();\n hasSaga = false;\n }\n }\n console.info('injectSaga, key: ', key, 'hasSaga: ', hasSaga);\n\n if (!hasSaga) {\n store.injectedSagas[key] = {\n key,\n saga: rootSaga,\n task: store.runSaga(rootSaga),\n };\n }\n};\n\nexport const injectRedux = ({ key, reducer, saga }, store = DefaultStore) => {\n console.info('injectRedux, key: ', key);\n if (reducer) injectReducer({ key, reducer }, store);\n if (saga) injectSaga({ key, saga }, store);\n};\n\nexport const useInjectRedux = injectRedux;\n","import { action } from '../util';\nimport { SET_VERSION, SET_VERSION_STATUS } from '../types/version';\n\nexport const setVersion = (commitRef, buildNo) =>\n action(SET_VERSION, { commitRef, buildNo });\n\nexport const setVersionStatus = status =>\n action(SET_VERSION_STATUS, { status });\n"],"names":["ACTION_PREFIX","GET_NODE_TREE","SET_NODE_TREE","GET_NODE_TREE_ERROR","initialState","root","treeDepends","isError","isReady","produce","state","action","type","nodes","currentHostname","contentTypeId","currentPath","currentNode","currentNodeAncestors","currentProject","entryID","entry","currentTreeId","entryDepends","error","undefined","isLoading","location","mappedEntry","nodeDepends","notFound","staticRoute","statusCode","SET_ANCESTORS","ancestors","SET_ENTRY","node","defaultStatus","id","Object","keys","length","sys","nodeWithoutEntry","UPDATE_LOADING_STATE","SET_NAVIGATION_PATH","path","entryUri","uri","route","component","window","SET_ROUTE","nextPath","SET_SIBLINGS","currentNodeSiblingParent","siblingIDs","siblings","parentId","map","currentNodeDepends","allNodeDepends","Set","currentNodeSiblings","currentNodeSiblingsParent","SET_SURROGATE_KEYS","surrogateKeys","SET_TARGET_PROJECT","project","allowedGroups","hostname","VERSION_PREFIX","SET_VERSION","SET_VERSION_STATUS","commitRef","buildNo","contensisVersionStatus","status","routerMiddleware","history","store","next","payload","method","args","featureReducers","stateType","reduxDevToolsMiddleware","f","__REDUX_DEVTOOLS_EXTENSION__","sagaMiddleware","createSagaMiddleware","reducers","navigation","NavigationReducer","routing","RoutingReducer","user","UserReducer","version","VersionReducer","combiner","combineReducers","fromJS","obj","globalThis","STATE_TYPE","immutable","default","createReducer","injectedReducers","rootReducer","runSaga","run","middleware","compose","applyMiddleware","thunkMiddleware","createInjectorsEnhancer","createStore","close","dispatch","END","reduxStore","hasNavigationTree","getIn","selectNavigationRoot","selectNavigationDepends","convertSagaArray","sagas","Array","isArray","rootSaga","all","injectReducer","key","reducer","DefaultStore","Reflect","has","replaceReducer","injectSaga","saga","hasSaga","injectedSagas","process","env","NODE_ENV","oldDescriptor","task","cancel","console","info","injectRedux","useInjectRedux","setVersion","setVersionStatus"],"mappings":"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"}
|
|
@@ -1,25 +1,24 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import
|
|
2
|
+
import 'jsonpath-mapper';
|
|
3
3
|
import 'redux';
|
|
4
|
-
import 'redux-immutable';
|
|
5
4
|
import 'redux-thunk';
|
|
6
5
|
import 'redux-saga';
|
|
7
6
|
import 'redux-injectors';
|
|
8
|
-
import { r as reduxStore, G as GET_NODE_TREE, h as hasNavigationTree, S as SET_NODE_TREE, b as GET_NODE_TREE_ERROR, i as injectRedux } from './version-
|
|
9
|
-
import { a as setSurrogateKeys, S as SET_NAVIGATION_PATH, b as SET_ROUTE, U as UPDATE_LOADING_STATE, c as SET_ENTRY, d as SET_ANCESTORS, e as SET_SIBLINGS, f as setRoute } from './actions-
|
|
10
|
-
import { R as REGISTER_USER, a as REGISTER_USER_SUCCESS, b as REGISTER_USER_FAILED, c as REQUEST_USER_PASSWORD_RESET, d as RESET_USER_PASSWORD, C as CHANGE_USER_PASSWORD, e as REQUEST_USER_PASSWORD_RESET_SENDING, f as REQUEST_USER_PASSWORD_RESET_SUCCESS, g as REQUEST_USER_PASSWORD_RESET_ERROR, h as RESET_USER_PASSWORD_SENDING, i as RESET_USER_PASSWORD_SUCCESS, j as RESET_USER_PASSWORD_ERROR, k as CHANGE_USER_PASSWORD_ERROR, l as CHANGE_USER_PASSWORD_SENDING, m as CHANGE_USER_PASSWORD_SUCCESS } from './reducers-
|
|
7
|
+
import { r as reduxStore, G as GET_NODE_TREE, h as hasNavigationTree, S as SET_NODE_TREE, b as GET_NODE_TREE_ERROR, i as injectRedux } from './version-cb9cd09d.js';
|
|
8
|
+
import { a as setSurrogateKeys, S as SET_NAVIGATION_PATH, b as SET_ROUTE, U as UPDATE_LOADING_STATE, c as SET_ENTRY, d as SET_ANCESTORS, e as SET_SIBLINGS, f as setRoute } from './actions-3cc39599.js';
|
|
9
|
+
import { R as REGISTER_USER, a as REGISTER_USER_SUCCESS, b as REGISTER_USER_FAILED, c as REQUEST_USER_PASSWORD_RESET, d as RESET_USER_PASSWORD, C as CHANGE_USER_PASSWORD, e as REQUEST_USER_PASSWORD_RESET_SENDING, f as REQUEST_USER_PASSWORD_RESET_SUCCESS, g as REQUEST_USER_PASSWORD_RESET_ERROR, h as RESET_USER_PASSWORD_SENDING, i as RESET_USER_PASSWORD_SUCCESS, j as RESET_USER_PASSWORD_ERROR, k as CHANGE_USER_PASSWORD_ERROR, l as CHANGE_USER_PASSWORD_SENDING, m as CHANGE_USER_PASSWORD_SUCCESS } from './reducers-d6c0edb1.js';
|
|
11
10
|
import { createBrowserHistory, createMemoryHistory } from 'history';
|
|
12
11
|
import { takeEvery, select, put, call, all } from '@redux-saga/core/effects';
|
|
13
12
|
import { Client, Op, Query } from 'contensis-delivery-api';
|
|
14
|
-
import { s as
|
|
13
|
+
import { a as selectCurrentProject, s as selectRouteEntry, b as selectCurrentNode, c as selectCurrentAncestors, d as selectRouteEntryEntryId, e as selectRouteEntryLanguage, f as selectMappedEntry, q as queryParams, h as selectCurrentSearch } from './selectors-82e71d8e.js';
|
|
14
|
+
import { s as selectVersionStatus } from './version-59c8f9be.js';
|
|
15
15
|
import 'query-string';
|
|
16
|
-
import { a as selectCurrentProject, s as selectRouteEntry, b as selectCurrentNode, c as selectCurrentAncestors, d as selectRouteEntryEntryId, e as selectRouteEntryLanguage, f as selectMappedEntry, q as queryParams, g as selectCurrentSearch } from './selectors-68799788.js';
|
|
17
16
|
import { info, error } from 'loglevel';
|
|
18
|
-
import { s as selectClientCredentials } from './ToJs-
|
|
19
|
-
import { f as findContentTypeMapping, h as handleRequiresLoginSaga, g as getManagementApiClient, l as loginSagas } from './login-
|
|
17
|
+
import { s as selectClientCredentials } from './ToJs-52fee252.js';
|
|
18
|
+
import { f as findContentTypeMapping, h as handleRequiresLoginSaga, g as getManagementApiClient, l as loginSagas } from './login-92db44d1.js';
|
|
20
19
|
import { to } from 'await-to-js';
|
|
21
20
|
import 'react-hot-loader';
|
|
22
|
-
import { R as RouteLoader } from './RouteLoader-
|
|
21
|
+
import { R as RouteLoader } from './RouteLoader-c2faac87.js';
|
|
23
22
|
|
|
24
23
|
const selectedHistory = typeof window !== 'undefined' ? createBrowserHistory : createMemoryHistory;
|
|
25
24
|
const history = (options = {}) => selectedHistory(options);
|
|
@@ -415,8 +414,8 @@ function* getRouteSaga(action) {
|
|
|
415
414
|
const entryLinkDepth = appsays && appsays.entryLinkDepth || 3;
|
|
416
415
|
const setContentTypeLimits = !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions);
|
|
417
416
|
const state = yield select();
|
|
418
|
-
const routeEntry = selectRouteEntry(state);
|
|
419
|
-
const routeNode = selectCurrentNode(state);
|
|
417
|
+
const routeEntry = selectRouteEntry(state, 'js');
|
|
418
|
+
const routeNode = selectCurrentNode(state, 'js');
|
|
420
419
|
const currentPath = action.path; //selectCurrentPath(state);
|
|
421
420
|
|
|
422
421
|
const deliveryApiStatus = selectVersionStatus(state);
|
|
@@ -431,8 +430,10 @@ function* getRouteSaga(action) {
|
|
|
431
430
|
// - all staticRoutes (where custom 'route.fetchNode' attribute is falsey)
|
|
432
431
|
// - standard Contensis SiteView Routing where we already have that entry in state
|
|
433
432
|
if (routeEntry && (!staticRoute || staticRoute.route && staticRoute.route.fetchNode)) {
|
|
434
|
-
pathNode = routeNode
|
|
435
|
-
|
|
433
|
+
pathNode = { ...routeNode,
|
|
434
|
+
entry: null
|
|
435
|
+
};
|
|
436
|
+
pathNode.entry = entry = routeEntry; //Do nothing, the entry is allready the right one.
|
|
436
437
|
// yield put({
|
|
437
438
|
// type: SET_ENTRY,
|
|
438
439
|
// entry,
|
|
@@ -444,7 +445,7 @@ function* getRouteSaga(action) {
|
|
|
444
445
|
type: UPDATE_LOADING_STATE,
|
|
445
446
|
isLoading: false
|
|
446
447
|
});
|
|
447
|
-
} else yield call(setRouteEntry, routeEntry
|
|
448
|
+
} else yield call(setRouteEntry, routeEntry, yield select(selectCurrentNode), yield select(selectCurrentAncestors));
|
|
448
449
|
} else {
|
|
449
450
|
// Handle homepage
|
|
450
451
|
if (isHome) {
|
|
@@ -624,7 +625,7 @@ function* setRouteEntry(entry, node, ancestors, siblings, entryMapper, notFound
|
|
|
624
625
|
const entrySys = entry && entry.sys || {};
|
|
625
626
|
const currentEntryId = yield select(selectRouteEntryEntryId);
|
|
626
627
|
const currentEntryLang = yield select(selectRouteEntryLanguage);
|
|
627
|
-
const mappedEntry = currentEntryId === entrySys.id && currentEntryLang === entrySys.language && remapEntry === false ? (
|
|
628
|
+
const mappedEntry = currentEntryId === entrySys.id && currentEntryLang === entrySys.language && remapEntry === false ? (yield select(selectMappedEntry, 'js')) || {} : yield mapRouteEntry(entryMapper, { ...node,
|
|
628
629
|
entry,
|
|
629
630
|
ancestors,
|
|
630
631
|
siblings
|
|
@@ -674,7 +675,7 @@ function* clientReloadHitServer() {
|
|
|
674
675
|
// on the 2nd load stateEntry.sys should be null at this point,
|
|
675
676
|
// we do not wish to reload again and get stuck in an infinite reloading loop
|
|
676
677
|
|
|
677
|
-
if (typeof window !== 'undefined' && stateEntry && stateEntry.
|
|
678
|
+
if (typeof window !== 'undefined' && (stateEntry !== null && stateEntry !== void 0 && stateEntry.sys || null)) {
|
|
678
679
|
window.location.reload();
|
|
679
680
|
}
|
|
680
681
|
}
|
|
@@ -954,7 +955,7 @@ function* changePasswordSaga(action) {
|
|
|
954
955
|
yield put({
|
|
955
956
|
type: CHANGE_USER_PASSWORD_SENDING
|
|
956
957
|
});
|
|
957
|
-
const clientCredentials =
|
|
958
|
+
const clientCredentials = yield select(selectClientCredentials);
|
|
958
959
|
const client = yield getManagementApiClient({ ...clientCredentials
|
|
959
960
|
});
|
|
960
961
|
const [err, res] = yield to(client.security.users.updatePassword(changePasswordObject));
|
|
@@ -1043,4 +1044,4 @@ const AppRoot = props => {
|
|
|
1043
1044
|
};
|
|
1044
1045
|
|
|
1045
1046
|
export { AppRoot as A, browserHistory as b, deliveryApi as d, history as h, pickProject as p, rootSaga as r };
|
|
1046
|
-
//# sourceMappingURL=App-
|
|
1047
|
+
//# sourceMappingURL=App-122f28a3.js.map
|