Merge pull request #914 from Codeinwp/prf/final-fixes

Prf/final fixes

Author: abaicus

assets/src/dashboard/parts/connected/OptimizationStatus.js

@@ -3,9 +3,10 @@ import { closeSmall, check } from '@wordpress/icons';
 
 const OptimizationStatus = ({ settings }) => {
 	const lazyloadEnabled = 'enabled' === settings?.lazyload;
+	const imageHandlingEnabled = 'enabled' === settings?.image_replacer;
 	const statuses = [
 		{
-			active: 'enabled' === settings?.image_replacer,
+			active: imageHandlingEnabled,
 			label: optimoleDashboardApp.strings.optimization_status.statusTitle1,
 			description: optimoleDashboardApp.strings.optimization_status.statusSubTitle1
 		},
@@ -19,34 +20,33 @@ const OptimizationStatus = ({ settings }) => {
 			label: optimoleDashboardApp.strings.optimization_status.statusTitle3,
 			description: optimoleDashboardApp.strings.optimization_status.statusSubTitle3
 		}
-	];
+	].map( el => ({
+		...el, active: imageHandlingEnabled && el.active
+	}) );
 
 	return (
 		<div className="bg-white flex flex-col text-gray-700 border-0 rounded-lg shadow-md p-8">
 			<h3 className="text-lg mt-0">{ optimoleDashboardApp.strings.optimization_status.title }</h3>
 			<ul className="grid gap-3 m-0">
-				{ statuses.map( ( status, index ) => {
-					let statusClass = status.active ? 'success' : 'danger';
-					return (
-						<li
-							key={ index }
-							className="flex items-start gap-2"
-						>
-							{ status.active ? (
-								<Icon icon={check} className="fill-success bg-success/20 rounded-full" size={20} />
-							) : (
-								<Icon icon={closeSmall} className="fill-danger bg-danger/20 rounded-full" size={20} />
-							) }
+				{ statuses.map( ( status, index ) => (
+					<li
+						key={index}
+						className="flex items-start gap-2"
+					>
+						{status.active ? (
+							<Icon icon={check} className="fill-success bg-success/20 rounded-full" size={20} />
+						) : (
+							<Icon icon={closeSmall} className="fill-danger bg-danger/20 rounded-full" size={20} />
+						)}
+						<div>
+							<span className='text-gray-700 font-normal font-semibold'>
+								{status.label}
+							</span>
 
-							<div>
-								<span className='text-gray-700 font-normal font-semibold'>
-									{ status.label }
-								</span>
-								<p className="m-0">{ status.description }</p>
-							</div>
-						</li>
-					);
-				}) }
+							<p className="m-0">{status.description}</p>
+						</div>
+					</li>
+				) ) }
 			</ul>
 			<p
 				className="m-0 mt-5"

assets/src/dashboard/parts/connected/settings/FilterControl.js

@@ -173,6 +173,7 @@ const FilterControl = ({
 
 		setFilterValue( '' );
 		setFilterType( FILTER_TYPES.FILENAME );
+		setFilterMatchType( defaultFilterOperator );
 	};
 
 	const hasItems = (