Remove deleted skills from skillIdToRubricsObject in the topic editor (…

…#11855) * remove deleted skills from skillIdToRubricsObject in the topic editor * handle missing skills in /fetch_skills gracefully
oppia · Feb 4, 2021 · 619c620 · 619c620
1 parent 1ecf469
commit 619c620
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/core/controllers/skill_editor.py b/core/controllers/skill_editor.py
@@ -260,10 +260,7 @@ def get(self):
 
         skill_ids = topic_services.get_all_skill_ids_assigned_to_some_topic()
 
-        try:
-            skills = skill_fetchers.get_multi_skills(skill_ids)
-        except Exception as e:
-            raise self.PageNotFoundException(e)
+        skills = skill_fetchers.get_multi_skills(skill_ids, strict=False)
 
         skill_dicts = [skill.to_dict() for skill in skills]
         self.values.update({

diff --git a/core/controllers/skill_editor_test.py b/core/controllers/skill_editor_test.py
@@ -422,13 +422,6 @@ def test_skill_data_handler_get_multiple_skills(self):
         self.assertEqual(len(json_response['skills']), 1)
         self.logout()
 
-    def test_skill_data_handler_get_fails(self):
-        self.login(self.ADMIN_EMAIL)
-        # Check GET returns 404 when cannot get skill by id.
-        self.delete_skill_model_and_memcache(self.admin_id, self.skill_id)
-        self.get_json(self.url, expected_status_int=404)
-        self.logout()
-
 
 class SkillDescriptionHandlerTest(BaseSkillEditorControllerTests):
     """Tests for SkillDescriptionHandler."""

diff --git a/core/templates/pages/topic-editor-page/services/topic-editor-state.service.ts b/core/templates/pages/topic-editor-page/services/topic-editor-state.service.ts
@@ -132,6 +132,10 @@ angular.module('oppia').factory('TopicEditorStateService', [
     };
     var _updateSkillIdToRubricsObject = function(skillIdToRubricsObject) {
       for (var skillId in skillIdToRubricsObject) {
+        // Skips deleted skills.
+        if (!skillIdToRubricsObject[skillId]) {
+          continue;
+        }
         var rubrics = skillIdToRubricsObject[skillId].map(function(rubric) {
           return RubricObjectFactory.createFromBackendDict(rubric);
         });