From 49a20218a5ba72d8f3329438fc2e4f142ae69a5a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 19 Aug 2022 14:09:41 -0500
Subject: [PATCH] fix(onboarding): improve modal launching and clicky behavior

---
 .../src/components/group-plans/groupPlansUpdateModal.vue    | 3 +++
 .../client/src/components/group-plans/taskInformation.vue   | 3 +++
 website/client/src/mixins/guide.js                          | 6 +-----
 website/common/locales/en/groups.json                       | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlansUpdateModal.vue b/website/client/src/components/group-plans/groupPlansUpdateModal.vue
index 35600137f5..e79c2dd39f 100644
--- a/website/client/src/components/group-plans/groupPlansUpdateModal.vue
+++ b/website/client/src/components/group-plans/groupPlansUpdateModal.vue
@@ -4,6 +4,8 @@
     title="New Shared Task Board"
     size="lg"
     hide-footer="hide-footer"
+    :no-close-on-backdrop="true"
+    :no-close-on-esc="true"
   >
     <div
       slot="modal-header"
@@ -196,6 +198,7 @@ export default {
   },
   methods: {
     close () {
+      this.$store.dispatch('user:set', { 'flags.tour.groupPlans': -2 });
       this.$root.$emit('bv::hide::modal', 'group-plans-update');
     },
   },
diff --git a/website/client/src/components/group-plans/taskInformation.vue b/website/client/src/components/group-plans/taskInformation.vue
index 24ba916f92..64c577b0b9 100644
--- a/website/client/src/components/group-plans/taskInformation.vue
+++ b/website/client/src/components/group-plans/taskInformation.vue
@@ -319,6 +319,9 @@ export default {
       this.group.members = members;
 
       this.loadTasks();
+      if (this.user.flags.tour.groupPlans !== -2) {
+        this.$root.$emit('bv::show::modal', 'group-plans-update');
+      }
     },
     async loadTasks () {
       this.tasksByType = {
diff --git a/website/client/src/mixins/guide.js b/website/client/src/mixins/guide.js
index dfe9314025..0234196f6b 100644
--- a/website/client/src/mixins/guide.js
+++ b/website/client/src/mixins/guide.js
@@ -136,8 +136,8 @@ export default {
         case 'patrons': return this.goto('hall', 0);
         case 'items': return this.goto('market', 0);
         case 'stable': return this.goto('pets', 0);
+        // @TODO: same page now case 'stable':     return this.goto('mounts', 0);
         case 'equipment': return this.goto('equipment', 0);
-        case 'groupPlanDetailTaskInformation': return this.alternativeModal('groupPlans', 'group-plans-update');
       }
 
       return null;
@@ -172,10 +172,6 @@ export default {
         this.markTourComplete(chapter);
       });
     },
-    alternativeModal (chapter, modal) {
-      this.$root.$emit('bv::show::modal', modal);
-      this.markTourComplete(chapter);
-    },
     markTourComplete (chapter) {
       const ups = {};
       const lastKnownStep = this.user.flags.tour[chapter];
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index dd39eeb687..0c838b18da 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -386,6 +386,6 @@
   "newGroupsBullet10a": "<strong>Leave a task unassigned</strong> if any member can complete it",
   "newGroupsBullet10b": "<strong>Assign a task to one member</strong> so only they can complete it",
   "newGroupsBullet10c": "<strong>Assign a task to multiple members</strong> if they all need to complete it",
-  "newGroupsVisitFAQ": "Visit the <a href='/static/faq#group-plans'>FAQ</a> from the Help dropdown for more guidance.",
+  "newGroupsVisitFAQ": "Visit the <a href='/static/faq#group-plans' target='_blank'>FAQ</a> from the Help dropdown for more guidance.",
   "newGroupsEnjoy": "We hope you enjoy the new Group Plans experience!"
 }