From 887b13bc3e0a883387d46567e641662890387dff Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Wed, 13 Aug 2025 18:46:34 +0530 Subject: [PATCH 1/4] fix: optimisation sidebar status when account is disabled --- .../dashboard/parts/connected/OptimizationStatus.js | 10 ++++++++-- inc/admin.php | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/assets/src/dashboard/parts/connected/OptimizationStatus.js b/assets/src/dashboard/parts/connected/OptimizationStatus.js index f4222938..706af084 100644 --- a/assets/src/dashboard/parts/connected/OptimizationStatus.js +++ b/assets/src/dashboard/parts/connected/OptimizationStatus.js @@ -2,9 +2,15 @@ import { Icon } from '@wordpress/components'; import { closeSmall, check } from '@wordpress/icons'; const OptimizationStatus = ({ settings }) => { - const lazyloadEnabled = 'enabled' === settings?.lazyload; - const imageHandlingEnabled = 'enabled' === settings?.image_replacer; + const userStatus = optimoleDashboardApp.user_status ? optimoleDashboardApp.user_status : 'inactive'; + const lazyloadEnabled = 'enabled' === settings?.lazyload && 'inactive' !== userStatus; + const imageHandlingEnabled = 'enabled' === settings?.image_replacer && 'inactive' !== userStatus; const statuses = [ + { + active: 'inactive' !== userStatus, + label: optimoleDashboardApp.strings.optimization_status.statusTitle4, + description: optimoleDashboardApp.strings.optimization_status.statusSubTitle4 + }, { active: imageHandlingEnabled, label: optimoleDashboardApp.strings.optimization_status.statusTitle1, diff --git a/inc/admin.php b/inc/admin.php index 60942298..a0efb6ab 100755 --- a/inc/admin.php +++ b/inc/admin.php @@ -2136,6 +2136,8 @@ private function get_dashboard_strings() { 'statusSubTitle2' => __( 'Images load as visitors scroll', 'optimole-wp' ), 'statusTitle3' => __( 'Image Scalling', 'optimole-wp' ), 'statusSubTitle3' => __( 'All images are perfectly sized for devices', 'optimole-wp' ), + 'statusTitle4' => __( 'Account Status', 'optimole-wp' ), + 'statusSubTitle4' => __( 'Your optimole account status', 'optimole-wp' ), ], 'optimization_tips' => sprintf( /* translators: 1 is the opening anchor tag, 2 is the closing anchor tag */ From fb58810ed73167848a6a6b4e31273c488bf4df24 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Thu, 14 Aug 2025 10:46:22 +0530 Subject: [PATCH 2/4] Remove account status in sidebar --- assets/src/dashboard/parts/connected/OptimizationStatus.js | 5 ----- inc/admin.php | 2 -- 2 files changed, 7 deletions(-) diff --git a/assets/src/dashboard/parts/connected/OptimizationStatus.js b/assets/src/dashboard/parts/connected/OptimizationStatus.js index 706af084..1862cdc2 100644 --- a/assets/src/dashboard/parts/connected/OptimizationStatus.js +++ b/assets/src/dashboard/parts/connected/OptimizationStatus.js @@ -6,11 +6,6 @@ const OptimizationStatus = ({ settings }) => { const lazyloadEnabled = 'enabled' === settings?.lazyload && 'inactive' !== userStatus; const imageHandlingEnabled = 'enabled' === settings?.image_replacer && 'inactive' !== userStatus; const statuses = [ - { - active: 'inactive' !== userStatus, - label: optimoleDashboardApp.strings.optimization_status.statusTitle4, - description: optimoleDashboardApp.strings.optimization_status.statusSubTitle4 - }, { active: imageHandlingEnabled, label: optimoleDashboardApp.strings.optimization_status.statusTitle1, diff --git a/inc/admin.php b/inc/admin.php index a0efb6ab..60942298 100755 --- a/inc/admin.php +++ b/inc/admin.php @@ -2136,8 +2136,6 @@ private function get_dashboard_strings() { 'statusSubTitle2' => __( 'Images load as visitors scroll', 'optimole-wp' ), 'statusTitle3' => __( 'Image Scalling', 'optimole-wp' ), 'statusSubTitle3' => __( 'All images are perfectly sized for devices', 'optimole-wp' ), - 'statusTitle4' => __( 'Account Status', 'optimole-wp' ), - 'statusSubTitle4' => __( 'Your optimole account status', 'optimole-wp' ), ], 'optimization_tips' => sprintf( /* translators: 1 is the opening anchor tag, 2 is the closing anchor tag */ From a7b011bc793581e282cd132dd3c0c19ccc207655 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Thu, 14 Aug 2025 14:34:47 +0530 Subject: [PATCH 3/4] refactor: check user status condition --- assets/src/dashboard/parts/connected/OptimizationStatus.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/dashboard/parts/connected/OptimizationStatus.js b/assets/src/dashboard/parts/connected/OptimizationStatus.js index 1862cdc2..ca657728 100644 --- a/assets/src/dashboard/parts/connected/OptimizationStatus.js +++ b/assets/src/dashboard/parts/connected/OptimizationStatus.js @@ -3,8 +3,8 @@ import { closeSmall, check } from '@wordpress/icons'; const OptimizationStatus = ({ settings }) => { const userStatus = optimoleDashboardApp.user_status ? optimoleDashboardApp.user_status : 'inactive'; - const lazyloadEnabled = 'enabled' === settings?.lazyload && 'inactive' !== userStatus; - const imageHandlingEnabled = 'enabled' === settings?.image_replacer && 'inactive' !== userStatus; + const lazyloadEnabled = 'enabled' === settings?.lazyload && userStatus === 'active'; + const imageHandlingEnabled = 'enabled' === settings?.image_replacer && userStatus === 'active'; const statuses = [ { active: imageHandlingEnabled, From d2eea3f5a464b0bb6269047b6d9fb48540eb4b20 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Thu, 14 Aug 2025 14:39:08 +0530 Subject: [PATCH 4/4] fix: ESLint error --- assets/src/dashboard/parts/connected/OptimizationStatus.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/dashboard/parts/connected/OptimizationStatus.js b/assets/src/dashboard/parts/connected/OptimizationStatus.js index ca657728..55038278 100644 --- a/assets/src/dashboard/parts/connected/OptimizationStatus.js +++ b/assets/src/dashboard/parts/connected/OptimizationStatus.js @@ -3,8 +3,8 @@ import { closeSmall, check } from '@wordpress/icons'; const OptimizationStatus = ({ settings }) => { const userStatus = optimoleDashboardApp.user_status ? optimoleDashboardApp.user_status : 'inactive'; - const lazyloadEnabled = 'enabled' === settings?.lazyload && userStatus === 'active'; - const imageHandlingEnabled = 'enabled' === settings?.image_replacer && userStatus === 'active'; + const lazyloadEnabled = 'enabled' === settings?.lazyload && 'active' === userStatus ; + const imageHandlingEnabled = 'enabled' === settings?.image_replacer && 'active' === userStatus; const statuses = [ { active: imageHandlingEnabled,