Config : Airtable.s + Node for dynamic content importing #50

pkane · 2023-11-28T17:49:08Z

Description

Add airtable.js dependency
Custom node script for pulling in airtable xd.gov content

Testing

For testing, make an edit to airtable-cache.json and commit to this branch.

…s. Starter test code for importing airtable into page via script element

…_news' element

…tion for apply page to show team bios content

…result

…curtis

…down files in new 'collections/_import' directory.

add env var for api key

swap api key for env var

… airtable js to include relevant layout info for build interpreter

…at-integration-curtis

… in generated markdown files

…and markdown files

curt-mitch-census

LGTM! I left a bunch of comments on the airtable.js file, but they're mostly code style-related. The main thing to confirm or update is the Ruby version.

curt-mitch-census · 2023-12-08T20:28:45Z

Gemfile.lock

@@ -94,7 +96,7 @@ DEPENDENCIES
  webrick

 RUBY VERSION
-   ruby 3.1.3p185
+   ruby 3.2.2p53


Does the site still build with this version of Ruby? I ask because there was a Jekyll bug that caused us to fall back to 3.1.3. If it looks like everything is working as expected, we can go ahead and migrate to 3.2.2, in which case we should update the .ruby-version file as well since that's what cloud.gov uses when it builds the site (and we'll know if the version is still breaking with the Pages build Action step).

Yes, and actually I refrained from committing the .Gemfile with the version change of 3.1.3 -> 3.2.2.
Should I include that as well?

Yeah, let's go ahead and update both the Gemfile and .ruby-version.

_layouts/bios.html

curt-mitch-census · 2023-12-08T20:30:44Z

airtable.js

+const fs = require('fs');
+const Airtable = require('airtable');
+
+const base = new Airtable({apiKey: process.env.AIRTABLE_API_KEY}).base('appuZMt69pZnTis2t');


Should we make the base ID an env variable as well?

curt-mitch-census · 2023-12-08T20:45:03Z

airtable.js

