Merge pull request #296 from paviliondev/add_after_time_targets

FEATURE: Add after time groups

Author: angusmcleod

app/controllers/custom_wizard/admin/user.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+class CustomWizard::UserController < ::Admin::AdminController
+  before_action :ensure_admin
+  requires_plugin "discourse-custom-wizard"
+
+  def clear_redirect
+    user = User.find_by(id: params[:id])
+
+    if user
+      user.custom_fields["redirect_to_wizard"] = nil
+      user.save_custom_fields(true)
+      render json: success_json
+    else
+      render json: failed_json
+    end
+  end
+end

app/controllers/custom_wizard/admin/wizard.rb

@@ -78,6 +78,7 @@ def save_wizard_params
       :resume_on_revisit,
       :theme_id,
       permitted: mapped_params,
+      after_time_groups: [],
       steps: [
         :id,
         :index,

app/jobs/regular/set_after_time_wizard.rb

@@ -3,20 +3,32 @@ module Jobs
   class SetAfterTimeWizard < ::Jobs::Base
     def execute(args)
       if SiteSetting.custom_wizard_enabled
-        wizard = CustomWizard::Wizard.create(args[:wizard_id])
+        @wizard = CustomWizard::Wizard.create(args[:wizard_id])
 
-        if wizard && wizard.after_time
+        if @wizard && @wizard.after_time
           user_ids = []
 
-          User.human_users.each do |user|
-            user_ids.push(user.id) if CustomWizard::Wizard.set_user_redirect(wizard.id, user)
+          target_users.each do |user|
+            user_ids.push(user.id) if CustomWizard::Wizard.set_after_time_redirect(@wizard.id, user)
           end
 
           CustomWizard::Template.clear_cache_keys
 
-          MessageBus.publish "/redirect_to_wizard", wizard.id, user_ids: user_ids
+          MessageBus.publish "/redirect_to_wizard", @wizard.id, user_ids: user_ids
         end
       end
     end
+
+    def target_users
+      users = []
+
+      if @wizard.after_time_groups.exists?
+        @wizard.after_time_groups.each { |group| users += group.users }
+      else
+        users = User.human_users
+      end
+
+      users
+    end
   end
 end

assets/javascripts/discourse/connectors/admin-user-details/admin-user-wizard-details.hbs

@@ -0,0 +1,28 @@
+<section class="details">
+  <h1>{{i18n "admin.wizard.user.label"}}</h1>
+
+  <div class="display-row">
+    <div class="field">{{i18n "admin.wizard.user.redirect.label"}}</div>
+    <div class="value">
+      {{#if model.redirect_to_wizard}}
+        <LinkTo
+          @route="adminWizardsWizardShow"
+          @model={{dasherize model.redirect_to_wizard}}
+        >
+          {{model.redirect_to_wizard}}
+        </LinkTo>
+      {{else}}
+        &mdash;
+      {{/if}}
+    </div>
+    <div class="controls">
+      {{#if model.redirect_to_wizard}}
+        <DButton
+          @action={{fn model.clearWizardRedirect model}}
+          @label="admin.wizard.user.redirect.remove_label"
+          @title="admin.wizard.user.redirect.remove_title"
+        />
+      {{/if}}
+    </div>
+  </div>
+</section>

assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6

@@ -12,9 +12,11 @@ import Controller from "@ember/controller";
 import copyText from "discourse/lib/copy-text";
 import I18n from "I18n";
 import { filterValues } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
+import { action } from "@ember/object";
 
 export default Controller.extend({
   modal: service(),
+  site: service(),
   hasName: notEmpty("wizard.name"),
 
   @observes("currentStep")
@@ -91,6 +93,24 @@ export default Controller.extend({
     return I18n.t(`admin.wizard.error.${errorType}`, errorParams);
   },
 
+  setAfterTimeGroupIds() {
+    const groups = this.site.groups.filter((g) =>
+      this.wizard.after_time_groups.includes(g.name)
+    );
+    this.setProperties({
+      afterTimeGroupIds: groups.map((g) => g.id),
+    });
+  },
+
+  @action
+  setAfterTimeGroups(groupIds) {
+    const groups = this.site.groups.filter((g) => groupIds.includes(g.id));
+    this.setProperties({
+      afterTimeGroupIds: groups.map((g) => g.id),
+      "wizard.after_time_groups": groups.map((g) => g.name),
+    });
+  },
+
   actions: {
     save() {
       this.setProperties({

assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6

@@ -2,6 +2,8 @@ import DiscourseURL from "discourse/lib/url";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import getUrl from "discourse-common/lib/get-url";
 import { observes } from "discourse-common/utils/decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { ajax } from "discourse/lib/ajax";
 
 export default {
   name: "custom-wizard-edits",
@@ -105,6 +107,24 @@ export default {
         route: "adminWizardsWizard",
         icon: "hat-wizard",
       });
+
+      if (api.getCurrentUser()?.admin) {
+        api.modifyClass("model:admin-user", {
+          pluginId: "custom-wizard",
+
+          clearWizardRedirect(user) {
+            return ajax(`/admin/users/${user.id}/wizards/clear_redirect`, {
+              type: "PUT",
+            })
+              .then(() => {
+                user.setProperties({
+                  redirect_to_wizard: null,
+                });
+              })
+              .catch(popupAjaxError);
+          },
+        });
+      }
     });
   },
 };

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

@@ -17,11 +17,13 @@ const wizard = {
     resume_on_revisit: null,
     theme_id: null,
     permitted: null,
+    after_time_groups: null,
   },
   mapped: ["permitted"],
   required: ["id"],
   dependent: {
     after_time: "after_time_scheduled",
+    after_time: "after_time_groups",
   },
   objectArrays: {
     step: {

assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6

@@ -47,5 +47,6 @@ export default DiscourseRoute.extend({
     };
 
     controller.setProperties(props);
+    controller.setAfterTimeGroupIds();
   },
 });

assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs

@@ -162,6 +162,22 @@
           }}
         </div>
       </div>
+
+      <div class="setting full">
+        <div class="setting-label">
+          <label>{{i18n "admin.wizard.after_time_groups.label"}}</label>
+        </div>
+        <div class="setting-value">
+          <GroupChooser
+            @content={{this.site.groups}}
+            @value={{this.afterTimeGroupIds}}
+            @onChange={{this.setAfterTimeGroups}}
+          />
+          <div class="setting-gutter">
+            {{i18n "admin.wizard.after_time_groups.description"}}
+          </div>
+        </div>
+      </div>
     {{/wizard-subscription-container}}
   </div>
 

assets/stylesheets/common/admin.scss

@@ -373,11 +373,16 @@ $error: #ef1700;
       }
 
       .input .select-kit,
-      > .select-kit {
+      > .select-kit:not(.group-chooser) {
         max-width: 250px !important;
         min-width: 250px !important;
       }
 
+      .group-chooser {
+        max-width: 400px !important;
+        min-width: 400px !important;
+      }
+
       &.force-final {
         padding: 1em;
         background-color: var(--primary-very-low);