Merge 2b96fc53fc into ca1aae4050

Fix failing specs

app/controllers/custom_wizard/admin/wizard.rb

@@ -166,7 +166,10 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
         visibility_level: mapped_params,
         members_visibility_level: mapped_params,
         add_event: mapped_params,
-        add_location: mapped_params
+        add_location: mapped_params,
+        public_exit: mapped_params,
+        public_admission: mapped_params,
+        primary_group: mapped_params
       ]
     )
   end

assets/javascripts/discourse/lib/wizard-schema.js.es6

@@ -173,6 +173,9 @@ const action = {
       visibility_level: null,
       members_visibility_level: null,
       custom_fields: null,
+      public_exit: true,
+      public_admission: true,
+      primary_group: true,
     },
   },
   mapped: [
@@ -205,6 +208,9 @@ const action = {
     "members_visibility_level",
     "add_event",
     "add_location",
+    "public_exit",
+    "public_admission",
+    "primary_group",
   ],
   required: ["id", "type"],
   dependent: {},

assets/javascripts/discourse/templates/components/wizard-custom-action.hbs

@@ -740,6 +740,60 @@
       }}
     </div>
   </div>
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.create_group.public_exit"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=action.public_exit
+        property="public_exit"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          textSelection=true
+          wizardFieldSelection=true
+          userFieldSelection=true
+          context="action"
+        )}}
+    </div>
+  </div>
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.create_group.public_admission"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=action.public_admission
+        property="public_admission"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          textSelection=true
+          wizardFieldSelection=true
+          userFieldSelection=true
+          context="action"
+        )}}
+    </div>
+  </div>
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.create_group.primary_group"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=action.primary_group
+        property="primary_group"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          textSelection=true
+          wizardFieldSelection=true
+          userFieldSelection=true
+          context="action"
+        )}}
+    </div>
+  </div>
 {{/if}}
 
 {{#if createCategory}}

config/locales/client.de.yml

@@ -383,6 +383,9 @@ de:
             messageable_level: Nachrichtbare Ebene
             visibility_level: Sichtbarkeitsstufe
             members_visibility_level: Sichtbarkeitsstufe der Mitglieder
+            public_exit: Erlaube Gruppenaustritt
+            public_admission: Erlaube der Gruppe beizutreten
+            primary_group: Primäre Gruppe
         custom_field:
           nav_label: "Benutzerdefinierte Felder"
           add: "Hinzufügen"

config/locales/client.en.yml

@@ -429,6 +429,9 @@ en:
             messageable_level: Messageable Level
             visibility_level: Visibility Level
             members_visibility_level: Members Visibility Level
+            public_exit: Allow Group exit
+            public_admission: Allow Group joining
+            primary_group: Primary Group
 
         custom_field:
           nav_label: "Custom Fields"

lib/custom_wizard/action.rb

@@ -425,7 +425,7 @@ class CustomWizard::Action
       ).perform
     end
 
-    if action['code']
+    if action['code'].present?
       @submission.fields[action['code']] = SecureRandom.hex(8)
       url += "&#{action['code']}=#{@submission.fields[action['code']]}"
     end
@@ -666,6 +666,9 @@ class CustomWizard::Action
       visibility_level
       members_visibility_level
       grant_trust_level
+      public_exit
+      public_admission
+      primary_group
     ).each do |attr|
       input = action[attr]
 

plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.6.3
+# version: 2.6.4
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech

spec/components/custom_wizard/action_spec.rb

@@ -212,11 +212,23 @@ describe CustomWizard::Action do
     end
   end
 
-  it 're-routes a user' do
-    wizard = CustomWizard::Builder.new(@template[:id], user).build
-    updater = wizard.create_updater(wizard.steps.last.id, {})
-    updater.update
-    expect(updater.result[:redirect_on_next]).to eq("https://google.com")
+  context "route to action" do
+    it 're-routes a user' do
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      updater = wizard.create_updater(wizard.steps.last.id, {})
+      updater.update
+      expect(updater.result[:redirect_on_next]).to eq("https://google.com")
+    end
+
+    it "works if the code field has a blank string" do
+      wizard_template[:actions].last[:code] = " "
+      update_template(wizard_template)
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      updater = wizard.create_updater(wizard.steps.last.id, {})
+      updater.update
+      expect(updater.result[:redirect_on_next]).to eq("https://google.com")
+    end
   end
 
   context "standard subscription actions" do

spec/fixtures/actions/create_group.json

@@ -100,5 +100,29 @@
       "output_type": "text",
       "output_connector": "set"
     }
+  ],
+  "public_exit": [
+    {
+      "type": "assignment",
+      "output": "false",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "public_admission": [
+    {
+      "type": "assignment",
+      "output": "false",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "primary_group": [
+    {
+      "type": "assignment",
+      "output": "false",
+      "output_type": "text",
+      "output_connector": "set"
+    }
   ]
-}
+}

spec/fixtures/actions/create_group_bad_user.json

@@ -100,5 +100,29 @@
       "output_type": "text",
       "output_connector": "set"
     }
+  ],
+  "public_exit": [
+    {
+      "type": "assignment",
+      "output": "false",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "public_admission": [
+    {
+      "type": "assignment",
+      "output": "false",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "primary_group": [
+    {
+      "type": "assignment",
+      "output": "false",
+      "output_type": "text",
+      "output_connector": "set"
+    }
   ]
-}
+}