Update to version 1.0.0

Author: Kristian Kosorin

.eslintrc.json

@@ -1,6 +1,7 @@
 {
 	"env": {
-		"browser": true
+		"browser": true,
+		"jquery": true
 	},
 	"plugins": ["compat"],
 	"extends": [ "plugin:@wordpress/eslint-plugin/recommended" ],

.gitignore

@@ -25,3 +25,7 @@ wp-content/plugins/hello.php
 
 composer.lock
 package-lock.json
+
+
+/backup
+*.zip

composer.json

@@ -1,5 +1,6 @@
 {
     "require": {
-        "google/apiclient": "^2.0"
+        "google/apiclient": "^2.0",
+        "monolog/monolog": "^1.25"
     }
-}
+}

gulpfile.js

@@ -20,10 +20,10 @@
   },
   "devDependencies": {
     "@wordpress/eslint-plugin": "^4.0.0",
-    "eslint": "^6.5.1",
+    "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-plugin-compat": "^3.3.0",
-    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-compat": "^3.5.1",
+    "eslint-plugin-import": "^2.20.1",
     "gulp": "^4.0.2",
     "gulp-composer": "^0.4.5",
     "gulp-eslint": "^6.0.0",

package.json

@@ -52,7 +52,7 @@ function add_menu() {
 		'manage_options',
 		'sgdd_basic',
 		'\\Sgdd\\Admin\\SettingsPages\\Basic\\display',
-		plugins_url( '/skaut-google-drive-documents/admin/icon.png' )
+		plugins_url( trailingslashit( dirname( plugin_basename( __FILE__ ) ) ) . '/icon.png' )
 	);
 }
 

plugin/admin/admin-page.php

