collavre_notion 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a44e06e55077d361a1368d57f752e817189741623eb271692511f9ce86dd62
-  data.tar.gz: 73d427435660609081b8884b563467af4e672f24dcf0082b5f33e34ce46cb224
+  metadata.gz: 911a0816f31071621d67860607d4c8351cf3713fd53fde43719e822b8fa06cfb
+  data.tar.gz: 69c180ccdd9b7de6aa0096d34a1570167a092151dcdffccf8d903f6ac682f877
 SHA512:
-  metadata.gz: f14d19445c41a6e9260affa911f1d5d881d9cb4e0483e6a92a64609632148b93106ba0e77bae84e80e476c7423213e69b6cee7c59d3bf7ad8dc265f48e0c68c3
-  data.tar.gz: 51b0ae5610f5294d3a56d7e10ec7b9e1bc0a41d4c820dffabd33d33825987d8079c52fa7042091b650f9128e75e6423fe5957fb0d514ebe81a773c4675f96823
+  metadata.gz: 586a45e62d1009bb7feee452d1699bc73148982ff3bc19a6bc44bfed11e481ecc69ac0645e86e9c7e46d8f89c9c4e62a9b72514e4479869ebd80115390940eac
+  data.tar.gz: 58b078595daad1d91f27863ae8f57fbc9c31ce1ca8118ae14379d83a67ec5157f3fe260d2b88dbb0db4e5beb35aea44ef816a30bfa05cb460c8429bcf8492e7e

data/app/controllers/collavre_notion/creatives/notion_integrations_controller.rb

@@ -1,6 +1,7 @@
 module CollavreNotion
   module Creatives
     class NotionIntegrationsController < ApplicationController
+      include Collavre::IntegrationSetup
       include Collavre::IntegrationPermission
 
       before_action :set_creative
@@ -122,10 +123,6 @@ module CollavreNotion
 
       private
 
-      def set_creative
-        @creative = Collavre::Creative.find(params[:creative_id])
-      end
-
       def linked_page_links(account)
         return CollavreNotion::NotionPageLink.none unless account
 

data/app/javascript/collavre_notion.js

