Skip to content

Commit 9dd3890

Browse files
Update demos to use platform-specific imports for 25.1 (DevExpress#30024)
Co-authored-by: Vasily Strelyaev <[email protected]>
1 parent 27dccfa commit 9dd3890

File tree

27 files changed

+43
-66
lines changed

27 files changed

+43
-66
lines changed

apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
44

55
import { DxChatModule } from 'devextreme-angular';
66
import { DxButtonModule } from 'devextreme-angular';
7-
import { DxChatTypes } from 'devextreme-angular/ui/chat';
7+
import { type DxChatTypes } from 'devextreme-angular/ui/chat';
88
import { Observable } from 'rxjs';
99
import { AppService } from './app.service';
10-
import { loadMessages } from 'devextreme/localization';
10+
import { loadMessages } from 'devextreme-angular/common/core/localization';
1111
import { DataSource } from 'devextreme-angular/common/data';
1212

1313
if (!/localhost/.test(document.location.host)) {

apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.service.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import remarkParse from 'remark-parse';
66
import remarkRehype from 'remark-rehype';
77
import rehypeStringify from 'rehype-stringify';
88
import rehypeMinifyWhitespace from 'rehype-minify-whitespace';
9-
import {
10-
User,
11-
Alert,
12-
MessageEnteredEvent,
13-
DxChatTypes,
14-
} from 'devextreme/ui/chat';
9+
import { type DxChatTypes } from 'devextreme-angular/ui/chat';
1510
import { DataSource, CustomStore } from 'devextreme-angular/common/data';
1611

1712
@Injectable({

apps/demos/Demos/Chat/AIAndChatbotIntegration/React/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback, useState } from 'react';
22
import Chat, { type ChatTypes } from 'devextreme-react/chat';
3-
import { loadMessages } from 'devextreme/localization';
3+
import { loadMessages } from 'devextreme-react/common/core/localization';
44
import {
55
user,
66
assistant,

apps/demos/Demos/Chat/AIAndChatbotIntegration/React/useApi.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { useCallback, useState } from 'react';
22
import { AzureOpenAI, OpenAI } from 'openai';
3-
import { ChatTypes } from 'devextreme-react/chat';
4-
import CustomStore from 'devextreme/data/custom_store';
5-
import DataSource from 'devextreme/data/data_source';
3+
import { type ChatTypes } from 'devextreme-react/chat';
4+
import { CustomStore, DataSource } from 'devextreme-react/common/data';
65
import {
76
ALERT_TIMEOUT, assistant,
87
AzureOpenAIConfig, REGENERATION_TEXT,

apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback, useState } from 'react';
22
import Chat from 'devextreme-react/chat';
3-
import { loadMessages } from 'devextreme/localization';
3+
import { loadMessages } from 'devextreme-react/common/core/localization';
44
import { user, assistant, CHAT_DISABLED_CLASS } from './data.js';
55
import Message from './Message.js';
66
import { dataSource, useApi } from './useApi.js';

apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/useApi.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useCallback, useState } from 'react';
22
import { AzureOpenAI } from 'openai';
3-
import CustomStore from 'devextreme/data/custom_store';
4-
import DataSource from 'devextreme/data/data_source';
3+
import { CustomStore, DataSource } from 'devextreme-react/common/data';
54
import {
65
ALERT_TIMEOUT, assistant, AzureOpenAIConfig, REGENERATION_TEXT,
76
} from './data.js';

apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import { ref, onBeforeMount } from 'vue';
5252
import DxChat, { type DxChatTypes } from 'devextreme-vue/chat';
5353
import DxButton from 'devextreme-vue/button';
54-
import { loadMessages } from 'devextreme/localization';
54+
import { loadMessages } from 'devextreme-vue/common/core/localization';
5555
import { AzureOpenAI } from 'openai';
5656
import {
5757
dictionary,

apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/data.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import CustomStore from 'devextreme/data/custom_store';
2-
import DataSource from 'devextreme/data/data_source';
1+
import { CustomStore, DataSource } from 'devextreme-vue/common/data';
32
import { unified } from 'unified';
43
import remarkParse from 'remark-parse';
54
import remarkRehype from 'remark-rehype';

apps/demos/Demos/Chat/MessageEditing/Angular/app/app.component.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ import { NgModule, Component, enableProdMode } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
44
import { DxChatModule, DxSelectBoxModule } from 'devextreme-angular';
5-
import {
6-
User,
7-
MessageEnteredEvent,
8-
MessageDeletedEvent,
9-
MessageUpdatedEvent,
10-
} from 'devextreme/ui/chat';
11-
import DataSource from 'devextreme/data/data_source';
5+
import { type DxChatTypes } from 'devextreme-angular/ui/chat';
6+
import { DataSource } from 'devextreme-angular/common/data';
127
import { AppService } from './app.service';
138

149
if (!document.location.host.includes('localhost')) {
@@ -27,7 +22,7 @@ if (window && window.config?.packageConfigPaths) {
2722
styleUrls: [`.${modulePrefix}/app.component.css`],
2823
})
2924
export class AppComponent {
30-
currentUser: User;
25+
currentUser: DxChatTypes.User;
3126

3227
allowUpdating = true;
3328

@@ -69,15 +64,15 @@ export class AppComponent {
6964
this.dataSource = this.appService.dataSource;
7065
}
7166

72-
onMessageEntered(e: MessageEnteredEvent): void {
67+
onMessageEntered(e: DxChatTypes.MessageEnteredEvent): void {
7368
this.appService.onMessageEntered(e);
7469
}
7570

76-
onMessageDeleted(e: MessageDeletedEvent): void {
71+
onMessageDeleted(e: DxChatTypes.MessageDeletedEvent): void {
7772
this.appService.onMessageDeleted(e);
7873
}
7974

80-
onMessageUpdated(e: MessageUpdatedEvent): void {
75+
onMessageUpdated(e: DxChatTypes.MessageUpdatedEvent): void {
8176
this.appService.onMessageUpdated(e);
8277
}
8378

apps/demos/Demos/Chat/MessageEditing/Angular/app/app.service.ts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
1-
import {
2-
User,
3-
Message,
4-
MessageEnteredEvent,
5-
MessageUpdatedEvent,
6-
MessageDeletedEvent,
7-
} from 'devextreme/ui/chat';
8-
import DataSource from 'devextreme/data/data_source';
9-
import CustomStore from 'devextreme/data/custom_store';
1+
import { type DxChatTypes } from 'devextreme-angular/ui/chat';
2+
import { CustomStore, DataSource } from 'devextreme-angular/common/data';
103
import Guid from 'devextreme/core/guid';
114

125
export class AppService {
136
date: Date;
147

15-
store: Message[] = [];
8+
store: DxChatTypes.Message[] = [];
169

1710
customStore: CustomStore;
1811

1912
dataSource: DataSource;
2013

21-
currentUser: User = {
14+
currentUser: DxChatTypes.User = {
2215
id: 'c94c0e76-fb49-4b9b-8f07-9f93ed93b4f3',
2316
name: 'John Doe',
2417
};
2518

26-
supportAgent: User = {
19+
supportAgent: DxChatTypes.User = {
2720
id: 'd16d1a4c-5c67-4e20-b70e-2991c22747c3',
2821
name: 'Support Agent',
2922
avatarUrl: '../../../../images/petersmith.png',
3023
};
3124

32-
messages: Message[] = [];
25+
messages: DxChatTypes.Message[] = [];
3326

3427
allowEditingLabel = { 'aria-label': 'Allow Editing' };
3528

@@ -92,15 +85,15 @@ export class AppService {
9285
});
9386
}
9487

95-
getUsers(): User[] {
88+
getUsers(): DxChatTypes.User[] {
9689
return [this.currentUser, this.supportAgent];
9790
}
9891

9992
getTimestamp(date: Date, offsetMinutes = 0): number {
10093
return date.getTime() + offsetMinutes * 60000;
10194
}
10295

103-
onMessageEntered({ message }: MessageEnteredEvent): void {
96+
onMessageEntered({ message }: DxChatTypes.MessageEnteredEvent): void {
10497
this.dataSource.store().push([{
10598
type: 'insert',
10699
data: {
@@ -110,15 +103,15 @@ export class AppService {
110103
}]);
111104
}
112105

113-
onMessageDeleted({ message }: MessageDeletedEvent): void {
106+
onMessageDeleted({ message }: DxChatTypes.MessageDeletedEvent): void {
114107
this.dataSource.store().push([{
115108
type: 'update',
116109
key: message.id,
117110
data: { isDeleted: true },
118111
}]);
119112
}
120113

121-
onMessageUpdated({ message, text }: MessageUpdatedEvent): void {
114+
onMessageUpdated({ message, text }: DxChatTypes.MessageUpdatedEvent): void {
122115
this.dataSource.store().push([{
123116
type: 'update',
124117
key: message.id,

0 commit comments

Comments
 (0)