@@ -1,80 +1,92 @@
-'use strict';
+(function($) {
+  "use strict";
 
-jQuery(document).ready(function ($) {
   function showDir(path) {
-
     /* If path is not initialized */
     if (!(path instanceof Array)) {
       path = [];
     }
 
-    $('#rootPath tbody tr').not('.loadingCircle').fadeOut();
-    $('.loadingCircle').fadeIn('slow');
+    $("#rootPath tbody tr")
+      .not(".loadingCircle")
+      .fadeOut();
+    $(".loadingCircle").fadeIn("slow");
 
     $.ajax({
-      url: sgddRootPathLocalize.ajaxUrl,
-      type: 'GET',
+      url: sgddRootPathLocalize.ajaxUrl, //eslint-disable-line no-undef
+      type: "GET",
       data: {
-        action: 'listDrive',
-        path: path,
-        _ajax_nonce: sgddRootPathLocalize.nonce // eslint-disable-line camelcase
+        action: "listDrive",
+        path,
+        _ajax_nonce: sgddRootPathLocalize.nonce // eslint-disable-line camelcase, no-undef
       },
-      success: function (response) {
-        var html = '';
-        var i;
+      success(response) {
+        let html = "";
+        let i;
 
-        $('.loadingCircle').fadeOut();
-        $('#rootPath tbody tr').not('.loadingCircle').fadeIn('slow');
+        $(".loadingCircle").fadeOut();
+        $("#rootPath tbody tr")
+          .not(".loadingCircle")
+          .fadeIn("slow");
 
         /* Print path */
         if (0 < path.length) {
-          html += '<a data-id="">' + sgddRootPathLocalize.driveList + '</a> > ';
+          html += '<a data-id="">' + sgddRootPathLocalize.driveList + "</a> > "; //eslint-disable-line no-undef
           for (i = 0; i < response.pathNames.length; i++) {
             if (0 < i) {
-              html += ' > ';
+              html += " > ";
             }
-            html += '<a data-id="' + path[i] + '">' + response.pathNames[i] + '</a>';
+            html +=
+              '<a data-id="' + path[i] + '">' + response.pathNames[i] + "</a>";
           }
         } else {
-          html += '<a data-id="">' + sgddRootPathLocalize.driveList + '</a>';
-          $('#submit').attr('disabled', 'disabled');
+          html += '<a data-id="">' + sgddRootPathLocalize.driveList + "</a>"; //eslint-disable-line no-undef
+          $("#submit").attr("disabled", "disabled");
         }
-        $('.tablePath').html(html);
+        $(".tablePath").html(html);
 
         /* Up directory dots */
         html = '<tr class="loadingCircle"></tr>';
         if (0 < path.length) {
           html += '<tr><td class="row-title"><label>..</label></tr>';
-          $('.tableBody').html(html);
+          $(".tableBody").html(html);
         }
 
         /* List dir content */
         for (i = 0; i < response.content.length; i++) {
           html += '<tr class="';
 
-          if (0 == i % 2) {
-            html += 'alternate';
+          if (0 === i % 2) {
+            html += "alternate";
           }
 
-          html += '"><td class="row-title"><label data-id="' + response.content[i].pathId + '">' + response.content[i].pathName + '</label>';
+          html +=
+            '"><td class="row-title"><label data-id="' +
+            response.content[i].pathId +
+            '">' +
+            response.content[i].pathName +
+            "</label>";
         }
-        $('.tableBody').html(html);
+        $(".tableBody").html(html);
 
-        $('.tableBody label').click(function () {
+        $(".tableBody label").click(function() {
           dirClick(path, this);
-          $('#submit').removeAttr('disabled');
+          $("#submit").removeAttr("disabled");
         });
 
-        $('.tablePath a').click(function () {
+        $(".tablePath a").click(function() {
           pathClick(path, this);
-          $('#submit').removeAttr('disabled');
+          $("#submit").removeAttr("disabled");
         });
 
-        $('#sgdd_root_path').val(JSON.stringify(path));
+        $("#sgdd_root_path").val(JSON.stringify(path));
       },
-      error: function (response) {
-        var html = '<div class="notice notice-error"><p>' + response.error + '</p></div>';
-        $('#rootPath').replaceWith(html);
+      error(response) {
+        const html =
+          '<div class="notice notice-error"><p>' +
+          response.error +
+          "</p></div>";
+        $("#rootPath").replaceWith(html);
       }
     });
   }
@@ -86,8 +98,8 @@ jQuery(document).ready(function ($) {
    * @param {*} element
    */
   function pathClick(path, element) {
-    var elementIndex = path.indexOf($(element).data('id'));
-    var newPath = path.slice(0, elementIndex + 1);
+    const elementIndex = path.indexOf($(element).data("id"));
+    const newPath = path.slice(0, elementIndex + 1);
 
     showDir(newPath);
   }
@@ -99,7 +111,7 @@ jQuery(document).ready(function ($) {
    * @param {*} element
    */
   function dirClick(path, element) {
-    var newID = $(element).data('id');
+    const newID = $(element).data("id");
 
     if (newID) {
       path.push(newID);
@@ -110,5 +122,5 @@ jQuery(document).ready(function ($) {
     showDir(path);
   }
 
-  showDir(sgddRootPathLocalize.path);
-});
+  showDir(sgddRootPathLocalize.path); //eslint-disable-line no-undef
+})(jQuery);

plugin/admin/js/path-selection.js

@@ -35,7 +35,7 @@ final class Item implements CacheItemInterface
     private $value;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      */
     private $expiration;
 
@@ -81,7 +81,7 @@ public function isHit()
             return true;
         }
 
-        return new \DateTime() < $this->expiration;
+        return $this->currentTime()->getTimestamp() < $this->expiration->getTimestamp();
     }
 
     /**
@@ -126,9 +126,9 @@ public function expiresAt($expiration)
     public function expiresAfter($time)
     {
         if (is_int($time)) {
-            $this->expiration = new \DateTime("now + $time seconds");
+            $this->expiration = $this->currentTime()->add(new \DateInterval("PT{$time}S"));
         } elseif ($time instanceof \DateInterval) {
-            $this->expiration = (new \DateTime())->add($time);
+            $this->expiration = $this->currentTime()->add($time);
         } elseif ($time === null) {
             $this->expiration = $time;
         } else {
@@ -182,4 +182,9 @@ private function isValidExpiration($expiration)
 
         return false;
     }
+
+    protected function currentTime()
+    {
+        return new \DateTime('now', new \DateTimeZone('UTC'));
+    }
 }