Merge v0.14.0 tag into develop branch

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
         description: This hook handles all frontend linting for Kolibri
         entry: yarn run lint-frontend:format
         language: system
-        pass_filenames: false
+        files: \.(js|vue|scss|css)$
 - repo: local
   hooks:
   - id: no-auto-migrations

.travis.yml

@@ -23,7 +23,7 @@ matrix:
   include:
     - python: "3.6"
       env:
-        - TOX_ENV=startup_provision_shutdown_without_zombies
+        - TOX_ENV=timely_shutdown_no_zombies
       script:
        - tox -e $TOX_ENV
     - python: "2.7"

CHANGELOG.md

@@ -2,6 +2,46 @@
 
 List of the most important changes for each release.
 
+## 0.14.0
+
+### Internationalization and localization
+
+- Added German
+- Added Khmer
+- CSV data files have localized headers and filenames
+
+### Added
+
+- In the Setup Wizard, users can import an existing facility from peer Kolibri devices on the network
+- Facility admins can sync facility data with peer Kolibri devices on the network or Kolibri Data Portal
+- Facility admins can import and export user accounts to and from a CSV file
+- Channels can display a learner-facing "tagline" on Learn channel list
+- Device and facility names can now be edited by admins
+- Super admins can delete facilities from a device
+- Quizzes and lessons can be assigned to individual learners in addition to whole groups or classes
+- Super admins can view the Facility and Coach pages for all facilities
+- Pingbacks to the telemetry server can now be disabled
+
+### Changed
+
+- New card layout for channels on Learn Page is more efficient and displays new taglines
+- Simplified setup process when using Kolibri for personal use
+- Improved sign-in flow, especially for devices with multiple facilities
+- The experience for upgrading channels has been improved with resource highlighting, improved statistics, and more efficient navigation
+- Improved icons for facilities, classrooms, quizzes, and other items
+- More consistent wording of notifications in the application
+- Quizzes and lessons with missing resources are more gracefully handled
+- Shut-down times are faster and more consistent
+
+### Fixed
+
+- Many visual and user experience issues
+- Language filter not working when viewing channels for import/export
+- A variety of mobile responsiveness issues have been addressed
+
+
+([0.14.0 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.14.0))
+
 ## 0.13.3
 
 ### Changed or fixed

kolibri/__init__.py

@@ -15,7 +15,7 @@
 
 #: This may not be the exact version as it's subject to modification with
 #: get_version() - use ``kolibri.__version__`` for the exact version string.
-VERSION = (0, 14, 0, "beta", 0)
+VERSION = (0, 14, 1, "alpha", 0)
 
 __author__ = "Learning Equality"
 __email__ = "info@learningequality.org"

kolibri/core/assets/src/api-resources/contentNode.js

