Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: hide bagde toggle if the user is inactive [ref Codeinwp/optimole-service#1438] #907

Merged
merged 2 commits into from
Apr 5, 2025
Merged

feat: hide bagde toggle if the user is inactive [ref Codeinwp/optimole-service#1438] #907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de77931
feat: hide bagde toggle if the user is inactive [ref Codeinwp/optimol…
abaicus Apr 2, 2025
bb476ce
Merge branch 'development' of https://github.com/codeinwp/optimole-wp…
abaicus Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 80 additions & 76 deletions assets/src/dashboard/parts/connected/settings/General.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ const General = ({
setSettings,
setCanSave
}) => {
const { isLoading } = useSelect( select => {
const { isLoading } = select( 'optimole' );
const { isLoading, isUserActive } = useSelect( select => {
const { isLoading, getUserStatus } = select( 'optimole' );

return {
isLoading: isLoading()
isLoading: isLoading(),
isUserActive: 'active' === getUserStatus()
};
});

Expand Down Expand Up @@ -91,88 +92,91 @@ const General = ({

<hr className="my-8 border-grayish-blue"/>

<ToggleControl
label={ optimoleDashboardApp.strings.options_strings.enable_badge_title }
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_badge_description } } /> }
checked={ isBannerEnabled }
disabled={ isLoading }
className={ classnames(
{
'is-disabled': isLoading
}
) }
onChange={ ( value ) => {
updateOption( 'banner_frontend', value );
setBadgeSettings( value );
} }
/>
{ isUserActive && <>
<ToggleControl
label={ optimoleDashboardApp.strings.options_strings.enable_badge_title }
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_badge_description } } /> }
checked={ isBannerEnabled }
disabled={ isLoading }
className={ classnames(
{
'is-disabled': isLoading
}
) }
onChange={ ( value ) => {
updateOption( 'banner_frontend', value );
setBadgeSettings( value );
} }
/>

{ isBannerEnabled && (
<div className="mt-4 badge-settings">
<Button
className={ classnames(
'border border-none bg-transparent text-blue-500 px-2 py-1 rounded-sm flex items-center cursor-pointer',
{
'is-disabled': isLoading
}
) }
onClick={ () => setBadgeSettings( ! showBadgeSettings ) }
>
<span>{ optimoleDashboardApp.strings.options_strings.enable_badge_settings }</span>
<Icon
icon={ showBadgeSettings ? chevronUp : chevronDown }
className="h-5 w-5"
style={{ fill: '#3b82f6' }}
/>
</Button>
{ showBadgeSettings && (
<div class="mt-4 space-y-4 pl-4 pt-2">
<div class="flex items-center justify-between mb-4">
<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_show_icon }</label>
<ToggleControl
label=""
checked={ isShowBadgeIcon }
disabled={ isLoading }
className={ classnames(
'flex items-center justify-between mb-4',
{
'is-disabled': isLoading
}
) }
onChange={ value => updateOption( 'show_badge_icon', value ) }
/>
</div>
<div class="flex items-center justify-between">
<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_position }</label>
<div class="flex space-x-2">
<Button
className={ classnames(
'px-4 py-2 border rounded border-[1px]',
'left' === activeBadgePosition ? 'border-blue-500 text-blue-500 bg-blue-100' : 'border-gray-300 text-gray-500 bg-gray-100',
{
'is-disabled': isLoading
}
) }
onClick={ () => updateOption( 'badge_position', 'left' ) }
>{ optimoleDashboardApp.strings.options_strings.badge_position_text_1 }</Button>
<Button
{ isBannerEnabled && (
<div className="mt-4 badge-settings">
<Button
className={ classnames(
'border border-none bg-transparent text-blue-500 px-2 py-1 rounded-sm flex items-center cursor-pointer',
{
'is-disabled': isLoading
}
) }
onClick={ () => setBadgeSettings( ! showBadgeSettings ) }
>
<span>{ optimoleDashboardApp.strings.options_strings.enable_badge_settings }</span>
<Icon
icon={ showBadgeSettings ? chevronUp : chevronDown }
className="h-5 w-5"
style={{ fill: '#3b82f6' }}
/>
</Button>
{ showBadgeSettings && (
<div class="mt-4 space-y-4 pl-4 pt-2">
<div class="flex items-center justify-between mb-4">
<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_show_icon }</label>
<ToggleControl
label=""
checked={ isShowBadgeIcon }
disabled={ isLoading }
className={ classnames(
'px-4 py-2 border rounded',
'right' === activeBadgePosition ? 'border-blue-500 text-blue-500 bg-blue-100' : 'border-gray-300 text-gray-500 bg-gray-100',
'flex items-center justify-between mb-4',
{
'is-disabled': isLoading
}
) }
onClick={ () => updateOption( 'badge_position', 'right' ) }
>{ optimoleDashboardApp.strings.options_strings.badge_position_text_2 }</Button>
onChange={ value => updateOption( 'show_badge_icon', value ) }
/>
</div>
<div class="flex items-center justify-between">
<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_position }</label>
<div class="flex space-x-2">
<Button
className={ classnames(
'px-4 py-2 border rounded border-[1px]',
'left' === activeBadgePosition ? 'border-blue-500 text-blue-500 bg-blue-100' : 'border-gray-300 text-gray-500 bg-gray-100',
{
'is-disabled': isLoading
}
) }
onClick={ () => updateOption( 'badge_position', 'left' ) }
>{ optimoleDashboardApp.strings.options_strings.badge_position_text_1 }</Button>
<Button
className={ classnames(
'px-4 py-2 border rounded',
'right' === activeBadgePosition ? 'border-blue-500 text-blue-500 bg-blue-100' : 'border-gray-300 text-gray-500 bg-gray-100',
{
'is-disabled': isLoading
}
) }
onClick={ () => updateOption( 'badge_position', 'right' ) }
>{ optimoleDashboardApp.strings.options_strings.badge_position_text_2 }</Button>
</div>
</div>
</div>
</div>
)}
</div>
)}
)}
</div>
)}

<hr className="my-8 border-grayish-blue"/>
<hr className="my-8 border-grayish-blue"/>

</>}

<BaseControl
label={ optimoleDashboardApp.strings.options_strings.cache_title }
Expand Down
Loading