Skip to content

Commit

Permalink
Merge pull request #589 from Codeinwp/fix/issue-588
Browse files Browse the repository at this point in the history
fix: sites not being removed from cloud library whitelist
  • Loading branch information
abaicus authored Jul 6, 2023
2 parents dbf7719 + 1f14954 commit 48f60e5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
22 changes: 9 additions & 13 deletions assets/src/parts/connected/settings/OffloadMedia.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import {
useState
} from '@wordpress/element';

import { addAction } from '@wordpress/hooks';

/**
* Internal dependencies.
*/
Expand Down Expand Up @@ -142,13 +140,19 @@ const OffloadMedia = ({
const data = { ...settings };

if ( 0 === value.length ) {
sites.all = true;
sites.all = 'true';
} else {
value.forEach( ( site ) => {
sites[ site ] = true;
sites[ site ] = 'true';
});
}

Object.keys( data[ 'cloud_sites' ]).forEach( ( site ) => {
if ( ! Object.prototype.hasOwnProperty.call( sites, site ) ) {
sites[ site ] = 'false';
}
});

data[ 'cloud_sites' ] = sites;
setSettings( data );
};
Expand Down Expand Up @@ -190,14 +194,6 @@ const OffloadMedia = ({
});
};

addAction(
'optimole.settings.save',
'optimole/rollback',
() => {
console.log( 'Trigger save!!!' );
}
);

return (
<>
<ToggleControl
Expand All @@ -223,7 +219,7 @@ const OffloadMedia = ({
>
<div className="optml__token__base flex p-6 bg-light-blue border border-blue-300 rounded-md items-center gap-8">
<FormTokenField
value={ Object.keys( settings['cloud_sites']).filter( site => 'all' !== site ).map( site => site ) || []}
value={ Object.keys( settings['cloud_sites']).filter( site => 'all' !== site && 'false' !== settings['cloud_sites'][ site ]).map( site => site ) || []}
suggestions={ whitelistedDomains }
onChange={ updateSites }
__experimentalExpandOnFocus={ true }
Expand Down
4 changes: 0 additions & 4 deletions development.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
* @package ThemeIsle
*/

if ( ! defined( 'WPINC' ) ) {
die;
}

if ( ! defined( 'ENABLE_OPTIMOLE_WP_DEV' ) ) {
define( 'ENABLE_OPTIMOLE_WP_DEV', true );
}
Expand Down

0 comments on commit 48f60e5

Please sign in to comment.