From 13dd6015f3c17a9d5bfb12b3cf869bef9b65393d Mon Sep 17 00:00:00 2001 From: RY997 Date: Fri, 20 Oct 2023 17:44:16 +0200 Subject: [PATCH] added redirect link to importing exercise page in first message --- .../exercise-chat-widget.component.html | 5 ++- .../exercise-chat-widget.component.ts | 32 +++++++++++-------- src/main/webapp/i18n/en/exerciseChatbot.json | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html b/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html index fee56bdb7e9d..c9ae8250e5a4 100644 --- a/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html +++ b/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html @@ -78,8 +78,7 @@

- - +
- +
diff --git a/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.ts b/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.ts index ca935925473a..b1dec67eced5 100644 --- a/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.ts +++ b/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.ts @@ -40,7 +40,6 @@ import { IrisMessageContent, IrisMessageContentType, IrisMessageTextContent, - getComponentInstruction, getPlanComponent, getTextContent, isPlanContent, @@ -57,9 +56,9 @@ import { IrisLogoSize } from '../../iris-logo/iris-logo.component'; import interact from 'interactjs'; import { DOCUMENT } from '@angular/common'; import { IrisHttpChatMessageService } from 'app/iris/http-chat-message.service'; -import { IrisExercisePlanComponent } from 'app/entities/iris/iris-exercise-plan-component.model'; import { IrisHttpCodeEditorMessageService } from 'app/iris/http-code-editor-message.service'; import { IrisChatSessionService } from 'app/iris/chat-session.service'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'jhi-exercise-chat-widget', @@ -120,17 +119,18 @@ export class ExerciseChatWidgetComponent implements OnInit, OnDestroy, AfterView unreadMessageIndex: number; error: IrisErrorType | null; dots = 1; - isFirstMessage = false; resendAnimationActive = false; shakeErrorField = false; shouldLoadGreetingMessage = true; fadeState = ''; + courseId: number; exerciseId: number; sessionService: IrisSessionService; shouldShowEmptyMessageError = false; currentMessageCount: number; rateLimit: number; rateLimitTimeframeHours: number; + importExerciseUrl: string; // User preferences userAccepted: boolean; @@ -149,14 +149,15 @@ export class ExerciseChatWidgetComponent implements OnInit, OnDestroy, AfterView constructor( private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any, - //private httpMessageService: IrisHttpMessageService, private userService: UserService, private router: Router, private sharedService: SharedService, private modalService: NgbModal, @Inject(DOCUMENT) private document: Document, + private translateService: TranslateService, ) { this.stateStore = data.stateStore; + this.courseId = data.courseId; this.exerciseId = data.exerciseId; this.sessionService = data.sessionService; this.navigationSubscription = this.router.events.subscribe((event) => { @@ -320,14 +321,26 @@ export class ExerciseChatWidgetComponent implements OnInit, OnDestroy, AfterView }, 500); } + /** + * Inserts the correct link to import the current programming exercise for a new variant generation. + */ + getFirstMessageContent(): string { + if (this.isChatSession()) { + return this.translateService.instant('artemisApp.exerciseChatbot.tutorFirstMessage'); + } + this.importExerciseUrl = `/course-management/${this.courseId}/programming-exercises/import/${this.exerciseId}`; + return this.translateService + .instant('artemisApp.exerciseChatbot.codeEditorFirstMessage') + .replace(/{link:(.*)}/, '$1'); + } + /** * Loads the first message in the conversation if it's not already loaded. */ loadFirstMessage(): void { - const textContent = this.isChatSession() ? 'artemisApp.exerciseChatbot.tutorFirstMessage' : 'artemisApp.exerciseChatbot.codeEditorFirstMessage'; const firstMessageContent = { type: IrisMessageContentType.TEXT, - textContent: textContent, + textContent: this.getFirstMessageContent(), } as IrisMessageTextContent; const firstMessage = { @@ -337,10 +350,7 @@ export class ExerciseChatWidgetComponent implements OnInit, OnDestroy, AfterView } as IrisArtemisClientMessage; if (this.messages.length === 0) { - this.isFirstMessage = true; this.stateStore.dispatch(new ActiveConversationMessageLoadedAction(firstMessage)); - } else if (this.messages[0].sender === IrisSender.ARTEMIS_CLIENT) { - this.isFirstMessage = true; } } @@ -737,10 +747,6 @@ export class ExerciseChatWidgetComponent implements OnInit, OnDestroy, AfterView return getPlanComponent(content); } - getComponentInstruction(component: IrisExercisePlanComponent) { - return getComponentInstruction(component); - } - isRateMessage() { return this.sessionService.httpMessageService instanceof IrisHttpChatMessageService; } diff --git a/src/main/webapp/i18n/en/exerciseChatbot.json b/src/main/webapp/i18n/en/exerciseChatbot.json index 15c85915a137..c2b25240f84d 100644 --- a/src/main/webapp/i18n/en/exerciseChatbot.json +++ b/src/main/webapp/i18n/en/exerciseChatbot.json @@ -55,7 +55,7 @@ "rateLimitExceeded": "You have reached the maximum number of messages you can send to Iris in a {{ hours }} hour window. Please try again later!" }, "tutorFirstMessage": "Hi, I'm Iris! I can help you with your programming exercise. You can learn more about me here.", - "codeEditorFirstMessage": "Hi, I'm Iris! I can help you to create programming exercises. For example: You can learn more about me here.", + "codeEditorFirstMessage": "Hi, I'm Iris! I can help you to create programming exercises. For example: You can learn more about me here.", "rateLimitTooltip": "This is the maximum number of messages you can send to Iris in a {{ hours }} hour window." } }