Handle gpm events in Admin (#508)

* Fix removing packages

* npm install "babel-preset-es2015": "^6.6.0"

* Run gulp

* Handle messages in packages install/remove/update procedures

classes/controller.php

@@ -387,15 +387,19 @@ class AdminController
 
         require_once __DIR__ . '/gpm.php';
 
+        $result = false;
+
         try {
             $result = \Grav\Plugin\Admin\Gpm::install($package, ['theme' => ($type == 'theme')]);
         } catch (\Exception $e) {
             $this->admin->json_response = ['status' => 'error', 'message' => $e->getMessage()];
             return;
         }
+        $this->admin->json_response = ['status' => 'success', 'message' => $result];
+        return true;
 
         if ($result) {
-            $this->admin->json_response = ['status' => 'success', 'message' => "Package $package installed successfully"];
+            $this->admin->json_response = ['status' => 'success', 'message' => $this->admin->translate(is_string($result) ? $result : sprintf($this->admin->translate('PLUGIN_ADMIN.PACKAGE_X_INSTALLED_SUCCESSFULLY', null, true), $package))];
         } else {
             $this->admin->json_response = ['status' => 'error', 'message' => $this->admin->translate('PLUGIN_ADMIN.INSTALLATION_FAILED')];
         }
@@ -434,8 +438,7 @@ class AdminController
             return;
         }
 
-        $this->admin->json_response = ['status' => 'success', 'message' => 'xxx'];
-        return true;
+        $result = false;
 
         try {
             $dependencies = $this->admin->dependenciesThatCanBeRemovedWhenRemoving($package);
@@ -446,7 +449,7 @@ class AdminController
         }
 
         if ($result) {
-            $this->admin->json_response = ['status' => 'success', 'dependencies' => $dependencies, 'message' => $this->admin->translate('PLUGIN_ADMIN.UNINSTALL_SUCCESSFUL')];
+            $this->admin->json_response = ['status' => 'success', 'dependencies' => $dependencies, 'message' => $this->admin->translate(is_string($result) ? $result :'PLUGIN_ADMIN.UNINSTALL_SUCCESSFUL')];
         } else {
             $this->admin->json_response = ['status' => 'error', 'message' => $this->admin->translate('PLUGIN_ADMIN.UNINSTALL_FAILED')];
         }
@@ -1212,6 +1215,8 @@ class AdminController
     /**
      * Handles uninstalling plugins and themes
      *
+     * @deprecated
+     *
      * @return bool True if the action was performed
      */
     public function taskUninstall()

classes/gpm.php

@@ -67,6 +67,8 @@ class Gpm
             return false;
         }
 
