Restricting number of tags for tag rules to one

app/assets/javascripts/admin/utils/directives/tags_with_translation.js.coffee

@@ -7,10 +7,15 @@ angular.module("admin.utils").directive "tagsWithTranslation", ($timeout) ->
     tagListAttr: "@?"
     findTags: "&"
     form: '=?'
+    onTagAdded: "&"
+    onTagRemoved: "&"
+    max: "="
   link: (scope, element, attrs) ->
     scope.findTags = undefined unless attrs.hasOwnProperty("findTags")
+    scope.limitReached = false
 
     compileTagList = ->
+      scope.limitReached = scope.object[scope.tagsAttr].length >= scope.max if scope.max != undefined
       scope.object[scope.tagListAttr] = (tag.text for tag in scope.object[scope.tagsAttr]).join(",")
 
     $timeout ->
@@ -21,10 +26,12 @@ angular.module("admin.utils").directive "tagsWithTranslation", ($timeout) ->
       compileTagList()
 
       scope.tagAdded = ->
+        scope.onTagAdded()
         compileTagList()
 
       scope.tagRemoved = ->
         # For some reason the tags input doesn't mark the form
         # as dirty when a tag is removed, which breaks the save bar
         scope.form.$setDirty(true) if typeof scope.form isnt 'undefined'
+        scope.onTagRemoved()
         compileTagList()

app/assets/javascripts/templates/admin/tag_rules/filter_order_cycles_input.html.haml

@@ -1,4 +1,10 @@
-%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
-  name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
-  ng: { model: "rule.preferred_matched_order_cycles_visibility"},
-  data: 'visibilityOptions', "min-search" => 5 }
+%div
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
+    ng: { model: "rule.preferred_matched_order_cycles_visibility", if: "!rule.is_default" },
+    data: 'visibilityOptions', "min-search" => 5 }
+  %input{ type: "hidden",
+    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
+    ng: { value: "'hidden'", if: "rule.is_default" } }
+  %span.text-normal{ ng: { if: "rule.is_default" } } not visible

app/assets/javascripts/templates/admin/tag_rules/filter_payment_methods_input.html.haml

@@ -1,4 +1,10 @@
-%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
-  name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
-  ng: { model: "rule.preferred_matched_payment_methods_visibility"},
-  data: 'visibilityOptions', "min-search" => 5 }
+%div
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
+    ng: { model: "rule.preferred_matched_payment_methods_visibility", if: "!rule.is_default" },
+    data: 'visibilityOptions', "min-search" => 5 }
+  %input{ type: "hidden",
+    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
+    ng: { value: "'hidden'", if: "rule.is_default" } }
+  %span.text-normal{ ng: { if: "rule.is_default" } } not visible

app/assets/javascripts/templates/admin/tag_rules/filter_products_input.html.haml

@@ -1,4 +1,10 @@
-%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
-  name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
-  ng: { model: "rule.preferred_matched_variants_visibility"},
-  data: 'visibilityOptions', "min-search" => 5 }
+%div
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
+    ng: { model: "rule.preferred_matched_variants_visibility", if: "!rule.is_default" },
+    data: 'visibilityOptions', "min-search" => 5 }
+  %input{ type: "hidden",
+    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
+    ng: { value: "'hidden'", if: "rule.is_default" } }
+  %span.text-normal{ ng: { if: "rule.is_default" } } not visible

app/assets/javascripts/templates/admin/tag_rules/filter_shipping_methods_input.html.haml

@@ -1,4 +1,10 @@
-%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
-  name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
-  ng: { model: "rule.preferred_matched_shipping_methods_visibility"},
-  data: 'visibilityOptions', "min-search" => 5 }
+%div
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
+    ng: { model: "rule.preferred_matched_shipping_methods_visibility", if: "!rule.is_default" },
+    data: 'visibilityOptions', "min-search" => 5 }
+  %input{ type: "hidden",
+    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
+    ng: { value: "'hidden'", if: "rule.is_default" } }
+  %span.text-normal{ ng: { if: "rule.is_default" } } not visible

app/assets/javascripts/templates/admin/tag_rules/tag_rule.html.haml

@@ -38,7 +38,7 @@
 
         %span.text-normal {{ opt[rule.type].textTop }}
       %td
-        %tags-with-translation{ object: "rule", "tags-attr" => "{{opt[rule.type].tagsAttr}}", "tag-list-attr" => "{{opt[rule.type].tagListAttr}}" }
+        %tags-with-translation{ object: "rule", max: 1, "tags-attr" => "{{opt[rule.type].tagsAttr}}", "tag-list-attr" => "{{opt[rule.type].tagListAttr}}" }
       %td.actions{ rowspan: 2 }
         %a{ ng: { click: "deleteTagRule(tagGroup, rule)" }, :class => "delete-tag-rule icon-trash no-text" }
     %tr

