Remove CKEditor-5 Initialisation (oppia#7432)

* Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Initial * Line break check * Revert Package-lock * Package-lock check-1 * Empty commit * Revert package-lock.json * Check package-lock.json * Resolve merge conflicts * Remove ck-5 files * test * Fix-1
kevintab95 · Aug 27, 2019 · adabccf · adabccf
1 parent 9f127ab
commit adabccf
Showing 17 changed files with 1,455 additions and 4,265 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -383,7 +383,6 @@
 
 # Rich text editor team.
 /core/templates/dev/head/components/ck-editor-helpers/ck-editor-4-rte.directive.ts @aks681
-/core/templates/dev/head/components/ck-editor-helpers/ck-editor-5-rte.directive.ts @aks681 @NishealJ
 /core/templates/dev/head/directives/mathjax-bind.directive.ts @aks681
 /core/templates/dev/head/mathjaxConfig.ts @aks681
 /core/templates/dev/head/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts @aks681

diff --git a/assets/constants.ts b/assets/constants.ts
@@ -17,10 +17,6 @@ export = {
   // Whether to allow custom event reporting to Google Analytics.
   "CAN_SEND_ANALYTICS_EVENTS": false,
 
-  // This specifies the current editor in use and used to switch
-  // between CK4 & CK5.
-  "CURRENT_RTE_IS_CKEDITOR_4": true,
-
   "ALL_CATEGORIES": ["Algebra", "Algorithms", "Architecture", "Arithmetic",
     "Art", "Astronomy", "Biology", "Business", "Calculus", "Chemistry",
     "Combinatorics", "Computing", "Economics", "Education", "Engineering",

diff --git a/core/templates/dev/head/components/ck-editor-helpers/ck-editor-5-rte.directive.ts b/core/templates/dev/head/components/ck-editor-helpers/ck-editor-5-rte.directive.ts
diff --git a/...es/dev/head/components/forms/schema-based-editors/schema-based-html-editor.directive.html b/...es/dev/head/components/forms/schema-based-editors/schema-based-html-editor.directive.html
@@ -1,9 +1,6 @@
 <!-- label-for-focus-target feature is removed since CKEditor has a
 focusManager to manage the focus activity automatically. -->
-<ck-editor-5-rte ng-if="!$ctrl.isDisabled() && !$ctrl.currentRteIsCKEditor4" ng-model="$ctrl.localValue"
-                 ui-config="$ctrl.uiConfig()">
-</ck-editor-5-rte>
-<ck-editor-4-rte ng-if="!$ctrl.isDisabled() && $ctrl.currentRteIsCKEditor4" ng-model="$ctrl.localValue"
+<ck-editor-4-rte ng-if="!$ctrl.isDisabled()" ng-model="$ctrl.localValue"
                  ui-config="$ctrl.uiConfig()">
 </ck-editor-4-rte>
 

diff --git a/...ates/dev/head/components/forms/schema-based-editors/schema-based-html-editor.directive.ts b/...ates/dev/head/components/forms/schema-based-editors/schema-based-html-editor.directive.ts
@@ -17,7 +17,6 @@
  */
 
 require('components/ck-editor-helpers/ck-editor-4-rte.directive.ts');
-require('components/ck-editor-helpers/ck-editor-5-rte.directive.ts');
 require('components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts');
 
 require('domain/utilities/UrlInterpolationService.ts');
@@ -37,10 +36,6 @@ angular.module('oppia').directive('schemaBasedHtmlEditor', [
         '/components/forms/schema-based-editors/' +
         'schema-based-html-editor.directive.html'),
       controllerAs: '$ctrl',
-      controller: ['$scope', 'CURRENT_RTE_IS_CKEDITOR_4',
-        function($scope, CURRENT_RTE_IS_CKEDITOR_4) {
-          var ctrl = this;
-          ctrl.currentRteIsCKEditor4 = CURRENT_RTE_IS_CKEDITOR_4;
-        }]
+      controller: [function() {}]
     };
   }]);
diff --git a/...ates/dev/head/components/question-directives/question-player/question-player.directive.ts b/...ates/dev/head/components/question-directives/question-player/question-player.directive.ts
@@ -17,7 +17,6 @@
  */
 
 require('components/ck-editor-helpers/ck-editor-4-rte.directive.ts');
