Changeset 3350309

Timestamp:

08/26/2025 10:41:34 AM (6 months ago)

Author:

infoforte

Message:

1.7.0

• Bug fixes and other improvements
• Added category selection in create articles

Location:

lyxity/trunk

Files:

• assets/js/main-page.js (modified) (7 diffs)
• includes/class-lyxity-api.php (modified) (1 diff)
• lyxity.php (modified) (8 diffs)
• readme.txt (modified) (2 diffs)
• templates/settings-page.php (modified) (1 diff)

lyxity/trunk/assets/js/main-page.js

@@ -8 +8 @@
     alertify.defaults.theme.cancel = "btn btn-danger";
     alertify.defaults.theme.input = "form-control";
+
+    // Fetch categories for Write Articles
+    function fetchCategories() {
+        const $list = $('#categories-list');
+        const $loading = $('#categories-loading');
+        const $error = $('#categories-error');
+        
+        if ($list.length === 0) return; // UI not present
+        
+        $error.hide();
+        $loading.show();
+        $list.empty();
+        
+        console.log('[Lyxity] AJAX lyxity_get_categories - sending');
+        $.ajax({
+            url: lyxityVars.ajaxUrl,
+            type: 'POST',
+            data: {
+                action: 'lyxity_get_categories',
+                nonce: lyxityVars.nonce
+            },
+            success: function(response) {
+                console.log('[Lyxity] AJAX lyxity_get_categories - success raw:', response);
+                if (response.success) {
+                    // Response may be like { categories: [...] } or root array
+                    const cats = response.data && (response.data.categories || response.data);
+                    if (Array.isArray(cats) && cats.length > 0) {
+                        categoriesCache = cats;
+                        renderCategories(cats);
+                        categoriesLoaded = true;
+                        $error.hide();
+                        console.log('[Lyxity] Categories loaded:', cats.length);
+                    } else {
+                        showCategoriesError('No categories returned.');
+                        console.warn('[Lyxity] No categories in response');
+                    }
+                } else {
+                    const message = (response.data && response.data.message) || 'Failed to fetch categories';
+                    showCategoriesError(message);
+                    console.error('[Lyxity] Categories fetch error (server message):', message);
+                }
+            },
+            error: function(xhr, status, error) {
+                showCategoriesError('Error fetching categories. Please try again.');
+                console.error('[Lyxity] AJAX lyxity_get_categories - error:', status, error, xhr);
+            },
+            complete: function() {
+                $loading.hide();
+                console.log('[Lyxity] AJAX lyxity_get_categories - complete');
+            }
+        });
+        
+        function showCategoriesError(msg) {
+            $error.find('p').text(msg);
+            $error.show();
+        }
+    }
+    
+    // Render categories as checkboxes
+    function renderCategories(categories) {
+        const $list = $('#categories-list');
+        if ($list.length === 0) return;
+        
+        $list.empty();
+        categories.forEach(function(cat) {
+            const id = cat.id || cat.ID || cat.categoryId;
+            const name = cat.name || cat.title || cat.categoryName || ('Category ' + id);
+            if (!id) return;
+            const $item = $('<label style="display:block; margin:4px 0;">')
+                .append(`<input type="checkbox" class="lyxity-category" value="${id}"> `)
+                .append(document.createTextNode(name));
+            $list.append($item);
+        });
+    }
 
     // Add bulk action handler
@@ -581 +655 @@
     // Write Articles functionality
     let suggestedKeywords = [];
+    let categoriesLoaded = false;
+    let categoriesCache = [];
     
     // Handle keyword source selection
@@ -625 +701 @@
             document.getElementById('metrics-column').style.display = 'block';
             
+            // Fetch categories once when entering the article generation step
+            if (!categoriesLoaded) {
+                console.log('[Lyxity] Triggering fetchCategories() on keyword selection');
+                fetchCategories();
+            } else {
+                console.log('[Lyxity] Categories already loaded, count=', (categoriesCache||[]).length);
+            }
+            
             // Fetch and display keyword metrics
             fetchKeywordMetrics(keyword);
@@ -843 +927 @@
         const ctaLink = $('#cta-link').val().trim();
         const ctaCaption = $('#cta-caption').val().trim();
+        const selectedCategories = $('#categories-list input.lyxity-category:checked').map(function(){ return parseInt(this.value, 10); }).get();
+        console.log('[Lyxity] Write Articles - selectedCategories=', selectedCategories);
         
         
@@ -895 +981 @@
                 
                 // Make request via WordPress AJAX to proxy through PHP
