Skip to content

Update to the latest version of arango-tools #1592

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
sleepycat merged 1 commit into from
Feb 5, 2021
Merged

Update to the latest version of arango-tools #1592

Show file tree
Hide file tree
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
110 changes: 9 additions & 101 deletions api-js/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions api-js/src/affiliation/loaders/__tests__/load-affiliations-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/user/loaders/__tests__/load-user-by-key.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading