@selfcommunity/react-core 0.2.5 → 0.3.0-alpha.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/lib/cjs/hooks/useSCAuth.d.ts.map +1 -1
- package/lib/cjs/hooks/useSCAuth.js +8 -3
- package/lib/cjs/hooks/useSCAuth.js.map +1 -1
- package/lib/cjs/hooks/useSCFetchFeed.d.ts.map +1 -1
- package/lib/cjs/hooks/useSCFetchFeed.js +17 -6
- package/lib/cjs/hooks/useSCFetchFeed.js.map +1 -1
- package/lib/esm/hooks/useSCAuth.d.ts.map +1 -1
- package/lib/esm/hooks/useSCAuth.js +8 -3
- package/lib/esm/hooks/useSCAuth.js.map +1 -1
- package/lib/esm/hooks/useSCFetchFeed.d.ts.map +1 -1
- package/lib/esm/hooks/useSCFetchFeed.js +17 -6
- package/lib/esm/hooks/useSCFetchFeed.js.map +1 -1
- package/lib/umd/react-core.js +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;
|
|
1
|
+
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;AA0EF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,cAAc,EAAE,aAAa;;;;;;EA8I5D"}
|
|
@@ -105,9 +105,14 @@ function stateInitializer(session) {
|
|
|
105
105
|
* Set http authorization if session type is OAuth or JWT
|
|
106
106
|
* Configure http object (Authorization, etc...)
|
|
107
107
|
*/
|
|
108
|
-
if ([Session.OAUTH_SESSION, Session.JWT_SESSION].includes(_session.type)
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
if ([Session.OAUTH_SESSION, Session.JWT_SESSION].includes(_session.type)) {
|
|
109
|
+
if (_session.authToken && _session.authToken.accessToken) {
|
|
110
|
+
api_services_1.http.setAuthorizeToken(_session.authToken.accessToken);
|
|
111
|
+
_isLoading = true;
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
api_services_1.http.setAuthorizeToken();
|
|
115
|
+
}
|
|
111
116
|
}
|
|
112
117
|
api_services_1.http.setSupportWithCredentials(_session.type === Session.COOKIE_SESSION);
|
|
113
118
|
return { user: null, session: _session, error: null, loading: _isLoading, isSessionRefreshing: false, refreshSession: false };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchFeed.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,YAAY,EAAsB,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAC,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAIvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;CAS/B,CAAC;
|
|
1
|
+
{"version":3,"file":"useSCFetchFeed.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,YAAY,EAAsB,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAC,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAIvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;CAS/B,CAAC;AAsHF;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE;IAC5C,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,YAAY,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,UAAU,CAAC,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA,KAAK,GAAG,CAAC;IAChD,cAAc,CAAC,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA,KAAK,GAAG,CAAC;IACpD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,cAAc,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;CACtD,OAmMA"}
|
|
@@ -41,16 +41,16 @@ function feedDataReducer(state, action) {
|
|
|
41
41
|
_state = Object.assign(Object.assign({}, state), { isLoadingNext: false, isLoadingPrevious: true });
|
|
42
42
|
break;
|
|
43
43
|
case exports.feedDataActionTypes.DATA_NEXT_LOADED:
|
|
44
|
-
_state = Object.assign(Object.assign(Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, results: [...state.results, ...action.payload.results], isLoadingNext: false, componentLoaded: true, next: action.payload.next }), (action.payload.previous ? { previous: action.payload.previous } : {})), (action.payload.count ? { count: action.payload.count } : {}));
|
|
44
|
+
_state = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, results: [...state.results, ...action.payload.results], isLoadingNext: false, componentLoaded: true, next: action.payload.next, nextPage: action.payload.nextPage }), (action.payload.previous ? { previous: action.payload.previous } : {})), (action.payload.count ? { count: action.payload.count } : {})), (action.payload.previousPage ? { previousPage: action.payload.previousPage } : {}));
|
|
45
45
|
break;
|
|
46
46
|
case exports.feedDataActionTypes.DATA_PREVIOUS_LOADED:
|
|
47
|
-
_state = Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, initialOffset: action.payload.initialOffset, results: [...action.payload.results, ...state.results], isLoadingPrevious: false, componentLoaded: true, previous: action.payload.previous });
|
|
47
|
+
_state = Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, initialOffset: action.payload.initialOffset, results: [...action.payload.results, ...state.results], isLoadingPrevious: false, componentLoaded: true, previous: action.payload.previous, previousPage: action.payload.previousPage });
|
|
48
48
|
break;
|
|
49
49
|
case exports.feedDataActionTypes.DATA_REVALIDATE:
|
|
50
50
|
_state = Object.assign(Object.assign({}, state), { results: action.payload.results });
|
|
51
51
|
break;
|
|
52
52
|
case exports.feedDataActionTypes.DATA_RELOAD:
|
|
53
|
-
_state = Object.assign(Object.assign({}, state), { next: action.payload.next, currentPage: 1, currentOffset: 0, initialOffset: 0, results: [], count: 0, previous: null, reload: true });
|
|
53
|
+
_state = Object.assign(Object.assign({}, state), { next: action.payload.next, currentPage: 1, previousPage: null, nextPage: null, currentOffset: 0, initialOffset: 0, results: [], count: 0, previous: null, reload: true });
|
|
54
54
|
break;
|
|
55
55
|
case exports.feedDataActionTypes.DATA_RELOADED:
|
|
56
56
|
_state = Object.assign(Object.assign({}, state), { componentLoaded: false, reload: false });
|
|
@@ -68,11 +68,16 @@ function feedDataReducer(state, action) {
|
|
|
68
68
|
*/
|
|
69
69
|
function stateInitializer(data) {
|
|
70
70
|
let _initState = Object.assign({ id: data.id, results: [], count: 0, next: data.next, previous: null, isLoadingNext: false, isLoadingPrevious: false, limit: data.queryParams.limit, currentPage: Math.ceil(data.queryParams.offset / data.queryParams.limit + 1), currentOffset: data.queryParams.offset, initialOffset: data.queryParams.offset, reload: false, componentLoaded: Boolean(data.prefetchedData) }, (data.prefetchedData && data.prefetchedData));
|
|
71
|
+
_initState['nextPage'] = _initState.next ? _initState.currentPage + 1 : null;
|
|
72
|
+
_initState['previousPage'] = _initState.previous ? _initState.currentPage - 1 : null;
|
|
71
73
|
const __feedStateCacheKey = (0, Cache_1.getStateFeedCacheKey)(data.id);
|
|
72
74
|
if (__feedStateCacheKey && utils_1.LRUCache.hasKey(__feedStateCacheKey) && data.cacheStrategy !== utils_1.CacheStrategies.NETWORK_ONLY) {
|
|
73
75
|
const _cachedStateData = utils_1.LRUCache.get(__feedStateCacheKey);
|
|
74
76
|
return Object.assign(Object.assign({}, _initState), _cachedStateData);
|
|
75
77
|
}
|
|
78
|
+
else if (data.prefetchedData) {
|
|
79
|
+
utils_1.LRUCache.set(__feedStateCacheKey, _initState);
|
|
80
|
+
}
|
|
76
81
|
return _initState;
|
|
77
82
|
}
|
|
78
83
|
/**
|
|
@@ -130,7 +135,7 @@ function useSCFetchFeed(props) {
|
|
|
130
135
|
* Get Feed data
|
|
131
136
|
*/
|
|
132
137
|
const performFetchData = (url, seekCache = true) => {
|
|
133
|
-
const __feedDataCacheKey = (0, Cache_1.getFeedCacheKey)(id,
|
|
138
|
+
const __feedDataCacheKey = (0, Cache_1.getFeedCacheKey)(id, url);
|
|
134
139
|
if (seekCache && utils_1.LRUCache.hasKey(__feedDataCacheKey) && cacheStrategy !== utils_1.CacheStrategies.NETWORK_ONLY) {
|
|
135
140
|
return Promise.resolve(utils_1.LRUCache.get(__feedDataCacheKey));
|
|
136
141
|
}
|
|
@@ -155,13 +160,15 @@ function useSCFetchFeed(props) {
|
|
|
155
160
|
dispatch({ type: exports.feedDataActionTypes.LOADING_PREVIOUS });
|
|
156
161
|
performFetchData(state.previous)
|
|
157
162
|
.then((res) => {
|
|
158
|
-
let currentOffset = Math.
|
|
163
|
+
let currentOffset = Math.max(getCurrentOffset(state.previous), 0);
|
|
159
164
|
let currentPage = Math.ceil(currentOffset / queryParams.limit + 1);
|
|
165
|
+
let previousPage = res.previous ? currentPage - 1 : null;
|
|
160
166
|
let count = res.count || state.count + res.results.length;
|
|
161
167
|
dispatch({
|
|
162
168
|
type: exports.feedDataActionTypes.DATA_PREVIOUS_LOADED,
|
|
163
169
|
payload: {
|
|
164
170
|
currentPage,
|
|
171
|
+
previousPage,
|
|
165
172
|
currentOffset,
|
|
166
173
|
count,
|
|
167
174
|
initialOffset: currentOffset,
|
|
@@ -189,12 +196,16 @@ function useSCFetchFeed(props) {
|
|
|
189
196
|
.then((res) => {
|
|
190
197
|
let currentOffset = Math.max(getCurrentOffset(res.next) - queryParams.limit, state.results.length);
|
|
191
198
|
let currentPage = Math.ceil(currentOffset / queryParams.limit + 1);
|
|
199
|
+
let nextPage = res.next ? currentPage + 1 : null;
|
|
192
200
|
let count = res.count || state.count + res.results.length;
|
|
193
201
|
dispatch({
|
|
194
202
|
type: exports.feedDataActionTypes.DATA_NEXT_LOADED,
|
|
195
203
|
payload: Object.assign({ currentPage,
|
|
204
|
+
nextPage,
|
|
196
205
|
currentOffset,
|
|
197
|
-
count, results: res.results, next: res.next, componentLoaded: true }, (queryParams.offset && state.results.length === 0
|
|
206
|
+
count, results: res.results, next: res.next, componentLoaded: true }, (queryParams.offset && state.results.length === 0
|
|
207
|
+
? { previous: res.previous, previousPage: res.previous ? currentPage - 1 : null }
|
|
208
|
+
: {})),
|
|
198
209
|
});
|
|
199
210
|
onNextPage && onNextPage(currentPage, currentOffset, count, res.results);
|
|
200
211
|
if (cacheStrategy === utils_1.CacheStrategies.STALE_WHILE_REVALIDATE) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchFeed.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":";;;AAAA,iCAAqD;AACrD,gDAAkD;AAElD,8DAAkG;AAClG,gDAAuE;AACvE,8CAAyE;AACzE,gDAA2D;AAkB3D;;;;;;GAMG;AACU,QAAA,mBAAmB,GAAG;IACjC,YAAY,EAAE,eAAe;IAC7B,gBAAgB,EAAE,mBAAmB;IACrC,gBAAgB,EAAE,mBAAmB;IACrC,oBAAoB,EAAE,uBAAuB;IAC7C,eAAe,EAAE,kBAAkB;IACnC,WAAW,EAAE,cAAc;IAC3B,aAAa,EAAE,gBAAgB;IAC/B,WAAW,EAAE,cAAc;CAC5B,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,KAAK,EAAE,MAAM;IACpC,IAAI,MAAM,CAAC;IACX,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,2BAAmB,CAAC,YAAY;YACnC,MAAM,mCAAO,KAAK,KAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,GAAC,CAAC;YACnE,MAAM;QACR,KAAK,2BAAmB,CAAC,gBAAgB;YACvC,MAAM,mCAAO,KAAK,KAAE,aAAa,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,GAAC,CAAC;YACnE,MAAM;QACR,KAAK,2BAAmB,CAAC,gBAAgB;YACvC,MAAM
|
|
1
|
+
{"version":3,"file":"useSCFetchFeed.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;
|
|
1
|
+
{"version":3,"file":"useSCAuth.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAMrD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;AA0EF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,cAAc,EAAE,aAAa;;;;;;EA8I5D"}
|
|
@@ -76,9 +76,14 @@ function stateInitializer(session) {
|
|
|
76
76
|
* Set http authorization if session type is OAuth or JWT
|
|
77
77
|
* Configure http object (Authorization, etc...)
|
|
78
78
|
*/
|
|
79
|
-
if ([Session.OAUTH_SESSION, Session.JWT_SESSION].includes(_session.type)
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
if ([Session.OAUTH_SESSION, Session.JWT_SESSION].includes(_session.type)) {
|
|
80
|
+
if (_session.authToken && _session.authToken.accessToken) {
|
|
81
|
+
http.setAuthorizeToken(_session.authToken.accessToken);
|
|
82
|
+
_isLoading = true;
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
http.setAuthorizeToken();
|
|
86
|
+
}
|
|
82
87
|
}
|
|
83
88
|
http.setSupportWithCredentials(_session.type === Session.COOKIE_SESSION);
|
|
84
89
|
return { user: null, session: _session, error: null, loading: _isLoading, isSessionRefreshing: false, refreshSession: false };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useSCAuth.js","sourceRoot":"","sources":["../../../src/hooks/useSCAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchFeed.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,YAAY,EAAsB,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAC,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAIvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;CAS/B,CAAC;
|
|
1
|
+
{"version":3,"file":"useSCFetchFeed.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,YAAY,EAAsB,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAC,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAIvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;CAS/B,CAAC;AAsHF;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE;IAC5C,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,YAAY,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,UAAU,CAAC,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA,KAAK,GAAG,CAAC;IAChD,cAAc,CAAC,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,IAAI,KAAA,KAAK,GAAG,CAAC;IACpD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,cAAc,CAAC,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;CACtD,OAmMA"}
|
|
@@ -38,16 +38,16 @@ function feedDataReducer(state, action) {
|
|
|
38
38
|
_state = Object.assign(Object.assign({}, state), { isLoadingNext: false, isLoadingPrevious: true });
|
|
39
39
|
break;
|
|
40
40
|
case feedDataActionTypes.DATA_NEXT_LOADED:
|
|
41
|
-
_state = Object.assign(Object.assign(Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, results: [...state.results, ...action.payload.results], isLoadingNext: false, componentLoaded: true, next: action.payload.next }), (action.payload.previous ? { previous: action.payload.previous } : {})), (action.payload.count ? { count: action.payload.count } : {}));
|
|
41
|
+
_state = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, results: [...state.results, ...action.payload.results], isLoadingNext: false, componentLoaded: true, next: action.payload.next, nextPage: action.payload.nextPage }), (action.payload.previous ? { previous: action.payload.previous } : {})), (action.payload.count ? { count: action.payload.count } : {})), (action.payload.previousPage ? { previousPage: action.payload.previousPage } : {}));
|
|
42
42
|
break;
|
|
43
43
|
case feedDataActionTypes.DATA_PREVIOUS_LOADED:
|
|
44
|
-
_state = Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, initialOffset: action.payload.initialOffset, results: [...action.payload.results, ...state.results], isLoadingPrevious: false, componentLoaded: true, previous: action.payload.previous });
|
|
44
|
+
_state = Object.assign(Object.assign({}, state), { currentPage: action.payload.currentPage, currentOffset: action.payload.currentOffset, initialOffset: action.payload.initialOffset, results: [...action.payload.results, ...state.results], isLoadingPrevious: false, componentLoaded: true, previous: action.payload.previous, previousPage: action.payload.previousPage });
|
|
45
45
|
break;
|
|
46
46
|
case feedDataActionTypes.DATA_REVALIDATE:
|
|
47
47
|
_state = Object.assign(Object.assign({}, state), { results: action.payload.results });
|
|
48
48
|
break;
|
|
49
49
|
case feedDataActionTypes.DATA_RELOAD:
|
|
50
|
-
_state = Object.assign(Object.assign({}, state), { next: action.payload.next, currentPage: 1, currentOffset: 0, initialOffset: 0, results: [], count: 0, previous: null, reload: true });
|
|
50
|
+
_state = Object.assign(Object.assign({}, state), { next: action.payload.next, currentPage: 1, previousPage: null, nextPage: null, currentOffset: 0, initialOffset: 0, results: [], count: 0, previous: null, reload: true });
|
|
51
51
|
break;
|
|
52
52
|
case feedDataActionTypes.DATA_RELOADED:
|
|
53
53
|
_state = Object.assign(Object.assign({}, state), { componentLoaded: false, reload: false });
|
|
@@ -65,11 +65,16 @@ function feedDataReducer(state, action) {
|
|
|
65
65
|
*/
|
|
66
66
|
function stateInitializer(data) {
|
|
67
67
|
let _initState = Object.assign({ id: data.id, results: [], count: 0, next: data.next, previous: null, isLoadingNext: false, isLoadingPrevious: false, limit: data.queryParams.limit, currentPage: Math.ceil(data.queryParams.offset / data.queryParams.limit + 1), currentOffset: data.queryParams.offset, initialOffset: data.queryParams.offset, reload: false, componentLoaded: Boolean(data.prefetchedData) }, (data.prefetchedData && data.prefetchedData));
|
|
68
|
+
_initState['nextPage'] = _initState.next ? _initState.currentPage + 1 : null;
|
|
69
|
+
_initState['previousPage'] = _initState.previous ? _initState.currentPage - 1 : null;
|
|
68
70
|
const __feedStateCacheKey = getStateFeedCacheKey(data.id);
|
|
69
71
|
if (__feedStateCacheKey && LRUCache.hasKey(__feedStateCacheKey) && data.cacheStrategy !== CacheStrategies.NETWORK_ONLY) {
|
|
70
72
|
const _cachedStateData = LRUCache.get(__feedStateCacheKey);
|
|
71
73
|
return Object.assign(Object.assign({}, _initState), _cachedStateData);
|
|
72
74
|
}
|
|
75
|
+
else if (data.prefetchedData) {
|
|
76
|
+
LRUCache.set(__feedStateCacheKey, _initState);
|
|
77
|
+
}
|
|
73
78
|
return _initState;
|
|
74
79
|
}
|
|
75
80
|
/**
|
|
@@ -127,7 +132,7 @@ export default function useSCFetchFeed(props) {
|
|
|
127
132
|
* Get Feed data
|
|
128
133
|
*/
|
|
129
134
|
const performFetchData = (url, seekCache = true) => {
|
|
130
|
-
const __feedDataCacheKey = getFeedCacheKey(id,
|
|
135
|
+
const __feedDataCacheKey = getFeedCacheKey(id, url);
|
|
131
136
|
if (seekCache && LRUCache.hasKey(__feedDataCacheKey) && cacheStrategy !== CacheStrategies.NETWORK_ONLY) {
|
|
132
137
|
return Promise.resolve(LRUCache.get(__feedDataCacheKey));
|
|
133
138
|
}
|
|
@@ -152,13 +157,15 @@ export default function useSCFetchFeed(props) {
|
|
|
152
157
|
dispatch({ type: feedDataActionTypes.LOADING_PREVIOUS });
|
|
153
158
|
performFetchData(state.previous)
|
|
154
159
|
.then((res) => {
|
|
155
|
-
let currentOffset = Math.
|
|
160
|
+
let currentOffset = Math.max(getCurrentOffset(state.previous), 0);
|
|
156
161
|
let currentPage = Math.ceil(currentOffset / queryParams.limit + 1);
|
|
162
|
+
let previousPage = res.previous ? currentPage - 1 : null;
|
|
157
163
|
let count = res.count || state.count + res.results.length;
|
|
158
164
|
dispatch({
|
|
159
165
|
type: feedDataActionTypes.DATA_PREVIOUS_LOADED,
|
|
160
166
|
payload: {
|
|
161
167
|
currentPage,
|
|
168
|
+
previousPage,
|
|
162
169
|
currentOffset,
|
|
163
170
|
count,
|
|
164
171
|
initialOffset: currentOffset,
|
|
@@ -186,12 +193,16 @@ export default function useSCFetchFeed(props) {
|
|
|
186
193
|
.then((res) => {
|
|
187
194
|
let currentOffset = Math.max(getCurrentOffset(res.next) - queryParams.limit, state.results.length);
|
|
188
195
|
let currentPage = Math.ceil(currentOffset / queryParams.limit + 1);
|
|
196
|
+
let nextPage = res.next ? currentPage + 1 : null;
|
|
189
197
|
let count = res.count || state.count + res.results.length;
|
|
190
198
|
dispatch({
|
|
191
199
|
type: feedDataActionTypes.DATA_NEXT_LOADED,
|
|
192
200
|
payload: Object.assign({ currentPage,
|
|
201
|
+
nextPage,
|
|
193
202
|
currentOffset,
|
|
194
|
-
count, results: res.results, next: res.next, componentLoaded: true }, (queryParams.offset && state.results.length === 0
|
|
203
|
+
count, results: res.results, next: res.next, componentLoaded: true }, (queryParams.offset && state.results.length === 0
|
|
204
|
+
? { previous: res.previous, previousPage: res.previous ? currentPage - 1 : null }
|
|
205
|
+
: {})),
|
|
195
206
|
});
|
|
196
207
|
onNextPage && onNextPage(currentPage, currentOffset, count, res.results);
|
|
197
208
|
if (cacheStrategy === CacheStrategies.STALE_WHILE_REVALIDATE) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSCFetchFeed.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,UAAU,EAAC,MAAM,OAAO,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAe,IAAI,EAAoC,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAkB3D;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,YAAY,EAAE,eAAe;IAC7B,gBAAgB,EAAE,mBAAmB;IACrC,gBAAgB,EAAE,mBAAmB;IACrC,oBAAoB,EAAE,uBAAuB;IAC7C,eAAe,EAAE,kBAAkB;IACnC,WAAW,EAAE,cAAc;IAC3B,aAAa,EAAE,gBAAgB;IAC/B,WAAW,EAAE,cAAc;CAC5B,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,KAAK,EAAE,MAAM;IACpC,IAAI,MAAM,CAAC;IACX,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,mBAAmB,CAAC,YAAY;YACnC,MAAM,mCAAO,KAAK,KAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,GAAC,CAAC;YACnE,MAAM;QACR,KAAK,mBAAmB,CAAC,gBAAgB;YACvC,MAAM,mCAAO,KAAK,KAAE,aAAa,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,GAAC,CAAC;YACnE,MAAM;QACR,KAAK,mBAAmB,CAAC,gBAAgB;YACvC,MAAM
|
|
1
|
+
{"version":3,"file":"useSCFetchFeed.js","sourceRoot":"","sources":["../../../src/hooks/useSCFetchFeed.ts"],"names":[],"mappings":"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"}
|