From f81fc0b6228b0e3587f40299b1f3d441c4a2f350 Mon Sep 17 00:00:00 2001 From: Kyle Sullivan Date: Tue, 7 Feb 2023 18:35:30 -0400 Subject: [PATCH] Show full timestamp instead of just date --- api/src/audit-logs/objects/audit-log.js | 7 ++++--- api/src/email-scan/objects/__tests__/dkim.test.js | 4 ++-- api/src/email-scan/objects/__tests__/dmarc.test.js | 4 ++-- api/src/email-scan/objects/__tests__/spf.test.js | 4 ++-- api/src/email-scan/objects/dkim.js | 4 ++-- api/src/email-scan/objects/dmarc.js | 4 ++-- api/src/email-scan/objects/email-scan.js | 14 +++++++------- api/src/email-scan/objects/spf.js | 4 ++-- .../objects/__tests__/verified-domain.test.js | 4 ++-- .../verified-domains/objects/verified-domain.js | 4 ++-- api/src/web-scan/objects/__tests__/https.test.js | 4 ++-- api/src/web-scan/objects/__tests__/ssl.test.js | 4 ++-- api/src/web-scan/objects/https.js | 4 ++-- api/src/web-scan/objects/ssl.js | 4 ++-- api/src/web-scan/objects/web-scan.js | 10 +++++----- 15 files changed, 40 insertions(+), 39 deletions(-) diff --git a/api/src/audit-logs/objects/audit-log.js b/api/src/audit-logs/objects/audit-log.js index f5d4e10f1e..87e905a844 100644 --- a/api/src/audit-logs/objects/audit-log.js +++ b/api/src/audit-logs/objects/audit-log.js @@ -1,10 +1,11 @@ -import { GraphQLObjectType, GraphQLString } from 'graphql' +import { GraphQLObjectType } from 'graphql' import { globalIdField } from 'graphql-relay' import { DomainRemovalReasonEnum } from '../../enums' import { UserActionEnums } from '../../enums/user-action' import { nodeInterface } from '../../node' import { initiatedByType } from './initiated-by' import { targetResourceType } from './target-resource' +import { GraphQLDateTime } from 'graphql-scalars' export const auditLogType = new GraphQLObjectType({ name: 'AuditLog', @@ -13,8 +14,8 @@ export const auditLogType = new GraphQLObjectType({ fields: () => ({ id: globalIdField('auditLog'), timestamp: { - type: GraphQLString, - description: 'Datetime string the activity occured.', + type: GraphQLDateTime, + description: 'Datetime string the activity occurred.', resolve: ({ timestamp }) => timestamp, }, initiatedBy: { diff --git a/api/src/email-scan/objects/__tests__/dkim.test.js b/api/src/email-scan/objects/__tests__/dkim.test.js index 1b4b7e385c..eca82c77f2 100644 --- a/api/src/email-scan/objects/__tests__/dkim.test.js +++ b/api/src/email-scan/objects/__tests__/dkim.test.js @@ -1,5 +1,5 @@ import { GraphQLNonNull, GraphQLID } from 'graphql' -import { GraphQLDate } from 'graphql-scalars' +import { GraphQLDateTime } from 'graphql-scalars' import { toGlobalId } from 'graphql-relay' import { domainType } from '../../../domain/objects' @@ -24,7 +24,7 @@ describe('given the dkimType object', () => { const demoType = dkimType.getFields() expect(demoType).toHaveProperty('timestamp') - expect(demoType.timestamp.type).toMatchObject(GraphQLDate) + expect(demoType.timestamp.type).toMatchObject(GraphQLDateTime) }) it('has a results field', () => { const demoType = dkimType.getFields() diff --git a/api/src/email-scan/objects/__tests__/dmarc.test.js b/api/src/email-scan/objects/__tests__/dmarc.test.js index c70bd167ec..2d02c5bac5 100644 --- a/api/src/email-scan/objects/__tests__/dmarc.test.js +++ b/api/src/email-scan/objects/__tests__/dmarc.test.js @@ -1,6 +1,6 @@ import { GraphQLNonNull, GraphQLID, GraphQLString, GraphQLInt } from 'graphql' import { toGlobalId } from 'graphql-relay' -import { GraphQLJSON, GraphQLDate } from 'graphql-scalars' +import { GraphQLJSON, GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../../domain/objects' import { guidanceTagConnection } from '../../../guidance-tag/objects' @@ -24,7 +24,7 @@ describe('given the dmarcType object', () => { const demoType = dmarcType.getFields() expect(demoType).toHaveProperty('timestamp') - expect(demoType.timestamp.type).toMatchObject(GraphQLDate) + expect(demoType.timestamp.type).toMatchObject(GraphQLDateTime) }) it('has a record field', () => { const demoType = dmarcType.getFields() diff --git a/api/src/email-scan/objects/__tests__/spf.test.js b/api/src/email-scan/objects/__tests__/spf.test.js index b430c70d93..d640ce1f22 100644 --- a/api/src/email-scan/objects/__tests__/spf.test.js +++ b/api/src/email-scan/objects/__tests__/spf.test.js @@ -1,6 +1,6 @@ import { GraphQLNonNull, GraphQLID, GraphQLInt, GraphQLString } from 'graphql' import { toGlobalId } from 'graphql-relay' -import { GraphQLJSON, GraphQLDate } from 'graphql-scalars' +import { GraphQLJSON, GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../../domain/objects' import { guidanceTagConnection } from '../../../guidance-tag/objects' @@ -24,7 +24,7 @@ describe('given the spfType object', () => { const demoType = spfType.getFields() expect(demoType).toHaveProperty('timestamp') - expect(demoType.timestamp.type).toMatchObject(GraphQLDate) + expect(demoType.timestamp.type).toMatchObject(GraphQLDateTime) }) it('has a lookups field', () => { const demoType = spfType.getFields() diff --git a/api/src/email-scan/objects/dkim.js b/api/src/email-scan/objects/dkim.js index 4b2421e0d9..3c998338a5 100644 --- a/api/src/email-scan/objects/dkim.js +++ b/api/src/email-scan/objects/dkim.js @@ -1,6 +1,6 @@ import { GraphQLObjectType } from 'graphql' import { connectionArgs, globalIdField } from 'graphql-relay' -import { GraphQLDate } from 'graphql-scalars' +import { GraphQLDateTime } from 'graphql-scalars' import { dkimResultConnection } from './dkim-result-connection' import { dkimResultOrder } from '../inputs' @@ -22,7 +22,7 @@ export const dkimType = new GraphQLObjectType({ }, }, timestamp: { - type: GraphQLDate, + type: GraphQLDateTime, description: `The time when the scan was initiated.`, resolve: ({ timestamp }) => new Date(timestamp), }, diff --git a/api/src/email-scan/objects/dmarc.js b/api/src/email-scan/objects/dmarc.js index 9703be47b9..5ce304a83d 100644 --- a/api/src/email-scan/objects/dmarc.js +++ b/api/src/email-scan/objects/dmarc.js @@ -1,6 +1,6 @@ import { GraphQLInt, GraphQLObjectType, GraphQLString } from 'graphql' import { connectionArgs, globalIdField } from 'graphql-relay' -import { GraphQLJSON, GraphQLDate } from 'graphql-scalars' +import { GraphQLJSON, GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../domain/objects' import { nodeInterface } from '../../node' @@ -22,7 +22,7 @@ export const dmarcType = new GraphQLObjectType({ }, }, timestamp: { - type: GraphQLDate, + type: GraphQLDateTime, description: `The time when the scan was initiated.`, resolve: ({ timestamp }) => new Date(timestamp), }, diff --git a/api/src/email-scan/objects/email-scan.js b/api/src/email-scan/objects/email-scan.js index 4111fa10a9..b40517b1c6 100644 --- a/api/src/email-scan/objects/email-scan.js +++ b/api/src/email-scan/objects/email-scan.js @@ -1,6 +1,6 @@ import { GraphQLObjectType } from 'graphql' import { connectionArgs } from 'graphql-relay' -import { GraphQLDate } from 'graphql-scalars' +import { GraphQLDateTime } from 'graphql-scalars' import { dkimOrder, dmarcOrder, spfOrder } from '../inputs' import { dkimConnection } from './dkim-connection' @@ -24,11 +24,11 @@ export const emailScanType = new GraphQLObjectType({ type: dkimConnection.connectionType, args: { startDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'Start date for date filter.', }, endDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'End date for date filter.', }, orderBy: { @@ -54,11 +54,11 @@ export const emailScanType = new GraphQLObjectType({ type: dmarcConnection.connectionType, args: { startDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'Start date for date filter.', }, endDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'End date for date filter.', }, orderBy: { @@ -84,11 +84,11 @@ export const emailScanType = new GraphQLObjectType({ type: spfConnection.connectionType, args: { startDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'Start date for date filter.', }, endDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'End date for date filter.', }, orderBy: { diff --git a/api/src/email-scan/objects/spf.js b/api/src/email-scan/objects/spf.js index b0b5e71276..8371bf9261 100644 --- a/api/src/email-scan/objects/spf.js +++ b/api/src/email-scan/objects/spf.js @@ -1,6 +1,6 @@ import { GraphQLInt, GraphQLObjectType, GraphQLString } from 'graphql' import { connectionArgs, globalIdField } from 'graphql-relay' -import { GraphQLJSON, GraphQLDate } from 'graphql-scalars' +import { GraphQLJSON, GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../domain/objects' import { nodeInterface } from '../../node' @@ -22,7 +22,7 @@ export const spfType = new GraphQLObjectType({ }, }, timestamp: { - type: GraphQLDate, + type: GraphQLDateTime, description: `The time the scan was initiated.`, resolve: ({ timestamp }) => new Date(timestamp), }, diff --git a/api/src/verified-domains/objects/__tests__/verified-domain.test.js b/api/src/verified-domains/objects/__tests__/verified-domain.test.js index b3dd32d579..97547c8b2c 100644 --- a/api/src/verified-domains/objects/__tests__/verified-domain.test.js +++ b/api/src/verified-domains/objects/__tests__/verified-domain.test.js @@ -1,6 +1,6 @@ import { GraphQLNonNull, GraphQLID } from 'graphql' import { toGlobalId } from 'graphql-relay' -import { GraphQLDate } from 'graphql-scalars' +import { GraphQLDateTime } from 'graphql-scalars' import { verifiedOrganizationConnection } from '../../../verified-organizations/objects' import { verifiedDomainType } from '../index' @@ -25,7 +25,7 @@ describe('given the verified domains object', () => { const demoType = verifiedDomainType.getFields() expect(demoType).toHaveProperty('lastRan') - expect(demoType.lastRan.type).toMatchObject(GraphQLDate) + expect(demoType.lastRan.type).toMatchObject(GraphQLDateTime) }) it('has a status field', () => { const demoType = verifiedDomainType.getFields() diff --git a/api/src/verified-domains/objects/verified-domain.js b/api/src/verified-domains/objects/verified-domain.js index 624ce489e7..c100afba0f 100644 --- a/api/src/verified-domains/objects/verified-domain.js +++ b/api/src/verified-domains/objects/verified-domain.js @@ -1,6 +1,6 @@ import { GraphQLObjectType } from 'graphql' import { connectionArgs, globalIdField } from 'graphql-relay' -import { GraphQLDate } from 'graphql-scalars' +import { GraphQLDateTime } from 'graphql-scalars' import { domainStatus } from '../../domain/objects' import { Domain } from '../../scalars' @@ -18,7 +18,7 @@ export const verifiedDomainType = new GraphQLObjectType({ resolve: ({ domain }) => domain, }, lastRan: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'The last time that a scan was ran on this domain.', resolve: ({ lastRan }) => lastRan, }, diff --git a/api/src/web-scan/objects/__tests__/https.test.js b/api/src/web-scan/objects/__tests__/https.test.js index 9fa1cbc3d2..f7d2f2cc4f 100644 --- a/api/src/web-scan/objects/__tests__/https.test.js +++ b/api/src/web-scan/objects/__tests__/https.test.js @@ -1,6 +1,6 @@ import { GraphQLID, GraphQLNonNull, GraphQLString } from 'graphql' import { toGlobalId } from 'graphql-relay' -import { GraphQLDate, GraphQLJSON } from 'graphql-scalars' +import { GraphQLDateTime, GraphQLJSON } from 'graphql-scalars' import { domainType } from '../../../domain/objects' import { guidanceTagConnection } from '../../../guidance-tag/objects' @@ -24,7 +24,7 @@ describe('given the https gql object', () => { const demoType = httpsType.getFields() expect(demoType).toHaveProperty('timestamp') - expect(demoType.timestamp.type).toMatchObject(GraphQLDate) + expect(demoType.timestamp.type).toMatchObject(GraphQLDateTime) }) it('has a implementation field', () => { const demoType = httpsType.getFields() diff --git a/api/src/web-scan/objects/__tests__/ssl.test.js b/api/src/web-scan/objects/__tests__/ssl.test.js index 225935bfac..459b6acf96 100644 --- a/api/src/web-scan/objects/__tests__/ssl.test.js +++ b/api/src/web-scan/objects/__tests__/ssl.test.js @@ -6,7 +6,7 @@ import { GraphQLBoolean, } from 'graphql' import { toGlobalId } from 'graphql-relay' -import { GraphQLJSON, GraphQLDate } from 'graphql-scalars' +import { GraphQLJSON, GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../../domain/objects' import { guidanceTagConnection } from '../../../guidance-tag/objects' @@ -88,7 +88,7 @@ describe('given the ssl gql object', () => { const demoType = sslType.getFields() expect(demoType).toHaveProperty('timestamp') - expect(demoType.timestamp.type).toMatchObject(GraphQLDate) + expect(demoType.timestamp.type).toMatchObject(GraphQLDateTime) }) it('has a weakCiphers field', () => { const demoType = sslType.getFields() diff --git a/api/src/web-scan/objects/https.js b/api/src/web-scan/objects/https.js index bfa770f7af..d93ace6af1 100644 --- a/api/src/web-scan/objects/https.js +++ b/api/src/web-scan/objects/https.js @@ -1,6 +1,6 @@ import { GraphQLObjectType, GraphQLString } from 'graphql' import { connectionArgs, globalIdField } from 'graphql-relay' -import { GraphQLDate, GraphQLJSON } from 'graphql-scalars' +import { GraphQLDateTime, GraphQLJSON } from 'graphql-scalars' import { domainType } from '../../domain/objects' import { nodeInterface } from '../../node' @@ -22,7 +22,7 @@ export const httpsType = new GraphQLObjectType({ }, }, timestamp: { - type: GraphQLDate, + type: GraphQLDateTime, description: `The time the scan was initiated.`, resolve: ({ timestamp }) => new Date(timestamp), }, diff --git a/api/src/web-scan/objects/ssl.js b/api/src/web-scan/objects/ssl.js index a18b2901df..bf3cc35013 100644 --- a/api/src/web-scan/objects/ssl.js +++ b/api/src/web-scan/objects/ssl.js @@ -5,7 +5,7 @@ import { GraphQLString, } from 'graphql' import { connectionArgs, globalIdField } from 'graphql-relay' -import { GraphQLJSON, GraphQLDate } from 'graphql-scalars' +import { GraphQLJSON, GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../domain/objects' import { nodeInterface } from '../../node' @@ -73,7 +73,7 @@ export const sslType = new GraphQLObjectType({ supportsEcdhKeyExchange, }, timestamp: { - type: GraphQLDate, + type: GraphQLDateTime, description: `The time when the scan was initiated.`, resolve: ({ timestamp }) => new Date(timestamp), }, diff --git a/api/src/web-scan/objects/web-scan.js b/api/src/web-scan/objects/web-scan.js index 1fb05945b5..55fa173299 100644 --- a/api/src/web-scan/objects/web-scan.js +++ b/api/src/web-scan/objects/web-scan.js @@ -1,6 +1,6 @@ import { GraphQLObjectType } from 'graphql' import { connectionArgs } from 'graphql-relay' -import { GraphQLDate } from 'graphql-scalars' +import { GraphQLDateTime } from 'graphql-scalars' import { domainType } from '../../domain/objects' import { httpsOrder, sslOrder } from '../inputs' @@ -23,11 +23,11 @@ export const webScanType = new GraphQLObjectType({ type: httpsConnection.connectionType, args: { startDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'Start date for date filter.', }, endDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'End date for date filter.', }, orderBy: { @@ -53,11 +53,11 @@ export const webScanType = new GraphQLObjectType({ type: sslConnection.connectionType, args: { startDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'Start date for date filter.', }, endDate: { - type: GraphQLDate, + type: GraphQLDateTime, description: 'End date for date filter.', }, orderBy: {