sage-rails 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931f749c5ad29614c085c54d6b64cdff27c97b890f6ef7b83f07bd9479793090
-  data.tar.gz: 2814cb42734249ca2a68115d1e66326826422c8bbaea3489969e66f1dd78b6af
+  metadata.gz: 67929c1b7b67545a01d0d4a1b5445e5b11238616030bbb503d246101413a0602
+  data.tar.gz: 8297beca0b69df3128c763913e4b029a92f4727308e5030629b10c99da92d144
 SHA512:
-  metadata.gz: a6fc5f8d88c18df4faf8a5dc67c6aae80fd2df8056781b05b2ed196c028dad5200d067d5a80e95fec0bac7a78963800bdbd1b8e6f293b9fd8eaf23834ce459bd
-  data.tar.gz: b025dade859f260085baa700bdf05284ecd0d4d5f2594be12c55d20efa4bed34f815b3b8294ac0ceee363ffefd74ccdc91bb815c0aa7a267c656199f05fad442
+  metadata.gz: c38e867b5658bcb82382460cdfcb2f6365c39aa1f8630b4703cb7f6731f43d04930c9d64bcdc91c58e1e609a40ceacbc2ce59ee4736926a6ad881057ba754e18
+  data.tar.gz: 0d59430c80f25acaceb6f7f26c48f35762cc127bddd56ac571eeecbf0e2c1dc5da61360342f1ca0c04cea9e7c7502711ab98cc7802415c1d43fbb5ee981b8f06

data/app/views/sage/queries/_statement_box.html.erb

@@ -26,6 +26,12 @@
     outline: 2px solid rgba(66, 165, 245, 1);
     outline-offset: 2px;
   }
+
+  /* ACE Editor cursor styling - sharp vertical line */
+  .ace_cursor {
+    border-left: 2px solid !important;
+    border-radius: 0 !important;
+  }
 </style>
 
 <div id=<%= dom_id(query, 'statement-box') %> class='' style="position: relative; border-radius: 10px;">
@@ -47,7 +53,7 @@
     <%= f.hidden_field :query_id, value: query.id %>
     <%= f.hidden_field :data_source, value: query.data_source || Blazer.data_sources.keys.first %>
     <div id="editor-container" style="position: relative;">
-      <div id="editor" style="height: 225px;" data-initial-content="<%= local_assigns[:statement] || query.statement %>"></div>
+      <div id="editor" style="height: 225px;" data-initial-content="<%= local_assigns[:statement] || query.statement %>"><%= local_assigns[:statement] || query.statement %></div>
     </div>
   <% end %>
 </div>
@@ -223,8 +229,16 @@
 
   // Set initial value from data attribute or current content
   const editorDiv = document.getElementById("editor")
-  const initialContent = editorDiv.getAttribute("data-initial-content") || editor.getValue()
-  
+  let initialContent = editorDiv.getAttribute("data-initial-content") || editor.getValue()
+
+  // Decode HTML entities that ERB escapes in the attribute
+  // This handles &quot;, &#39;, &#10; (newlines), etc.
+  if (initialContent && editorDiv.hasAttribute("data-initial-content")) {
+    const textarea = document.createElement('textarea');
+    textarea.innerHTML = initialContent;
+    initialContent = textarea.value;
+  }
+
   if (initialContent && initialContent !== editor.getValue()) {
     editor.setValue(initialContent, -1) // -1 moves cursor to start
   }

data/app/views/sage/queries/new.html.erb

@@ -198,6 +198,12 @@
     text-overflow: ellipsis;
     margin-bottom: 10px;
   }
+
+  /* ACE Editor cursor styling - sharp vertical line */
+  .ace_cursor {
+    border-left: 2px solid !important;
+    border-radius: 0 !important;
+  }
 </style>
 
 <script>
@@ -251,12 +257,16 @@
     }
   }
 
-  document.addEventListener('DOMContentLoaded', function() {
+  let tabsInitialized = false;
+
+  function setupTabSwitching() {
     const promptTab = document.getElementById('prompt-tab');
     const sqlTab = document.getElementById('sql-tab');
     const promptPage = document.getElementById('prompt-page');
     const sqlPage = document.getElementById('sql-page');
 
+    if (!promptTab || !sqlTab || !promptPage || !sqlPage) return;
+
     function switchToPromptMode() {
       promptTab.classList.add('active');
       sqlTab.classList.remove('active');
@@ -269,32 +279,29 @@
       promptTab.classList.remove('active');
       sqlPage.classList.add('active');
       promptPage.classList.remove('active');
+
+      // Initialize ACE editor when switching to SQL mode
+      setTimeout(() => {
+        initializeAceEditor();
+      }, 100);
     }
 
-    promptTab.addEventListener('click', switchToPromptMode);
-    sqlTab.addEventListener('click', switchToSqlMode);
+    // Only attach listeners once
+    if (!tabsInitialized) {
+      promptTab.addEventListener('click', switchToPromptMode);
+      sqlTab.addEventListener('click', switchToSqlMode);
+      tabsInitialized = true;
+    }
 
     // If we have fork parameters, automatically switch to SQL mode
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('fork_query_id') || urlParams.get('name')) {
-      console.log('Fork detected, switching to SQL mode');
       switchToSqlMode();
-      // Initialize ACE editor immediately for forks
-      setTimeout(() => {
-        console.log('Initializing ACE editor for fork');
-        initializeAceEditor();
-      }, 200);
     }
-  });
+  }
 
-  // Initialize ACE editor when SQL tab is clicked
-  document.addEventListener('click', function(e) {
-    if (e.target.id === 'sql-tab') {
-      setTimeout(() => {
-        initializeAceEditor();
-      }, 100);
-    }
-  });
+  document.addEventListener('DOMContentLoaded', setupTabSwitching);
+  document.addEventListener('turbo:load', setupTabSwitching);
 
   // Ensure form submission captures the editor value
   document.addEventListener('submit', function(e) {
@@ -305,28 +312,4 @@
       }
     }
   });
-
-  // Handle Turbo navigation for fork detection
-  document.addEventListener('turbo:load', function() {
-    const urlParams = new URLSearchParams(window.location.search);
-    if (urlParams.get('fork_query_id') || urlParams.get('name')) {
-      console.log('Fork detected via turbo:load, switching to SQL mode');
-      const promptTab = document.getElementById('prompt-tab');
-      const sqlTab = document.getElementById('sql-tab');
-      const promptPage = document.getElementById('prompt-page');
-      const sqlPage = document.getElementById('sql-page');
-      
-      if (sqlTab && promptTab && sqlPage && promptPage) {
-        sqlTab.classList.add('active');
-        promptTab.classList.remove('active');
-        sqlPage.classList.add('active');
-        promptPage.classList.remove('active');
-        
-        setTimeout(() => {
-          console.log('Initializing ACE editor for fork via turbo:load');
-          initializeAceEditor();
-        }, 200);
-      }
-    }
-  });
 </script>

data/lib/sage/version.rb

@@ -1,3 +1,3 @@
 module Sage
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sage-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Nathan Jones