@@ -1,3 +1,6 @@
+import { csrfToken, showError, clearError, updateStepVisibility, openOAuthPopup, fetchWithCsrf, setupModalClose } from 'collavre/modules/integration_wizard';
+import { alertDialog, confirmDialog } from 'collavre/lib/utils/dialog';
+
 let notionIntegrationInitialized = false;
 
 if (!notionIntegrationInitialized) {
@@ -43,10 +46,6 @@ if (!notionIntegrationInitialized) {
     let exportType = 'new-page';
     let selectedParentPage = null;
 
-    function csrfToken() {
-      return document.querySelector('meta[name="csrf-token"]')?.content;
-    }
-
     function resetWizard() {
       currentStep = 'connect';
       hasExistingIntegration = false;
@@ -55,8 +54,7 @@ if (!notionIntegrationInitialized) {
       exportType = 'new-page';
       selectedParentPage = null;
       statusEl.textContent = '';
-      errorEl.style.display = 'none';
-      errorEl.textContent = '';
+      clearError(errorEl);
       if (existingContainer) {
         existingContainer.style.display = 'none';
       }
@@ -74,12 +72,7 @@ if (!notionIntegrationInitialized) {
     }
 
     function updateStep() {
-      ['connect', 'workspace', 'summary']
-        .forEach(function (step) {
-          const el = document.getElementById(`notion-step-${step}`);
-          if (!el) return;
-          el.style.display = (step === currentStep) ? 'block' : 'none';
-        });
+      updateStepVisibility(currentStep, ['connect', 'workspace', 'summary'], 'notion-step');
 
       if (currentStep === 'connect') {
         prevBtn.style.display = 'none';
@@ -105,29 +98,13 @@ if (!notionIntegrationInitialized) {
       }
     }
 
-    function showError(message) {
-      errorEl.textContent = message;
-      errorEl.style.display = 'block';
-    }
-
-    function clearError() {
-      errorEl.style.display = 'none';
-      errorEl.textContent = '';
-    }
-
     function loadIntegrationStatus() {
       if (!creativeId) return;
 
       statusEl.textContent = modal.dataset.loading;
-      clearError();
+      clearError(errorEl);
 
-      fetch(`/notion/creatives/${creativeId}/notion_integration`, {
-        method: 'GET',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Content-Type': 'application/json'
-        }
-      })
+      fetchWithCsrf(`/notion/creatives/${creativeId}/notion_integration`)
         .then(response => response.json())
         .then(data => {
           console.log('Notion integration status:', data);
@@ -168,7 +145,7 @@ if (!notionIntegrationInitialized) {
         .catch(error => {
           console.error('Error loading integration status:', error);
           statusEl.textContent = '';
-          showError(modal.dataset.loadFailed);
+          showError(errorEl, modal.dataset.loadFailed);
         });
     }
 
@@ -285,13 +262,13 @@ if (!notionIntegrationInitialized) {
 
     function performExport() {
       if (!creativeId) {
-        showError(modal.dataset.noCreative);
+        showError(errorEl, modal.dataset.noCreative);
         return;
       }
 
       exportBtn.disabled = true;
       exportBtn.textContent = modal.dataset.exporting;
-      clearError();
+      clearError(errorEl);
 
       const requestData = {
         action: 'export'
@@ -304,13 +281,9 @@ if (!notionIntegrationInitialized) {
       console.log('Sending export request:', requestData);
       console.log('Export type:', exportType, 'Selected parent page:', selectedParentPage);
 
-      fetch(`/notion/creatives/${creativeId}/notion_integration`, {
+      fetchWithCsrf(`/notion/creatives/${creativeId}/notion_integration`, {
         method: 'PATCH',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(requestData)
+        body: requestData
       })
         .then(response => response.json())
         .then(data => {
@@ -322,12 +295,12 @@ if (!notionIntegrationInitialized) {
               resetWizard();
             }, 2000);
           } else {
-            showError(data.message || modal.dataset.exportFailed);
+            showError(errorEl, data.message || modal.dataset.exportFailed);
           }
         })
         .catch(error => {
           console.error('Export error:', error);
-          showError(modal.dataset.exportFailed);
+          showError(errorEl, modal.dataset.exportFailed);
         })
         .finally(() => {
           exportBtn.disabled = false;
@@ -340,15 +313,11 @@ if (!notionIntegrationInitialized) {
 
       syncBtn.disabled = true;
       syncBtn.textContent = modal.dataset.syncing;
-      clearError();
+      clearError(errorEl);
 
-      fetch(`/notion/creatives/${creativeId}/notion_integration`, {
+      fetchWithCsrf(`/notion/creatives/${creativeId}/notion_integration`, {
         method: 'PATCH',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ action: 'sync' })
+        body: { action: 'sync' }
       })
         .then(response => response.json())
         .then(data => {
@@ -356,12 +325,12 @@ if (!notionIntegrationInitialized) {
             statusEl.textContent = modal.dataset.syncSuccess || 'Sync completed successfully';
             statusEl.style.color = 'green';
           } else {
-            showError(data.message || modal.dataset.syncFailed);
+            showError(errorEl, data.message || modal.dataset.syncFailed);
           }
         })
         .catch(error => {
           console.error('Sync error:', error);
-          showError(modal.dataset.syncFailed);
+          showError(errorEl, modal.dataset.syncFailed);
         })
         .finally(() => {
           syncBtn.disabled = false;
@@ -369,20 +338,14 @@ if (!notionIntegrationInitialized) {
         });
     }
 
-    function performDelete() {
-      if (!confirm(modal.dataset.deleteConfirm)) return;
+    async function performDelete() {
+      if (!(await confirmDialog(modal.dataset.deleteConfirm))) return;
 
       deleteBtn.disabled = true;
       deleteBtn.textContent = modal.dataset.removing;
-      clearError();
+      clearError(errorEl);
 
-      fetch(`/notion/creatives/${creativeId}/notion_integration`, {
-        method: 'DELETE',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Content-Type': 'application/json'
-        }
-      })
+      fetchWithCsrf(`/notion/creatives/${creativeId}/notion_integration`, { method: 'DELETE' })
         .then(response => response.json())
         .then(data => {
           if (data.success) {
@@ -393,12 +356,12 @@ if (!notionIntegrationInitialized) {
               resetWizard();
             }, 2000);
           } else {
-            showError(data.message || modal.dataset.deleteFailed);
+            showError(errorEl, data.message || modal.dataset.deleteFailed);
           }
         })
         .catch(error => {
           console.error('Delete error:', error);
-          showError(modal.dataset.deleteFailed);
+          showError(errorEl, modal.dataset.deleteFailed);
         })
         .finally(() => {
           deleteBtn.disabled = false;
@@ -410,7 +373,7 @@ if (!notionIntegrationInitialized) {
     openBtn.addEventListener('click', function () {
       creativeId = this.dataset.creativeId;
       if (!creativeId) {
-        alert(modal.dataset.noCreative);
+        alertDialog(modal.dataset.noCreative);
         return;
       }
       modal.style.display = 'flex';
@@ -418,10 +381,7 @@ if (!notionIntegrationInitialized) {
       loadIntegrationStatus();
     });
 
-    closeBtn.addEventListener('click', function () {
-      modal.style.display = 'none';
-      resetWizard();
-    });
+    setupModalClose(modal, closeBtn, resetWizard);
 
     // Listen for OAuth success message from popup window
     window.addEventListener('message', function(event) {
@@ -436,26 +396,19 @@ if (!notionIntegrationInitialized) {
 
     loginBtn.addEventListener('click', function () {
       console.log('Notion login button clicked');
-      const width = parseInt(this.dataset.windowWidth) || 600;
-      const height = parseInt(this.dataset.windowHeight) || 700;
-      const left = (screen.width - width) / 2;
-      const top = (screen.height - height) / 2;
+      const authWindow = openOAuthPopup('notion-auth-window', {
+        width: parseInt(this.dataset.windowWidth) || 600,
+        height: parseInt(this.dataset.windowHeight) || 700,
+        onClose: function () {
+          console.log('Auth window closed, reloading integration status');
+          loadIntegrationStatus();
+        }
+      });
 
-      const authWindow = window.open('', 'notion-auth-window', 
-        `width=${width},height=${height},left=${left},top=${top},scrollbars=yes,resizable=yes`);
-      
       if (authWindow) {
         loginForm.target = 'notion-auth-window';
         loginForm.submit();
         console.log('Auth form submitted to popup window');
-        
-        const checkClosed = setInterval(() => {
-          if (authWindow.closed) {
-            clearInterval(checkClosed);
-            console.log('Auth window closed, reloading integration status');
-            setTimeout(() => loadIntegrationStatus(), 1000);
-          }
-        }, 1000);
       } else {
         loginForm.target = '_blank';
         loginForm.submit();
@@ -472,7 +425,7 @@ if (!notionIntegrationInitialized) {
     });
 
     nextBtn.addEventListener('click', function () {
-      clearError();
+      clearError(errorEl);
       if (currentStep === 'connect') {
         currentStep = 'workspace';
         updateParentPageOptions();
@@ -501,11 +454,5 @@ if (!notionIntegrationInitialized) {
       });
     }
 
-    modal.addEventListener('click', function (e) {
-      if (e.target === modal) {
-        modal.style.display = 'none';
-        resetWizard();
-      }
-    });
   });
 }

data/lib/collavre_notion/version.rb

@@ -1,3 +1,3 @@
 module CollavreNotion
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_notion
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Collavre