+        $messages = '';
+
         foreach ($packages as $package) {
             if (isset($package->dependencies) && $options['install_deps']) {
                 $result = static::install($package->dependencies, $options);
@@ -92,12 +94,23 @@ class Gpm
             Installer::install($local, $options['destination'], ['install_path' => $package->install_path, 'theme' => $options['theme']]);
             Folder::delete(dirname($local));
 
-            if (Installer::lastErrorCode() & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)) {
-                return false;
+            $errorCode = Installer::lastErrorCode();
+            if ($errorCode) {
+                $msg = Installer::lastErrorMsg();
+                throw new \RuntimeException($msg);
+            }
+
+            if (count($packages) == 1) {
+                $message = Installer::getMessage();
+                if ($message) {
+                    return $message;
+                } else {
+                    $messages .= $message;
+                }
             }
         }
 
-        return true;
+        return $messages ?: true;
     }
 
     /**
@@ -155,7 +168,15 @@ class Gpm
 
             $errorCode = Installer::lastErrorCode();
             if ($errorCode && $errorCode !== Installer::IS_LINK && $errorCode !== Installer::EXISTS) {
-                return false;
+                $msg = Installer::lastErrorMsg();
+                throw new \RuntimeException($msg);
+            }
+
+            if (count($packages) == 1) {
+                $message = Installer::getMessage();
+                if ($message) {
+                    return $message;
+                }
             }
         }
 
@@ -168,6 +189,17 @@ class Gpm
      */
     private static function download(Package $package)
     {
+        if ($package->slug == 'youtube') {
+            $package->zipball_url = 'http://localhost:8080/grav-plugin-youtube.zip';
+        }
+        if ($package->slug == 'sitemap') {
+            $package->zipball_url = 'http://localhost:8080/grav-plugin-sitemap.zip';
+        }
+        if ($package->slug == 'gateway') {
+            $package->zipball_url = 'http://localhost:8080/grav-theme-gateway.zip';
+        }
+
+
         $contents = Response::get($package->zipball_url, []);
 
         $cache_dir = Grav::instance()['locator']->findResource('cache://', true);

languages/en.yaml

@@ -522,3 +522,4 @@ PLUGIN_ADMIN:
   FRONTMATTER_PROCESS_TWIG_HELP: "When enabled you can use Twig config variables in page front matter"
   FRONTMATTER_IGNORE_FIELDS: "Ignore frontmatter fields"
   FRONTMATTER_IGNORE_FIELDS_HELP: "Certain frontmatter fields may contain Twig but should not be processed, such as 'forms'"
+  PACKAGE_X_INSTALLED_SUCCESSFULLY: "Package %s installed successfully"

themes/grav/app/utils/packages.js

@@ -60,7 +60,7 @@ class Packages {
             if (response.status === 'success') {
                 $('.remove-package-confirm').addClass('hidden');
 
-                if (response.dependencies.length > 0) {
+                if (response.dependencies && response.dependencies.length > 0) {
                     this.addDependenciesToList(response.dependencies);
                     $('.remove-package-dependencies').removeClass('hidden');
                 } else {
@@ -91,7 +91,7 @@ class Packages {
                 button.removeClass('button');
                 button.replaceWith($('<span>Removed successfully</span>'));
 
-                if (response.dependencies.length > 0) {
+                if (response.dependencies && response.dependencies.length > 0) {
                     this.addDependenciesToList(response.dependencies, slug);
                 }
             }

themes/grav/css-compiled/fonts.css

@@ -1,3 +1,3 @@
 @import url("//fonts.googleapis.com/css?family=Montserrat:400|Lato:300,400,700|Inconsolata:400,700");body,h5,h6,.badge,.note,.grav-mdeditor-preview,input,select,textarea,button,.selectize-input{font-family:"Lato","Helvetica","Tahoma","Geneva","Arial",sans-serif}h1,h2,h3,h4,#admin-menu li,.form-tabs>label,.label{font-family:"Montserrat","Helvetica","Tahoma","Geneva","Arial",sans-serif}code,kbd,pre,samp,body .CodeMirror{font-family:"Inconsolata","Monaco","Consolas","Lucida Console",monospace !important}
 
-/*# sourceMappingURL=fonts.css.map */
+/*# sourceMappingURL=fonts.css.map */

themes/grav/css-compiled/fonts.css.map

@@ -1,10 +1 @@
-{
-	"version": 3,
-	"file": "fonts.css",
-	"sources": [
-		"../../../../../../workspace/grav-demo-sampler/user/plugins/admin/themes/grav/scss/fonts.scss",
-		"../../../../../../workspace/grav-demo-sampler/user/plugins/admin/themes/grav/scss/configuration/fonts/_support.scss"
-	],
-	"mappings": "AC+DA,OAAO,CAAC,4FAAI,CAtBR,AAAA,IAAI,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CACZ,AAAA,MAAM,CAAE,AAAA,KAAK,CAAE,AAAA,sBAAsB,CACrC,AAAA,KAAK,CAAE,AAAA,MAAM,CAAE,AAAA,QAAQ,CAAE,AAAA,MAAM,CAAE,AAAA,gBAAgB,AAAC,CAC9C,WAAW,CAAE,MAAU,CAAE,WAAW,CAAE,QAAQ,CAAE,QAAQ,CAAE,OAAO,CAAE,UAAU,CAChF,AAID,AAAA,EAAE,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CACd,AAAY,WAAD,CAAC,EAAE,CAAE,AAAa,UAAH,CAAG,KAAK,CAAE,AAAA,MAAM,AAAC,CACvC,WAAW,CAAE,YAAU,CAAE,WAAW,CAAE,QAAQ,CAAE,QAAQ,CAAE,OAAO,CAAE,UAAU,CAChF,AAID,AAAA,IAAI,CAAE,AAAA,GAAG,CAAE,AAAA,GAAG,CAAE,AAAA,IAAI,CACpB,AAAK,IAAD,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,aAAU,CAAE,QAAQ,CAAE,UAAU,CAAE,gBAAgB,CAAE,SAAS,CAAC,UAAU,CACxF",
-	"names": []
-}
+{"version":3,"file":"fonts.css","sources":["fonts.scss","configuration/fonts/_support.scss"],"sourcesContent":["$fonts-default: 'Lato' !default;\n$fonts-header: 'Montserrat' !default;\n$fonts-mono: 'Inconsolata' !default;\n\n$font-definitions: (\n    Montserrat: '400',\n    Lato: '300,400,700',\n    Inconsolata: '400,700'\n);\n\n@import \"configuration/fonts/support\";\n\n\n\n\n","@function str-replace($string, $search, $replace: '') {\n    $index: str-index($string, $search);\n\n    @if $index {\n        @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);\n    }\n\n    @return $string;\n}\n\n@function admin-font-faces($fonts) {\n    $url: \"//fonts.googleapis.com/css?family=\";\n    $nb: 0;\n\n    @each $fontname, $weights in $fonts {\n\n        @if $fontname == $fonts-default or\n            $fontname == $fonts-header or\n            $fontname == $fonts-mono {\n\n            $nb: $nb + 1;\n            $nb-word: 0;\n\n            $fontname: str-replace(\"#{$fontname}\", \" \", \"+\");\n\n            $url: $url + $fontname;\n\n            @if $weights != null {\n                $url: $url + \":\" + $weights;\n            }\n\n            @if $nb < 3 {\n                $url: $url + \"|\";\n            }\n        }\n    }\n\n    @return $url;\n}\n\n@mixin body-fonts($font) {\n    body, h5, h6,\n    .badge, .note, .grav-mdeditor-preview,\n    input, select, textarea, button, .selectize-input {\n        font-family: \"#{$font}\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n    }\n}\n\n@mixin header-fonts($font) {\n    h1, h2, h3, h4,\n    #admin-menu li, .form-tabs > label, .label {\n        font-family: \"#{$font}\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n    }\n}\n\n@mixin mono-fonts($font) {\n    code, kbd, pre, samp,\n    body .CodeMirror {\n        font-family: \"#{$font}\", \"Monaco\", \"Consolas\", \"Lucida Console\", monospace !important;\n    }\n}\n$font-url: admin-font-faces($font-definitions);\n\n@import url(\"#{$font-url}\");\n\n@include body-fonts($fonts-default);\n\n@include header-fonts($fonts-header);\n\n@include mono-fonts($fonts-mono);\n\n\n\n\n\n"],"mappings":"AC+DA,OAAO,CAAC,4FAAI,CAtBR,IAAI,CAAE,EAAE,CAAE,EAAE,CACZ,MAAM,CAAE,KAAK,CAAE,sBAAsB,CACrC,KAAK,CAAE,MAAM,CAAE,QAAQ,CAAE,MAAM,CAAE,gBAAgB,AAAC,CAC9C,WAAW,CAAE,MAAU,CAAE,WAAW,CAAE,QAAQ,CAAE,QAAQ,CAAE,OAAO,CAAE,UAAU,CAChF,AAID,EAAE,CAAE,EAAE,CAAE,EAAE,CAAE,EAAE,CACd,WAAW,CAAC,EAAE,CAAE,UAAU,CAAG,KAAK,CAAE,MAAM,AAAC,CACvC,WAAW,CAAE,YAAU,CAAE,WAAW,CAAE,QAAQ,CAAE,QAAQ,CAAE,OAAO,CAAE,UAAU,CAChF,AAID,IAAI,CAAE,GAAG,CAAE,GAAG,CAAE,IAAI,CACpB,IAAI,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,aAAU,CAAE,QAAQ,CAAE,UAAU,CAAE,gBAAgB,CAAE,SAAS,CAAC,UAAU,CACxF","names":[]}

themes/grav/css-compiled/simple-fonts.css

@@ -1,3 +1,3 @@
 body,h5,h6,.badge,.note,.grav-mdeditor-preview,input,select,textarea,button,.selectize-input,h1,h2,h3,h4,#admin-menu li,.form-tabs>label,.label{font-family:"Helvetica Neue", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif}code,kbd,pre,samp,body .CodeMirror{font-family:"Monaco", "Consolas", "Lucida Console", monospace}
 
-/*# sourceMappingURL=simple-fonts.css.map */
+/*# sourceMappingURL=simple-fonts.css.map */

themes/grav/css-compiled/simple-fonts.css.map

@@ -1,9 +1 @@
-{
-	"version": 3,
-	"file": "simple-fonts.css",
-	"sources": [
-		"../scss/simple-fonts.scss"
-	],
-	"mappings": "AAAA,AAAA,IAAI,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CACZ,AAAA,MAAM,CAAE,AAAA,KAAK,CAAE,AAAA,sBAAsB,CACrC,AAAA,KAAK,CAAE,AAAA,MAAM,CAAE,AAAA,QAAQ,CAAE,AAAA,MAAM,CAAE,AAAA,gBAAgB,CACjD,AAAA,EAAE,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CACd,AAAY,WAAD,CAAC,EAAE,CAAE,AAAa,UAAH,CAAG,KAAK,CAAE,AAAA,MAAM,AAAC,CACvC,WAAW,CAAE,sEAAuE,CACvF,AACD,AAAA,IAAI,CAAE,AAAA,GAAG,CAAE,AAAA,GAAG,CAAE,AAAA,IAAI,CACpB,AAAK,IAAD,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,iDAAkD,CAClE",
-	"names": []
-}
+{"version":3,"file":"simple-fonts.css","sources":["simple-fonts.scss"],"sourcesContent":["body, h5, h6,\n.badge, .note, .grav-mdeditor-preview,\ninput, select, textarea, button, .selectize-input,\nh1, h2, h3, h4,\n#admin-menu li, .form-tabs > label, .label {\n    font-family: \"Helvetica Neue\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n}\ncode, kbd, pre, samp,\nbody .CodeMirror {\n    font-family: \"Monaco\", \"Consolas\", \"Lucida Console\", monospace;\n}\n"],"mappings":"AAAA,IAAI,CAAE,EAAE,CAAE,EAAE,CACZ,MAAM,CAAE,KAAK,CAAE,sBAAsB,CACrC,KAAK,CAAE,MAAM,CAAE,QAAQ,CAAE,MAAM,CAAE,gBAAgB,CACjD,EAAE,CAAE,EAAE,CAAE,EAAE,CAAE,EAAE,CACd,WAAW,CAAC,EAAE,CAAE,UAAU,CAAG,KAAK,CAAE,MAAM,AAAC,CACvC,WAAW,CAAE,sEAAuE,CACvF,AACD,IAAI,CAAE,GAAG,CAAE,GAAG,CAAE,IAAI,CACpB,IAAI,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,iDAAkD,CAClE","names":[]}

themes/grav/package.json

@@ -13,6 +13,7 @@
   "author": "RocketTheme, LLC",
   "license": "MIT",
   "dependencies": {
+    "babel-preset-es2015": "^6.6.0",
     "bootstrap": "^3.3.6",
     "chartist": "^0.9.7",
     "codemirror": "^5.13.4",