Fix copying filters for e2t messages and conditional redirects.

campaignion_action/src/Redirects/Filter.php

@@ -29,9 +29,8 @@ class Filter extends Model {
    *   Data representing the filter.
    */
   public static function fromArray(array $data) {
-    $data += ['id' => NULL, 'weight' => 0];
+    $data += ['weight' => 0];
     $filter = new static();
-    $filter->id = $data['id'];
     $filter->setData($data);
     return $filter;
   }

campaignion_action/src/Redirects/Redirect.php

@@ -73,7 +73,7 @@ public function setFilters(array $new_filters) {
 
     foreach ($new_filters as $nf) {
       if ($nf instanceof Filter) {
-        $f = $nf;
+        $f = $nf->redirect_id == $this->id ? $nf : clone $nf;
       }
       else {
         // Reuse filter objects if 'id' is passed and found.

campaignion_action/tests/Redirects/RedirectTest.php

@@ -69,6 +69,38 @@ public function testRedirectCloning() {
     $this->assertEqual(1, $t1->filters[0]->config['value']);
   }
 
+  /**
+   * Test copying a filter from one redirect template to another.
+   */
+  public function testCopyFilter() {
+    $data = [
+      'id' => 42,
+      'label' => 'A',
+      'destination' => 'node/50',
+      'filters' => [['type' => 'test', 'value' => 1]],
+    ];
+    $redirect_a = new Redirect($data);
+    $redirect_a->filters[0]->id = 42;
+
+    $data = [
+      'id' => 43,
+      'label' => 'B',
+      'destination' => 'node/50',
+      'filters' => [],
+    ];
+    $redirect_b = new Redirect($data);
+
+    // Copy as array.
+    $redirect_b->setFilters([$redirect_a->filters[0]->toArray()]);
+    $this->assertEquals(42, $redirect_a->filters[0]->id);
+    $this->assertNotEquals(42, $redirect_b->filters[0]->id);
+
+    // Copy as filter object.
+    $redirect_b->setFilters([$redirect_a->filters[0]]);
+    $this->assertEquals(42, $redirect_a->filters[0]->id);
+    $this->assertNotEquals(42, $redirect_b->filters[0]->id);
+  }
+
   /**
    * Test checkFilters without any filters configured (ie. default redirect).
    */

campaignion_email_to_target/messages_app/package.json

@@ -21,6 +21,7 @@
     "lodash.omit": "^4.5.0"
   },
   "devDependencies": {
+    "@vue/test-utils": "^1.0.0-beta.20",
     "autoprefixer": "^6.7.2",
     "babel-core": "^6.22.1",
     "babel-eslint": "^7.1.1",

campaignion_email_to_target/messages_app/src/components/SpecDialog.vue

@@ -336,6 +336,7 @@ export default {
     this.$bus.$on('duplicateSpec', index => {
       const duplicate = clone(this.specs[index])
       duplicate.id = emptySpec(duplicate.type).id
+      duplicate.filters.forEach((filter) => { filter.id = null })
       duplicate.label = Drupal.t('Copy of @messageName', {'@messageName': duplicate.label})
       this.currentSpec = duplicate
       this.determineExclusionMode()

campaignion_email_to_target/messages_app/test/unit/specs/components.spec.js

@@ -0,0 +1,44 @@
+import mutations from '@/store/mutations'
+import initialState from '@/store/state'
+import testData from '../fixtures/example-data'
+import Vue from 'vue'
+import { shallowMount } from '@vue/test-utils'
+import SpecDialog from '@/components/SpecDialog'
+
+describe('components', function () {
+  var state
+
+  beforeEach(function () {
+    state = Object.assign({}, initialState)
+    mutations.initializeData(state, testData)
+  })
+
+  describe('SpecDialog', () => {
+    Vue.config.ignoredElements = [
+      'el-dialog', 'el-button', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'
+    ]
+    const bus = new Vue()
+
+    it('duplicates a spec', () => {
+      const wrapper = shallowMount(SpecDialog, {
+        mocks: {
+          $store: {
+            state: state,
+            commit: function () {}
+          },
+          $bus: bus
+        }
+      })
+      var s = state.specs[0]
+      bus.$emit('duplicateSpec', 0)
+
+      expect(wrapper.vm.currentSpec.label).to.equal(`Copy of ${s.label}`)
+      expect(wrapper.vm.currentSpec.type).to.equal(s.type)
+      expect(wrapper.vm.currentSpec.message).to.deep.equal(s.message)
+      expect(wrapper.vm.currentSpec.id, 'id should be resetted').to.be.null
+      for (let filter of wrapper.vm.currentSpec.filters) {
+        expect(filter.id, 'filter ids should be resetted').to.be.null
+      }
+    })
+  })
+})

campaignion_email_to_target/src/Filter.php

@@ -19,7 +19,9 @@ class Filter extends Model {
   public $config = [];
 
   public static function fromArray($data) {
-    return new static($data);
+    $f = new static();
+    $f->setData($data);
+    return $f;
   }
 
   public function __construct($data = array(), $new = TRUE) {

campaignion_email_to_target/src/MessageTemplate.php

@@ -92,7 +92,7 @@ public function setFilters(array $new_filters) {
 
     foreach ($new_filters as $nf) {
       if ($nf instanceof Filter) {
-        $f = $nf;
+        $f = $nf->message_id == $this->id ? $nf : clone $nf;
       }
       else {
         // Reuse filter objects if 'id' is passed and found.

campaignion_email_to_target/tests/MessageTemplateTest.php

@@ -70,6 +70,41 @@ public function testMessageCloning() {
     $this->assertEqual(1, $t1->filters[0]->config['value']);
   }
 
+  /**
+   * Test copying a filter from one message template to another.
+   */
+  public function testCopyFilter() {
+    $data = [
+      'id' => 42,
+      'type' => 'message',
+      'label' => 'A',
+      'filters' => [[
+        'type' => 'test',
+        'config' => ['value' => 1],
+      ]],
+    ];
+    $template_a = new MessageTemplate($data);
+    $template_a->filters[0]->id = 42;
+
+    $data = [
+      'id' => 43,
+      'type' => 'message',
+      'label' => 'B',
+      'filters' => [],
+    ];
+    $template_b = new MessageTemplate($data);
+
+    // Copy as array.
+    $template_b->setFilters([$template_a->filters[0]->toArray()]);
+    $this->assertEquals(42, $template_a->filters[0]->id);
+    $this->assertNotEquals(42, $template_b->filters[0]->id);
+
+    // Copy as filter object.
+    $template_b->setFilters([$template_a->filters[0]]);
+    $this->assertEquals(42, $template_a->filters[0]->id);
+    $this->assertNotEquals(42, $template_b->filters[0]->id);
+  }
+
   /**
    * Test creating a message instance.
    */

campaignion_wizard/redirects_app/src/components/RedirectDialog.vue

@@ -241,6 +241,7 @@ export default {
     this.$root.$on('duplicateRedirect', index => {
       const duplicate = clone(this.redirects[index])
       duplicate.id = emptyRedirect().id
+      duplicate.filters.forEach((filter) => { filter.id = null })
       duplicate.label = Drupal.t('Copy of @redirectLabel', {'@redirectLabel': duplicate.label})
       this.currentRedirect = duplicate
       this.$store.commit('editNewRedirect')