Changeset 3411238

Timestamp:

12/04/2025 05:16:54 PM (2 months ago)

Author:

neonic

Message:

Add product bulk organize action and some improvements

Location:

lens-media-library-folders/trunk

Files:

• assets/js/modules/features/Settings.js (modified) (6 diffs)
• assets/js/modules/posts/PostMediaOrganizer.js (modified) (5 diffs)
• readme.txt (modified) (1 diff)
• src/Admin/AssetLoader.php (modified) (1 diff)
• src/Admin/PostMediaManager.php (modified) (7 diffs)
• src/Rest/Controllers/SettingsController.php (modified) (1 diff)

lens-media-library-folders/trunk/assets/js/modules/features/Settings.js

@@ -58 +58 @@
         // Settings storage key
         this.storageKey = 'lens_settings';
+        this.localStorageMigrationFlag = 'lens_settings_migrated_v1';
+        this.localStorageIgnoredKeys = ['telemetry_enabled'];
+        this.telemetryCacheKey = 'lens_telemetry_cache';
         
         // Current settings cache
@@ -75 +78 @@
         this.$resetButton = null;
         this.$resetConfirmInput = null;
-        this.$resetStatusMessage = null;
+        this.$resetStatusMessage = null;
+
+        // One-time cleanup: remove telemetry flag from old localStorage so fresh installs default to opt-out
+        this.purgeLegacyTelemetryCache();
 
         this.apiAccess = {
@@ -189 +195 @@
             const saved = localStorage.getItem(this.storageKey);
             const settings = saved ? JSON.parse(saved) : {};
+
+            // Never hydrate telemetry from local cache; must come from server
+            this.localStorageIgnoredKeys.forEach((key) => {
+                if (settings[key] !== undefined) {
+                    delete settings[key];
+                }
+            });
 
             if (settings['sidebar-width'] === undefined) {
@@ -299 +312 @@
     writeSettingsToLocal(settings) {
         try {
-            localStorage.setItem(this.storageKey, JSON.stringify(settings));
+            const filtered = { ...settings };
+            this.localStorageIgnoredKeys.forEach((key) => {
+                if (filtered[key] !== undefined) {
+                    delete filtered[key];
+                }
+            });
+
+            localStorage.setItem(this.storageKey, JSON.stringify(filtered));
             return true;
         } catch (error) {
             console.error('[Settings] Error saving settings to localStorage:', error);
             return false;
+        }
+    }
+
+    /**
+     * Persist telemetry state with activation stamp so reinstalls (new activation) ignore stale cache.
+     */
+    writeTelemetryCache(value) {
+        try {
+            const activation = this.getTelemetryActivation();
+            const payload = {
+                value: Boolean(value),
+                activation
+            };
+            localStorage.setItem(this.telemetryCacheKey, JSON.stringify(payload));
+        } catch (error) {
+            console.warn('[Settings] Unable to write telemetry cache', error);
+        }
+    }
+
+    /**
+     * Read telemetry cache if activation matches current install.
+     */
+    readTelemetryCache() {
+        try {
+            const raw = localStorage.getItem(this.telemetryCacheKey);
+            if (!raw) return null;
+            const parsed = JSON.parse(raw);
+            if (!parsed || typeof parsed.activation === 'undefined') {
+                return null;
+            }
+            if (parsed.activation !== this.getTelemetryActivation()) {
+                return null;
+            }
+            return typeof parsed.value === 'undefined' ? null : Boolean(parsed.value);
+        } catch (error) {
+            console.warn('[Settings] Unable to read telemetry cache', error);
+            return null;
+        }
+    }
+
+    /**
+     * Get current activation stamp passed from server (resets on uninstall/reinstall).
+     */
+    getTelemetryActivation() {
+        const config = window.lens_config || {};
+        const telemetry = config.telemetry || {};
+        const activation = telemetry.first_activated || 0;
+        return Number(activation) || 0;
+    }
+
+    /**
+     * One-time cleanup to ensure telemetry opt-in isn't carried across uninstall/reinstall
+     */
+    purgeLegacyTelemetryCache() {
+        try {
+            if (localStorage.getItem(this.localStorageMigrationFlag)) {
+                return;
+            }
+
+            const saved = localStorage.getItem(this.storageKey);
+            if (saved) {
+                const settings = JSON.parse(saved);
+                if (settings && settings.telemetry_enabled !== undefined) {
+                    delete settings.telemetry_enabled;
+                    localStorage.setItem(this.storageKey, JSON.stringify(settings));
+                }
+            }
+
+            localStorage.setItem(this.localStorageMigrationFlag, '1');
+        } catch (error) {
+            console.warn('[Settings] Unable to purge legacy telemetry cache', error);
         }
     }
@@ -1616 +1707 @@
         };
 
+        // Telemetry: trust server, but fall back to cached state if activation matches and server didn't return true
+        const cachedTelemetry = this.readTelemetryCache();
+        if (typeof cachedTelemetry === 'boolean' && this.currentSettings['telemetry_enabled'] !== true) {
+            this.currentSettings['telemetry_enabled'] = cachedTelemetry;
+        }
+
         this.currentSettings = this.normalizeSettings(this.currentSettings);
 
@@ -1719 +1816 @@
             ...collectedSettings
         };
