= new EventEmitter();
- protected prompt: SafeHtml;
- constructor(protected sanitizer: DomSanitizer) {}
+ constructor() {}
+
+ protected get title(): string {
+ return this.component.content.title || '';
+ }
+
+ protected get prompt(): string {
+ return this.component.content.prompt || '';
+ }
ngOnInit(): void {
- this.prompt = this.sanitizer.bypassSecurityTrustHtml(this.component.content.prompt);
this.dynamicPrompt = new DynamicPrompt(this.component.content.dynamicPrompt);
}
diff --git a/src/assets/wise5/services/createComponentService.ts b/src/assets/wise5/services/createComponentService.ts
index bd53503ba41..7db0294a8df 100644
--- a/src/assets/wise5/services/createComponentService.ts
+++ b/src/assets/wise5/services/createComponentService.ts
@@ -2,11 +2,13 @@ import { Injectable } from '@angular/core';
import { TeacherProjectService } from './teacherProjectService';
import { ComponentServiceLookupService } from './componentServiceLookupService';
import { Node } from '../common/Node';
+import { ComponentInfoService } from './componentInfoService';
@Injectable()
export class CreateComponentService {
constructor(
private componentServiceLookupService: ComponentServiceLookupService,
+ private componentInfoService: ComponentInfoService,
private projectService: TeacherProjectService
) {}
@@ -22,6 +24,7 @@ export class CreateComponentService {
const node = this.projectService.getNode(nodeId);
const service = this.componentServiceLookupService.getService(componentType);
const component = service.createComponent();
+ component.title = this.componentInfoService.getInfo(componentType).getLabel();
if (service.componentHasWork(component)) {
if (node.showSaveButton == false) {
if (this.projectService.doesAnyComponentInNodeShowSubmitButton(node.id)) {
diff --git a/src/assets/wise5/services/projectService.ts b/src/assets/wise5/services/projectService.ts
index 0fdf55ce8a9..cc2ba827e27 100644
--- a/src/assets/wise5/services/projectService.ts
+++ b/src/assets/wise5/services/projectService.ts
@@ -804,7 +804,7 @@ export class ProjectService {
*/
getThemeSettings(): any {
let themeSettings = {};
- if (this.project.themeSettings) {
+ if (this.project?.themeSettings) {
if (this.project.theme) {
// TODO: check if this is a valid theme (using ConfigService) rather than just truthy
themeSettings = this.project.themeSettings[this.project.theme];
@@ -1873,7 +1873,7 @@ export class ProjectService {
}
getSpeechToTextSettings(): any {
- return this.project.speechToText;
+ return this.project?.speechToText;
}
getPreviousNodeId(nodeId: string): string {
diff --git a/src/messages.xlf b/src/messages.xlf
index 2ec1ae93178..777a1d3a1c2 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -11173,14 +11173,14 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Edit: . src/assets/wise5/authoringTool/components/edit-component-dialog/edit-component-dialog.component.ts
- 29,30
+ 31,32Advancedsrc/assets/wise5/authoringTool/components/edit-component-dialog/edit-component-dialog.component.ts
- 32,35
+ 34,37src/assets/wise5/authoringTool/components/edit-node-advanced-button/edit-node-advanced-button.component.ts
@@ -11191,7 +11191,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Close
src/assets/wise5/authoringTool/components/edit-component-dialog/edit-component-dialog.component.ts
- 49,54
+ 52,57src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html
@@ -11202,6 +11202,13 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.114,119
+
+ Activity Title
+
+ src/assets/wise5/authoringTool/components/edit-component-title/edit-component-title.component.ts
+ 13,14
+
+ Authoring Tool Menu
@@ -22071,7 +22078,7 @@ If this problem continues, let your teacher know and move on to the next activit
Credit: src/assets/wise5/components/outsideURL/outside-url-student/outside-url-student.component.html
- 7,9
+ 8,10
@@ -22508,28 +22515,28 @@ If this problem continues, let your teacher know and move on to the next activit
You must submit work on "" to view the summary.src/assets/wise5/components/summary/summary-student/summary-student.component.ts
- 134
+ 136You must complete "" to view the summary.src/assets/wise5/components/summary/summary-student/summary-student.component.ts
- 136
+ 138You must submit work on "" to view the class summary.src/assets/wise5/components/summary/summary-student/summary-student.component.ts
- 142
+ 144You must complete "" to view the class summary.src/assets/wise5/components/summary/summary-student/summary-student.component.ts
- 144
+ 146