Merge pull request #42 from venveo/change/refactor

Beta 4 - Refactor

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Characteristic Changelog
 
+## 1.0.0-beta.4 - 2/13/20
+## Changed
+- Refactored element structures such that we rely more on native Craft relations and Block Elements
+- Rewrote frontend field input to be more maintainable
+- Drilldown should be more performant 
+- Now requires Craft 3.4
+- Start using Vue Admin Table
+- Removed characteristic behavior in favor of field
+- Improved characteristic field to work more like Matrix fields
+- Changed CharacteristicLink to CharacteristicLinkBlock
+- Removed respectStructure from drilldown in favor of always respecting the structure
+- Characteristics now support multiple propagation methods
+
+## Fixed
+- Various improvements to multi-site support
+- Erroneous warning about unsaved changes on edit element screens
+- Drilldown now respects existing query parameters and paths
+
 ## 1.0.0-beta.3 - 1/31/20
 ## Fixed
 - Fixed error when saving drafts

README.md

@@ -53,31 +53,41 @@ you to quickly create a "Quiz" to find the most suitable element.
 
 ## Requirements
 
-This plugin requires Craft CMS 3.3.0 or later.
+This plugin requires Craft CMS 3.4.0 or later.
 
 ## Using Characteristic
 
 ### The Drilldown Helper
 ```twig
+{# Any arbitrary base element query #}
 {% set query = craft.entries.section('restaurants') %}
-{% set drilldown = craft.characteristic.drilldown('restaurants', query) %}
+
+{# Create an instance of the drilldown helper for the characteristic group with the handle `restaurantCharacteristics` #}
+{% set drilldown = craft.characteristic.drilldown('restaurantCharacteristics', query) %}
 
 {% set state = drilldown.state %}
 
 {% set current = drilldown.currentCharacteristic %}
 
+{# Get a text field called characteristicDescription off of the characteristic #}
 <h2>{{ current.characteristicDescription }}</h2>
 
+{# Get all of the options available for the current characteristic #}
 {% set options = drilldown.currentOptions.all() %}
 
 <ul>
     {% for option in options %}
+{# Use the applyToDrilldownState method to create a URL for this value based on the current state #}
         <li><a href="{{ option.applyToDrilldownState(state).url }}">{{ option.value }}</a></li>
+
+{# Grab a featuredImage Asset field off of the option #}
         {% if option.featuredImage.exists() %}
         <img src="{{ option.featuredImage.one().url }}" />
         {% endif %}
     {% endfor %}
     <hr>
+
+{# Optional URL to skip the question with picking an answer #}
     <a href="{{ drilldown.skipUrl() }}">Skip Question</a>
 </ul>
 
@@ -94,20 +104,9 @@ This plugin requires Craft CMS 3.3.0 or later.
 ```
 
 ### The characteristics field
-The field returns a CharacteristicLinkQuery pre-configured for the
+The field returns a CharacteristicLinkBlockQuery pre-configured for the
 element.
 
-#### Get a single characteristic's value
-```twig
-<ul>
-{# Loop over restaurants showing the selected price Characteristic #}
-    {% for restaurant in query.all() %}
-        {% set price = restaurant.restaurantAttributes.characteristic('price').with(['value']).all() %}
-        <li>{{ restaurant.title }} - {{ price ? price[0].value.value : 'No Data' }}</li>
-    {% endfor %}
-</ul>
-```
-
 #### Get all characteristics on an entry and show them as a table
 ```twig
 <table class="table-auto">
@@ -118,41 +117,19 @@ element.
     </tr>
     </thead>
     <tbody>
-    {# We have to group our characteristics by something (title), otherwise they will show a distinct table rows #}
-    {% set attributes = entry.restaurantAttributes.all()|group(v => v.characteristic.title) %}
-    {% for title, values in attributes %}
+    
+    {% set blocks = entry.restaurantAttributes.all() %}
+    {% for block in blocks %}
     <tr>
-        <td class="border px-4 py-2">{{ title }}</td>
+        <td class="border px-4 py-2">{{ block.characteristic.title }}</td>
         {# We're going to create a string out of the characteristic value's text value #}
-        <td class="border px-4 py-2">{{ values|column('value.value')|join(', ') }}</td>
+        <td class="border px-4 py-2">{{ block.values.all()|column('value')|join(', ') }}</td>
     </tr>
     {% endfor %}
     </tbody>
 </table>
 ```
 
