Introduction to Angular 8. (oppia#7027)

* init * Tries * required appinit * Fix some tests * Fix some tests * Fix last remaining e2e * Merge * fix failing tests * fix failing tests * restore karma * multi karma tries * revert multi karma tries * Half way mod try * email dashboard mod * Tries * Clean up and apply workaround * Change name of the combine file * Remove waitforangularenable statement * Remove unwanted difs * Added comments * Review changes * Remove unnecessary additions * Review * Remove extra require * Remove unnecessary change * Remove unnecessary change * Review changes
saketringsia · Jun 28, 2019 · e1bb364 · e1bb364
1 parent a614c6b
commit e1bb364
Show file tree

Hide file tree

Showing 726 changed files with 2,251 additions and 1,134 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,10 @@
 {
   "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "sourceType": "module"
+  },
   "extends": [
-    "eslint:recommended",
+    "eslint:recommended"
   ],
   "plugins": [
     "angular",

diff --git a/core/templates/dev/head/App.ts b/core/templates/dev/head/App.ts
@@ -68,6 +68,8 @@ require('app.constants.ts');
 // loaded after app.constants.ts
 require('I18nFooter.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.config([
   '$compileProvider', '$cookiesProvider', '$httpProvider',
   '$interpolateProvider', '$locationProvider',

diff --git a/core/templates/dev/head/AppInit.ts b/core/templates/dev/head/AppInit.ts
@@ -16,11 +16,39 @@
  * @fileoverview File for initializing the main oppia module.
  */
 
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { StaticProvider } from '@angular/core';
+
+@NgModule({
+  imports: [
+    BrowserModule
+  ]
+})
+class MainAngularModule {
+  // Empty placeholder method to satisfy the `Compiler`.
+  ngDoBootstrap() {}
+}
+
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { downgradeModule } from '@angular/upgrade/static';
+
+const bootstrapFn = (extraProviders: StaticProvider[]) => {
+  const platformRef = platformBrowserDynamic(extraProviders);
+  return platformRef.bootstrapModule(MainAngularModule);
+};
+const downgradedModule = downgradeModule(bootstrapFn);
+
+declare var angular: any;
+
 var oppia = angular.module(
   'oppia', [
     'dndLists', 'headroom', 'infinite-scroll', 'ngAnimate',
     'ngAudio', 'ngCookies', 'ngImgCrop', 'ngJoyRide', 'ngMaterial',
     'ngResource', 'ngSanitize', 'ngTouch', 'pascalprecht.translate',
-    'toastr', 'ui.bootstrap', 'ui.sortable', 'ui.tree', 'ui.validate'
+    'toastr', 'ui.bootstrap', 'ui.sortable', 'ui.tree', 'ui.validate',
+    downgradedModule
   ].concat(
   window.GLOBALS ? (window.GLOBALS.ADDITIONAL_ANGULAR_MODULES || []) : []));
+
+exports.module = oppia;
diff --git a/core/templates/dev/head/I18nFooter.ts b/core/templates/dev/head/I18nFooter.ts
@@ -18,6 +18,8 @@
  * @author milagro.teruel@gmail.com (Milagro Teruel)
  */
 
+var oppia = require('AppInit.ts').module;
+
 oppia.controller('I18nFooter', [
   '$cookies', '$http', '$rootScope', '$scope', '$timeout', '$translate',
   'UserService',

diff --git a/core/templates/dev/head/app.constants.ts b/core/templates/dev/head/app.constants.ts
@@ -16,6 +16,8 @@
  * @fileoverview Shared constants for the Oppia module.
  */
 
+var oppia = require('AppInit.ts').module;
+
 for (var constantName in constants) {
   oppia.constant(constantName, constants[constantName]);
 }

diff --git a/core/templates/dev/head/base_components/BaseContentDirective.ts b/core/templates/dev/head/base_components/BaseContentDirective.ts
@@ -20,6 +20,8 @@ require('pages/OppiaFooterDirective.ts');
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('baseContent', [
   'UrlInterpolationService',
   function(UrlInterpolationService) {

diff --git a/core/templates/dev/head/base_components/WarningLoaderDirective.ts b/core/templates/dev/head/base_components/WarningLoaderDirective.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('warningLoader', [
   'UrlInterpolationService',
   function(UrlInterpolationService) {

diff --git a/core/templates/dev/head/components/button-directives/create-activity-button.directive.ts b/core/templates/dev/head/components/button-directives/create-activity-button.directive.ts
@@ -23,6 +23,8 @@ require('services/contextual/UrlService.ts');
 require('services/SiteAnalyticsService.ts');
 require('services/UserService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('createActivityButton', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/core/templates/dev/head/components/button-directives/exploration-embed-button.service.ts b/core/templates/dev/head/components/button-directives/exploration-embed-button.service.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/SiteAnalyticsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('ExplorationEmbedButtonService', [
   '$uibModal', 'SiteAnalyticsService', 'UrlInterpolationService',
   function($uibModal, SiteAnalyticsService, UrlInterpolationService) {

diff --git a/core/templates/dev/head/components/button-directives/hint-and-solution-buttons.directive.ts b/core/templates/dev/head/components/button-directives/hint-and-solution-buttons.directive.ts
@@ -31,6 +31,8 @@ require('services/contextual/DeviceInfoService.ts');
 
 require('pages/exploration-player-page/exploration-player-page.constants.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('hintAndSolutionButtons', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/core/templates/dev/head/components/button-directives/social-buttons.directive.ts b/core/templates/dev/head/components/button-directives/social-buttons.directive.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('socialButtons', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/core/templates/dev/head/components/ck-editor-helpers/ck-editor-rte.directive.ts b/core/templates/dev/head/components/ck-editor-helpers/ck-editor-rte.directive.ts
@@ -19,6 +19,8 @@
 require('services/ContextService.ts');
 require('services/RteHelperService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('ckEditorRte', [
   'ContextService', 'RteHelperService', 'PAGE_CONTEXT',
   function(ContextService, RteHelperService, PAGE_CONTEXT) {

diff --git a/core/templates/dev/head/components/ck-editor-helpers/ck-editor-widgets.initializer.ts b/core/templates/dev/head/components/ck-editor-helpers/ck-editor-widgets.initializer.ts
@@ -21,6 +21,8 @@ require('rich_text_components/richTextComponentsRequires.ts');
 require('services/HtmlEscaperService.ts');
 require('services/RteHelperService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.run([
   '$timeout', '$compile', '$rootScope', '$uibModal', 'RteHelperService',
   'HtmlEscaperService',

diff --git a/...s/dev/head/components/common-layout-directives/common-elements/alert-message.directive.ts b/...s/dev/head/components/common-layout-directives/common-elements/alert-message.directive.ts
@@ -18,6 +18,8 @@
 
 require('services/AlertsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('alertMessage', [function() {
   return {
     restrict: 'E',

diff --git a/...v/head/components/common-layout-directives/common-elements/attribution-guide.directive.ts b/...v/head/components/common-layout-directives/common-elements/attribution-guide.directive.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/BrowserCheckerService.ts');
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('attributionGuide', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/...v/head/components/common-layout-directives/common-elements/background-banner.directive.ts b/...v/head/components/common-layout-directives/common-elements/background-banner.directive.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('backgroundBanner', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/...es/dev/head/components/common-layout-directives/common-elements/loading-dots.directive.ts b/...es/dev/head/components/common-layout-directives/common-elements/loading-dots.directive.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('loadingDots', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/...lates/dev/head/components/common-layout-directives/common-elements/promo-bar.directive.ts b/...lates/dev/head/components/common-layout-directives/common-elements/promo-bar.directive.ts
@@ -21,6 +21,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/PromoBarService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('promoBar', [
   '$window', 'PromoBarService', 'UrlInterpolationService',
   function($window, PromoBarService, UrlInterpolationService) {

diff --git a/...s/dev/head/components/common-layout-directives/common-elements/sharing-links.directive.ts b/...s/dev/head/components/common-layout-directives/common-elements/sharing-links.directive.ts
@@ -21,6 +21,8 @@ require('domain/utilities/UrlInterpolationService.ts');
 require('services/HtmlEscaperService.ts');
 require('services/SiteAnalyticsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('sharingLinks', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/...head/components/common-layout-directives/navigation-bars/side-navigation-bar.directive.ts b/...head/components/common-layout-directives/navigation-bars/side-navigation-bar.directive.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('sideNavigationBar', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/.../head/components/common-layout-directives/navigation-bars/top-navigation-bar.directive.ts b/.../head/components/common-layout-directives/navigation-bars/top-navigation-bar.directive.ts
@@ -27,6 +27,8 @@ require('services/UserService.ts');
 require('services/contextual/DeviceInfoService.ts');
 require('services/contextual/WindowDimensionsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('topNavigationBar', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/core/templates/dev/head/components/entity-creation-services/collection-creation.service.ts b/core/templates/dev/head/components/entity-creation-services/collection-creation.service.ts
@@ -24,6 +24,8 @@ require('services/SiteAnalyticsService.ts');
 // duplicated code between CollectionCreationService and
 // ExplorationCreationService.
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('CollectionCreationService', [
   '$http', '$rootScope', '$timeout', '$window', 'AlertsService',
   'SiteAnalyticsService', 'UrlInterpolationService',

diff --git a/core/templates/dev/head/components/entity-creation-services/exploration-creation.service.ts b/core/templates/dev/head/components/entity-creation-services/exploration-creation.service.ts
@@ -21,6 +21,8 @@ require('domain/utilities/UrlInterpolationService.ts');
 require('services/AlertsService.ts');
 require('services/SiteAnalyticsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('ExplorationCreationService', [
   '$http', '$rootScope', '$timeout', '$uibModal', '$window',
   'AlertsService', 'SiteAnalyticsService', 'UrlInterpolationService',

diff --git a/core/templates/dev/head/components/entity-creation-services/question-creation.service.ts b/core/templates/dev/head/components/entity-creation-services/question-creation.service.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('QuestionCreationService', [
   '$http', '$q', 'UrlInterpolationService',
   function($http, $q, UrlInterpolationService) {

diff --git a/core/templates/dev/head/components/entity-creation-services/skill-creation.service.ts b/core/templates/dev/head/components/entity-creation-services/skill-creation.service.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/AlertsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('SkillCreationService', [
   '$http', '$rootScope', '$timeout', '$window', 'AlertsService',
   'UrlInterpolationService',

diff --git a/core/templates/dev/head/components/entity-creation-services/story-creation.service.ts b/core/templates/dev/head/components/entity-creation-services/story-creation.service.ts
@@ -21,6 +21,8 @@ require('domain/utilities/UrlInterpolationService.ts');
 require('pages/topic-editor-page/services/topic-editor-state.service.ts');
 require('services/AlertsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('StoryCreationService', [
   '$http', '$rootScope', '$timeout', '$uibModal', '$window', 'AlertsService',
   'TopicEditorStateService', 'TopicUpdateService', 'UrlInterpolationService',

diff --git a/core/templates/dev/head/components/entity-creation-services/topic-creation.service.ts.ts b/core/templates/dev/head/components/entity-creation-services/topic-creation.service.ts.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/AlertsService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.factory('TopicCreationService', [
   '$http', '$rootScope', '$timeout', '$uibModal', '$window', 'AlertsService',
   'UrlInterpolationService',

diff --git a/...templates/dev/head/components/forms/custom-forms-directives/apply-validation.directive.ts b/...templates/dev/head/components/forms/custom-forms-directives/apply-validation.directive.ts
@@ -19,6 +19,8 @@
 require('filters/string-utility-filters/underscores-to-camel-case.filter.ts');
 
 /* eslint-disable angular/directive-restrict */
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('applyValidation', ['$filter', function($filter) {
   return {
     require: 'ngModel',

diff --git a/...plates/dev/head/components/forms/custom-forms-directives/audio-file-uploader.directive.ts b/...plates/dev/head/components/forms/custom-forms-directives/audio-file-uploader.directive.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/IdGenerationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('audioFileUploader', [
   'IdGenerationService', 'UrlInterpolationService',
   function(IdGenerationService, UrlInterpolationService) {

diff --git a/core/templates/dev/head/components/forms/custom-forms-directives/html-select.directive.ts b/core/templates/dev/head/components/forms/custom-forms-directives/html-select.directive.ts
@@ -23,6 +23,8 @@ require('domain/utilities/UrlInterpolationService.ts');
 // Attribute 'val' is presented to the user. After user selection, the
 // corresponding attribute 'id' is assigned to 'selection'
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('htmlSelect', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {

diff --git a/core/templates/dev/head/components/forms/custom-forms-directives/image-uploader.directive.ts b/core/templates/dev/head/components/forms/custom-forms-directives/image-uploader.directive.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/IdGenerationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('imageUploader', [
   'IdGenerationService', 'UrlInterpolationService',
   function(IdGenerationService, UrlInterpolationService) {

diff --git a/core/templates/dev/head/components/forms/custom-forms-directives/object-editor.directive.ts b/core/templates/dev/head/components/forms/custom-forms-directives/object-editor.directive.ts
@@ -18,6 +18,8 @@
 
 // Individual object editor directives are in extensions/objects/templates.
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('objectEditor', ['$compile', '$log', function($compile, $log) {
   return {
     scope: {

diff --git a/...templates/dev/head/components/forms/custom-forms-directives/require-is-float.directive.ts b/...templates/dev/head/components/forms/custom-forms-directives/require-is-float.directive.ts
@@ -22,6 +22,8 @@
 require('components/forms/validators/is-float.filter.ts');
 
 /* eslint-disable angular/directive-restrict */
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('requireIsFloat', ['$filter', function($filter) {
   return {
     require: 'ngModel',

diff --git a/...templates/dev/head/components/forms/custom-forms-directives/select2-dropdown.directive.ts b/...templates/dev/head/components/forms/custom-forms-directives/select2-dropdown.directive.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('select2Dropdown', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     // Directive for incorporating select2 dropdowns.

diff --git a/...nts/forms/forms-templates/mark-all-audio-and-translations-as-needing-update.controller.ts b/...nts/forms/forms-templates/mark-all-audio-and-translations-as-needing-update.controller.ts
@@ -17,6 +17,8 @@
  * mark_all_audio_and_translations_as_needing_update modal.
  */
 
+var oppia = require('AppInit.ts').module;
+
 oppia.controller('MarkAllAudioAndTranslationsAsNeedingUpdateController', [
   '$scope', '$uibModalInstance',
   function($scope, $uibModalInstance) {

diff --git a/...ates/dev/head/components/forms/schema-based-editors/schema-based-bool-editor.directive.ts b/...ates/dev/head/components/forms/schema-based-editors/schema-based-bool-editor.directive.ts
@@ -18,6 +18,8 @@
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('schemaBasedBoolEditor', [
   'UrlInterpolationService',
   function(UrlInterpolationService) {

diff --git a/...s/dev/head/components/forms/schema-based-editors/schema-based-choices-editor.directive.ts b/...s/dev/head/components/forms/schema-based-editors/schema-based-choices-editor.directive.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/NestedDirectivesRecursionTimeoutPreventionService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('schemaBasedChoicesEditor', [
   'NestedDirectivesRecursionTimeoutPreventionService',
   'UrlInterpolationService',

diff --git a/...es/dev/head/components/forms/schema-based-editors/schema-based-custom-editor.directive.ts b/...es/dev/head/components/forms/schema-based-editors/schema-based-custom-editor.directive.ts
@@ -19,6 +19,8 @@
 require('domain/utilities/UrlInterpolationService.ts');
 require('services/NestedDirectivesRecursionTimeoutPreventionService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('schemaBasedCustomEditor', [
   'NestedDirectivesRecursionTimeoutPreventionService',
   'UrlInterpolationService',

diff --git a/...ates/dev/head/components/forms/schema-based-editors/schema-based-dict-editor.directive.ts b/...ates/dev/head/components/forms/schema-based-editors/schema-based-dict-editor.directive.ts
@@ -23,6 +23,8 @@ require('domain/utilities/UrlInterpolationService.ts');
 require('services/IdGenerationService.ts');
 require('services/NestedDirectivesRecursionTimeoutPreventionService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('schemaBasedDictEditor', [
   'NestedDirectivesRecursionTimeoutPreventionService',
   'UrlInterpolationService',

diff --git a/...templates/dev/head/components/forms/schema-based-editors/schema-based-editor.directive.ts b/...templates/dev/head/components/forms/schema-based-editors/schema-based-editor.directive.ts
@@ -45,6 +45,8 @@ require(
 
 require('domain/utilities/UrlInterpolationService.ts');
 
+var oppia = require('AppInit.ts').module;
+
 oppia.directive('schemaBasedEditor', [
   'UrlInterpolationService', function(UrlInterpolationService) {
     return {