@@ -22,9 +22,6 @@ export default new Resource({
   fetchNodeAssessments(ids) {
     return this.getListEndpoint('node_assessments', { ids });
   },
-  fetchAncestors(id) {
-    return this.fetchDetailCollection('ancestors', id);
-  },
   fetchRecommendationsFor(id, getParams) {
     return this.fetchDetailCollection('recommendations_for', id, getParams);
   },

kolibri/core/assets/src/mixins/notificationStrings.js

@@ -12,7 +12,8 @@ export default createTranslator('NotificationStrings', {
   },
   coachesAssignedNoCount: {
     message: '{count, plural, one {Coach assigned} other {Coaches assigned}}',
-    context: 'Assigning an unspecified number of coaches to a class',
+    context:
+      'String appears as a short notification in a bottom left corner of the screen when more than one coach is assigned to a class, but without specifying the number.',
   },
   coachesRemovedNoCount: {
     message: '{count, plural, one {Coach removed} other {Coaches removed}}',

kolibri/core/assets/src/utils/UserType.js

@@ -9,5 +9,19 @@ export default function UserType(userObject) {
   }
 
   // get first role associated with this facility
-  return userObject.roles.find(role => role.collection === userObject.facility).kind;
+  const firstRole = userObject.roles.find(role => role.collection === userObject.facility);
+
+  if (firstRole) {
+    return firstRole.kind;
+  } else {
+    // HACK check for edge case where the User has a Classroom-level COACH role in
+    // spite of not having a Facility-level ASSIGNABLE_COACH role
+    const coachRole = userObject.roles.find(role => role.kind === UserKinds.COACH);
+    if (coachRole) {
+      return UserKinds.ASSIGNABLE_COACH;
+    } else {
+      // If all else fails, display user as a LEARNER
+      return UserKinds.LEARNER;
+    }
+  }
 }

kolibri/core/assets/src/views/TextTruncator.vue

@@ -4,21 +4,14 @@
     <div v-if="viewAllText">
       {{ text }}
     </div>
-    <template v-else>
-      <div ref="shaveEl">
-        {{ text }}
-      </div>
-      <KTooltip
-        reference="shaveEl"
-        :refs="$refs"
-        :disabled="!tooltipText"
-      >
-        {{ tooltipText }}
-      </KTooltip>
-    </template>
-    <div class="show-more">
+    <div v-else ref="shaveEl">
+      {{ text }}
+    </div>
+    <div
+      v-if="showViewMore && (textIsTruncated || viewAllText)"
+      class="show-more"
+    >
       <KButton
-        v-if="showViewMore && (textIsTruncated || viewAllText)"
         appearance="basic-link"
         :text="viewAllText ? $tr('viewLessButtonPrompt') : coreString('viewMoreAction')"
         @click.stop.prevent="viewAllText = !viewAllText"
@@ -51,11 +44,6 @@
           return value > 0;
         },
       },
-      showTooltip: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
       showViewMore: {
         type: Boolean,
         required: false,
@@ -69,12 +57,6 @@
       };
     },
     computed: {
-      tooltipText() {
-        if (!this.showTooltip || this.showViewMore || !this.textIsTruncated) {
-          return null;
-        }
-        return this.text;
-      },
       currentDimensions() {
         return {
           text: this.text,

kolibri/core/assets/src/views/sync/FacilityAdminCredentialsForm.vue

@@ -147,7 +147,7 @@
       },
       duplicateFacilityNamesExplanation: {
         message: "This facility is different from '{facilities}'. These facilities will not sync.",
-        context: 'Explanation that is shown if two facilities with the same name are on the device',
+        context: 'Explanation displayed when two facilities with the same name are on the device',
       },
     },
   };

kolibri/core/assets/src/views/sync/SelectAddressModalGroup/AddAddressForm.vue

@@ -142,7 +142,10 @@
       errorInvalidAddress: 'Please enter a valid IP address, URL, or hostname',
       header: 'New address',
       nameDesc: 'Choose a name for this address so you can remember it later:',
-      nameLabel: 'Network name',
+      nameLabel: {
+        message: 'Name',
+        context: "\nThis should be just 'Name', not 'Network name'",
+      },
       namePlaceholder: 'e.g. House network',
       submitButtonLabel: 'Add',
       tryingToConnect: 'Trying to connect to server…',

kolibri/core/content/api.py

@@ -58,10 +58,12 @@
 from kolibri.core.content.utils.stopwords import stopwords_set
 from kolibri.core.decorators import query_params_required
 from kolibri.core.device.models import ContentCacheKey
+from kolibri.core.lessons.models import Lesson
 from kolibri.core.logger.models import ContentSessionLog
 from kolibri.core.logger.models import ContentSummaryLog
 from kolibri.core.query import SQSum
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -305,6 +307,9 @@ class ContentNodeViewset(ValuesViewset):
         "parent",
         "sort_order",
         "title",