-require('components/ck-editor-helpers/ck-editor-5-rte.directive.ts');
 require('components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts');
 require('directives/angular-html-bind.directive.ts');
 require('directives/mathjax-bind.directive.ts');

diff --git a/core/templates/dev/head/components/rubrics-editor/rubrics-editor.directive.ts b/core/templates/dev/head/components/rubrics-editor/rubrics-editor.directive.ts
@@ -21,7 +21,6 @@ require(
 require('domain/skill/RubricObjectFactory.ts');
 require('domain/utilities/UrlInterpolationService.ts');
 require('components/ck-editor-helpers/ck-editor-4-rte.directive.ts');
-require('components/ck-editor-helpers/ck-editor-5-rte.directive.ts');
 require('components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts');
 require('components/forms/custom-forms-directives/image-uploader.directive.ts');
 

diff --git a/...d-page/suggestion-modal-for-creator-view/suggestion-modal-for-creator-view.directive.html b/...d-page/suggestion-modal-for-creator-view/suggestion-modal-for-creator-view.directive.html
@@ -19,10 +19,7 @@ <h3>Review Suggestion</h3>
         </angular-html-bind>
       </div>
       <div ng-show="suggestionEditorIsShown">
-        <ck-editor-5-rte ng-if="!currentRteIsCKEditor4" ng-model="suggestionData.newSuggestionHtml">
-        </ck-editor-5-rte>
-        <ck-editor-4-rte ng-if="currentRteIsCKEditor4" ng-model="suggestionData.newSuggestionHtml">
-        </ck-editor-4-rte>
+        <ck-editor-4-rte ng-model="suggestionData.newSuggestionHtml"></ck-editor-4-rte>
         <input type="text" class="form-control oppia-review-message" ng-model="summaryMessage" placeholder="Summarize your new changes">
       </div>
     </div>

diff --git a/...board-page/suggestion-modal-for-creator-view/suggestion-modal-for-creator-view.service.ts b/...board-page/suggestion-modal-for-creator-view/suggestion-modal-for-creator-view.service.ts
@@ -16,7 +16,6 @@
  * @fileoverview Service to display suggestion modal in creator view.
  */
 require('components/ck-editor-helpers/ck-editor-4-rte.directive.ts');
-require('components/ck-editor-helpers/ck-editor-5-rte.directive.ts');
 require('components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts');
 
 require('domain/utilities/UrlInterpolationService.ts');
@@ -67,14 +66,14 @@ angular.module('oppia').factory('SuggestionModalForCreatorDashboardService', [
         },
         controller: [
           '$log', '$scope', '$uibModalInstance', 'SuggestionModalService',
-          'canReviewActiveThread', 'description', 'CURRENT_RTE_IS_CKEDITOR_4',
-          'newContent', 'oldContent', 'stateName', 'suggestionIsHandled',
-          'suggestionStatus', 'suggestionType',
+          'canReviewActiveThread', 'description', 'newContent', 'oldContent',
+          'stateName', 'suggestionIsHandled', 'suggestionStatus',
+          'suggestionType',
           function(
               $log, $scope, $uibModalInstance, SuggestionModalService,
-              canReviewActiveThread, description, CURRENT_RTE_IS_CKEDITOR_4,
-              newContent, oldContent, stateName, suggestionIsHandled,
-              suggestionStatus, suggestionType
+              canReviewActiveThread, description, newContent, oldContent,
+              stateName, suggestionIsHandled, suggestionStatus,
+              suggestionType
           ) {
             $scope.isNotHandled = !suggestionIsHandled;
             $scope.canReject = $scope.isNotHandled;
@@ -94,8 +93,6 @@ angular.module('oppia').factory('SuggestionModalForCreatorDashboardService', [
               $scope.errorMessage = '';
             }
 
-            $scope.currentRteIsCKEditor4 = CURRENT_RTE_IS_CKEDITOR_4;
-
             $scope.oldContent = oldContent;
             $scope.newContent = newContent;
             $scope.stateName = stateName;

diff --git a/...uggestion-modal-for-learner-local-view/suggestion-modal-for-exploration-player.service.ts b/...uggestion-modal-for-learner-local-view/suggestion-modal-for-exploration-player.service.ts
@@ -17,7 +17,6 @@
  */
 
 require('components/ck-editor-helpers/ck-editor-4-rte.directive.ts');
-require('components/ck-editor-helpers/ck-editor-5-rte.directive.ts');
 require('components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts');
 
 require('domain/utilities/UrlInterpolationService.ts');
@@ -42,12 +41,12 @@ angular.module('oppia').factory('SuggestionModalForExplorationPlayerService', [
         resolve: {},
         controller: [
           '$scope', '$timeout', '$uibModalInstance', 'ExplorationEngineService',
-          'CURRENT_RTE_IS_CKEDITOR_4', 'PlayerPositionService',
-          'PlayerTranscriptService', 'SuggestionModalService',
+          'PlayerPositionService', 'PlayerTranscriptService',
+          'SuggestionModalService',
           function(
               $scope, $timeout, $uibModalInstance, ExplorationEngineService,
-              CURRENT_RTE_IS_CKEDITOR_4, PlayerPositionService,
-              PlayerTranscriptService, SuggestionModalService) {
+              PlayerPositionService, PlayerTranscriptService,
+              SuggestionModalService) {
             var stateName = PlayerPositionService.getCurrentStateName();
             var displayedCard = PlayerTranscriptService.getCard(
               PlayerPositionService.getDisplayedCardIndex());
@@ -67,8 +66,6 @@ angular.module('oppia').factory('SuggestionModalForExplorationPlayerService', [
               SuggestionModalService.cancelSuggestion($uibModalInstance);
             };
 
-            $scope.currentRteIsCKEditor4 = CURRENT_RTE_IS_CKEDITOR_4;
-
             $scope.submitSuggestion = function() {
               var data = {
                 target_id: ExplorationEngineService.getExplorationId(),

diff --git a/...ages/exploration-player-page/templates/exploration-player-suggestion-modal.directive.html b/...ages/exploration-player-page/templates/exploration-player-suggestion-modal.directive.html
@@ -4,10 +4,7 @@ <h3>Suggest a Change</h3>
 
 <div class="modal-body protractor-test-exploration-suggestion-modal">
   <!-- ng-model needs to bind to a property of an object on the scope (the property cannot sit directly on the scope). -->
-  <ck-editor-5-rte ng-if="!currentRteIsCKEditor4" ng-show="showEditor" ng-model="suggestionData.suggestionHtml">
-  </ck-editor-5-rte>
-  <ck-editor-4-rte ng-if="currentRteIsCKEditor4" ng-show="showEditor" ng-model="suggestionData.suggestionHtml">
-  </ck-editor-4-rte>
+  <ck-editor-4-rte ng-show="showEditor" ng-model="suggestionData.suggestionHtml"></ck-editor-4-rte>
   <br>
   Briefly describe your changes (required):
   <input type="text" ng-model="description" class="protractor-test-suggestion-description-input" style="width: 100%">

diff --git a/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.controller.ts b/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.controller.ts
@@ -16,7 +16,6 @@
  * @fileoverview Primary controller for the skill editor page.
  */
 
-
 require('interactions/interactionsQuestionsRequires.ts');
 require('objects/objectComponentsRequires.ts');
 

diff --git a/core/tests/protractor/accessibility.js b/core/tests/protractor/accessibility.js
@@ -49,7 +49,6 @@ describe('Cache Slugs', function() {
   it('should check that errors get logged for missing resources', function() {
     browser.get('/console_errors');
     var expectedErrors = [
-      'ckeditor-duplicated-modules',
       'http://localhost:9001/build/fail/logo/288x128_logo_white.png'
     ];
     general.checkConsoleErrorsExist(expectedErrors);

diff --git a/core/tests/protractor_utils/general.js b/core/tests/protractor_utils/general.js
@@ -42,16 +42,6 @@ var checkForConsoleErrors = function(errorsToIgnore) {
       });
     }
 
-    // Since we are in the process of upgrading CKeditor-4 to Ckeditor-5,
-    // we are observing consoles errors for duplicated modules
-    // (for more details,
-    // please refer to https://github.com/ckeditor/ckeditor5/issues/1821)
-    // and therefore, we need to filter such logs until we've upgraded to
-    // CKEditor-5 completely.
-    browserLogs = browserLogs.filter(function(browserLog) {
-      return !(browserLog.message.includes('ckeditor-duplicated-modules'));
-    });
-
     for (var i = 0; i < browserLogs.length; i++) {
       if (browserLogs[i].level.value > CONSOLE_LOG_THRESHOLD) {
         var errorFatal = true;