+
+// Utility function we'll use to compare our data
+const deepCompare = (arg1, arg2) => {
+    if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){


Instead of referencing call directly on the prototype's toString method, we should just be able to use toString directly:

Suggested change

if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){

if (arg1.toString() === arg2.toString()){

Yeah I pulled this from an old comparison snippet I had saved. I think it was written this way to avoid errors when trying to run .toString() on a null or undefined type. I might be mistaken and maybe this doesn't occur in ES6 anymore. But here's what I'm referring to...

To use the base Object.prototype.toString() with an object that has it overridden (or to invoke it on null or undefined), you need to call Function.prototype.call() or Function.prototype.apply() on it, passing the object you want to inspect as the first parameter (called thisArg).

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/toString

Ah, I see. In that case maybe it makes more sense to compare them via JSON.stringify:

Suggested change

if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){

if (JSON.stringify(arg1) === JSON.stringify(arg2)){

airtable.js

curt-mitch-census · 2023-12-08T21:01:47Z

airtable.js

+// Utility function we'll use to compare our data
+const deepCompare = (arg1, arg2) => {
+    if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){
+      if (Object.prototype.toString.call(arg1) === '[object Object]' || Object.prototype.toString.call(arg1) === '[object Array]' ){


Here we can use the toString method directly for the first part of the conditional, and Array.isArray for the second part:

Suggested change

if (Object.prototype.toString.call(arg1) === '[object Object]' || Object.prototype.toString.call(arg1) === '[object Array]' ){

if (arg1.toString() === '[object Object]' || Array.isArray(arg1)){

.github/workflows/airtable.yml

curt-mitch-census · 2023-12-13T19:07:16Z

airtable.js

-    if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){
-      if (Object.prototype.toString.call(arg1) === '[object Object]' || Object.prototype.toString.call(arg1) === '[object Array]' ){
+    if (JSON.stringify(arg1) === JSON.stringify(arg2)){
+      if (JSON.stringify(arg1) === '[object Object]' || Array.isArray(arg1)){


Sorry, I should be more explicit for this line since the JSON.stringify method shouldn't ever return '[object Object]'. Here we should probably use typeof like so:

typeof arg1 === 'object' || Array.isArray(arg1))

Whoops, sorry about that! I haphazardly grouped that in with the other changes.

curt-mitch-census · 2023-12-14T19:03:23Z

Closing this PR in favor of #60 .

pkane and others added 14 commits November 16, 2023 15:52

Add airtable dependency, along with new package and package-lock file…

3d16eb1

…s. Starter test code for importing airtable into page via script element

Swap require import for Airtable.js CDN import

762a64a

Add Curtis Airtable API token

cd67fac

Update base ID

4145e9a

Updates to API to get first 6 records of site content

26fc195

Create xdContent object from record fields. Render test data to 'more…

cc80724

…_news' element

Separate the content and markup creation logic. Create separate condi…

0646e96

…tion for apply page to show team bios content

Test parsing of image content, adding image tags to page.

d4d2420

Merge branch 'master' into at-integration-curtis

0441f45

Create node script to read from airtable, write cache json file from …

e31ad79

…result

Merge branch 'master' of github.com:XDgov/xd.gov into at-integration-…

0b324dc

…curtis

Create structure for generating markup and writing to news, bios mark…

367b75a

…down files in new 'collections/_import' directory.

Use deepCompare function to compare to cache, handle accordingly

cce4276

Remove test js from javascript include file

de1f12f

pkane requested review from ian-gov and curt-mitch-census November 28, 2023 17:49

pkane marked this pull request as draft November 28, 2023 17:49

pkane and others added 13 commits November 28, 2023 12:52

Cleanup logs

57a5099

Restore master version of home and apply page files.

dfbe1f0

Create workflow folder and test airtable action

712af6e

Gemfile lockfile update platforms list

0366c46

Restore liquid dependency version. Rename airtable action

24092c2

Add npm install step to actions

d8015f9

Update airtable.yml

94350ef

add env var for api key

Update airtable.js

adc8c55

swap api key for env var

Update config file to build from new import collections files. Update…

fd8164d

… airtable js to include relevant layout info for build interpreter

Merge branch 'at-integration-curtis' of github.com:XDgov/xd.gov into …

64a561c

…at-integration-curtis

Adjust markup concatenation in string literal to fix formatting issue…

9de6e7f

… in generated markdown files

Updated cache and markdown files

ddb8510

Create new layout type for bios. Add simple grid styling.

f0630b5

pkane added 6 commits November 30, 2023 13:35

Restore private key lookup

ddb6a8d

Update workflow to create new pr after building

ad47270

Replace pr step with CPR marketplace action

6fc0a3d

Update gitignore with vendor and .bundle folders

f234501

Create new news landing layout type, update config

e0714a0

Update airtable script to include image alt attributes. Commit cache …

12355a8

…and markdown files

pkane marked this pull request as ready for review December 8, 2023 20:21

curt-mitch-census approved these changes Dec 8, 2023

View reviewed changes

pkane added 8 commits December 11, 2023 09:57

Comment out hiring include within new layouts

23f0e99

Cleanup anonymous functions for consistency.

05360e6

leverage object destructuring for cleaner markup construction functions

4d37ac0

Update airtable workflow with named jekyll build step

4fb425c

Update bios and cache file

3d2ccbc

Update ruby version

4b744d9

Refactor object prototype call to use json stringify and array isarray

ffc4563

Airtable console comment

1a5adf4

curt-mitch-census reviewed Dec 13, 2023

View reviewed changes

pkane added 2 commits December 13, 2023 15:25

Fix typeof erroneous change

dcb672d

Liquid dependency version update

6213aa0

curt-mitch-census mentioned this pull request Dec 14, 2023

Airtable Script + Pages dependency fix #60

Merged

curt-mitch-census closed this Dec 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Config : Airtable.s + Node for dynamic content importing #50

Config : Airtable.s + Node for dynamic content importing #50

pkane commented Nov 28, 2023 •

edited

Loading

curt-mitch-census left a comment

curt-mitch-census Dec 8, 2023

pkane Dec 11, 2023

curt-mitch-census Dec 12, 2023

curt-mitch-census Dec 8, 2023

curt-mitch-census Dec 8, 2023

pkane Dec 11, 2023

curt-mitch-census Dec 12, 2023

curt-mitch-census Dec 8, 2023

curt-mitch-census Dec 13, 2023

pkane Dec 13, 2023

curt-mitch-census commented Dec 14, 2023

	if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){
	if (arg1.toString() === arg2.toString()){

	if (Object.prototype.toString.call(arg1) === Object.prototype.toString.call(arg2)){
	if (JSON.stringify(arg1) === JSON.stringify(arg2)){

	if (Object.prototype.toString.call(arg1) === '[object Object]' \|\| Object.prototype.toString.call(arg1) === '[object Array]' ){
	if (arg1.toString() === '[object Object]' \|\| Array.isArray(arg1)){

Config : Airtable.s + Node for dynamic content importing #50

Config : Airtable.s + Node for dynamic content importing #50

Conversation

pkane commented Nov 28, 2023 • edited Loading

Description

Testing

curt-mitch-census left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

curt-mitch-census commented Dec 14, 2023

pkane commented Nov 28, 2023 •

edited

Loading