+        "lft",
+        "rght",
+        "tree_id",
     )
 
     field_map = {
@@ -314,55 +319,72 @@ class ContentNodeViewset(ValuesViewset):
     read_only = True
 
     def consolidate(self, items, queryset):
-        assessmentmetadata = {
-            a["contentnode"]: a
-            for a in models.AssessmentMetaData.objects.filter(
-                contentnode__in=queryset
-            ).values(
-                "assessment_item_ids",
-                "number_of_assessments",
-                "mastery_model",
-                "randomize",
-                "is_manipulable",
-                "contentnode",
-            )
-        }
+        output = []
 
-        files = {}
-
-        for f in models.File.objects.filter(contentnode__in=queryset).values(
-            "id",
-            "contentnode",
-            "local_file__id",
-            "priority",
-            "local_file__available",
-            "local_file__file_size",
-            "local_file__extension",
-            "preset",
-            "lang__id",
-            "lang__lang_code",
-            "lang__lang_subcode",
-            "lang__lang_name",
-            "lang__lang_direction",
-            "supplementary",
-            "thumbnail",
-        ):
-            if f["contentnode"] not in files:
-                files[f["contentnode"]] = []
-            f["checksum"] = f.pop("local_file__id")
-            f["available"] = f.pop("local_file__available")
-            f["file_size"] = f.pop("local_file__file_size")
-            f["extension"] = f.pop("local_file__extension")
-            files[f["contentnode"]].append(f)
+        if items:
+            assessmentmetadata = {
+                a["contentnode"]: a
+                for a in models.AssessmentMetaData.objects.filter(
+                    contentnode__in=queryset
+                ).values(
+                    "assessment_item_ids",
+                    "number_of_assessments",
+                    "mastery_model",
+                    "randomize",
+                    "is_manipulable",
+                    "contentnode",
+                )
+            }
 
-        output = []
+            files = {}
 
-        for item in items:
-            item["assessmentmetadata"] = assessmentmetadata.get(item["id"])
-            item["files"] = list(
-                map(lambda x: map_file(x, item), files.get(item["id"], []))
+            for f in models.File.objects.filter(contentnode__in=queryset).values(
+                "id",
+                "contentnode",
+                "local_file__id",
+                "priority",
+                "local_file__available",
+                "local_file__file_size",
+                "local_file__extension",
+                "preset",
+                "lang__id",
+                "lang__lang_code",
+                "lang__lang_subcode",
+                "lang__lang_name",
+                "lang__lang_direction",
+                "supplementary",
+                "thumbnail",
+            ):
+                if f["contentnode"] not in files:
+                    files[f["contentnode"]] = []
+                f["checksum"] = f.pop("local_file__id")
+                f["available"] = f.pop("local_file__available")
+                f["file_size"] = f.pop("local_file__file_size")
+                f["extension"] = f.pop("local_file__extension")
+                files[f["contentnode"]].append(f)
+
+            ancestors = queryset.get_ancestors().values(
+                "id", "title", "lft", "rght", "tree_id"
             )
-            output.append(item)
+
+            for item in items:
+                item["assessmentmetadata"] = assessmentmetadata.get(item["id"])
+                item["files"] = list(
+                    map(lambda x: map_file(x, item), files.get(item["id"], []))
+                )
+
+                lft = item.pop("lft")
+                rght = item.pop("rght")
+                tree_id = item.pop("tree_id")
+                item["ancestors"] = list(
+                    filter(
+                        lambda x: x["lft"] < lft
+                        and x["rght"] > rght
+                        and x["tree_id"] == tree_id,
+                        ancestors,
+                    )
+                )
+                output.append(item)
         return output
 
     def get_queryset(self):
@@ -511,19 +533,6 @@ def next_content(self, request, **kwargs):
             {"kind": next_item.kind, "id": next_item.id, "title": next_item.title}
         )
 
-    @detail_route(methods=["get"])
-    def ancestors(self, request, **kwargs):
-        cache_key = "contentnode_ancestors_{pk}".format(pk=kwargs.get("pk"))
-
-        if cache.get(cache_key) is not None:
-            return Response(cache.get(cache_key))
-
-        ancestors = list(self.get_object().get_ancestors().values("id", "title"))
-
-        cache.set(cache_key, ancestors, 60 * 10)
-
-        return Response(ancestors)
-
     @detail_route(methods=["get"])
     def recommendations_for(self, request, **kwargs):
         """
@@ -904,9 +913,19 @@ def retrieve(self, request, pk):
 
 
 class ContentNodeProgressFilter(IdFilter):
+    lesson = UUIDFilter(method="filter_by_lesson")
+
+    def filter_by_lesson(self, queryset, name, value):
+        try:
+            lesson = Lesson.objects.get(pk=value)
+            node_ids = list(map(lambda x: x["contentnode_id"], lesson.resources))
+            return queryset.filter(pk__in=node_ids)
+        except Lesson.DoesNotExist:
+            return queryset.none()
+
     class Meta:
         model = models.ContentNode
-        fields = ["ids"]
+        fields = ["ids", "parent", "lesson"]
 
 
 class ContentNodeProgressViewset(viewsets.ReadOnlyModelViewSet):

kolibri/core/content/test/test_content_app.py

@@ -792,17 +792,6 @@ def test_contentnode_parent(self):
         for i in range(len(children)):
             self.assertEqual(response.data[i]["title"], children[i].title)
 
-    def test_contentnode_ancestors(self):
-        node = content.ContentNode.objects.get(title="c2c2")
-        ancestors = node.get_ancestors()
-        ancestors_titles = {n.title for n in ancestors}
-        response = self.client.get(
-            reverse("kolibri:core:contentnode-ancestors", kwargs={"pk": node.id})
-        )
-        response_titles = {n["title"] for n in response.data}
-        self.assertEqual(len(response.data), ancestors.count())
-        self.assertEqual(ancestors_titles, response_titles)
-
     def test_channelmetadata_list(self):
         response = self.client.get(reverse("kolibri:core:channel-list", kwargs={}))
         self.assertEqual(response.data[0]["name"], "testing")