DatoCMS client library upgrade #58
Conversation
DonatoM
changed the title
netlify.toml
Outdated
| @@ -5,3 +5,6 @@ | |||
|
|
|||
| [context.staging] | |||
| command = "npm run stage" | |||
|
|
|||
| [context.donato_datocms_client_library_update] | |||
There was a problem hiding this comment.
Will remove this once this PR gets approved.
| title: this.title, | ||
| alt: this.alt, | ||
| url: this.url(), | ||
| path: this.path |
There was a problem hiding this comment.
Needed to override this method because components rely on receiving a relative URL rather than an absolute URL.
There was a problem hiding this comment.
should we refactor components to use the absolute URL in the future? If so, lets make a quick issue about it so we don't forget
There was a problem hiding this comment.
Yeah, that would remove the need for the monkey patch altogether. I'll go ahead and create an issue for it.
There was a problem hiding this comment.
Leaving you the approval since I can trust you'll implement some things and do one final build on staging to verify everything is all good!
I think the routes generation is in routes-util already so that's the biggest thing I want to avoid moving back into static.config.js. But the focus here is just to get the site back up and working, we can revisit the rest next weekend.
netlify.toml
Outdated
| @@ -5,3 +5,6 @@ | |||
|
|
|||
| [context.staging] | |||
| command = "npm run stage" | |||
|
|
|||
| [context.donato_datocms_client_library_update] | |||
| "datocms-search": "^0.1.7", | ||
| "dotenv": "^6.2.0", |
There was a problem hiding this comment.
Was getting an error locally as well as on Netlify
| @@ -42,7 +42,7 @@ const HomePage = ({ | |||
| </Head> | |||
| <div className="g-content-wrap"> | |||
| <section className="featured-post"> | |||
| <Post {...mainFeaturedPost} useThumbnail /> | |||
| <Post {...mainFeaturedPost[0]} useThumbnail /> | |||
There was a problem hiding this comment.
is this because of the other logic that turns non-arrays into an array with a single item? Or is this something else?
There was a problem hiding this comment.
Yep, it's the logic that turns everything into an array.
src/datocms/client.js
Outdated
|
|
||
| export default class DatoClient { | ||
| constructor(credentials = { token: null }) { | ||
| if (!credentials.token) throw new Error('Missing Datocms Credentials'); | ||
| this.client = new SiteClient(credentials.token); | ||
| this.loader = new Loader(this.client, false); |
There was a problem hiding this comment.
I think the second argument of the constructor defaults to false already so we can remove that from here i think. ref
src/datocms/client.js
Outdated
| return this.client.fields.find(itemTypeID); | ||
| await this.loader.load(); | ||
| const content = this.loader.itemsRepo.collectionsByType; | ||
| return content; |
There was a problem hiding this comment.
we can just return here since we're not using the variable.
There was a problem hiding this comment.
in the future maybe we wrap the itemsRepo properties in getter methods here for convenience. Nice shit nonetheless, man!
| }); | ||
|
|
||
| let fields = []; | ||
| const uniqueFields = uniq(models.reduce((arr, m) => arr.concat(m.fields), [])); |
| return item; | ||
| }); | ||
| modelContent.forEach(record => { | ||
| try { |
There was a problem hiding this comment.
why are we wrapping this in a try/catch if we don't throw any errors at all or use any Promises here?
There was a problem hiding this comment.
Sometimes calling toMap() raises an error. Didn't have much time to investigate. Nothing stuck out whem checking pages in staging. Perhaps this is something we can come back to.
Stacktrace for the error I get when calling toMap():
TypeError: Cannot read property 'width' of undefined
[0] at File.get (/Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/local/fields/File.js:75:26)
[0] at /Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/utils/seoTagsBuilder.js:133:20
[0] at Array.find (native)
[0] at image (/Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/utils/seoTagsBuilder.js:132:8)
[0] at /Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/utils/seoTagsBuilder.js:149:18
[0] at Array.reduce (<anonymous>)
[0] at seoTagsBuilder (/Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/utils/seoTagsBuilder.js:148:34)
[0] at Item.get (/Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/local/Item.js:235:44)
[0] at Item.toMap (/Users/donatocruz/Desktop/jc/jewish-currents-static/node_modules/datocms-client/lib/local/Item.js:105:16)
[0] at /Users/donatocruz/Desktop/jc/jewish-currents-static/src/datocms/normalizer.js:34:45
static.config.js
Outdated
| const final = flatten(routes); | ||
| console.log(`Processed ${final.length} Post routes`); | ||
| return final; | ||
| }; |
There was a problem hiding this comment.
Why did we move these pagination functions back in here? Can't we keep them where they were or were there changes made to them?
I want to keep this file from growing out of proportion with what is necessary for understanding React Static's main config file. As a sidenote, we could also make an issue for changing this all up to utilize React Static's logic for generating page routes: makePageRoutes
There was a problem hiding this comment.
My bad I'm not sure why I copied this a while ago. Created the issue here: #60
* upgrade datocms-clientjs library, adjust data normalizer to properly search for the model type * update the netlify staging environment branch * add dotenv dependency * add build wip refactor * monkey patch file toMap implementation and remove unused code * leave a comment around required fields mapping and refactor build process a bit * leverage local build cache * remove unnecessary undefined checks * remove duplicate code * remove explicit declaration of previewMode in the Dato Loader * no longer automatically deploy this branch to the staging environment
No description provided.