layout handing on turbo content

chaskiq · michelson · Jan 18, 2023 · Jan 18, 2023 · Jan 18, 2023 · Jan 19, 2023
commit 3a0c70b80ced6193221c18d32976fb2df2644d45
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -209,10  209,11 @@ def current_resource_owner
   end
 
   def layout_by_resource
-     if turbo_frame_request?
-      return "application" if request.headers['Turbo-Frame'] == "content"
     if turbo_frame_request?
       return "application" if request.headers["Turbo-Frame"] == "content"
 
       return false
-     end
     end
 
     if devise_controller?
       "devise"

diff --git a/app/javascript/controllers/messenger_controller.js b/app/javascript/controllers/messenger_controller.js
@@ -96,7  96,7 @@ export default class extends Controller {
 
           break;
         case 'tours:receive':
-          debugger
           debugger;
           message = {
             type: 'chaskiq:user_tour_receive',
             data: data.data,

diff --git a/app/javascript/controllers/tour_editor_controller.js b/app/javascript/controllers/tour_editor_controller.js
@@ -102,7  102,7 @@ export default class extends Controller {
   }
 
   activatePreview(e) {
-    debugger
     debugger;
     window.parent.postMessage(
       {
         type: 'chaskiq:tours',

diff --git a/app/javascript/new_embed.js b/app/javascript/new_embed.js
@@ -433,9  433,9 @@ window.Chaskiq = window.Chaskiq || {
   },
 
   loadUserTour(data) {
-    if(document.getElementById('tourManagerFrame')) {
-      console.log("skip tour as tour manager is active")
-     return
     if (document.getElementById('tourManagerFrame')) {
       console.log('skip tour as tour manager is active');
       return;
     }
     const pattern = new UrlPattern(data.url.replace(/^.*\/\/[^\/] /, ''));
     const currentLocation = document.location.pathname;
@@ -659,7  659,7 @@ window.Chaskiq = window.Chaskiq || {
           this.handleFrameEvents(event.data.data);
           break;
         case 'chaskiq:tours':
-          debugger
           debugger;
           this.handleTourEditor.bind(this)(event.data);
           break;
         case 'chaskiq:banners':

diff --git a/app/javascript/tour_manager.js b/app/javascript/tour_manager.js
@@ -34,8  34,8 @@ class TourManager {
   }
 
   pushEvent(data) {
-    console.log("ABOUT TO PUSH", data)
-    debugger
     console.log('ABOUT TO PUSH', data);
     debugger;
     switch (data.action) {
       case 'disablePreview':
         this.disablePreview();
@@ -139,7  139,9 @@ class TourManager {
 
     const cssPath = finder(target); // Assuming 'finder' is available in the context
     const encodedCssPath = encodeURIComponent(cssPath);
-    const url = document.querySelector("#tourManagerFrame").src.replace("tour_editor", `tour_step?target=${encodedCssPath}`)
     const url = document
       .querySelector('#tourManagerFrame')
       .src.replace('tour_editor', `tour_step?target=${encodedCssPath}`);
     const path = {
       target: cssPath,
       content: `<div>

diff --git a/app/models/bot_task.rb b/app/models/bot_task.rb
@@ -230,10  230,10 @@ def self.duplicate(record)
   def bot_paths_objects
     return @bot_paths_objects = [] if paths.blank?
 
-    @bot_paths_objects ||= (paths.map { |o|
     @bot_paths_objects ||= paths.map do |o|
       o.delete("followActions")
-      BotPath.new(o) 
-    } || [])
       BotPath.new(o)
     end || []
   end
 
   def bot_paths_objects=(attrs)