Skip to content
Open
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
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "karma.conf.js",
"polyfills": [
"@angular/localize/init",
Expand Down Expand Up @@ -289,4 +290,4 @@
"cli": {
"analytics": false
}
}
}
21,531 changes: 8,191 additions & 13,340 deletions package-lock.json

Large diffs are not rendered by default.

70 changes: 43 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@
"not dead"
],
"dependencies": {
"@angular/animations": "^20.1.7",
"@angular/cdk": "^20.1.6",
"@angular/common": "^20.1.7",
"@angular/compiler": "^20.1.7",
"@angular/core": "^20.1.7",
"@angular/elements": "^20.1.7",
"@angular/forms": "^20.1.7",
"@angular/material": "^20.1.6",
"@angular/platform-browser": "^20.1.7",
"@angular/platform-browser-dynamic": "^20.1.7",
"@angular/router": "^20.1.7",
"@angular/animations": "^21.2.13",
"@angular/cdk": "^21.2.11",
"@angular/common": "^21.2.13",
"@angular/compiler": "^21.2.13",
"@angular/core": "^21.2.13",
"@angular/elements": "^21.2.13",
"@angular/forms": "^21.2.13",
"@angular/material": "^21.2.11",
"@angular/platform-browser": "^21.2.13",
"@angular/platform-browser-dynamic": "^21.2.13",
"@angular/router": "^21.2.13",
"@aws-sdk/client-cognito-identity": "^3.310.0",
"@aws-sdk/client-comprehend": "^3.310.0",
"@aws-sdk/client-ses": "^3.310.0",
"@aws-sdk/client-transcribe-streaming": "^3.310.0",
"@aws-sdk/client-translate": "^3.310.0",
"@aws-sdk/credential-provider-cognito-identity": "^3.310.0",
"@ng-select/ng-select": "^20.1.2",
"@ng-select/ng-select": "^21.8.2",
"@ng-web-apis/common": "^2.0.1",
"@ng-web-apis/intersection-observer": "^3.0.0",
"@stomp/rx-stomp": "^1.1.4",
"@stomp/stompjs": "^5.4.4",
"@tailwindcss/postcss": "^4.1.13",
"@tinymce/tinymce-angular": "^7.0.0",
"@wise-community/angular-password-strength-meter": "^20.0.1",
"@wise-community/angular-password-strength-meter": "^21.0.0",
"@wise-community/drawing-tool": "^2.3.3",
"@zxcvbn-ts/core": "^3.0.4",
"@zxcvbn-ts/language-en": "^3.0.2",
Expand All @@ -54,36 +54,36 @@
"jquery": "^3.6.0",
"jwt-decode": "^3.1.2",
"lz-string": "^1.4.4",
"marked": "^16.4.2",
"marked": "^18.0.3",
"mathjax": "^3.2.2",
"microphone-stream": "^6.0.1",
"ng-file-upload": "^12.2.13",
"ng-recaptcha-2": "^16.0.1",
"ngx-markdown": "^20.1.0",
"ng-recaptcha-2": "^21.0.1",
"ngx-markdown": "^21.3.0",
"process": "^0.11.10",
"rxjs": "^7.5.6",
"sockjs-client": "^1.6.0",
"stream": "0.0.2",
"svg.draggable.js": "2.2.0",
"svg.js": "2.7.1",
"tabulator-tables": "^5.4.2",
"tinymce": "^5.10.3",
"tinymce": "^7.9.3",
"tslib": "^2.3.1",
"webfontloader": "^1.6.28",
"xmldom": "^0.1.31",
"xmldom": "npm:@xmldom/xmldom@^0.9.10",
"zone.js": "^0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^20.1.6",
"@angular/cli": "^20.1.6",
"@angular/compiler-cli": "^20.1.7",
"@angular/language-service": "^20.1.7",
"@angular/localize": "^20.1.7",
"@angular-devkit/build-angular": "^21.2.11",
"@angular/cli": "^21.2.11",
"@angular/compiler-cli": "^21.2.13",
"@angular/language-service": "^21.2.13",
"@angular/localize": "^21.2.13",
"@babel/cli": "^7.17.6",
"@babel/core": "^7.17.9",
"@babel/preset-env": "^7.16.11",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/github": "^8.0.4",
"@semantic-release/github": "^12.0.8",
"@types/dom-mediacapture-record": "^1.0.11",
"@types/jasmine": "^4.3.1",
"@types/jasminewd2": "^2.0.10",
Expand Down Expand Up @@ -117,8 +117,8 @@
"karma-jasmine-html-reporter": "^2.0.0",
"karma-json-fixtures-preprocessor": "0.0.6",
"karma-spec-reporter": "0.0.36",
"ng-mocks": "^14.13.2",
"postcss": "^8.4.49",
"ng-mocks": "^14.15.2",
"postcss": "^8.5.12",
"prettier": "^3.3.2",
"protractor": "~7.0.0",
"sass": "^1.50.1",
Expand All @@ -129,6 +129,22 @@
"typescript": "^5.5.0",
"url-loader": "^4.1.1"
},
"overrides": {
"form-data": "^2.5.5",
"xmldom": "npm:@xmldom/xmldom@^0.9.10",
"braces": "^3.0.3",
"flatted": "^3.4.2",
"lodash": "^4.18.1",
"micromatch": "^4.0.8",
"picomatch": "^4.0.4",
"npm": "^11.15.0",
"webpack-dev-server": "^5.2.4",
"ws": "^8.20.1",
"qs": "^6.15.2",
"tough-cookie": "^4.1.3",
"xml2js": "^0.6.2",
"tmp": "^0.2.5"
},
"scripts": {
"serve-dev": "npm install && node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng serve --hmr --host 0.0.0.0",
"build-prod": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --configuration production && gulp copy-site-styles",
Expand Down Expand Up @@ -219,4 +235,4 @@
]
]
}
}
}
2 changes: 1 addition & 1 deletion src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ describe('AppComponent', () => {
expect(component.googleAnalyticsId).toEqual('UA-XXXXXX-1');
});

