Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added check for undefined for contentful #6800

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

added check for undefined for contentful #6800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 36 additions & 34 deletions src/shared/reducers/contentful/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,43 +120,45 @@ function onQueryContentDone(state, action) {

/* Adds matched items to items collection. */
const d = _.omit(data, 'includes');
let a = collectionActions.addItems(_.keyBy(data.items, i => i.sys.id));
res.items = reduceCollection(res.items, a);

/* Adds query itself to the quries collection. */
d.items = d.items.map(i => i.sys.id);
a = collectionActions.loadItemDone(operationId, queryId, d);
res.queries = reduceCollection(res.queries, a);

/* In case the resulting query match is different from the one stored in the
* old state, we should correctly update reference counters of the newly
* matched items, and of the items not matched anymore. */

const q = state.queries[queryId];

let added = [];
const gone = [];
if (q.item) {
const neu = new Set(d.items);
const old = new Set(q.item.items);
d.items.forEach((id) => {
if (!old.has(id)) added.push(id);
});
q.item.items.forEach((id) => {
if (!neu.has(id)) gone.push(id);
});
} else added = d.items;

if (added.length) {
a = collectionActions.bookItems(added, q.numRefs);
/* sometimes contentful returns no data, so just return current state if that happens */
if (data && data.items) {
let a = collectionActions.addItems(_.keyBy(data.items, i => i.sys.id));
res.items = reduceCollection(res.items, a);
}

if (gone.length) {
a = collectionActions.freeItems(gone, q.numRefs);
res.items = reduceCollection(res.items, a);
/* Adds query itself to the quries collection. */
d.items = d.items.map(i => i.sys.id);
a = collectionActions.loadItemDone(operationId, queryId, d);
res.queries = reduceCollection(res.queries, a);

/* In case the resulting query match is different from the one stored in the
* old state, we should correctly update reference counters of the newly
* matched items, and of the items not matched anymore. */

const q = state.queries[queryId];

let added = [];
const gone = [];
if (q.item) {
const neu = new Set(d.items);
const old = new Set(q.item.items);
d.items.forEach((id) => {
if (!old.has(id)) added.push(id);
});
q.item.items.forEach((id) => {
if (!neu.has(id)) gone.push(id);
});
} else added = d.items;

if (added.length) {
a = collectionActions.bookItems(added, q.numRefs);
res.items = reduceCollection(res.items, a);
}

if (gone.length) {
a = collectionActions.freeItems(gone, q.numRefs);
res.items = reduceCollection(res.items, a);
}
}

return res;
}

Expand Down