Skip to content

Use setData for model fetches as well as collection fetches. #3132

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

Merged
bjester merged 1 commit into from
May 4, 2021
Merged

Use setData for model fetches as well as collection fetches. #3132

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
24 changes: 3 additions & 21 deletions contentcuration/contentcuration/frontend/shared/data/resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import isFunction from 'lodash/isFunction';
import isString from 'lodash/isString';
import matches from 'lodash/matches';
import overEvery from 'lodash/overEvery';
import pick from 'lodash/pick';
import sortBy from 'lodash/sortBy';
import uniq from 'lodash/uniq';
import uniqBy from 'lodash/uniqBy';
Expand Down Expand Up @@ -177,7 +176,6 @@ class IndexedDBResource {
idField = 'id',
uuid = true,
indexFields = [],
annotatedFilters = [],
syncable = false,
listeners = {},
...options
Expand All @@ -188,10 +186,6 @@ class IndexedDBResource {
this.schema = [idField, ...indexFields].join(',');
this.rawIdField = idField;
this.indexFields = new Set([idField, ...indexFields]);
// A list of property names that if we filter by them, we will stamp them on
// the data returned from the API endpoint, so that we can requery them again
// via indexedDB.
this.annotatedFilters = annotatedFilters;

INDEXEDDB_RESOURCES[tableName] = this;
copyProperties(this, options);
Expand Down Expand Up @@ -237,7 +231,7 @@ class IndexedDBResource {
});
}

setData(itemData, annotatedFilters = {}) {
setData(itemData) {
const now = Date.now();
// Explicitly set the source of this as a fetch
// from the server, to prevent us from trying
Expand All @@ -263,7 +257,6 @@ class IndexedDBResource {
const data = itemData
.map(datum => {
datum[LAST_FETCHED] = now;
Object.assign(datum, annotatedFilters);
const id = this.getIdValue(datum);
// If we have an updated change, apply the modifications here
if (
Expand Down Expand Up @@ -575,8 +568,7 @@ class Resource extends mix(APIResource, IndexedDBResource) {
pageData = response.data;
itemData = pageData.results;
}
const annotatedFilters = pick(params, this.annotatedFilters);
return this.setData(itemData, annotatedFilters).then(data => {
return this.setData(itemData).then(data => {
// setData also applies any outstanding local change events to the data
// so we return the data returned from setData to make sure the most up to date
// representation is returned from the fetch.
Expand Down Expand Up @@ -638,17 +630,7 @@ class Resource extends mix(APIResource, IndexedDBResource) {

fetchModel(id) {
return client.get(this.modelUrl(id)).then(response => {
const now = Date.now();
const data = response.data;
data[LAST_FETCHED] = now;
// Explicitly set the source of this as a fetch
// from the server, to prevent us from trying
// to sync these changes back to the server!
return this.transaction({ mode: 'rw', source: IGNORED_SOURCE }, () => {
return this.table.put(data).then(() => {
return data;
});
});
return this.setData([response.data]).then(data => data[0]);
});
}

Expand Down