Add ISO date support

Author: SamuelTallet

index.php

@@ -18,7 +18,7 @@
  * 
  * @var string
  */
-define('MPG_APP_VERSION', '1.0.2');
+define('MPG_APP_VERSION', '1.0.3');
 
 /**
  * Development mode?

src/Controllers/CollectionController.php

@@ -30,6 +30,12 @@ public function insertOneAction() : Response {
             return new JsonResponse(400, ErrorNormalizer::normalize($th, __METHOD__));
         }
 
+        foreach ($decodedRequestBody['document'] as &$insertValue) {
+            if ( preg_match(MongoDBHelper::ISO_DATE_TIME_REGEX, $insertValue) ) {
+                $insertValue = new \MongoDB\BSON\UTCDateTime(new \DateTime($insertValue));
+            }
+        }
+
         try {
 
             $collection = MongoDBHelper::getClient()->selectCollection(
@@ -58,7 +64,7 @@ public function countAction() : Response {
         }
 
         if ( isset($decodedRequestBody['filter']['_id'])
-            && is_string($decodedRequestBody['filter']['_id']) ) {
+            && preg_match(MongoDBHelper::MDB_OBJECT_ID_REGEX, $decodedRequestBody['filter']['_id']) ) {
                 $decodedRequestBody['filter']['_id'] =
                     new \MongoDB\BSON\ObjectId($decodedRequestBody['filter']['_id']);
         }
@@ -91,7 +97,7 @@ public function deleteOneAction() : Response {
         }
 
         if ( isset($decodedRequestBody['filter']['_id'])
-            && is_string($decodedRequestBody['filter']['_id']) ) {
+            && preg_match(MongoDBHelper::MDB_OBJECT_ID_REGEX, $decodedRequestBody['filter']['_id']) ) {
                 $decodedRequestBody['filter']['_id'] =
                     new \MongoDB\BSON\ObjectId($decodedRequestBody['filter']['_id']);
         }
@@ -124,7 +130,7 @@ public function findAction() : Response {
         }
 
         if ( isset($decodedRequestBody['filter']['_id'])
-            && is_string($decodedRequestBody['filter']['_id']) ) {
+            && preg_match(MongoDBHelper::MDB_OBJECT_ID_REGEX, $decodedRequestBody['filter']['_id']) ) {
                 $decodedRequestBody['filter']['_id'] =
                     new \MongoDB\BSON\ObjectId($decodedRequestBody['filter']['_id']);
         }
@@ -143,6 +149,16 @@ public function findAction() : Response {
             return new JsonResponse(500, ErrorNormalizer::normalize($th, __METHOD__));
         }
 
+        foreach ($documents as $document) {
+            foreach ($document as &$documentValue) {
+                if ( is_a($documentValue, '\MongoDB\BSON\ObjectId') ) {
+                    $documentValue = (string) $documentValue;
+                } elseif ( is_a($documentValue, '\MongoDB\BSON\UTCDatetime') ) {
+                    $documentValue = $documentValue->toDateTime()->format('Y-m-d\TH:i:s.v\Z');
+                }
+            }
+        }
+
         return new JsonResponse(200, $documents);
 
     }
@@ -159,11 +175,17 @@ public function updateOneAction() : Response {
         }
 
         if ( isset($decodedRequestBody['filter']['_id'])
-            && is_string($decodedRequestBody['filter']['_id']) ) {
+            && preg_match(MongoDBHelper::MDB_OBJECT_ID_REGEX, $decodedRequestBody['filter']['_id']) ) {
                 $decodedRequestBody['filter']['_id'] =
                     new \MongoDB\BSON\ObjectId($decodedRequestBody['filter']['_id']);
         }
 
+        foreach ($decodedRequestBody['update']['$set'] as &$updateValue) {
+            if ( preg_match(MongoDBHelper::ISO_DATE_TIME_REGEX, $updateValue) ) {
+                $updateValue = new \MongoDB\BSON\UTCDateTime(new \DateTime($updateValue));
+            }
+        }
+
         try {
 
             $collection = MongoDBHelper::getClient()->selectCollection(

src/Helpers/MongoDBHelper.php

@@ -5,7 +5,23 @@
 use MongoDB\Client;
 
 class MongoDBHelper {
- 
+
+    /**
+     * Regular expression for a MongoDB ObjectID.
+     * 
+     * @var string
+     * @see https://stackoverflow.com/questions/20988446/regex-for-mongodb-objectid
+     */
+    public const MDB_OBJECT_ID_REGEX = '/^[a-f\d]{24}$/i';
+
+    /**
+     * Regular expression for an ISO date-time.
+     * 
+     * @var string
+     * @see https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime
+     */
+    public const ISO_DATE_TIME_REGEX = '/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/';
+
     /**
      * MongoDB client singleton instance.
      * 

static/js/jsonview.bundle.mod.js

@@ -192,13 +192,9 @@ var JsonView = (function (exports) {
       // XXX Modification made for MongoDB PHP GUI.
       if ( node.key === '_id' ) {
         MPG.documentId = node.value;
-        MPG.documentIdType = 'int';
+        MPG.documentIdType = _typeof(node.value);
       }
-      if ( node.key === '$oid' ) {
-        MPG.documentId = node.value;
-        MPG.documentIdType = 'string';
-      }
-      if ( node.depth >= 2 && node.depth <= 5 && !(/(_id|\$oid)/).test(node.key) ) {
+      if ( node.depth >= 2 && node.depth <= 5 && node.key !== '_id' ) {
         var documentFieldIsUpdatable = true;
       } else {
         var documentFieldIsUpdatable = false;

static/js/mpg.database.query.js

@@ -595,19 +595,19 @@ MPG.eventListeners.addUpdate = function() {
 
         updatableJsonValue.addEventListener('click', function(event) {
 
-            var documentFieldNewValue = window.prompt('New value');
+            var documentField = event.currentTarget;
+
+            var documentFieldNewValue = window.prompt('New value', documentField.innerHTML);
 
             if ( documentFieldNewValue === null ) {
                 return;
             }
 
-            var documentField = event.currentTarget;
-
             documentFieldNewValue = MPG.helpers.convertStringToAny(
                 documentFieldNewValue, documentField.dataset.documentFieldType
             );
 
-            if ( MPG.documentIdType === 'int' ) {
+            if ( MPG.documentIdType === 'number' ) {
                 var documentId = parseInt(documentField.dataset.documentId);
             } else {
                 var documentId = documentField.dataset.documentId;
@@ -632,7 +632,7 @@ MPG.eventListeners.addUpdate = function() {
                 function(response) {
 
                     if ( JSON.parse(response) === 1 ) {
-                        documentField.innerText = MPG.helpers.convertAnyToString(
+                        documentField.innerHTML = MPG.helpers.convertAnyToString(
                             documentFieldNewValue
                         );
                     }