From d452aac0f9b151ac3233dc18a0d7fdd838239e23 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 1 Apr 2025 14:43:36 +0100 Subject: [PATCH] fix: proper datetime name --- .../graphql/resolvers/scalar.resolver.js | 2 +- lib/new-admin/graphql/types/bill.type.js | 2 +- lib/new-admin/graphql/types/cashbox.type.js | 4 ++-- .../graphql/types/customInfoRequests.type.js | 2 +- lib/new-admin/graphql/types/customer.type.js | 22 +++++++++---------- lib/new-admin/graphql/types/log.type.js | 12 +++++----- lib/new-admin/graphql/types/machine.type.js | 18 +++++++-------- .../graphql/types/notification.type.js | 2 +- lib/new-admin/graphql/types/scalar.type.js | 2 +- .../graphql/types/transaction.type.js | 14 ++++++------ lib/new-admin/graphql/types/users.type.js | 10 ++++----- .../machineActions/DiagnosticsModal.jsx | 4 ++-- .../src/pages/Analytics/Analytics.jsx | 4 ++-- new-lamassu-admin/src/pages/MachineLogs.jsx | 6 ++--- .../Transactions/Transactions.jsx | 2 +- .../src/pages/Maintenance/CashUnits.jsx | 2 +- new-lamassu-admin/src/pages/ServerLogs.jsx | 4 ++-- .../src/pages/Transactions/DetailsCard.jsx | 4 ++-- .../src/pages/Transactions/Transactions.jsx | 8 +++---- package-lock.json | 5 ----- 20 files changed, 62 insertions(+), 67 deletions(-) diff --git a/lib/new-admin/graphql/resolvers/scalar.resolver.js b/lib/new-admin/graphql/resolvers/scalar.resolver.js index 58f4c90b..ddfc12ac 100644 --- a/lib/new-admin/graphql/resolvers/scalar.resolver.js +++ b/lib/new-admin/graphql/resolvers/scalar.resolver.js @@ -3,7 +3,7 @@ const { DateTimeISOResolver, JSONResolver, JSONObjectResolver } = require('graph const resolvers = { JSON: JSONResolver, JSONObject: JSONObjectResolver, - Date: DateTimeISOResolver + DateTimeISO: DateTimeISOResolver } module.exports = resolvers diff --git a/lib/new-admin/graphql/types/bill.type.js b/lib/new-admin/graphql/types/bill.type.js index b3303519..265a137a 100644 --- a/lib/new-admin/graphql/types/bill.type.js +++ b/lib/new-admin/graphql/types/bill.type.js @@ -6,7 +6,7 @@ const typeDef = gql` fiat: Int fiatCode: String deviceId: ID - created: Date + created: DateTimeISO cashUnitOperationId: ID } diff --git a/lib/new-admin/graphql/types/cashbox.type.js b/lib/new-admin/graphql/types/cashbox.type.js index 7cb64dee..ada0441d 100644 --- a/lib/new-admin/graphql/types/cashbox.type.js +++ b/lib/new-admin/graphql/types/cashbox.type.js @@ -4,7 +4,7 @@ const typeDef = gql` type CashboxBatch { id: ID deviceId: ID - created: Date + created: DateTimeISO operationType: String customBillCount: Int performedBy: String @@ -14,7 +14,7 @@ const typeDef = gql` type Query { cashboxBatches: [CashboxBatch] @auth - cashboxBatchesCsv(from: Date, until: Date, timezone: String): String @auth + cashboxBatchesCsv(from: DateTimeISO, until: DateTimeISO, timezone: String): String @auth } type Mutation { diff --git a/lib/new-admin/graphql/types/customInfoRequests.type.js b/lib/new-admin/graphql/types/customInfoRequests.type.js index 6bbf9c31..88d2def3 100644 --- a/lib/new-admin/graphql/types/customInfoRequests.type.js +++ b/lib/new-admin/graphql/types/customInfoRequests.type.js @@ -33,7 +33,7 @@ const typeDef = gql` customerId: ID infoRequestId: ID override: String - overrideAt: Date + overrideAt: DateTimeISO overrideBy: ID customerData: JSON customInfoRequest: CustomInfoRequest diff --git a/lib/new-admin/graphql/types/customer.type.js b/lib/new-admin/graphql/types/customer.type.js index 7356973b..b24a1bfa 100644 --- a/lib/new-admin/graphql/types/customer.type.js +++ b/lib/new-admin/graphql/types/customer.type.js @@ -9,7 +9,7 @@ const typeDef = gql` newPhoto: Upload photoType: String frontCameraPath: String - frontCameraAt: Date + frontCameraAt: DateTimeISO frontCameraOverride: String phone: String email: String @@ -17,19 +17,19 @@ const typeDef = gql` smsOverride: String idCardData: JSONObject idCardDataOverride: String - idCardDataExpiration: Date + idCardDataExpiration: DateTimeISO idCardPhoto: Upload idCardPhotoPath: String idCardPhotoOverride: String - idCardPhotoAt: Date + idCardPhotoAt: DateTimeISO usSsn: String usSsnOverride: String sanctions: Boolean - sanctionsAt: Date + sanctionsAt: DateTimeISO sanctionsOverride: String totalTxs: Int totalSpent: String - lastActive: Date + lastActive: DateTimeISO lastTxFiat: String lastTxFiatCode: String lastTxClass: String @@ -53,21 +53,21 @@ const typeDef = gql` smsOverride: String idCardData: JSONObject idCardDataOverride: String - idCardDataExpiration: Date + idCardDataExpiration: DateTimeISO idCardPhotoPath: String idCardPhotoOverride: String usSsn: String usSsnOverride: String sanctions: Boolean - sanctionsAt: Date + sanctionsAt: DateTimeISO sanctionsOverride: String totalTxs: Int totalSpent: String - lastActive: Date + lastActive: DateTimeISO lastTxFiat: String lastTxFiatCode: String lastTxClass: String - suspendedUntil: Date + suspendedUntil: DateTimeISO subscriberInfo: Boolean phoneOverride: String } @@ -82,8 +82,8 @@ const typeDef = gql` type CustomerNote { id: ID customerId: ID - created: Date - lastEditedAt: Date + created: DateTimeISO + lastEditedAt: DateTimeISO lastEditedBy: ID title: String content: String diff --git a/lib/new-admin/graphql/types/log.type.js b/lib/new-admin/graphql/types/log.type.js index 57dae9f8..de7aee38 100644 --- a/lib/new-admin/graphql/types/log.type.js +++ b/lib/new-admin/graphql/types/log.type.js @@ -4,22 +4,22 @@ const typeDef = gql` type MachineLog { id: ID! logLevel: String! - timestamp: Date! + timestamp: DateTimeISO! message: String! } type ServerLog { id: ID! logLevel: String! - timestamp: Date! + timestamp: DateTimeISO! message: String } type Query { - machineLogs(deviceId: ID!, from: Date, until: Date, limit: Int, offset: Int): [MachineLog] @auth - machineLogsCsv(deviceId: ID!, from: Date, until: Date, limit: Int, offset: Int, timezone: String): String @auth - serverLogs(from: Date, until: Date, limit: Int, offset: Int): [ServerLog] @auth - serverLogsCsv(from: Date, until: Date, limit: Int, offset: Int, timezone: String): String @auth + machineLogs(deviceId: ID!, from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int): [MachineLog] @auth + machineLogsCsv(deviceId: ID!, from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, timezone: String): String @auth + serverLogs(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int): [ServerLog] @auth + serverLogsCsv(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, timezone: String): String @auth } ` diff --git a/lib/new-admin/graphql/types/machine.type.js b/lib/new-admin/graphql/types/machine.type.js index c5dbfb78..d157913c 100644 --- a/lib/new-admin/graphql/types/machine.type.js +++ b/lib/new-admin/graphql/types/machine.type.js @@ -10,8 +10,8 @@ const typeDef = gql` name: String! deviceId: ID! paired: Boolean! - lastPing: Date - pairedAt: Date + lastPing: DateTimeISO + pairedAt: DateTimeISO diagnostics: Diagnostics version: String model: String @@ -26,9 +26,9 @@ const typeDef = gql` } type Diagnostics { - timestamp: Date - frontTimestamp: Date - scanTimestamp: Date + timestamp: DateTimeISO + frontTimestamp: DateTimeISO + scanTimestamp: DateTimeISO } type CashUnits { @@ -64,8 +64,8 @@ const typeDef = gql` deviceId: ID! name: String model: String - paired: Date! - unpaired: Date! + paired: DateTimeISO! + unpaired: DateTimeISO! } type MachineEvent { @@ -73,9 +73,9 @@ const typeDef = gql` deviceId: String eventType: String note: String - created: Date + created: DateTimeISO age: Float - deviceTime: Date + deviceTime: DateTimeISO } enum MachineAction { diff --git a/lib/new-admin/graphql/types/notification.type.js b/lib/new-admin/graphql/types/notification.type.js index 52ffdbbf..841d0a30 100644 --- a/lib/new-admin/graphql/types/notification.type.js +++ b/lib/new-admin/graphql/types/notification.type.js @@ -6,7 +6,7 @@ const typeDef = gql` type: String detail: JSON message: String - created: Date + created: DateTimeISO read: Boolean valid: Boolean } diff --git a/lib/new-admin/graphql/types/scalar.type.js b/lib/new-admin/graphql/types/scalar.type.js index 43415af4..e082f98d 100644 --- a/lib/new-admin/graphql/types/scalar.type.js +++ b/lib/new-admin/graphql/types/scalar.type.js @@ -3,7 +3,7 @@ const gql = require('graphql-tag') const typeDef = gql` scalar JSON scalar JSONObject - scalar Date + scalar DateTimeISO scalar Upload ` diff --git a/lib/new-admin/graphql/types/transaction.type.js b/lib/new-admin/graphql/types/transaction.type.js index e7ff9cf8..9edde74b 100644 --- a/lib/new-admin/graphql/types/transaction.type.js +++ b/lib/new-admin/graphql/types/transaction.type.js @@ -14,12 +14,12 @@ const typeDef = gql` txHash: String phone: String error: String - created: Date + created: DateTimeISO send: Boolean sendConfirmed: Boolean dispense: Boolean timedout: Boolean - sendTime: Date + sendTime: DateTimeISO errorCode: String operatorCompleted: Boolean sendPending: Boolean @@ -35,7 +35,7 @@ const typeDef = gql` customerPhone: String customerEmail: String customerIdCardDataNumber: String - customerIdCardDataExpiration: Date + customerIdCardDataExpiration: DateTimeISO customerIdCardData: JSONObject customerName: String customerFrontCameraPath: String @@ -44,9 +44,9 @@ const typeDef = gql` machineName: String discount: Int txCustomerPhotoPath: String - txCustomerPhotoAt: Date + txCustomerPhotoAt: DateTimeISO batched: Boolean - batchTime: Date + batchTime: DateTimeISO batchError: String walletScore: Int profit: String @@ -60,8 +60,8 @@ const typeDef = gql` } type Query { - transactions(from: Date, until: Date, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, excludeTestingCustomers: Boolean): [Transaction] @auth - transactionsCsv(from: Date, until: Date, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, timezone: String, excludeTestingCustomers: Boolean, simplified: Boolean): String @auth + transactions(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, excludeTestingCustomers: Boolean): [Transaction] @auth + transactionsCsv(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, timezone: String, excludeTestingCustomers: Boolean, simplified: Boolean): String @auth transactionCsv(id: ID, txClass: String, timezone: String): String @auth txAssociatedDataCsv(id: ID, txClass: String, timezone: String): String @auth transactionFilters: [Filter] @auth diff --git a/lib/new-admin/graphql/types/users.type.js b/lib/new-admin/graphql/types/users.type.js index ceb8a659..09622c1f 100644 --- a/lib/new-admin/graphql/types/users.type.js +++ b/lib/new-admin/graphql/types/users.type.js @@ -45,7 +45,7 @@ const typeDef = ` type UserSession { sid: String! sess: JSONObject! - expire: Date! + expire: DateTimeISO! } type User { @@ -53,8 +53,8 @@ const typeDef = ` username: String role: String enabled: Boolean - created: Date - last_accessed: Date + created: DateTimeISO + last_accessed: DateTimeISO last_accessed_from: String last_accessed_address: String } @@ -68,14 +68,14 @@ const typeDef = ` type ResetToken { token: String user_id: ID - expire: Date + expire: DateTimeISO } type RegistrationToken { token: String username: String role: String - expire: Date + expire: DateTimeISO } type Query { diff --git a/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx b/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx index d87a5620..dabd12a0 100644 --- a/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx +++ b/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx @@ -37,8 +37,8 @@ const MACHINE_LOGS = gql` query machineLogsCsv( $deviceId: ID! $limit: Int - $from: Date - $until: Date + $from: DateTimeISO + $until: DateTimeISO $timezone: String ) { machineLogsCsv( diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx index 0282a126..ab279ad5 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx @@ -59,8 +59,8 @@ const DAY_OPTIONS = R.map( const GET_TRANSACTIONS = gql` query transactions( - $from: Date - $until: Date + $from: DateTimeISO + $until: DateTimeISO $excludeTestingCustomers: Boolean ) { transactions( diff --git a/new-lamassu-admin/src/pages/MachineLogs.jsx b/new-lamassu-admin/src/pages/MachineLogs.jsx index bcde1a2d..e0240989 100644 --- a/new-lamassu-admin/src/pages/MachineLogs.jsx +++ b/new-lamassu-admin/src/pages/MachineLogs.jsx @@ -37,8 +37,8 @@ const GET_MACHINE_LOGS_CSV = gql` query MachineLogs( $deviceId: ID! $limit: Int - $from: Date - $until: Date + $from: DateTimeISO + $until: DateTimeISO $timezone: String ) { machineLogsCsv( @@ -52,7 +52,7 @@ const GET_MACHINE_LOGS_CSV = gql` ` const GET_MACHINE_LOGS = gql` - query MachineLogs($deviceId: ID!, $limit: Int, $from: Date, $until: Date) { + query MachineLogs($deviceId: ID!, $limit: Int, $from: DateTimeISO, $until: DateTimeISO) { machineLogs( deviceId: $deviceId limit: $limit diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx index 3ba9dd33..bd43a125 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx @@ -20,7 +20,7 @@ const useStyles = makeStyles(mainStyles) const NUM_LOG_RESULTS = 5 const GET_TRANSACTIONS = gql` - query transactions($limit: Int, $from: Date, $until: Date, $deviceId: String) { + query transactions($limit: Int, $from: DateTimeISO, $until: DateTimeISO, $deviceId: String) { transactions( limit: $limit from: $from diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx index 491cfe8e..4c656d0e 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx @@ -97,7 +97,7 @@ const SET_CASSETTE_BILLS = gql` ` const GET_BATCHES_CSV = gql` - query cashboxBatchesCsv($from: Date, $until: Date, $timezone: String) { + query cashboxBatchesCsv($from: DateTimeISO, $until: DateTimeISO, $timezone: String) { cashboxBatchesCsv(from: $from, until: $until, timezone: $timezone) } ` diff --git a/new-lamassu-admin/src/pages/ServerLogs.jsx b/new-lamassu-admin/src/pages/ServerLogs.jsx index 0b436add..6f78f0c2 100644 --- a/new-lamassu-admin/src/pages/ServerLogs.jsx +++ b/new-lamassu-admin/src/pages/ServerLogs.jsx @@ -57,7 +57,7 @@ const SHOW_ALL = { code: 'SHOW_ALL', display: 'Show all' } const NUM_LOG_RESULTS = 500 const GET_CSV = gql` - query ServerData($limit: Int, $from: Date, $until: Date, $timezone: String) { + query ServerData($limit: Int, $from: DateTimeISO, $until: DateTimeISO, $timezone: String) { serverLogsCsv( limit: $limit from: $from @@ -68,7 +68,7 @@ const GET_CSV = gql` ` const GET_SERVER_DATA = gql` - query ServerData($limit: Int, $from: Date, $until: Date) { + query ServerData($limit: Int, $from: DateTimeISO, $until: DateTimeISO) { serverVersion uptime { name diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx index 365e5b52..efc77d70 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx @@ -46,8 +46,8 @@ const TX_SUMMARY = gql` $txId: ID! $deviceId: ID! $limit: Int - $from: Date - $until: Date + $from: DateTimeISO + $until: DateTimeISO $txClass: String $timezone: String ) { diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx index 73879bd2..1d58b5d1 100644 --- a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx +++ b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx @@ -40,8 +40,8 @@ const GET_TRANSACTIONS_CSV = gql` query transactions( $simplified: Boolean $limit: Int - $from: Date - $until: Date + $from: DateTimeISO + $until: DateTimeISO $timezone: String $excludeTestingCustomers: Boolean ) { @@ -69,8 +69,8 @@ const GET_TRANSACTION_FILTERS = gql` const GET_TRANSACTIONS = gql` query transactions( $limit: Int - $from: Date - $until: Date + $from: DateTimeISO + $until: DateTimeISO $txClass: String $deviceId: String $customerName: String diff --git a/package-lock.json b/package-lock.json index e1d79475..c8abac1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5596,11 +5596,6 @@ "node": ">=0.10.0" } }, - "node_modules/base-64": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", - "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" - }, "node_modules/base-x": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",