Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/devextreme-angular/src/core/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { DxIntegrationModule } from './integration';

config({
buyNowLink: 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeAngular.aspx',
licensingDocLink: 'https://go.devexpress.com/Licensing_Documentation_DevExtremeAngular.aspx',
licensingDocLink: 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_Angular.aspx',
});
Comment thread
ajivanyandev marked this conversation as resolved.

let serverStateKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ describe('DevExtreme Angular widget', () => {
});

it('correctly sets the help link', () => {
expect(config().licensingDocLink).toBe('https://go.devexpress.com/Licensing_Documentation_DevExtremeAngular.aspx');
expect(config().licensingDocLink).toBe('https://www.devexpress.com/go/Licensing_Documentation_DevExpress_Angular.aspx');
});

it('should be disposed', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe('rendering', () => {
});

it('correctly sets the help link', () => {
expect(config().licensingDocLink).toBe('https://go.devexpress.com/Licensing_Documentation_DevExtremeReact.aspx');
expect(config().licensingDocLink).toBe('https://www.devexpress.com/go/Licensing_Documentation_DevExpress_React.aspx');
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-react/src/core/component-base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const DX_REMOVE_EVENT = 'dxremove';

config({
buyNowLink: 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeReact.aspx',
licensingDocLink: 'https://go.devexpress.com/Licensing_Documentation_DevExtremeReact.aspx',
licensingDocLink: 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_React.aspx',
Comment thread
ajivanyandev marked this conversation as resolved.
});

type ComponentBaseProps = ComponentProps & {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ describe('component rendering', () => {
});

it('correctly sets the help link', () => {
expect(config().licensingDocLink).toBe('https://go.devexpress.com/Licensing_Documentation_DevExtremeVue.aspx');
expect(config().licensingDocLink).toBe('https://www.devexpress.com/go/Licensing_Documentation_DevExpress_Vue.aspx');
});

describe('options', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-vue/src/core/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const dxClassesPrefix = 'dx-';

config({
buyNowLink: 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeVue.aspx',
licensingDocLink: 'https://go.devexpress.com/Licensing_Documentation_DevExtremeVue.aspx',
licensingDocLink: 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_Vue.aspx',
Comment thread
ajivanyandev marked this conversation as resolved.
});

function parseClassList(classList: string): string[] {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/core/license/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const RTM_MIN_PATCH_VERSION = 3;
export const KEY_SPLITTER = '.';

export const BUY_NOW_LINK = 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeJQuery.aspx';
export const LICENSING_DOC_LINK = 'https://go.devexpress.com/Licensing_Documentation_DevExtremeJQuery.aspx';
export const LICENSING_DOC_LINK = 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_JQuery.aspx';

export const LICENSE_KEY_PLACEHOLDER = '/* ___$$$$$___devextreme___lcp___placeholder____$$$$$ */';

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/core/license/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface VerifiedToken {

export type Token = ErrorToken | VerifiedToken;

type LicenseVerifyResult = 'W0019' | 'W0020' | 'W0021' | 'W0022' | 'W0023' | 'W0024';
type LicenseVerifyResult = 'W0019' | 'W0020' | 'W0021' | 'W0023';

export const GENERAL_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'general' };
export const VERIFICATION_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'verification' };
Expand Down
10 changes: 0 additions & 10 deletions packages/devextreme/js/__internal/core/m_errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,7 @@ export default errorUtils({
+ 'To verify your DevExtreme license, make certain to specify a correct key in the GlobalConfig. If you continue to encounter this error, please visit https://www.devexpress.com/ClientCenter/DownloadManager to obtain a valid license key.\n\n'
+ 'If you have a valid license and this problem persists, please submit a support ticket via the DevExpress Support Center. We will be happy to follow-up: https://supportcenter.devexpress.com/ticket/create.\n\n',

W0022: 'DevExtreme: Pre-release software. Not suitable for commercial use.\n\n'
+ 'Detailed license/registration related information and instructions: https://js.devexpress.com/Documentation/Licensing/.\n\n'
+ 'Pre-release software may contain deficiencies and as such, should not be considered for use or integrated in any mission critical application.\n\n',

W0023: 'DevExtreme: the following \'devextreme\' package version does not match versions of other DevExpress products used in this application:\n\n'
+ '{0}\n\n'
+ 'Interoperability between different versions of the products listed herein cannot be guaranteed.\n\n',
Comment thread
ajivanyandev marked this conversation as resolved.

W0024: 'DevExtreme: Use Your DevExtreme License Key - Not Your DevExpress .NET License Key\n\n'
+ 'Invalid/incorrect license key. You used your DevExpress .NET license key instead of your DevExtreme (React, Angular, Vue, JS) license key. Please copy your DevExtreme license key and try again. \n\n'
+ 'Go to https://www.devexpress.com/ClientCenter/DownloadManager (navigate to the DevExtreme Subscription section) to obtain a valid DevExtreme license key. To validate your license, specify the correct key within GlobalConfig.\n\n'
+ 'For detailed license/registration information, visit https://js.devexpress.com/Documentation/Licensing/.\n\n'
+ 'If you have a valid license and the issue persists, submit a support ticket via the DevExpress Support Center. We will be happy to follow-up: https://supportcenter.devexpress.com/ticket/create.\n\n',
});
6 changes: 0 additions & 6 deletions packages/devextreme/js/core/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,8 @@
/**
* @name ErrorsCore.W0021
*/
/**
* @name ErrorsCore.W0022
*/
/**
* @name ErrorsCore.W0023
*/
/**
* @name ErrorsCore.W0024
*/
import errors from '../__internal/core/m_errors';
export default errors;
Loading