Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
69493fa
Remove unused AiChatShowWorkModule
hirokiterashima Oct 15, 2025
c187f1a
Remove unnecessary imports
hirokiterashima Oct 15, 2025
40cca13
Remove unused PeerChatShowWorkModule
hirokiterashima Oct 15, 2025
99b22eb
Remove ComponentServiceLookupServiceModule. Was only being used in test
hirokiterashima Oct 15, 2025
20071d0
Remove SummaryStudentModule
hirokiterashima Oct 15, 2025
3dc598b
Remove MatchStudentModule and MatchCommonModule. Import standalone co…
hirokiterashima Oct 15, 2025
45477d0
Remove HelpIconComponent dep. Import directly in places needed.
hirokiterashima Oct 15, 2025
9dbf205
Remove PreviewComponentComponent dep. Import directly in places needed.
hirokiterashima Oct 15, 2025
56eac16
Remove ComponentComponent and HighchartsChartModule. These are import…
hirokiterashima Oct 16, 2025
3ea1d50
Remove OpenResponseStudent module. Directly import component and prov…
hirokiterashima Oct 16, 2025
eaeb70b
Ignore ComponentInfoDialogComponent tests for now. Will fix later.
hirokiterashima Oct 16, 2025
27ab052
Remove PauseScreenMenuComponent from ClassroomMonitorModule
hirokiterashima Oct 16, 2025
0ffa5f8
Remove HighchartsChartModule from modules
hirokiterashima Oct 16, 2025
3d9cbc7
Remove NodeStatusIconComponent from StudentTeacherCommonModule. It's …
hirokiterashima Oct 16, 2025
7654d34
Remove DialogResponsesComponent. It's imported by component that uses…
hirokiterashima Oct 16, 2025
b67d177
Remove NodeIconComponent. It's imported by component that uses it.
hirokiterashima Oct 16, 2025
b7391a9
Remove NotebookModule. It's imported by component that uses it.
hirokiterashima Oct 16, 2025
409f71b
Remove StudentTeacherCommonModule
hirokiterashima Oct 16, 2025
28b7ee6
Remove StatusIconComponent from GradingCommonModule. It's imported by…
hirokiterashima Oct 16, 2025
9f1e87b
Remove ComponentGradingComponent from modules. It's imported by compo…
hirokiterashima Oct 16, 2025
58cf3c6
Remove ComponentStateInfoComponent from modules. It's imported by com…
hirokiterashima Oct 16, 2025
8c3b222
Remove StudentComponentModule. It's imported by component that uses it.
hirokiterashima Oct 16, 2025
30e1822
Remove GradingCommonModule. It's imported by component that uses it.
hirokiterashima Oct 16, 2025
861a418
Remove ComponentAuthoringModule
hirokiterashima Oct 16, 2025
3beed01
Clean up imports
hirokiterashima Oct 16, 2025
e16e4dd
EditNodeTitleComponent: move template inline
hirokiterashima Oct 16, 2025
beb0287
Remove StudentVLEModule and use StudentRoutingModule instead
hirokiterashima Oct 16, 2025
f899369
Replace jquery with angular equivalent
hirokiterashima Nov 17, 2025
076c35d
Merge pull request #2242 from WISE-Community/remove-modules-part-1
hirokiterashima Nov 17, 2025
5cc2ede
Remove milestone modules, move custom element definition to milestone…
hirokiterashima Nov 17, 2025
06aad3f
Remove redundant deps from ClassroomMonitorModule.
hirokiterashima Nov 17, 2025
bdcf5fe
Remove PeerGroupGradingModule. Redundant.
hirokiterashima Nov 17, 2025
a091d1d
Remove ClassroomMonitorModule move deps to TeacherToolsModule. Remove…
hirokiterashima Nov 17, 2025
ab81de2
Remove StudentTeacherCommonServicesModule dep from ClassroomMonitorTe…
hirokiterashima Nov 18, 2025
8b214fd
Removed PeerChatModule and imported components directly instead.
hirokiterashima Nov 18, 2025
03e2a9d
Replace ngIf with new syntax
hirokiterashima Nov 18, 2025
e9e6e60
Replace ngFor with new syntax
hirokiterashima Nov 18, 2025
12e4d57
Added comments on why we can't replace ShowGroup/MyWorkStudentModule …
hirokiterashima Nov 19, 2025
10a7b39
Remove Dialog and Snack modules from ClassroomMonitorTesting module. …
hirokiterashima Nov 19, 2025
a9b1554
Update tests to not use ComponentTypeService. Removed ComponentInfoDi…
hirokiterashima Nov 21, 2025
ad21fb2
Replace ImportComponentRoutingModule with just a an array of Routes
hirokiterashima Nov 21, 2025
ed31bc8
Replace NodeAdvancedAuthoringRoutingModule with a simple array of Routes
hirokiterashima Nov 21, 2025
f2fa94e
Replace NodeAuthoringRoutingModule with a simple array of Routes
hirokiterashima Nov 21, 2025
b7b3287
Replace StructureAuthoringRoutingModule with a simple array of Routes
hirokiterashima Nov 21, 2025
0e327ed
Replace AddLessonRoutingModule with a simple array of Routes. Fix ins…
hirokiterashima Nov 21, 2025
29c5867
Replace AddNodeRoutingModule with a simple array of Routes. Fix inser…
hirokiterashima Nov 21, 2025
590f5a0
Replace AuthoringRoutingModule with a simple array of Routes
hirokiterashima Nov 21, 2025
7f81fc8
Replace TeacherToolsRoutingModule with a simple array of Routes
hirokiterashima Nov 21, 2025
934eddd
Replace ForgotRoutingModule with a simple array of Routes
hirokiterashima Nov 22, 2025
d01285e
Replace HelpRoutingModule with a simple array of Routes
hirokiterashima Nov 22, 2025
cdd09a3
Merge pull request #2246 from WISE-Community/remove-modules-part-2
hirokiterashima Dec 4, 2025
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
4 changes: 2 additions & 2 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ const routes: Routes = [
},
{
path: 'forgot',
loadChildren: () => import('./forgot/forgot-routing.module').then((m) => m.ForgotRoutingModule)
loadChildren: () => import('./forgot/forgot.routes').then((m) => m.routes)
},
{
path: 'help',
loadChildren: () => import('./help/help-routing.module').then((m) => m.HelpRoutingModule)
loadChildren: () => import('./help/help.routes').then((m) => m.routes)
},
{
path: 'join',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import { Component as WISEComponent } from '../../../assets/wise5/common/Compone
import { components } from '../../../assets/wise5/components/Components';

@Component({
templateUrl: './edit-component-advanced.component.html',
imports: [MatDivider, MatDialogModule, MatButtonModule],
styles: [
'.mat-divider { margin: 0 -16px; } .mat-mdc-dialog-content { padding-top: 10px !important; padding-bottom: 10px !important; }'
],
imports: [MatDivider, MatDialogModule, MatButtonModule]
templateUrl: './edit-component-advanced.component.html'
})
export class EditComponentAdvancedComponent {
@ViewChild('component') private componentElementRef: ElementRef;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { Component, Input } from '@angular/core';
import { MatTooltipModule } from '@angular/material/tooltip';

@Component({
imports: [CommonModule, MatTooltipModule],
selector: 'alert-status-corner',
styleUrl: 'alert-status-corner.scss',
templateUrl: 'alert-status-corner.component.html'
imports: [CommonModule, MatTooltipModule],
selector: 'alert-status-corner',
styleUrl: 'alert-status-corner.scss',
templateUrl: 'alert-status-corner.component.html'
})
export class AlertStatusCornerComponent {
@Input() hasNewAlert: boolean;
Expand Down
21 changes: 19 additions & 2 deletions src/app/classroom-monitor/milestones/milestones.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Component } from '@angular/core';
import { Component, Injector } from '@angular/core';
import { createCustomElement } from '@angular/elements';
import { MatDialog } from '@angular/material/dialog';
import { Subscription } from 'rxjs';
import { MilestoneDetailsDialogComponent } from '../../../assets/wise5/classroomMonitor/classroomMonitorComponents/milestones/milestone-details-dialog/milestone-details-dialog.component';
Expand All @@ -12,6 +13,8 @@ import { MatCard, MatCardContent } from '@angular/material/card';
import { MatProgressSpinner } from '@angular/material/progress-spinner';
import { NgClass } from '@angular/common';
import { MatIcon } from '@angular/material/icon';
import { MilestoneReportDataComponent } from '../../teacher/milestone/milestone-report-data/milestone-report-data.component';
import { MilestoneReportGraphComponent } from '../../teacher/milestone/milestone-report-graph/milestone-report-graph.component';

@Component({
imports: [MatCard, MatCardContent, MatProgressSpinner, NgClass, MatIcon],
Expand All @@ -27,9 +30,23 @@ export class MilestonesComponent {
private achievementService: AchievementService,
private annotationService: AnnotationService,
private milestoneService: MilestoneService,
private injector: Injector,
private dialog: MatDialog,
private dataService: TeacherDataService
) {}
) {
if (!customElements.get('milestone-report-data')) {
customElements.define(
'milestone-report-data',
createCustomElement(MilestoneReportDataComponent, { injector: this.injector })
);
}
if (!customElements.get('milestone-report-graph')) {
customElements.define(
'milestone-report-graph',
createCustomElement(MilestoneReportGraphComponent, { injector: this.injector })
);
}
}

ngOnInit() {
this.loadProjectMilestones();
Expand Down

This file was deleted.

15 changes: 12 additions & 3 deletions src/app/classroom-monitor/status-icon/status-icon.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@ import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';

@Component({
imports: [MatIconModule, MatTooltipModule],
selector: 'status-icon',
templateUrl: 'status-icon.component.html'
imports: [MatIconModule, MatTooltipModule],
selector: 'status-icon',
template: `
<mat-icon
class="{{ class }}"
tabindex="0"
matTooltip="{{ tooltip }}"
matTooltipPosition="above"
>
{{ name }}
</mat-icon>
`
})
export class StatusIconComponent {
@Input() class: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { MatButton } from '@angular/material/button';
import { MatCard, MatCardContent } from '@angular/material/card';

@Component({
templateUrl: './forgot-user-password-complete.component.html',
imports: [MatCard, MatCardContent, MatButton]
imports: [MatCard, MatCardContent, MatButton],
templateUrl: './forgot-user-password-complete.component.html'
})
export class ForgotUserPasswordCompleteComponent {
@Input() username: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { Routes } from '@angular/router';
import { ForgotComponent } from './forgot.component';
import { ForgotHomeComponent } from './forgot-home/forgot-home.component';
import { ForgotStudentComponent } from './student/forgot-student/forgot-student.component';
Expand All @@ -15,7 +14,7 @@ import { ForgotTeacherPasswordVerifyComponent } from './teacher/forgot-teacher-p
import { ForgotTeacherPasswordChangeComponent } from './teacher/forgot-teacher-password-change/forgot-teacher-password-change.component';
import { ForgotUserPasswordCompleteComponent } from './forgot-user-password-complete/forgot-user-password-complete.component';

const routes: Routes = [
export const routes: Routes = [
{
path: '',
component: ForgotComponent,
Expand All @@ -37,9 +36,3 @@ const routes: Routes = [
]
}
];

@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class ForgotRoutingModule {}
8 changes: 4 additions & 4 deletions src/app/help/help.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Component } from '@angular/core';
import { RouterModule } from '@angular/router';

@Component({
imports: [RouterModule],
selector: 'app-help',
styleUrl: './help.component.scss',
templateUrl: './help.component.html'
imports: [RouterModule],
selector: 'app-help',
styleUrl: './help.component.scss',
templateUrl: './help.component.html'
})
export class HelpComponent {}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { Routes } from '@angular/router';
import { HelpComponent } from './help.component';
import { HelpHomeComponent } from './help-home/help-home.component';
import { GettingStartedComponent } from './faq/getting-started/getting-started.component';
import { TeacherFaqComponent } from './faq/teacher-faq/teacher-faq.component';
import { StudentFaqComponent } from './faq/student-faq/student-faq.component';

const helpRoutes: Routes = [
export const routes: Routes = [
{
path: '',
component: HelpComponent,
Expand All @@ -18,9 +17,3 @@ const helpRoutes: Routes = [
]
}
];

@NgModule({
imports: [RouterModule.forChild(helpRoutes)],
exports: [RouterModule]
})
export class HelpRoutingModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Component } from '@angular/core';
import { RouterModule } from '@angular/router';

@Component({
selector: 'app-header-signin',
imports: [RouterModule],
templateUrl: './header-signin.component.html',
styleUrls: ['./header-signin.component.scss']
imports: [RouterModule],
selector: 'app-header-signin',
styleUrl: './header-signin.component.scss',
templateUrl: './header-signin.component.html'
})
export class HeaderSigninComponent {}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { MatTooltipModule } from '@angular/material/tooltip';
type SelectAllItemsStatus = 'none' | 'some' | 'all';

@Component({
imports: [MatCheckboxModule, MatTooltipModule],
providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }],
selector: 'select-all-items-checkbox',
styleUrl: 'select-all-items-checkbox.component.scss',
templateUrl: './select-all-items-checkbox.component.html'
imports: [MatCheckboxModule, MatTooltipModule],
providers: [{ provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }],
selector: 'select-all-items-checkbox',
styleUrl: 'select-all-items-checkbox.component.scss',
templateUrl: './select-all-items-checkbox.component.html'
})
export class SelectAllItemsCheckboxComponent {
@Output() allSelectedEvent: EventEmitter<void> = new EventEmitter<void>();
Expand Down
8 changes: 4 additions & 4 deletions src/app/modules/shared/blurb/blurb.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common';
import { Component, ContentChild, Input, TemplateRef } from '@angular/core';

@Component({
imports: [CommonModule],
selector: 'app-blurb',
styleUrl: './blurb.component.scss',
templateUrl: './blurb.component.html'
imports: [CommonModule],
selector: 'app-blurb',
styleUrl: './blurb.component.scss',
templateUrl: './blurb.component.html'
})
export class BlurbComponent {
@Input() content: string;
Expand Down
24 changes: 12 additions & 12 deletions src/app/modules/shared/search-bar/search-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ import { MatInputModule } from '@angular/material/input';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';

@Component({
encapsulation: ViewEncapsulation.None,
imports: [
CommonModule,
MatButtonModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
ReactiveFormsModule
],
selector: 'app-search-bar',
styleUrl: './search-bar.component.scss',
templateUrl: './search-bar.component.html'
encapsulation: ViewEncapsulation.None,
imports: [
CommonModule,
MatButtonModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
ReactiveFormsModule
],
selector: 'app-search-bar',
styleUrl: './search-bar.component.scss',
templateUrl: './search-bar.component.html'
})
export class SearchBarComponent implements OnInit {
@Output('update') change: EventEmitter<string> = new EventEmitter<string>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';

@Component({
imports: [MatButtonModule, MatIconModule, MatTooltipModule],
selector: 'notebook-launcher',
templateUrl: 'notebook-launcher.component.html'
imports: [MatButtonModule, MatIconModule, MatTooltipModule],
selector: 'notebook-launcher',
templateUrl: 'notebook-launcher.component.html'
})
export class NotebookLauncherComponent {
protected label: string = '';
@Input() notebookConfig: any;
private subscription: Subscription = new Subscription();

constructor(private notebookService: NotebookService, private projectService: ProjectService) {}
constructor(
private notebookService: NotebookService,
private projectService: ProjectService
) {}

ngOnInit(): void {
this.setLabel();
Expand Down
51 changes: 0 additions & 51 deletions src/app/notebook/notebook.module.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/app/student-teacher-common-services.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import { OutsideURLService } from '../assets/wise5/components/outsideURL/outside
import { PathService } from '../assets/wise5/services/pathService';
import { PeerChatService } from '../assets/wise5/components/peerChat/peerChatService';
import { PeerGroupService } from '../assets/wise5/services/peerGroupService';
import { CRaterPingService } from '../assets/wise5/services/cRaterPingService';
import { ProjectLibraryService } from '../assets/wise5/services/projectLibraryService';
import { ProjectService } from '../assets/wise5/services/projectService';
import { SessionService } from '../assets/wise5/services/sessionService';
Expand Down Expand Up @@ -101,7 +100,6 @@ import { WiseLinkService } from './services/wiseLinkService';
PathService,
PeerChatService,
PeerGroupService,
CRaterPingService,
ProjectLibraryService,
{ provide: ProjectService, useExisting: VLEProjectService },
SessionService,
Expand Down
Loading
Loading