+                console.log('[Lyxity] AJAX lyxity_generate_articles - sending', requestData, selectedCategories);
                 $.ajax({
                     url: lyxityVars.ajaxUrl,
@@ -905 +992 @@
                         site_url: requestData.SiteUrl,
                         cta_text: requestData.ClickToActionText,
-                        cta_link: requestData.ClickToActionLink
+                        cta_link: requestData.ClickToActionLink,
+                        // Send as JSON string; PHP handler normalizes both array and JSON
+                        categories: JSON.stringify(selectedCategories)
                     },
                     success: function(response) {
                         // Show a single white-background message per requirements
-                        
+                        console.log('[Lyxity] AJAX lyxity_generate_articles - success raw:', response);
                         alertify.success('Article is being generated in background, you can track progress using Dashboard.');
                     },
                     error: function(xhr, status, error) {
+                        console.error('[Lyxity] AJAX lyxity_generate_articles - error:', status, error, xhr);
                         alertify.error('Error generating articles: ' + (xhr.responseJSON?.message || error || 'Unknown error'));
                     },
@@ -918 +1008 @@
                         // Restore button state
                         $button.prop('disabled', false).html(originalText);
+                        console.log('[Lyxity] AJAX lyxity_generate_articles - complete');
                     }
                 });

lyxity/trunk/includes/class-lyxity-api.php

@@ -936 +936 @@
     
     /**
+     * Get categories from the API for Write Article
+     *
+     * @return array|WP_Error Response array or WP_Error on failure
+     */
+    public function get_categories() {
+        $site_url = get_site_url();
+        $api_key = $this->get_api_key();
+        if (empty($api_key)) {
+            return new WP_Error('missing_api_key', 'API key is not configured');
+        }
+        $data = array(
+            // Follow existing keyword endpoint casing
+            'siteUrl' => $site_url,
+            'apiKey' => $api_key,
+        );
+        // Debug: log request
+        error_log('Lyxity Debug - get_categories - Request: ' . json_encode($data));
+        $result = $this->make_request('articles/categories', $data);
+        // Debug: log response (truncate to avoid huge logs)
+        $truncated = is_array($result) ? json_encode(array_slice($result, 0, 1)) : (is_string($result) ? substr($result, 0, 500) : print_r($result, true));
+        error_log('Lyxity Debug - get_categories - Response (truncated): ' . $truncated);
+        return $result;
+    }
+    
+    /**
      * Apply rewrite content
      * 

lyxity/trunk/lyxity.php

@@ -3 +3 @@
 Plugin Name: Lyxity
 Description: The art of modern search engine optimization
-Version: 1.6.0
+Version: 1.7.0
 Author: Infoforte
 Author URI: https://infoforte.com
@@ -20 +20 @@
 
 // Define plugin constants
-define('LYXITY_VERSION', '1.6.0');
+define('LYXITY_VERSION', '1.7.0');
 define('LYXITY_FILE', __FILE__);
 define('LYXITY_PATH', plugin_dir_path(__FILE__));
@@ -77 +77 @@
         add_action('wp_ajax_lyxity_save_api_key', array($this, 'ajax_save_api_key'));
         add_action('wp_ajax_lyxity_get_suggested_keywords', array($this, 'ajax_get_suggested_keywords'));
+        // New: Get categories for Write Articles
+        add_action('wp_ajax_lyxity_get_categories', array($this, 'ajax_get_categories'));
         // New: Generate articles via Lyxity API
         add_action('wp_ajax_lyxity_generate_articles', array($this, 'ajax_generate_articles'));
@@ -602 +604 @@
     
     /**
+     * AJAX handler: Get categories list from API
+     */
+    public function ajax_get_categories() {
+        // Security
+        if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'lyxity-ajax-nonce')) {
+            wp_send_json_error(array('message' => 'Security check failed.'));
+        }
+        if (!current_user_can('edit_posts')) {
+            wp_send_json_error(array('message' => 'You do not have permission to perform this action.'));
+        }
+        // Debug: incoming request
+        error_log('Lyxity Debug - ajax_get_categories - triggered by user ' . get_current_user_id());
+        $api = new Lyxity_API();
+        $response = $api->get_categories();
+        if (is_wp_error($response)) {
+            error_log('Lyxity Debug - ajax_get_categories - WP_Error: ' . $response->get_error_message());
+            wp_send_json_error(array('message' => 'API Error: ' . $response->get_error_message()));
+        }
+        // Expect API to return something like ['categories' => [ ['id'=>..,'name'=>..], ... ]]
+        $count = 0;
+        if (is_array($response)) {
+            if (isset($response['categories']) && is_array($response['categories'])) { $count = count($response['categories']); }
+            else { $count = count($response); }
+        }
+        error_log('Lyxity Debug - ajax_get_categories - success, categories count: ' . $count);
+        wp_send_json_success($response);
+    }
+    
+    /**
      * AJAX handler: Generate articles via Lyxity API
      */
