Skip to content

Commit 7041e92

Browse files
authored
License: Add new urls for licensing trial panels (#33287)
1 parent 1724318 commit 7041e92

10 files changed

Lines changed: 8 additions & 24 deletions

File tree

packages/devextreme-angular/src/core/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import { DxIntegrationModule } from './integration';
4343

4444
config({
4545
buyNowLink: 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeAngular.aspx',
46-
licensingDocLink: 'https://go.devexpress.com/Licensing_Documentation_DevExtremeAngular.aspx',
46+
licensingDocLink: 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_Angular.aspx',
4747
});
4848

4949
let serverStateKey;

packages/devextreme-angular/tests/src/core/component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ describe('DevExtreme Angular widget', () => {
162162
});
163163

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

168168
it('should be disposed', () => {

packages/devextreme-react/src/core/__tests__/component.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ describe('rendering', () => {
127127
});
128128

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

packages/devextreme-react/src/core/component-base.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const DX_REMOVE_EVENT = 'dxremove';
3939

4040
config({
4141
buyNowLink: 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeReact.aspx',
42-
licensingDocLink: 'https://go.devexpress.com/Licensing_Documentation_DevExtremeReact.aspx',
42+
licensingDocLink: 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_React.aspx',
4343
});
4444

4545
type ComponentBaseProps = ComponentProps & {

packages/devextreme-vue/src/core/__tests__/component.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ describe('component rendering', () => {
289289
});
290290

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

295295
describe('options', () => {

packages/devextreme-vue/src/core/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const dxClassesPrefix = 'dx-';
4848

4949
config({
5050
buyNowLink: 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeVue.aspx',
51-
licensingDocLink: 'https://go.devexpress.com/Licensing_Documentation_DevExtremeVue.aspx',
51+
licensingDocLink: 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_Vue.aspx',
5252
});
5353

5454
function parseClassList(classList: string): string[] {

packages/devextreme/js/__internal/core/license/const.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export const RTM_MIN_PATCH_VERSION = 3;
33
export const KEY_SPLITTER = '.';
44

55
export const BUY_NOW_LINK = 'https://go.devexpress.com/Licensing_Installer_Watermark_DevExtremeJQuery.aspx';
6-
export const LICENSING_DOC_LINK = 'https://go.devexpress.com/Licensing_Documentation_DevExtremeJQuery.aspx';
6+
export const LICENSING_DOC_LINK = 'https://www.devexpress.com/go/Licensing_Documentation_DevExpress_JQuery.aspx';
77

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

packages/devextreme/js/__internal/core/license/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface VerifiedToken {
2121

2222
export type Token = ErrorToken | VerifiedToken;
2323

24-
type LicenseVerifyResult = 'W0019' | 'W0020' | 'W0021' | 'W0022' | 'W0023' | 'W0024';
24+
type LicenseVerifyResult = 'W0019' | 'W0020' | 'W0021' | 'W0023';
2525

2626
export const GENERAL_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'general' };
2727
export const VERIFICATION_ERROR: ErrorToken = { kind: TokenKind.corrupted, error: 'verification' };

packages/devextreme/js/__internal/core/m_errors.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,7 @@ export default errorUtils({
121121
+ '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'
122122
+ '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',
123123

124-
W0022: 'DevExtreme: Pre-release software. Not suitable for commercial use.\n\n'
125-
+ 'Detailed license/registration related information and instructions: https://js.devexpress.com/Documentation/Licensing/.\n\n'
126-
+ 'Pre-release software may contain deficiencies and as such, should not be considered for use or integrated in any mission critical application.\n\n',
127-
128124
W0023: 'DevExtreme: the following \'devextreme\' package version does not match versions of other DevExpress products used in this application:\n\n'
129125
+ '{0}\n\n'
130126
+ 'Interoperability between different versions of the products listed herein cannot be guaranteed.\n\n',
131-
132-
W0024: 'DevExtreme: Use Your DevExtreme License Key - Not Your DevExpress .NET License Key\n\n'
133-
+ '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'
134-
+ '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'
135-
+ 'For detailed license/registration information, visit https://js.devexpress.com/Documentation/Licensing/.\n\n'
136-
+ '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',
137127
});

packages/devextreme/js/core/errors.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,8 @@
162162
/**
163163
* @name ErrorsCore.W0021
164164
*/
165-
/**
166-
* @name ErrorsCore.W0022
167-
*/
168165
/**
169166
* @name ErrorsCore.W0023
170167
*/
171-
/**
172-
* @name ErrorsCore.W0024
173-
*/
174168
import errors from '../__internal/core/m_errors';
175169
export default errors;

0 commit comments

Comments
 (0)