Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add new license while white label enabled #4433

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

Merged
merged 2 commits into from
Sep 10, 2025
+11 −12
Merged

Add new license while white label enabled #4433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f2182a
fix: add new license while white label enabled
girishpanchal30 Aug 26, 2025
05bade2
refactor: license validation condition
girishpanchal30 Aug 26, 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
23 changes: 11 additions & 12 deletions assets/apps/dashboard/src/Components/Content/Sidebar/LicenseCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ const LicenseCard = () => {
const { valid, expiration } = license;
const { whiteLabel, strings } = neveDash;
const { licenseCardHeading, licenseCardDescription } = strings;
const isValid = 'valid' === valid;

const toggleLicense = () => {
const toDo = 'valid' === valid ? 'deactivate' : 'activate';
const toDo = isValid ? 'deactivate' : 'activate';
setStatus('activate' === toDo ? 'activating' : 'deactivating');
send(proApi + '/toggle_license', { key, action: toDo }).then(
(response) => {
Expand All @@ -48,7 +49,7 @@ const LicenseCard = () => {
);
};

if (whiteLabel && whiteLabel.hideLicense) {
if (whiteLabel && whiteLabel.hideLicense && isValid) {
return null;
}

Expand All @@ -63,9 +64,7 @@ const LicenseCard = () => {
};

if (!status) {
return isOrWasValid
? __('Deactivate', 'neve')
: __('Activate', 'neve');
return isValid ? __('Deactivate', 'neve') : __('Activate', 'neve');
}

return statusLabelMap[status];
Expand Down Expand Up @@ -94,22 +93,22 @@ const LicenseCard = () => {
id="license-field"
name="license-field"
className="flex-grow rounded !border-gray-300 text-sm !py-1 !px-2"
disabled={isOrWasValid}
disabled={isValid}
onChange={(e) => {
const keyToSet = e.target.value.replace(/\s+/g, '');
setKey(keyToSet);
}}
value={
isOrWasValid
isValid
? '******************************' +
key.slice(-5)
: key
}
placeholder={__('Enter License Key', 'neve')}
/>
<Button
isPrimary={'valid' !== valid}
isSecondary={'valid' === valid}
isPrimary={!isValid}
isSecondary={isValid}
disabled={!!status || !key}
isSubmit
>
Expand All @@ -126,10 +125,10 @@ const LicenseCard = () => {
{isOrWasValid && (
<div className="flex items-center gap-1">
<Pill
type={valid === 'valid' ? 'success' : 'warning'}
type={isValid ? 'success' : 'warning'}
className="inline-flex items-center gap-1 px-2 py-1"
>
{valid === 'valid' ? (
{isValid ? (
<>
<LucideCircleCheck size={14} />
<span>{__('Valid', 'neve')}</span>
Expand All @@ -145,7 +144,7 @@ const LicenseCard = () => {
<>
<span className="space-x-1 ml-auto">
<span className="text-xs">
{'valid' === valid
{isValid
? __('Expires', 'neve')
: __('Expired', 'neve')}
</span>
Expand Down
Loading