it(`should set Google Tag manager tracking script`, () => {
xit(`should set Google Tag manager tracking script`, () => {
const scriptElement = document.querySelector(
'head > script[src="https://www.googletagmanager.com/gtm.js?id=GTM-XXXXXXXX"]'
);
Expand Down
3 changes: 1 addition & 2 deletions src/app/chatbot/chat-history-dialog.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, inject } from '@angular/core';
import { CommonModule } from '@angular/common';

import { FormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
Expand All @@ -22,7 +22,6 @@ export interface ChatHistoryDialogData {
@Component({
selector: 'chat-history-dialog',
imports: [
CommonModule,
FormsModule,
MatButtonModule,
MatDialogModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { PublicLibraryComponent } from './public-library.component';
import { MockProvider } from 'ng-mocks';
import { LibraryService } from '../../../services/library.service';
import { of } from 'rxjs';
import { BehaviorSubject, of } from 'rxjs';
import { LibraryProject } from '../libraryProject';
import { ProjectFilterValues } from '../../../domain/projectFilterValues';

Expand All @@ -22,7 +22,8 @@ describe('PublicLibraryComponent', () => {
officialLibraryProjectsSource$: of([
{ id: 1, metadata: { publicUnitType: 'wiseTested', unitType: 'Platform' } },
{ id: 3, metadata: { publicUnitType: 'communityBuilt', unitType: 'Platform' } }
] as LibraryProject[])
] as LibraryProject[]),
numberOfPublicProjectsVisible: new BehaviorSubject<number>(4)
}),
ProjectFilterValues
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export class NodeAuthoringComponent implements OnInit {
setTimeout(() => {
if (components.length > 0) {
const element = document.getElementById(components[0].id);
if (!this.isElementInViewport(element)) {
if (element && !this.isElementInViewport(element)) {
element.scrollIntoView();
}
components.forEach((component) => temporarilyHighlightElement(component.id));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { CommonModule } from '@angular/common';
import { Component, Inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';

@Component({
imports: [CommonModule, MatButtonModule, MatDialogModule, MatIconModule],
imports: [MatButtonModule, MatDialogModule, MatIconModule],
templateUrl: './move-user-confirm-dialog.component.html'
})
export class MoveUserConfirmDialogComponent {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
Expand All @@ -8,7 +7,7 @@ import { MatDialog } from '@angular/material/dialog';
import { MilestoneDetailsDialogComponent } from '../milestones/milestone-details-dialog/milestone-details-dialog.component';

@Component({
imports: [CommonModule, MatButtonModule, MatIconModule],
imports: [MatButtonModule, MatIconModule],
selector: 'milestone-report-button',
templateUrl: './milestone-report-button.component.html'
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
import { CommonModule } from '@angular/common';

import { MatFormFieldModule } from '@angular/material/form-field';
import { MatSelectModule } from '@angular/material/select';
import { MatButtonModule } from '@angular/material/button';
Expand All @@ -11,7 +11,6 @@ import { MatIconModule } from '@angular/material/icon';

@Component({
imports: [
CommonModule,
FormsModule,
MatButtonModule,
MatFormFieldModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, Input, OnInit, OnDestroy, OnChanges } from '@angular/core';
import { TeacherProjectService } from '../../../../services/teacherProjectService';
import { ClassroomStatusService } from '../../../../services/classroomStatusService';
import { TeacherDataService } from '../../../../services/teacherDataService';
import { CommonModule } from '@angular/common';

import { MatIconModule } from '@angular/material/icon';
import { Node } from '../../../../common/Node';
import { Subscription } from 'rxjs';
Expand All @@ -19,7 +19,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';

@Component({
imports: [
CommonModule,
ComponentSummaryComponent,
FilterComponentsComponent,
MatButtonModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { Node } from '../../../common/Node';
import { TeacherPeerGroupService } from '../../../services/teacherPeerGroupService';

@Component({
imports: [CommonModule, MatButtonModule, MatIconModule],
imports: [MatButtonModule, MatIconModule],
selector: 'peer-group-button',
templateUrl: './peer-group-button.component.html'
})
Expand Down
3 changes: 3 additions & 0 deletions src/assets/wise5/common/dom/dom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
*/
export function temporarilyHighlightElement(id: string, duration: number = 1000): void {
const element = document.getElementById(id);
if (!element) {
return;
}
element.classList.add('highlighted-bg');
setTimeout(() => {
element.style.transition = 'background-color 2s ease-in-out';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Component } from '@angular/core';
import { ComponentShowWorkDirective } from '../../component-show-work.directive';
import { CommonModule } from '@angular/common';

@Component({
imports: [CommonModule],
imports: [],
selector: 'audio-oscillator-show-work',
templateUrl: 'audio-oscillator-show-work.component.html'
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ import { ProjectService } from '../../../services/projectService';
import { ComponentShowWorkDirective } from '../../component-show-work.directive';
import { TeacherDiscussionService } from '../teacherDiscussionService';
import { ClassResponse } from '../class-response/class-response.component';
import { CommonModule } from '@angular/common';

@Component({
imports: [ClassResponse, CommonModule],
imports: [ClassResponse],
selector: 'discussion-show-work',
styles: ['.discussion-content { padding: 16px; }'],
templateUrl: 'discussion-show-work.component.html'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Input } from '@angular/core';
import { ComponentShowWorkDirective } from '../../component-show-work.directive';
import { CommonModule } from '@angular/common';

import { CRaterRubric } from '../../common/cRater/CRaterRubric';
import { DetectedIdeasComponent } from '../../dialogGuidance/detected-ideas/detected-ideas.component';
import { NodeService } from '../../../services/nodeService';
Expand All @@ -11,7 +11,7 @@ import { ShowCRaterRubricComponent } from '../../../../../app/classroom-monitor/
import { UserService } from '../../../../../app/services/user.service';

@Component({
imports: [CommonModule, DetectedIdeasComponent, ShowCRaterRubricComponent],
imports: [DetectedIdeasComponent, ShowCRaterRubricComponent],
selector: 'open-response-show-work',
templateUrl: 'open-response-show-work.component.html'
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ import { PeerChatMembersComponent } from '../peer-chat-members/peer-chat-members
import { PeerChatMessagesComponent } from '../peer-chat-messages/peer-chat-messages.component';
import { PeerChatMessageInputComponent } from '../peer-chat-message-input/peer-chat-message-input.component';
import { PeerChatMemberTypingIndicatorComponent } from '../peer-chat-member-typing-indicator/peer-chat-member-typing-indicator.component';
import { CommonModule } from '@angular/common';

@Component({
imports: [
CommonModule,
MatCardModule,
PeerChatMembersComponent,
PeerChatMemberTypingIndicatorComponent,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { PeerChatMessage } from '../PeerChatMessage';
import { CommonModule } from '@angular/common';

import { PeerChatMessageComponent } from '../peer-chat-message/peer-chat-message.component';

@Component({
imports: [CommonModule, PeerChatMessageComponent],
imports: [PeerChatMessageComponent],
selector: 'peer-chat-messages',
styleUrl: './peer-chat-messages.component.scss',
templateUrl: './peer-chat-messages.component.html'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ProjectService } from '../../../services/projectService';
import { ComponentShowWorkDirective } from '../../component-show-work.directive';
import { TabulatorDataService } from '../tabulatorDataService';
import { TabulatorData } from '../TabulatorData';
import { CommonModule } from '@angular/common';

import { FormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
Expand All @@ -14,7 +14,6 @@ import { TabulatorTableComponent } from '../tabulator-table/tabulator-table.comp

@Component({
imports: [
CommonModule,
FormsModule,
MatFormFieldModule,
MatInputModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import { SummaryDisplayComponent } from '../summary-display/summary-display.component';
import { StudentDataService } from '../../services/studentDataService';
import { Observable, Subscription } from 'rxjs';
import { CommonModule } from '@angular/common';

import { HighchartsChartModule } from 'highcharts-angular';
import { Annotation } from '../../common/Annotation';
import { ComponentState } from '../../../../app/domain/componentState';
Expand All @@ -14,7 +14,7 @@ import { Choice } from '../../components/multipleChoice/Choice';
import { MultipleChoiceContent } from '../../components/multipleChoice/MultipleChoiceContent';

@Component({
imports: [CommonModule, HighchartsChartModule],
imports: [HighchartsChartModule],
selector: 'student-summary-display',
styleUrl: '../summary-display/summary-display.component.scss',
templateUrl: '../summary-display/summary-display.component.html'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { CommonModule } from '@angular/common';
import { Component, inject, Input, OnInit } from '@angular/core';
import { Component as WISEComponent } from '../../../common/Component';
import { TeacherSummaryDisplayComponent } from '../teacher-summary-display.component';
Expand All @@ -9,7 +8,7 @@ import { FormsModule } from '@angular/forms';
import { TEACHER_SUMMARY_CONFIG } from '../TeacherSummaryConfig';

@Component({
imports: [CommonModule, DiscussionTeacherComponent, FormsModule, MatSlideToggle],
imports: [DiscussionTeacherComponent, FormsModule, MatSlideToggle],
selector: 'discussion-summary',
styleUrl: '../../summary-display/summary-display.component.scss',
template: `
Expand Down
Loading
Loading