Update action dropdown behaviour to show sub level

assets/javascripts/discourse/components/wizard-custom-action.js.es6

@@ -1,7 +1,7 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
 import wizardSchema, {
-  actionsAvailableWithAdditionalSubscription,
+  actionsRequiringAdditionalSubscription,
-  actionsAvailableWithCurrentSubscription,
+  actionSubscriptionLevel,
 } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
 import { empty, equal, or } from "@ember/object/computed";
 import { notificationLevels, selectKitContent } from "../lib/wizard";
@@ -99,20 +99,15 @@ export default Component.extend(UndoChanges, {
 
   @discourseComputed("subscribed", "subscription")
   actionTypes(subscribed, subscription) {
-    let unsubscribedActions = actionsAvailableWithAdditionalSubscription(
+    let unsubscribedActions = actionsRequiringAdditionalSubscription(
-      subscription
-    );
-    let subscribedActions = actionsAvailableWithCurrentSubscription(
       subscription
     );
     return Object.keys(wizardSchema.action.types).reduce((result, type) => {
-      let subscriptionLabel =
-        subscribedActions.includes(type) || unsubscribedActions.includes(type);
       let disabled = unsubscribedActions.includes(type);
       result.push({
         id: type,
         name: I18n.t(`admin.wizard.action.${type}.label`),
-        subscription: subscriptionLabel,
+        subscription: actionSubscriptionLevel(type),
         disabled: disabled,
       });
       return result;

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

@@ -201,8 +201,8 @@ const action = {
     "send_to_api",
   ],
   actionTypesWithSubscription: {
-    basic: ["send_message", "add_to_group", "watch_categories"],
+    standard: ["send_message", "add_to_group", "watch_categories"],
-    advanced: ["create_category", "create_group", "send_to_api"],
+    business: ["create_category", "create_group", "send_to_api"],
   },
   dependent: {},
   objectArrays: {},
@@ -215,31 +215,30 @@ const wizardSchema = {
   action,
 };
 
-export function actionsAvailableWithAdditionalSubscription(
+export function actionsRequiringAdditionalSubscription(
   currentSubscription
 ) {
   switch (currentSubscription) {
-    case "advanced":
+    case "business":
       return [];
-    case "basic":
+    case "standard":
-      return action.actionTypesWithSubscription["advanced"];
+      return action.actionTypesWithSubscription["business"];
-    case "none":
+    default:
-      return action.actionTypesWithSubscription["basic"].concat(
+      return action.actionTypesWithSubscription["standard"].concat(
-        action.actionTypesWithSubscription["advanced"]
+        action.actionTypesWithSubscription["business"]
       );
   }
 }
 
-export function actionsAvailableWithCurrentSubscription(currentSubscription) {
+export function actionSubscriptionLevel(type) {
-  switch (currentSubscription) {
+  if (action.actionTypesWithSubscription["business"].includes(type)) {
-    case "advanced":
+    return "business" 
-      return action.actionTypesWithSubscription["advanced"].concat(
+  } else {
-        action.actionTypesWithSubscription["basic"]
+    if (action.actionTypesWithSubscription["standard"].includes(type)) {
-      );
+      return "standard"
-    case "basic":
+    } else {
-      return action.actionTypesWithSubscription["basic"];
+      return ""
-    case "none":
+    }
-      return [];
   }
 }
 

assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs

@@ -11,11 +11,7 @@
   <span class="name">{{html-safe label}}</span>
   {{#if item.subscription}}
     <span class="subscription-label">
-      {{#if item.disabled}}
+     {{item.subscription}}
-        {{i18n "admin.wizard.subscription.additional_label"}}
-      {{else}}
-        {{i18n "admin.wizard.subscription.label"}}
-      {{/if}}
     </span>
   {{/if}}
 </div>