-### The characteristic attribute
-Characteristic will inject some attributes into your elements to make
-querying characteristics easier! Take care to ensure you don't have any
-fields with the same handles as these.
-
-- `characteristics` returns a CharacteristicQuery configured to return
-only those related to the source element.
-
-```twig
-<ul>
-    {% for product in craft.entries.section('products').all() %}
-    <li>{{product.title}}</li>
-    <ul>
-        {% for characteristic in product.characteristics.all() %}
-        {# We could use .values() without a parameter if we wanted to get all possible values indiscriminately #}
-        <li>{{ characteristic.title }} - {{ characteristic.values(restaurant).all()|column('value')|join(', ') }}</li>
-        {% endfor %}
-    </ul>
-    {% endfor %}
-</ul>
-```
-
 ### Querying for elements
 There are a few different ways to query for elements with certain characteristics.
 
@@ -182,9 +159,9 @@ Characteristic Value is relative to a specific Characteristic. A
 Characteristic Value has a `value` attribute that is a text string that
 is unique to each Characteristic. For example: "Yes", "No", "1.25".
 
-#### Characteristic Link
+#### Characteristic Link Block
 An Element that contains the linkage between a particular
-Characteristic, a Characteristic Value, the field it was created from,
+Characteristic, a number of Characteristic Values, the field it was created from,
 as well as the element its attached to.
 
 #### Characteristic Field

composer.json

@@ -2,7 +2,7 @@
   "name": "venveo/craft-characteristic",
   "description": "Drill-drown on element characteristics",
   "type": "craft-plugin",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "keywords": [
     "craft",
     "cms",

src/Characteristic.php

@@ -11,9 +11,7 @@
 namespace venveo\characteristic;
 
 use Craft;
-use craft\base\Element;
 use craft\base\Plugin;
-use craft\events\DefineBehaviorsEvent;
 use craft\events\RegisterComponentTypesEvent;
 use craft\events\RegisterCpSettingsEvent;
 use craft\events\RegisterUrlRulesEvent;
@@ -23,12 +21,12 @@
 use craft\web\twig\variables\Cp;
 use craft\web\twig\variables\CraftVariable;
 use craft\web\UrlManager;
-use venveo\characteristic\behaviors\ElementCharacteristicsBehavior;
 use venveo\characteristic\elements\Characteristic as CharacteristicElement;
+use venveo\characteristic\elements\CharacteristicLinkBlock as CharacteristicLinkBlockElement;
 use venveo\characteristic\elements\CharacteristicValue as CharacteristicValueElement;
 use venveo\characteristic\fields\Characteristics as CharacteristicsField;
 use venveo\characteristic\services\CharacteristicGroups;
-use venveo\characteristic\services\CharacteristicLinks;
+use venveo\characteristic\services\CharacteristicLinkBlocks;
 use venveo\characteristic\services\Characteristics;
 use venveo\characteristic\services\CharacteristicValues;
 use venveo\characteristic\variables\CharacteristicVariable;
@@ -44,7 +42,7 @@
  * @property  CharacteristicGroups $characteristicGroups
  * @property  Characteristics $characteristics
  * @property  CharacteristicValues $characteristicValues
- * @property  CharacteristicLinks $characteristicLinks
+ * @property  CharacteristicLinkBlocks $characteristicLinkBlocks
  */
 class Characteristic extends Plugin
 {
@@ -81,7 +79,7 @@ public function init()
             'characteristicGroups' => CharacteristicGroups::class,
             'characteristics' => Characteristics::class,
             'characteristicValues' => CharacteristicValues::class,
-            'characteristicLinks' => CharacteristicLinks::class,
+            'characteristicLinkBlocks' => CharacteristicLinkBlocks::class,
         ]);
 
         Event::on(
@@ -114,14 +112,11 @@ function (RegisterUrlRulesEvent $event) {
             Elements::EVENT_REGISTER_ELEMENT_TYPES,
             function (RegisterComponentTypesEvent $event) {
                 $event->types[] = CharacteristicElement::class;
+                $event->types[] = CharacteristicLinkBlockElement::class;
                 $event->types[] = CharacteristicValueElement::class;
             }
         );
 
-        Event::on(Element::class, Element::EVENT_DEFINE_BEHAVIORS, function (DefineBehaviorsEvent $e) {
-            $e->behaviors[] = ElementCharacteristicsBehavior::class;
-        });
-
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
@@ -163,6 +158,4 @@ public function getCpNavItem()
         }
         return null;
     }
-    // Protected Methods
-    // =========================================================================
 }