app/assets/javascripts/templates/admin/tags_input.html.haml

@@ -1,4 +1,6 @@
-%tags-input{ template: 'admin/tag.html', ng: { model: 'object[tagsAttr]' }, on: { tag: { added: 'tagAdded()', removed:'tagRemoved()' } } }
+%tags-input{ template: 'admin/tag.html',
+  ng: { model: 'object[tagsAttr]', class: "{'limit-reached': limitReached}"},
+  on: { tag: { added: 'tagAdded()', removed:'tagRemoved()' } } }
   %auto-complete{ ng: { if: "findTags" }, source: "findTags({query: $query})",
                  template: "admin/tag_autocomplete.html",
                  "min-length" => "0",

app/assets/stylesheets/admin/tag_rules.css.scss

@@ -1,3 +1,11 @@
+tags-input {
+  &.limit-reached {
+    input, span.input {
+      display: none;
+    }
+  }
+}
+
 .no_tags {
   margin-bottom: 40px;
   color: #aeaeae;

app/views/admin/enterprises/form/_tag_rules.html.haml

@@ -16,9 +16,7 @@
                 %h5
                   For customers tagged:
               %td
-                %tags-input{ ng: { model: 'tagGroup.tags'},
-                  min: { tags: "1" },
-                  on: { tag: { added: "updateTagsRulesFor(tagGroup)", removed: "updateTagsRulesFor(tagGroup)" } } }
+                %tags-with-translation{ object: "tagGroup", max: 1, on: { tag: { added: "updateTagsRulesFor(tagGroup)", removed: "updateTagsRulesFor(tagGroup)" } } }
 
         .no_rules{ ng: { show: "tagGroup.rules.length == 0" } }
           No rules apply to this tag yet

spec/features/admin/tag_rules_spec.rb

@@ -64,7 +64,7 @@ feature 'Tag Rules', js: true do
       click_button "Add Rule"
       within(".default_rules #tr_0") do
         find(:css, "tags-input .tags input").set "wholesale\n"
-        select2_select "NOT VISIBLE", from: "enterprise_tag_rules_attributes_0_preferred_matched_order_cycles_visibility"
+        expect(page).to have_content "not visible"
       end
 
       # New DiscountOrder Rule
@@ -128,19 +128,21 @@ feature 'Tag Rules', js: true do
       expect(page).to have_selector '.customer_tag .header tags-input .tag-list ti-tag-item', text: "local", count: 1
       expect(page).to have_selector '.customer_tag .header tags-input .tag-list ti-tag-item', text: "wholesale", count: 1
       expect(page).to have_selector '.customer_tag .header tags-input .tag-list ti-tag-item', text: "trusted", count: 1
-      all(:css, ".customer_tag .header tags-input .tags input").each { |node| node.set "volunteer\n" }
+      all(:css, ".customer_tag .header tags-input").each do |node|
+        node.find("li.tag-item a.remove-button").trigger('click')
+        node.find(".tags input").set "volunteer\n"
+      end
 
       # DEFAULT FilterShippingMethods rule
       within ".default_rules #tr_0" do
-        expect(first('tags-input .tag-list ti-tag-item')).to have_content "local"
+        within "li.tag-item", text: "local ✖" do find("a.remove-button").trigger('click') end
         find(:css, "tags-input .tags input").set "volunteers-only\n"
-        expect(page).to have_select2 "enterprise_tag_rules_attributes_0_preferred_matched_shipping_methods_visibility", selected: 'VISIBLE'
-        select2_select 'NOT VISIBLE', from: "enterprise_tag_rules_attributes_0_preferred_matched_shipping_methods_visibility"
+        expect(page).to have_content "not visible"
       end
 
       # FilterProducts rule
       within ".customer_tag #tr_1" do
-        expect(first('tags-input .tag-list ti-tag-item')).to have_content "member"
+        within "li.tag-item", text: "member ✖" do find("a.remove-button").trigger('click') end
         find(:css, "tags-input .tags input").set "volunteers-only1\n"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_1_preferred_matched_variants_visibility", selected: 'VISIBLE'
         select2_select 'NOT VISIBLE', from: "enterprise_tag_rules_attributes_1_preferred_matched_variants_visibility"
@@ -148,7 +150,7 @@ feature 'Tag Rules', js: true do
 
       # FilterPaymentMethods rule
       within ".customer_tag #tr_2" do
-        expect(first('tags-input .tag-list ti-tag-item')).to have_content "trusted"
+        within "li.tag-item", text: "trusted ✖" do find("a.remove-button").trigger('click') end
         find(:css, "tags-input .tags input").set "volunteers-only2\n"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_2_preferred_matched_payment_methods_visibility", selected: 'NOT VISIBLE'
         select2_select 'VISIBLE', from: "enterprise_tag_rules_attributes_2_preferred_matched_payment_methods_visibility"
@@ -156,7 +158,7 @@ feature 'Tag Rules', js: true do
 
       # FilterOrderCycles rule
       within ".customer_tag #tr_3" do
-        expect(first('tags-input .tag-list ti-tag-item')).to have_content "wholesale"
+        within "li.tag-item", text: "wholesale ✖" do find("a.remove-button").trigger('click') end
         find(:css, "tags-input .tags input").set "volunteers-only3\n"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_3_preferred_matched_order_cycles_visibility", selected: 'VISIBLE'
         select2_select 'NOT VISIBLE', from: "enterprise_tag_rules_attributes_3_preferred_matched_order_cycles_visibility"
@@ -164,7 +166,7 @@ feature 'Tag Rules', js: true do
 
       # FilterShippingMethods rule
       within ".customer_tag #tr_4" do
-        expect(first('tags-input .tag-list ti-tag-item')).to have_content "local"
+        within "li.tag-item", text: "local ✖" do find("a.remove-button").trigger('click') end
         find(:css, "tags-input .tags input").set "volunteers-only4\n"
         expect(page).to have_select2 "enterprise_tag_rules_attributes_4_preferred_matched_shipping_methods_visibility", selected: 'NOT VISIBLE'
         select2_select 'VISIBLE', from: "enterprise_tag_rules_attributes_4_preferred_matched_shipping_methods_visibility"
@@ -183,31 +185,31 @@ feature 'Tag Rules', js: true do
 
       # DEFAULT FilterShippingMethods rule
       expect(default_fsm_tag_rule.reload.preferred_customer_tags).to eq ""
-      expect(default_fsm_tag_rule.preferred_shipping_method_tags).to eq "local,volunteers-only"
+      expect(default_fsm_tag_rule.preferred_shipping_method_tags).to eq "volunteers-only"
       expect(default_fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "hidden"
 
       # FilterShippingMethods rule
       expect(fsm_tag_rule.reload.priority).to eq 1
-      expect(fsm_tag_rule.preferred_customer_tags).to eq "local,volunteer"
-      expect(fsm_tag_rule.preferred_shipping_method_tags).to eq "local,volunteers-only4"
+      expect(fsm_tag_rule.preferred_customer_tags).to eq "volunteer"
+      expect(fsm_tag_rule.preferred_shipping_method_tags).to eq "volunteers-only4"
       expect(fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "visible"
 
       # FilterProducts rule
       expect(fp_tag_rule.reload.priority).to eq 2
-      expect(fp_tag_rule.preferred_customer_tags).to eq "member,volunteer"
-      expect(fp_tag_rule.preferred_variant_tags).to eq "member,volunteers-only1"
+      expect(fp_tag_rule.preferred_customer_tags).to eq "volunteer"
+      expect(fp_tag_rule.preferred_variant_tags).to eq "volunteers-only1"
       expect(fp_tag_rule.preferred_matched_variants_visibility).to eq "hidden"
 
       # FilterPaymentMethods rule
       expect(fpm_tag_rule.reload.priority).to eq 3
-      expect(fpm_tag_rule.preferred_customer_tags).to eq "trusted,volunteer"
-      expect(fpm_tag_rule.preferred_payment_method_tags).to eq "trusted,volunteers-only2"
+      expect(fpm_tag_rule.preferred_customer_tags).to eq "volunteer"
+      expect(fpm_tag_rule.preferred_payment_method_tags).to eq "volunteers-only2"
       expect(fpm_tag_rule.preferred_matched_payment_methods_visibility).to eq "visible"
 
       # FilterOrderCycles rule
       expect(foc_tag_rule.reload.priority).to eq 4
-      expect(foc_tag_rule.preferred_customer_tags).to eq "wholesale,volunteer"
-      expect(foc_tag_rule.preferred_exchange_tags).to eq "wholesale,volunteers-only3"
+      expect(foc_tag_rule.preferred_customer_tags).to eq "volunteer"
+      expect(foc_tag_rule.preferred_exchange_tags).to eq "volunteers-only3"
       expect(foc_tag_rule.preferred_matched_order_cycles_visibility).to eq "hidden"
 
       # DiscountOrder rule