Merge branch 'release/2.0.1'

Author: brandonkelly

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release Notes for Webhooks for Craft CMS
 
+## 2.0.1 - 2019-03-20
+
+### Fixed
+- Fixed a bug where it wasn’t possible to create or edit webhooks if a plugin contained an invalid class. ([#8](https://github.com/craftcms/webhooks/issues/8))
+- Fixed a SQL error that would occur on installs that had been updated from Webhooks 1.x.
+- Fixed a SQL error that occurred when attempting to uninstall Webhooks.
+
 ## 2.0.0 - 2019-03-19
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/webhooks",
   "description": "Post webhooks when events are triggered in Craft CMS.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "craft-plugin",
   "keywords": [
     "html",

src/Plugin.php

@@ -48,7 +48,7 @@ class Plugin extends \craft\base\Plugin
     /**
      * @inheritdoc
      */
-    public $schemaVersion = '2.0.0';
+    public $schemaVersion = '2.0.1';
 
     // Public Methods
     // =========================================================================

src/WebhookHelper.php

@@ -35,7 +35,7 @@ class WebhookHelper
      */
     public static function classSuggestions(): array
     {
-        $data = Craft::$app->getCache()->getOrSet('webhooks.classSuggestions', function() {
+        return Craft::$app->getCache()->getOrSet('webhooks.classSuggestions', function() {
             $classes = [];
             foreach (self::_findClasses() as $class) {
                 $classes[] = [
@@ -47,12 +47,6 @@ public static function classSuggestions(): array
         }, null, new FileDependency([
             'fileName' => Craft::$app->getPath()->getVendorPath() . '/composer/autoload_real.php',
         ]));
-
-        return [
-            [
-                'data' => $data,
-            ],
-        ];
     }
 
     /**

src/controllers/WebhooksController.php

@@ -79,17 +79,13 @@ public function actionEdit(int $id = null, int $groupId = null, Webhook $webhook
             }
         }
 
-        // Autosuggest classes
-        $classSuggestions = WebhookHelper::classSuggestions();
-
         Craft::$app->getView()->registerAssetBundle(EditAsset::class);
 
         return $this->renderTemplate('webhooks/_manage/edit', compact(
             'groupOptions',
             'webhook',
             'title',
-            'crumbs',
-            'classSuggestions'
+            'crumbs'
         ));
     }
 
@@ -169,6 +165,16 @@ public function actionDelete(): Response
         return $this->redirectToPostedUrl();
     }
 
+    /**
+     * Returns the available sender classes.
+     */
+    public function actionClassSuggestions(): Response
+    {
+        return $this->asJson([
+            'classes' => WebhookHelper::classSuggestions(),
+        ]);
+    }
+
     /**
      * Returns the available events for a component class.
      */

src/migrations/Install.php

@@ -77,8 +77,8 @@ public function safeUp()
     public function safeDown()
     {
         // Drop the DB table
+        $this->dropTableIfExists('{{%webhookrequests}}');
         $this->dropTableIfExists('{{%webhooks}}');
         $this->dropTableIfExists('{{%webhookgroups}}');
-        $this->dropTableIfExists('{{%webhookrequests}}');
     }
 }

src/migrations/m190112_00000_json_payload.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace craft\webhooks\migrations;
+
+use Craft;
+use craft\db\Migration;
+
+/**
+ * m190320_182458_payload_template_col migration.
+ */
+class m190320_182458_payload_template_col extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp()
+    {
+        if (!$this->db->columnExists('{{%webhooks}}', 'payloadTemplate')) {
+            $this->addColumn('{{%webhooks}}', 'payloadTemplate', $this->mediumText()->after('eventAttributes'));
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown()
+    {
+        echo "m190320_182458_payload_template_col cannot be reverted.\n";
+        return false;
+    }
+}

src/migrations/m190320_182458_payload_template_col.php

@@ -0,0 +1,24 @@
+{% extends '_includes/forms/autosuggest' %}
+
+{% block data %}
+    {{ parent() }}
+    this.updateSuggestions()
+    {#data.inputProps.onInputChange = this.myOnInputChange;#}
+
+{% endblock %}
+
+
+{% block methods %}
+    {{ parent() }}
+    updateSuggestions() {
+        Craft.postActionRequest('webhooks/webhooks/class-suggestions', {}, $.proxy(function(response, textStatus) {
+            if (textStatus === 'success') {
+                this.suggestions = [
+                    {
+                        data: response.classes
+                    }
+                ];
+            }
+        }, this));
+    },
+{% endblock %}

src/templates/_manage/class-autosuggest.html

@@ -41,18 +41,20 @@
         errors: webhook.getErrors('name')
     }) }}
 
-    {{ forms.autosuggestField({
-        label: 'Sender Class'|t('webhooks'),
-        required: true,
-        instructions: 'The class name the sender must be an instance of.'|t('webhooks'),
+    {% set classInput = include('webhooks/_manage/class-autosuggest', {
         id: 'class',
         name: 'class',
         class: 'code ltr',
-        suggestions: classSuggestions,
         placeholder: 'craft\\elements\\Entry',
         value: webhook.class,
         errors: webhook.getErrors('class')
-    }) }}
+    }, with_context = false) %}
+    {{ forms.field({
+        label: 'Sender Class'|t('webhooks'),
+        required: true,
+        instructions: 'The class name the sender must be an instance of.'|t('webhooks'),
+        errors: webhook.getErrors('class')
+    }, classInput) }}
 
     {% set eventInput = include('webhooks/_manage/event-autosuggest', {
         id: 'event',