+
+        // Persist telemetry state locally with activation stamp (used only as fallback, not for reinstalls)
+        if (Object.prototype.hasOwnProperty.call(collectedSettings, 'telemetry_enabled')) {
+            this.writeTelemetryCache(collectedSettings['telemetry_enabled']);
+        }
 
         if (!this.writeSettingsToLocal(this.currentSettings)) {

lens-media-library-folders/trunk/assets/js/modules/posts/PostMediaOrganizer.js

@@ -851 +851 @@
          */
         initBulkActions() {
+            this.bindBulkFormSubmission();
+
             // Check if bulk organize was triggered
             const urlParams = new URLSearchParams(window.location.search);
@@ -866 +868 @@
             // See initBulkActions()
         }
+
+        /**
+         * Bind bulk form submission to prevent page refresh for Lens action.
+         */
+        bindBulkFormSubmission() {
+            const $form = $('#posts-filter');
+            if (!$form.length) {
+                return;
+            }
+
+            const getSelectedAction = () => {
+                const top = $('#bulk-action-selector-top').val();
+                const bottom = $('#bulk-action-selector-bottom').val();
+                return top !== '-1' ? top : bottom;
+            };
+
+            $form.on('submit.lensBulkOrganize', this.handleBulkFormSubmit.bind(this, $form, getSelectedAction));
+        }
+
+        /**
+         * Handle Lens bulk organize submit without reloading.
+         */
+        handleBulkFormSubmit($form, getSelectedAction, e) {
+            const action = getSelectedAction();
+            if (action !== 'lens_bulk_organize_media') {
+                return;
+            }
+
+            e.preventDefault();
+            e.stopPropagation();
+
+            const postIds = this.getSelectedPostIds($form);
+
+            if (!postIds.length) {
+                this.showNotification(__('Please select posts and try again','lens-media-library-folders'), 'info');
+                return;
+            }
+
+            this.showBulkOrganizeModal(postIds.length, postIds);
+        }
+
+        /**
+         * Collect selected post IDs from the list table.
+         */
+        getSelectedPostIds($form) {
+            return $form.find('input[name="post[]"]:checked').map((index, el) => parseInt(el.value, 10)).get().filter((id) => !isNaN(id));
+        }
         
         /**
          * Show bulk organize modal
          */
-        async showBulkOrganizeModal(postCount) {
-            // Get the transient data from server
-            const transientKey = 'lens_bulk_organize_' + this.config.userId;
-            
+        async showBulkOrganizeModal(postCount, selectedPostIds = null) {
+            const postIdsFromSelection = Array.isArray(selectedPostIds) ? selectedPostIds.filter((id) => !isNaN(parseInt(id, 10))) : null;
+
             try {
-                // First get the post IDs from transient
+                if (postIdsFromSelection && postIdsFromSelection.length) {
+                    const statsResponse = await this.apiClient.post('post-media/stats', {
+                        post_ids: postIdsFromSelection
+                    });
+
+                    if (!statsResponse.success) {
+                        this.showNotification(__('Failed to get media statistics','lens-media-library-folders'), 'error');
+                        return;
+                    }
+
+                    this.showBulkModal(postIdsFromSelection, statsResponse.data);
+                    return;
+                }
+
+                // Fallback to server-provided transient (compatibility with existing flow)
                 const response = await $.ajax({
                     url: this.config.ajaxUrl,
@@ -893 +955 @@
                     
                     // Show a helpful message instead of error
-                this.showNotification(__('Please select posts and try again','lens-media-library-folders'), 'info');
+                    this.showNotification(__('Please select posts and try again','lens-media-library-folders'), 'info');
                     return;
                 }
@@ -1026 +1088 @@
             });
             
+            // Preload media so organize works without expanding the list
+            this.loadBulkMedia(postIds);
+
             // Show modal with fade-in effect after initialization
             setTimeout(() => {
@@ -1057 +1122 @@
             this.bulkModal.find('.lens-modal-organize').on('click', async () => {
                 const folderData = bulkFolderSelector.getValue();
-                
-                // Confirm action
-                if (!confirm(this.config.strings.confirmBulk)) {
-                    return;
-                }
                 
                 await this.organizeBulkMedia(postIds, folderData.id, folderData.name);

lens-media-library-folders/trunk/readme.txt

@@ -320 +320 @@
 
 == Changelog ==
+
+= 1.0.1 - 2025-12-04 =
+* Added: "Organize Media" to WooCommerce product bulk actions, allowing product media to be moved in a single pass.
+* Minor bug fixes and improvements.
 
 = 1.0.0 - 2025-12-01 =

lens-media-library-folders/trunk/src/Admin/AssetLoader.php

@@ -1231 +1231 @@
                     'max_file_size_readable' => $import_max_file_size_label,
                     'supported_formats'      => array( 'csv', 'json', 'xml', 'zip' ),
+                ),
+                'telemetry'             => array(
+                    'first_activated' => (int) get_option( \Lens\Admin\Telemetry::OPTION_FIRST_ACTIVATED, 0 ),
                 ),
             );

lens-media-library-folders/trunk/src/Admin/PostMediaManager.php

@@ -22 +22 @@
 use Lens\Models\Folder;
 use Lens\Models\Attachment;
+use Lens\Models\Permission;
 use WP_Post;
 use WP_Error;
@@ -33 +34 @@
 
     /**
+     * Post types that should expose Lens bulk actions.
+     *
+     * @var array
+     */
+    private $bulk_action_post_types = array( 'post', 'page', 'product' );
+
+    /**
      * Constructor.
      */
@@ -54 +62 @@
 
         // Add bulk actions
-        add_filter( 'bulk_actions-edit-post', array( $this, 'add_bulk_actions' ) );
-        add_filter( 'bulk_actions-edit-page', array( $this, 'add_bulk_actions' ) );
-        add_filter( 'handle_bulk_actions-edit-post', array( $this, 'handle_bulk_actions' ), 10, 3 );
-        add_filter( 'handle_bulk_actions-edit-page', array( $this, 'handle_bulk_actions' ), 10, 3 );
+        foreach ( $this->get_bulk_action_post_types() as $post_type ) {
+            add_filter( "bulk_actions-edit-{$post_type}", array( $this, 'add_bulk_actions' ) );
+            add_filter( "handle_bulk_actions-edit-{$post_type}", array( $this, 'handle_bulk_actions' ), 10, 3 );
+        }
 
         // AJAX handlers
@@ -2085 +2093 @@
         $trashed_media_ids     = $trashed_media_handler->get_trashed_attachment_ids();
 
+        // Provide lightweight permission map for list/editor contexts
+        $user_permissions = array(
+            'lens_manage_media'   => Permission::current_user_can_capability( 'lens_manage_media' ),
+            'lens_bulk_operations' => Permission::current_user_can_capability( 'lens_bulk_operations' ),
+        );
+
+        $permissions_available = (bool) apply_filters( 'lens/permissions/is_available', false, get_current_user_id() );
+
         // IMPORTANT: Localize ApiClient BEFORE enqueueing it
         wp_localize_script(
@@ -2096 +2112 @@
                 'debug'           => defined( 'WP_DEBUG' ) && WP_DEBUG,
                 'trashedMediaIds' => $trashed_media_ids, // Pre-loaded trashed IDs for Classic Editor
+                'user_permissions' => $user_permissions,
+                'permissions_available' => $permissions_available,
             )
         );
@@ -2840 +2858 @@
 
     /**
+     * Get post types that should expose Lens bulk actions.
+     *
+     * @return array Post types.
+     */
+    private function get_bulk_action_post_types() {
+        /**
+         * Filters the post types that display Lens bulk actions.
+         *
+         * @since 1.0.0
+         *
+         * @param array $post_types Post types that should expose Lens bulk actions.
+         */
+        return apply_filters( 'lens_bulk_action_post_types', $this->bulk_action_post_types );
+    }
+
+    /**
      * Add bulk actions to post list.
      *
@@ -3210 +3244 @@
         }
 
-        $valid_screens = array( 'post', 'page', 'edit-post', 'edit-page' );
+        $valid_screens = array( 'post', 'page', 'product', 'edit-post', 'edit-page', 'edit-product' );
         $screen_id     = $screen->id;
         $base          = $screen->base;

lens-media-library-folders/trunk/src/Rest/Controllers/SettingsController.php

@@ -350 +350 @@
 
                 // Handle special telemetry setting
-                if ( isset( $config['handler'] ) && 'telemetry' === $config['handler'] ) {
-                    if ( ! current_user_can( 'manage_options' ) ) {
-                        return $this->error(
-                            Constants::REST_ERROR_FORBIDDEN,
-                            __( 'You do not have permission to change telemetry settings.', 'lens-media-library-folders' ),
-                            rest_authorization_required_code()
-                        );
-                    }
-
-                    Telemetry::update_consent( $value );
-                    $updated[ $key ] = $value;
-                    continue;
-                }
+            if ( isset( $config['handler'] ) && 'telemetry' === $config['handler'] ) {
+                // Same capability already enforced by update_settings_permissions_check (upload_files).
+                Telemetry::update_consent( $value );
+                $updated[ $key ] = $value;
+                continue;
+            }
 
             $meta_key = isset( $config['user_meta_key'] ) ? $config['user_meta_key'] : Constants::user_meta( $key );