From ebe31c0bb25ad06809a3425754de200fb31f4192 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 7 Aug 2023 16:40:35 -0700 Subject: [PATCH] Remove/clean up AngularJS Modules: remove all downgradeComponent except AT and CM --- .../classroom-monitor.module.ts | 13 +- .../manageStudents/manageStudentsModule.ts | 26 ++-- .../nodeProgress/nodeProgress.ts | 29 ----- .../studentProgress/studentProgress.ts | 11 -- .../data-export-angular-js-module.ts | 6 +- src/assets/wise5/common-angular-js-module.ts | 35 +----- .../openResponseAuthoringComponentModule.ts | 22 ---- src/assets/wise5/directives/components.ts | 32 ----- src/assets/wise5/themes/default/theme.js | 9 -- src/assets/wise5/themes/default/theme.ts | 6 + .../wise5/themes/default/themeComponents.ts | 24 ---- .../wise5/vle/studentAsset/studentAsset.ts | 13 -- src/messages.xlf | 112 +++++++++--------- 13 files changed, 74 insertions(+), 264 deletions(-) delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nodeProgress.ts delete mode 100644 src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/studentProgress.ts delete mode 100644 src/assets/wise5/components/openResponse/openResponseAuthoringComponentModule.ts delete mode 100644 src/assets/wise5/themes/default/theme.js create mode 100644 src/assets/wise5/themes/default/theme.ts delete mode 100644 src/assets/wise5/themes/default/themeComponents.ts delete mode 100644 src/assets/wise5/vle/studentAsset/studentAsset.ts diff --git a/src/assets/wise5/classroomMonitor/classroom-monitor.module.ts b/src/assets/wise5/classroomMonitor/classroom-monitor.module.ts index ad21e50741..735cc29b16 100644 --- a/src/assets/wise5/classroomMonitor/classroom-monitor.module.ts +++ b/src/assets/wise5/classroomMonitor/classroom-monitor.module.ts @@ -2,24 +2,13 @@ import * as angular from 'angular'; import './classroomMonitorComponents/manageStudents/manageStudentsModule'; -import './classroomMonitorComponents/nodeProgress/nodeProgress'; -import './classroomMonitorComponents/studentProgress/studentProgress'; import './dataExport/data-export-angular-js-module'; import { downgradeComponent } from '@angular/upgrade/static'; -import { NotebookGradingComponent } from './notebook-grading/notebook-grading.component'; -import { StudentGradingComponent } from './student-grading/student-grading.component'; -import { StudentProgressComponent } from './student-progress/student-progress.component'; import { ClassroomMonitorComponent } from './classroom-monitor.component'; export default angular - .module('classroomMonitor', ['dataExport', 'manageStudents', 'nodeProgress', 'studentProgress']) + .module('classroomMonitor', ['dataExport', 'manageStudents']) .directive('classroomMonitor', downgradeComponent({ component: ClassroomMonitorComponent })) - .directive('notebookGrading', downgradeComponent({ component: NotebookGradingComponent })) - .directive( - 'studentGrading', - downgradeComponent({ component: StudentGradingComponent }) as angular.IDirectiveFactory - ) - .directive('studentProgress', downgradeComponent({ component: StudentProgressComponent })) .config([ '$stateProvider', '$translatePartialLoaderProvider', diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manageStudentsModule.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manageStudentsModule.ts index a3f6262b90..ccb06e2035 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manageStudentsModule.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/manageStudentsModule.ts @@ -1,19 +1,11 @@ import * as angular from 'angular'; -import { downgradeComponent } from '@angular/upgrade/static'; -import { ManageStudentsComponent } from './manage-students/manage-students.component'; -angular - .module('manageStudents', []) - .directive( - 'manageStudentsComponent', - downgradeComponent({ component: ManageStudentsComponent }) as angular.IDirectiveFactory - ) - .config([ - '$stateProvider', - ($stateProvider) => { - $stateProvider.state('root.cm.manageStudents', { - url: '/manage-students', - component: 'manageStudentsComponent' - }); - } - ]); +angular.module('manageStudents', []).config([ + '$stateProvider', + ($stateProvider) => { + $stateProvider.state('root.cm.manageStudents', { + url: '/manage-students', + component: 'manageStudentsComponent' + }); + } +]); diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nodeProgress.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nodeProgress.ts deleted file mode 100644 index 05ac1e3329..0000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeProgress/nodeProgress.ts +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -import * as angular from 'angular'; -import { downgradeComponent } from '@angular/upgrade/static'; -import { NavItemScoreComponent } from './navItemScore/nav-item-score.component'; -import { NavItemProgressComponent } from '../../../../../app/classroom-monitor/nav-item-progress/nav-item-progress.component'; -import { NavItemComponent } from './nav-item/nav-item.component'; -import { NodeProgressViewComponent } from './node-progress-view/node-progress-view.component'; - -const NodeProgress = angular - .module('nodeProgress', []) - .directive( - 'nodeProgressView', - downgradeComponent({ component: NodeProgressViewComponent }) as angular.IDirectiveFactory - ) - .directive( - 'navItem', - downgradeComponent({ component: NavItemComponent }) as angular.IDirectiveFactory - ) - .directive( - 'navItemProgress', - downgradeComponent({ component: NavItemProgressComponent }) as angular.IDirectiveFactory - ) - .directive( - 'navItemScore', - downgradeComponent({ component: NavItemScoreComponent }) as angular.IDirectiveFactory - ); - -export default NodeProgress; diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/studentProgress.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/studentProgress.ts deleted file mode 100644 index aa0fc2ea13..0000000000 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/studentProgress/studentProgress.ts +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -import * as angular from 'angular'; -import { downgradeComponent } from '@angular/upgrade/static'; -import { ProjectProgressComponent } from './project-progress/project-progress.component'; - -const StudentProgress = angular - .module('studentProgress', []) - .directive('projectProgress', downgradeComponent({ component: ProjectProgressComponent })); - -export default StudentProgress; diff --git a/src/assets/wise5/classroomMonitor/dataExport/data-export-angular-js-module.ts b/src/assets/wise5/classroomMonitor/dataExport/data-export-angular-js-module.ts index 189ed8aea7..33ee771b23 100644 --- a/src/assets/wise5/classroomMonitor/dataExport/data-export-angular-js-module.ts +++ b/src/assets/wise5/classroomMonitor/dataExport/data-export-angular-js-module.ts @@ -1,16 +1,12 @@ -import { downgradeComponent, downgradeInjectable } from '@angular/upgrade/static'; +import { downgradeInjectable } from '@angular/upgrade/static'; import * as angular from 'angular'; import { ComponentServiceLookupService } from '../../services/componentServiceLookupService'; import { DataExportService } from '../../services/dataExportService'; -import { DataExportComponent } from './data-export/data-export.component'; -import { ExportStepVisitsComponent } from './export-step-visits/export-step-visits.component'; export default angular .module('dataExport', ['ngFileSaver']) .factory('DataExportService', downgradeInjectable(DataExportService)) .factory('ComponentServiceLookupService', downgradeInjectable(ComponentServiceLookupService)) - .directive('dataExport', downgradeComponent({ component: DataExportComponent })) - .directive('exportStepVisits', downgradeComponent({ component: ExportStepVisitsComponent })) .config([ '$stateProvider', ($stateProvider) => { diff --git a/src/assets/wise5/common-angular-js-module.ts b/src/assets/wise5/common-angular-js-module.ts index f3765b3ea7..3d8ba96eb7 100644 --- a/src/assets/wise5/common-angular-js-module.ts +++ b/src/assets/wise5/common-angular-js-module.ts @@ -1,6 +1,6 @@ import './lib/jquery/jquery-global'; import * as angular from 'angular'; -import { downgradeComponent, downgradeInjectable } from '@angular/upgrade/static'; +import { downgradeInjectable } from '@angular/upgrade/static'; import { AchievementService } from './services/achievementService'; import 'angular-file-saver'; import 'ng-file-upload'; @@ -33,19 +33,12 @@ import { NodeService } from './services/nodeService'; import { NotebookService } from './services/notebookService'; import { NotificationService } from './services/notificationService'; import { SessionService } from './services/sessionService'; -import './vle/studentAsset/studentAsset'; import { StudentAssetService } from './services/studentAssetService'; import { StudentDataService } from './services/studentDataService'; import { TagService } from './services/tagService'; import './themes/default/theme'; -import { EditorComponent } from '@tinymce/tinymce-angular'; -import { WiseTinymceEditorComponent } from './directives/wise-tinymce-editor/wise-tinymce-editor.component'; -import { NotebookNotesComponent } from '../../app/notebook/notebook-notes/notebook-notes.component'; -import { NotebookReportComponent } from '../../app/notebook/notebook-report/notebook-report.component'; -import { NotebookReportAnnotationsComponent } from '../../app/notebook/notebook-report-annotations/notebook-report-annotations.component'; import { ComputerAvatarService } from './services/computerAvatarService'; import { ComponentTypeService } from './services/componentTypeService'; -import { SideMenuComponent } from './common/side-menu/side-menu.component'; angular .module('common', [ @@ -60,28 +53,6 @@ angular 'pascalprecht.translate', 'ui.router' ]) - .directive( - 'editor', - downgradeComponent({ component: EditorComponent }) as angular.IDirectiveFactory - ) - .directive( - 'wiseTinymceEditor', - downgradeComponent({ component: WiseTinymceEditorComponent }) as angular.IDirectiveFactory - ) - .directive( - 'notebookNotes', - downgradeComponent({ component: NotebookNotesComponent }) as angular.IDirectiveFactory - ) - .directive( - 'notebookReport', - downgradeComponent({ component: NotebookReportComponent }) as angular.IDirectiveFactory - ) - .directive( - 'notebookReportAnnotations', - downgradeComponent({ - component: NotebookReportAnnotationsComponent - }) as angular.IDirectiveFactory - ) .service('AchievementService', downgradeInjectable(AchievementService)) .factory('AnnotationService', downgradeInjectable(AnnotationService)) .factory('AudioRecorderService', downgradeInjectable(AudioRecorderService)) @@ -98,10 +69,6 @@ angular .factory('StudentAssetService', downgradeInjectable(StudentAssetService)) .factory('TagService', downgradeInjectable(TagService)) .factory('StudentDataService', downgradeInjectable(StudentDataService)) - .directive( - 'sideMenu', - downgradeComponent({ component: SideMenuComponent }) as angular.IDirectiveFactory - ) .filter('Filters', Filters) .config([ '$httpProvider', diff --git a/src/assets/wise5/components/openResponse/openResponseAuthoringComponentModule.ts b/src/assets/wise5/components/openResponse/openResponseAuthoringComponentModule.ts deleted file mode 100644 index 9cf52a4f26..0000000000 --- a/src/assets/wise5/components/openResponse/openResponseAuthoringComponentModule.ts +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; - -import * as angular from 'angular'; -import { downgradeComponent, downgradeInjectable } from '@angular/upgrade/static'; -import { OpenResponseService } from './openResponseService'; -import { OpenResponseAuthoring } from './open-response-authoring/open-response-authoring.component'; -import { EditOpenResponseAdvancedComponent } from './edit-open-response-advanced/edit-open-response-advanced.component'; - -const openResponseAuthoringComponentModule = angular - .module('openResponseAuthoringComponentModule', []) - .service('OpenResponseService', downgradeInjectable(OpenResponseService)) - .directive( - 'openResponseAuthoring', - downgradeComponent({ component: OpenResponseAuthoring }) as angular.IDirectiveFactory - ) - .directive( - 'editOpenResponseAdvanced', - downgradeComponent({ - component: EditOpenResponseAdvancedComponent - }) as angular.IDirectiveFactory - ); -export default openResponseAuthoringComponentModule; diff --git a/src/assets/wise5/directives/components.ts b/src/assets/wise5/directives/components.ts index 242f17dc24..3cf9ce3ea4 100644 --- a/src/assets/wise5/directives/components.ts +++ b/src/assets/wise5/directives/components.ts @@ -5,43 +5,11 @@ import Compile from './compile/compile'; import DisableDeleteKeypress from './disableDeleteKeypress/disableDeleteKeypress'; import Draggable from './draggable/draggable'; import Sticky from './sticky/sticky'; -import { downgradeComponent } from '@angular/upgrade/static'; -import { MilestoneReportDataComponent } from '../../../app/teacher/milestone/milestone-report-data/milestone-report-data.component'; -import { PossibleScoreComponent } from '../../../app/possible-score/possible-score.component'; -import { ComponentComponent } from '../components/component/component.component'; -import { TeacherSummaryDisplay } from './teacher-summary-display/teacher-summary-display.component'; -import { TeacherNodeIconComponent } from '../authoringTool/teacher-node-icon/teacher-node-icon.component'; -import { MilestoneReportGraphComponent } from '../../../app/teacher/milestone/milestone-report-graph/milestone-report-graph.component'; const Components = angular.module('components', []); - Components.component('compile', Compile); -Components.directive( - 'component', - downgradeComponent({ component: ComponentComponent }) as angular.IDirectiveFactory -); Components.component('disableDeleteKeypress', DisableDeleteKeypress); Components.component('draggable', Draggable); -Components.directive( - 'milestoneReportData', - downgradeComponent({ component: MilestoneReportDataComponent }) as angular.IDirectiveFactory -); -Components.directive( - 'milestoneReportGraph', - downgradeComponent({ component: MilestoneReportGraphComponent }) as angular.IDirectiveFactory -); -Components.directive( - 'nodeIcon', - downgradeComponent({ component: TeacherNodeIconComponent }) as angular.IDirectiveFactory -); -Components.directive( - 'possibleScore', - downgradeComponent({ component: PossibleScoreComponent }) as angular.IDirectiveFactory -); -Components.directive( - 'teacherSummaryDisplay', - downgradeComponent({ component: TeacherSummaryDisplay }) as angular.IDirectiveFactory -); Components.directive('sticky', Sticky); export default Components; diff --git a/src/assets/wise5/themes/default/theme.js b/src/assets/wise5/themes/default/theme.js deleted file mode 100644 index 1ef357d135..0000000000 --- a/src/assets/wise5/themes/default/theme.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -import './themeComponents'; - -import './js/webfonts'; - -const themeModule = angular.module('theme', ['theme.components']); - -export default themeModule; diff --git a/src/assets/wise5/themes/default/theme.ts b/src/assets/wise5/themes/default/theme.ts new file mode 100644 index 0000000000..190f088a7e --- /dev/null +++ b/src/assets/wise5/themes/default/theme.ts @@ -0,0 +1,6 @@ +'use strict'; +import * as angular from 'angular'; +import './js/webfonts'; + +const themeModule = angular.module('theme', []); +export default themeModule; diff --git a/src/assets/wise5/themes/default/themeComponents.ts b/src/assets/wise5/themes/default/themeComponents.ts deleted file mode 100644 index a085cc753f..0000000000 --- a/src/assets/wise5/themes/default/themeComponents.ts +++ /dev/null @@ -1,24 +0,0 @@ -'use strict'; - -import * as angular from 'angular'; -import { downgradeComponent } from '@angular/upgrade/static'; -import { HelpIconComponent } from './themeComponents/helpIcon/help-icon.component'; -import { NodeStatusIcon } from './themeComponents/nodeStatusIcon/node-status-icon.component'; -import { StepToolsComponent } from './themeComponents/stepTools/step-tools.component'; - -const ThemeComponents = angular - .module('theme.components', []) - .directive( - 'helpIcon', - downgradeComponent({ component: HelpIconComponent }) as angular.IDirectiveFactory - ) - .directive( - 'nodeStatusIcon', - downgradeComponent({ component: NodeStatusIcon }) as angular.IDirectiveFactory - ) - .directive( - 'stepTools', - downgradeComponent({ component: StepToolsComponent }) as angular.IDirectiveFactory - ); - -export default ThemeComponents; diff --git a/src/assets/wise5/vle/studentAsset/studentAsset.ts b/src/assets/wise5/vle/studentAsset/studentAsset.ts deleted file mode 100644 index f4dd7ac3a7..0000000000 --- a/src/assets/wise5/vle/studentAsset/studentAsset.ts +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; -import * as angular from 'angular'; -import { downgradeComponent } from '@angular/upgrade/static'; -import { StudentAssetsComponent } from './student-assets/student-assets.component'; - -const studentAssetModule = angular - .module('studentAsset', []) - .directive( - 'studentAssets', - downgradeComponent({ component: StudentAssetsComponent }) as angular.IDirectiveFactory - ); - -export default studentAssetModule; diff --git a/src/messages.xlf b/src/messages.xlf index c3c8ce0f3a..2d954a56b1 100644 --- a/src/messages.xlf +++ b/src/messages.xlf @@ -912,7 +912,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.ts - 58 + 57 @@ -9308,62 +9308,62 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Authoring Tool src/assets/wise5/authoringTool/authoring-tool.component.ts - 27 + 28 Unit Home src/assets/wise5/authoringTool/authoring-tool.component.ts - 33 + 34 src/assets/wise5/authoringTool/authoring-tool.component.ts - 34 + 35 Unit Info src/assets/wise5/authoringTool/authoring-tool.component.ts - 43 + 44 src/assets/wise5/authoringTool/authoring-tool.component.ts - 44 + 45 File Manager src/assets/wise5/authoringTool/authoring-tool.component.ts - 53 + 54 src/assets/wise5/authoringTool/authoring-tool.component.ts - 54 + 55 Notebook Settings src/assets/wise5/authoringTool/authoring-tool.component.ts - 63 + 64 src/assets/wise5/authoringTool/authoring-tool.component.ts - 64 + 65 Milestones src/assets/wise5/authoringTool/authoring-tool.component.ts - 73 + 74 src/assets/wise5/authoringTool/authoring-tool.component.ts - 74 + 75 src/assets/wise5/classroomMonitor/classroom-monitor.component.ts @@ -9374,33 +9374,33 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Unit List src/assets/wise5/authoringTool/authoring-tool.component.ts - 83 + 84 src/assets/wise5/authoringTool/authoring-tool.component.ts - 84 + 85 You do not have permission to edit this unit. src/assets/wise5/authoringTool/authoring-tool.component.ts - 193 + 194 src/assets/wise5/authoringTool/authoring-tool.component.ts - 276 + 277 Session Timeout src/assets/wise5/authoringTool/authoring-tool.component.ts - 220 + 221 src/assets/wise5/authoringTool/authoring-tool.component.ts - 224 + 225 src/assets/wise5/classroomMonitor/classroom-monitor.component.ts @@ -9415,7 +9415,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.You have been inactive for a long time. Do you want to stay logged in? src/assets/wise5/authoringTool/authoring-tool.component.ts - 222 + 223 src/assets/wise5/classroomMonitor/classroom-monitor.component.ts @@ -9430,35 +9430,35 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Yes src/assets/wise5/authoringTool/authoring-tool.component.ts - 225 + 226 No src/assets/wise5/authoringTool/authoring-tool.component.ts - 226 + 227 Saving... src/assets/wise5/authoringTool/authoring-tool.component.ts - 248 + 249 Saved src/assets/wise5/authoringTool/authoring-tool.component.ts - 262 + 263 Error Saving Unit. Please refresh the page. src/assets/wise5/authoringTool/authoring-tool.component.ts - 269 + 270 @@ -13709,7 +13709,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/tool-bar/tool-bar.component.html - 9 + 8 @@ -17194,7 +17194,7 @@ Category Name: src/assets/wise5/components/draw/draw-authoring/draw-authoring.component.ts - 244 + 243 @@ -20662,7 +20662,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 96 + 95 @@ -20673,11 +20673,11 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 108 + 107 src/assets/wise5/services/teacherProjectService.ts - 150 + 149 @@ -20688,11 +20688,11 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 109 + 108 src/assets/wise5/services/teacherProjectService.ts - 151 + 150 @@ -20710,7 +20710,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 118 + 117 @@ -20721,7 +20721,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 119 + 118 @@ -20732,7 +20732,7 @@ If this problem continues, let your teacher know and move on to the next activit src/assets/wise5/services/teacherProjectService.ts - 120 + 119 @@ -20949,145 +20949,145 @@ If this problem continues, let your teacher know and move on to the next activit First Lesson src/assets/wise5/services/teacherProjectService.ts - 56 + 55 First Step src/assets/wise5/services/teacherProjectService.ts - 74 + 73 Notes src/assets/wise5/services/teacherProjectService.ts - 110 + 109 src/assets/wise5/services/teacherProjectService.ts - 152 + 151 Final Report src/assets/wise5/services/teacherProjectService.ts - 127 + 126 Final summary report of what you learned in this unit src/assets/wise5/services/teacherProjectService.ts - 128 + 127 Use this space to write your final report using evidence from your notebook. src/assets/wise5/services/teacherProjectService.ts - 129 + 128 <h3>This is a heading</h3><p>This is a paragraph.</p> src/assets/wise5/services/teacherProjectService.ts - 130 + 129 Teacher Notebook src/assets/wise5/services/teacherProjectService.ts - 138 + 137 teacher notes src/assets/wise5/services/teacherProjectService.ts - 160 + 159 src/assets/wise5/services/teacherProjectService.ts - 161 + 160 Teacher Notes src/assets/wise5/services/teacherProjectService.ts - 162 + 161 src/assets/wise5/services/teacherProjectService.ts - 169 + 168 Notes for the teacher as they're running the WISE unit src/assets/wise5/services/teacherProjectService.ts - 170 + 169 Use this space to take notes for this unit src/assets/wise5/services/teacherProjectService.ts - 171 + 170 <p>Use this space to take notes for this unit</p> src/assets/wise5/services/teacherProjectService.ts - 172 + 171 All steps after this one will not be visitable until src/assets/wise5/services/teacherProjectService.ts - 947 + 946 All steps after this one will not be visible until src/assets/wise5/services/teacherProjectService.ts - 950 + 949 All other steps will not be visitable until src/assets/wise5/services/teacherProjectService.ts - 953 + 952 All other steps will not be visible until src/assets/wise5/services/teacherProjectService.ts - 956 + 955 This step will not be visitable until src/assets/wise5/services/teacherProjectService.ts - 959 + 958 This step will not be visible until src/assets/wise5/services/teacherProjectService.ts - 962 + 961