Update to the latest version of arango-tools (canada-ca#1592)

sleepycat · web-flow · commit 7628b9631959 · 2021-02-05T11:44:24.000-05:00
Arangojs renamed methods on the cursor and transaction objects, which where returned by Arango-tools. Given code makes some extensive use of those methods, Arango-tools now returns a proxy object that translates the old calls (cursor.each and transaction.run) to the new calls (cursor.forEach and transaction.step). cursor.hasNext was changed from a function to a boolean so this was fixed by a simple search and replace. Details: https://arangodb.github.io/arangojs/CHANGELOG#cursor-api-1
diff --git a/api-js/package-lock.json b/api-js/package-lock.json
diff --git a/api-js/package.json b/api-js/package.json
@@ -11,6 +11,7 @@
     "build": "npm run clean && babel ./src --out-dir dist/src --ignore 'src/**/*.spec.js','src/**/*.test.js' && babel index.js migrations.js --out-dir dist/",
     "start": "node ./dist/index.js",
     "dev": "nodemon --exec babel-node index.js",
+    "dbg": "node --inspect-brk node_modules/.bin/jest --runInBand --no-cache",
     "clean": "rm -rf ./dist && mkdir dist",
     "test": "jest",
     "test-coverage": "jest --coverage",
@@ -24,7 +25,7 @@
     "@lingui/core": "^3.4.0",
     "apollo-server": "^2.19.2",
     "apollo-server-express": "^2.19.2",
-    "arango-tools": "^0.0.9",
+    "arango-tools": "^0.2.3",
     "arangojs": "^7.2.0",
     "bcryptjs": "^2.4.3",
     "cors": "^2.8.5",
diff --git a/api-js/src/affiliation/loaders/__tests__/load-affiliations-by-key.test.js b/api-js/src/affiliation/loaders/__tests__/load-affiliations-by-key.test.js
@@ -148,7 +148,7 @@ describe('given a affiliationLoaderByKey dataloader', () => {
             RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey, _type: "affiliation" })
         `
 
-        while (expectedCursor.hasNext()) {
+        while (expectedCursor.hasNext) {
           const tempAff = await expectedCursor.next()
           affiliationIds.push(tempAff._key)
           expectedAffiliations.push(tempAff)
@@ -265,7 +265,7 @@ describe('given a affiliationLoaderByKey dataloader', () => {
             RETURN MERGE(affiliation, { id: affiliation._key, orgKey: orgKey, userKey: userKey, _type: "affiliation" })
         `
 
-        while (expectedCursor.hasNext()) {
+        while (expectedCursor.hasNext) {
           const tempAff = await expectedCursor.next()
           affiliationIds.push(tempAff._key)
           expectedAffiliations.push(tempAff)
diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js
@@ -100,7 +100,7 @@ describe('given the dmarcSumLoaderByKey dataloader', () => {
           }
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const temp = await expectedCursor.next()
         summaryKeys.push(temp._key)
         expectedSummaries.push(temp)
diff --git a/api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js b/api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js
@@ -61,7 +61,7 @@ describe('given a domainLoaderByDomain dataloader', () => {
           RETURN MERGE({ id: domain._key, _type: "domain" }, domain)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDomain = await expectedCursor.next()
         domainDomains.push(tempDomain.domain)
         expectedDomains.push(tempDomain)
diff --git a/api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js b/api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js
@@ -63,7 +63,7 @@ describe('given a domainLoaderByKey dataloader', () => {
           RETURN MERGE({ id: domain._key, _type: "domain" }, domain)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDomain = await expectedCursor.next()
         domainIds.push(tempDomain._key)
         expectedDomains.push(tempDomain)
diff --git a/api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js
@@ -71,7 +71,7 @@ describe('given the dkimLoaderByKey function', () => {
           RETURN MERGE({ id: dkimScan._key, _type: "dkim" }, dkimScan)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDkim = await expectedCursor.next()
         dkimKeys.push(tempDkim._key)
         expectedDkimScans.push(tempDkim)
diff --git a/api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js
@@ -71,7 +71,7 @@ describe('given the dkimResultLoaderByKey function', () => {
           RETURN MERGE({ id: dkimResult._key, _type: "dkimResult"  }, dkimResult)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDkimResult = await expectedCursor.next()
         dkimResultKeys.push(tempDkimResult._key)
         expectedDkimResults.push(tempDkimResult)
diff --git a/api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js
@@ -69,7 +69,7 @@ describe('given the dmarcLoaderByKey function', () => {
         RETURN MERGE({ id: dmarcScan._key, _type: "dmarc" }, dmarcScan)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDmarc = await expectedCursor.next()
         dmarcKeys.push(tempDmarc._key)
         expectedDkimScans.push(tempDmarc)
diff --git a/api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js
@@ -70,7 +70,7 @@ describe('given the spfLoaderByKey function', () => {
           RETURN MERGE({ id: spfScan._key, _type: "spf" }, spfScan)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempSpf = await expectedCursor.next()
         spfKeys.push(tempSpf._key)
         expectedSpfScans.push(tempSpf)
diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js
@@ -71,7 +71,7 @@ describe('given the dkimGuidanceTagLoader function', () => {
           RETURN MERGE(tag, { tagId: tag._key, id: tag._key, _type: "guidanceTag" })
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDkim = await expectedCursor.next()
         dkimTagKeys.push(tempDkim._key)
         expectedDkimTags.push(tempDkim)
diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js
@@ -71,7 +71,7 @@ describe('given the dmarcGuidanceTagLoader function', () => {
           RETURN MERGE(tag, { tagId: tag._key, id: tag._key, _type: "guidanceTag" })
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempDkim = await expectedCursor.next()
         dmarcTagKeys.push(tempDkim._key)
         expectedDmarcTags.push(tempDkim)
diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js
@@ -71,7 +71,7 @@ describe('given the httpsGuidanceTagLoader function', () => {
           RETURN MERGE(tag, { tagId: tag._key, id: tag._key, _type: "guidanceTag" })
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempHttps = await expectedCursor.next()
         httpsTagKeys.push(tempHttps._key)
         expectedHttpsTags.push(tempHttps)
diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js
@@ -71,7 +71,7 @@ describe('given the spfGuidanceTagLoader function', () => {
           RETURN MERGE(tag, { tagId: tag._key, id: tag._key, _type: "guidanceTag" })
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempSpf = await expectedCursor.next()
         spfTagKeys.push(tempSpf._key)
         expectedSpfTags.push(tempSpf)
diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js
@@ -71,7 +71,7 @@ describe('given the sslGuidanceTagLoader function', () => {
           RETURN MERGE(tag, { tagId: tag._key, id: tag._key, _type: "guidanceTag" })
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempSsl = await expectedCursor.next()
         sslTagKeys.push(tempSsl._key)
         expectedSslTags.push(tempSsl)
diff --git a/api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js b/api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js
@@ -146,7 +146,7 @@ describe('given a orgLoaderByKey dataloader', () => {
             RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, _type: "organization", id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails))
         `
 
-        while (expectedCursor.hasNext()) {
+        while (expectedCursor.hasNext) {
           const tempOrg = await expectedCursor.next()
           orgIds.push(tempOrg._key)
           expectedOrgs.push(tempOrg)
@@ -243,7 +243,7 @@ describe('given a orgLoaderByKey dataloader', () => {
               RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, _type: "organization", id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails))
           `
 
-        while (expectedCursor.hasNext()) {
+        while (expectedCursor.hasNext) {
           const tempOrg = await expectedCursor.next()
           orgIds.push(tempOrg._key)
           expectedOrgs.push(tempOrg)
diff --git a/api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js b/api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js
@@ -134,7 +134,7 @@ describe('given a orgLoaderByKey dataloader', () => {
             RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, _type: "organization", id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("en", org.orgDetails))
         `
 
-        while (expectedCursor.hasNext()) {
+        while (expectedCursor.hasNext) {
           const tempOrg = await expectedCursor.next()
           orgSlugs.push(tempOrg.slug)
           expectedOrgs.push(tempOrg)
@@ -231,7 +231,7 @@ describe('given a orgLoaderByKey dataloader', () => {
             RETURN MERGE({ _id: org._id, _key: org._key, _rev: org._rev, _type: "organization", id: org._key, verified: org.verified, domainCount: COUNT(domains), summaries: org.summaries }, TRANSLATE("fr", org.orgDetails))
         `
 
-        while (expectedCursor.hasNext()) {
+        while (expectedCursor.hasNext) {
           const tempOrg = await expectedCursor.next()
           orgSlugs.push(tempOrg.slug)
           expectedOrgs.push(tempOrg)
diff --git a/api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js b/api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js
@@ -80,7 +80,7 @@ describe('given the chartSummaryLoaderByKey function', () => {
           RETURN MERGE({ id: summary._key }, summary)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempSummary = await expectedCursor.next()
         summaryKeys.push(tempSummary._key)
         expectedSummaries.push(tempSummary)
diff --git a/api-js/src/user/loaders/__tests__/load-user-by-key.test.js b/api-js/src/user/loaders/__tests__/load-user-by-key.test.js
@@ -81,7 +81,7 @@ describe('given a userLoaderByKey dataloader', () => {
           RETURN MERGE({ id: user._key, _type: "user" }, user)
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempUser = await expectedCursor.next()
         userKeys.push(tempUser._key)
         expectedUsers.push(tempUser)
diff --git a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js
@@ -94,7 +94,7 @@ describe('given a verifiedDomainLoaderByDomain dataloader', () => {
           RETURN MERGE(domain, { id: domain._key, _type: "verifiedDomain" })
       `
 
-      while (expectedCursor.hasNext()) {
+      while (expectedCursor.hasNext) {
         const tempUser = await expectedCursor.next()
         domainDomains.push(tempUser.domain)
         expectedDomains.push(tempUser)
diff --git a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-key.test.js b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-key.test.js
diff --git a/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-key.test.js b/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-key.test.js
diff --git a/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-slug.test.js b/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-slug.test.js
diff --git a/api-js/src/web-scan/loaders/__tests__/load-https-by-key.test.js b/api-js/src/web-scan/loaders/__tests__/load-https-by-key.test.js
diff --git a/api-js/src/web-scan/loaders/__tests__/load-ssl-by-key.test.js b/api-js/src/web-scan/loaders/__tests__/load-ssl-by-key.test.js
diff --git a/app/minikube/README.md b/app/minikube/README.md

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ describe('given the dmarcSumLoaderByKey dataloader', () => {`
`100`	`100`	`}`
`101`	`101`	`
`102`	`102`
`103`		`- while (expectedCursor.hasNext()) {`
	`103`	`+ while (expectedCursor.hasNext) {`
`104`	`104`	`const temp = await expectedCursor.next()`
`105`	`105`	`summaryKeys.push(temp._key)`
`106`	`106`	`expectedSummaries.push(temp)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ describe('given a domainLoaderByDomain dataloader', () => {`
`61`	`61`	`RETURN MERGE({ id: domain._key, _type: "domain" }, domain)`
`62`	`62`	`
`63`	`63`
`64`		`- while (expectedCursor.hasNext()) {`
	`64`	`+ while (expectedCursor.hasNext) {`
`65`	`65`	`const tempDomain = await expectedCursor.next()`
`66`	`66`	`domainDomains.push(tempDomain.domain)`
`67`	`67`	`expectedDomains.push(tempDomain)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ describe('given a domainLoaderByKey dataloader', () => {`
`63`	`63`	`RETURN MERGE({ id: domain._key, _type: "domain" }, domain)`
`64`	`64`	`
`65`	`65`
`66`		`- while (expectedCursor.hasNext()) {`
	`66`	`+ while (expectedCursor.hasNext) {`
`67`	`67`	`const tempDomain = await expectedCursor.next()`
`68`	`68`	`domainIds.push(tempDomain._key)`
`69`	`69`	`expectedDomains.push(tempDomain)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ describe('given the dkimLoaderByKey function', () => {`
`71`	`71`	`RETURN MERGE({ id: dkimScan._key, _type: "dkim" }, dkimScan)`
`72`	`72`	`
`73`	`73`
`74`		`- while (expectedCursor.hasNext()) {`
	`74`	`+ while (expectedCursor.hasNext) {`
`75`	`75`	`const tempDkim = await expectedCursor.next()`
`76`	`76`	`dkimKeys.push(tempDkim._key)`
`77`	`77`	`expectedDkimScans.push(tempDkim)`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ describe('given the dmarcLoaderByKey function', () => {`
`69`	`69`	`RETURN MERGE({ id: dmarcScan._key, _type: "dmarc" }, dmarcScan)`
`70`	`70`	`
`71`	`71`
`72`		`- while (expectedCursor.hasNext()) {`
	`72`	`+ while (expectedCursor.hasNext) {`
`73`	`73`	`const tempDmarc = await expectedCursor.next()`
`74`	`74`	`dmarcKeys.push(tempDmarc._key)`
`75`	`75`	`expectedDkimScans.push(tempDmarc)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ describe('given the spfLoaderByKey function', () => {`
`70`	`70`	`RETURN MERGE({ id: spfScan._key, _type: "spf" }, spfScan)`
`71`	`71`	`
`72`	`72`
`73`		`- while (expectedCursor.hasNext()) {`
	`73`	`+ while (expectedCursor.hasNext) {`
`74`	`74`	`const tempSpf = await expectedCursor.next()`
`75`	`75`	`spfKeys.push(tempSpf._key)`
`76`	`76`	`expectedSpfScans.push(tempSpf)`