@@ -619 +650 @@
         $cta_text = isset($_POST['cta_text']) ? sanitize_text_field(wp_unslash($_POST['cta_text'])) : '';
         $cta_link = isset($_POST['cta_link']) ? esc_url_raw(wp_unslash($_POST['cta_link'])) : '';
+        // Categories can arrive as array (categories[]) or JSON string; normalize to array of ints
+        $categories = array();
+        if (isset($_POST['categories'])) {
+            $raw = wp_unslash($_POST['categories']);
+            if (is_array($raw)) {
+                $categories = array_map('absint', $raw);
+            } elseif (is_string($raw) && !empty($raw)) {
+                $decoded = json_decode($raw, true);
+                if (is_array($decoded)) {
+                    $categories = array_map('absint', $decoded);
+                }
+            }
+        }
+        // Debug: log incoming
+        error_log('Lyxity Debug - ajax_generate_articles - incoming: keywords=' . $keywords . ', count=' . $number_of_articles . ', categories=' . json_encode($categories) . ', cta_link=' . $cta_link);
 
         if (empty($keywords) || $number_of_articles <= 0) {
@@ -644 +690 @@
             'ClickToActionLink' => $cta_link,
         );
+        if (!empty($categories)) {
+            // API expects parameter named "categories" as array of integers
+            $payload['categories'] = array_values(array_filter($categories));
+        }
+        // Debug: log payload (safe fields only)
+        error_log('Lyxity Debug - ajax_generate_articles - payload: ' . json_encode($payload));
 
         // Call API via centralized class
@@ -650 +702 @@
 
         if (is_wp_error($response)) {
+            error_log('Lyxity Debug - ajax_generate_articles - WP_Error: ' . $response->get_error_message());
             wp_send_json_error(array('message' => 'API Error: ' . $response->get_error_message()));
         }
 
+        // Debug success
+        error_log('Lyxity Debug - ajax_generate_articles - success response received');
         wp_send_json_success($response);
     }
@@ -1120 +1175 @@
                                 </tr>
                                 <tr>
+                                    <th scope="row" style="width: 150px;"><label><?php esc_html_e('Categories:', 'lyxity'); ?></label></th>
+                                    <td>
+                                        <div id="categories-loading" style="display:none"><i class="fas fa-spinner fa-spin"></i> <?php esc_html_e('Loading categories...', 'lyxity'); ?></div>
+                                        <div id="categories-error" class="notice notice-error" style="display:none;"><p></p></div>
+                                        <div id="categories-list" style="max-height:160px; overflow:auto; border:1px solid #ccd0d4; padding:8px; border-radius:4px;"></div>
+                                        <p class="description"><?php esc_html_e('Select one or more categories to assign to generated articles.', 'lyxity'); ?></p>
+                                    </td>
+                                </tr>
+                                <tr>
                                     <th scope="row" style="width: 150px;"><label for="cta-link"><?php esc_html_e('Call to Action Link:', 'lyxity'); ?></label></th>
                                     <td>

lyxity/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.0
 Tested up to: 6.8
-Stable tag: 1.6.0
+Stable tag: 1.7.0
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -113 +113 @@
 
 == Changelog ==
+= 1.7.0 =
+- Bug fixes and other improvements
+- Added category selection in create articles
+
 = 1.6.0 =
 - Bug fixes and other improvements

lyxity/trunk/templates/settings-page.php

@@ -250 +250 @@
                                                         <?php esc_html_e('English (US)', 'lyxity'); ?>
                                                     </option>
-                                                    <option value="fr-FR" <?php selected($default_language, 'fr-FR'); ?>>
-                                                        <?php esc_html_e('French', 'lyxity'); ?>
-                                                    </option>
-                                                    <option value="de-DE" <?php selected($default_language, 'de-DE'); ?>>
-                                                        <?php esc_html_e('German', 'lyxity'); ?>
-                                                    </option>
-                                                    <option value="es-ES" <?php selected($default_language, 'es-ES'); ?>>
-                                                        <?php esc_html_e('Spanish', 'lyxity'); ?>
-                                                    </option>
                                                 </select>
                                             </div>