Merge branch 'release-v0.4.x' into release-v0.5.x

# Conflicts:
#	kolibri/core/assets/src/state/actions.js
#	kolibri/plugins/learn/assets/src/views/assessment-wrapper/index.vue
#	kolibri/plugins/user/assets/src/views/sign-in-page/index.vue

Author: rtibbles

kolibri/core/assets/src/state/actions.js

@@ -21,8 +21,8 @@ import { redirectBrowser } from '../utils/browser';
 
 const logging = logger.getLogger(__filename);
 const intervalTime = 5000; // Frequency at which time logging is updated
-const progressThreshold = 0.1; // Update logs if user has reached 20% more progress
-const timeThreshold = 30; // Update logs if 30 seconds have passed since last update
+const progressThreshold = 0.25; // Update logs if user has reached 25% more progress
+const timeThreshold = 60; // Update logs if 60 seconds have passed since last update
 
 /**
  * Vuex State Mappers

kolibri/plugins/learn/assets/src/views/assessment-wrapper/index.vue

@@ -215,10 +215,17 @@ oriented data synchronization.
             simpleAnswer,
             firstAttempt: true,
           });
+          // Save attempt log on first attempt
+          this.saveAttemptLogMasterLog();
         } else {
-          this.updateAttemptLogMasteryLog({ complete: this.complete });
+          this.updateAttemptLogMasteryLog({
+            complete: this.complete,
+          });
+          if (this.complete) {
+            // Otherwise only save if the attempt is now complete
+            this.saveAttemptLogMasterLog();
+          }
         }
-        this.saveAttemptLogMasterLog();
       },
       hintTaken({ answerState }) {
         this.updateAttemptLogInteractionHistoryAction({
@@ -236,8 +243,9 @@ oriented data synchronization.
           });
           this.firstAttempt = false;
           this.onlyHinted = true;
+          // Only save if this was the first attempt to capture this
+          this.saveAttemptLogMasterLog();
         }
-        this.saveAttemptLogMasterLog();
       },
       setItemId() {
         const index = this.totalattempts % this.assessmentIds.length;
@@ -308,6 +316,10 @@ oriented data synchronization.
         this.$emit('stopTracking', ...args);
       },
     },
+    beforeDestroy() {
+      // Make sure any unsaved data is captured before tear down.
+      this.saveAttemptLogMasterLog();
+    },
     computed: {
       canLogInteractions() {
         return !this.isSuperuser && this.isUserLoggedIn;

kolibri/plugins/user/assets/src/views/sign-in-page/index.vue

@@ -166,15 +166,23 @@
         });
       },
       setSuggestionTerm(newVal, oldVal) {
-        if (newVal.length < 3) {
-          this.suggestionTerm = '';
-          this.usernameSuggestions = [];
-        } else if (
-          (!newVal.startsWith(this.suggestionTerm) && this.suggestionTerm.length) ||
-          !this.suggestionTerm.length
-        ) {
-          this.suggestionTerm = newVal;
-          this.setSuggestions();
+        if (newVal !== null && typeof newVal !== 'undefined') {
+          // Only check if defined or not null
+          if (newVal.length < 3) {
+            // Don't search for suggestions if less than 3 characters entered
+            this.suggestionTerm = '';
+            this.usernameSuggestions = [];
+          } else if (
+            (!newVal.startsWith(this.suggestionTerm) && this.suggestionTerm.length) ||
+            !this.suggestionTerm.length
+          ) {
+            // We have already set a suggestion search term
+            // The currently set suggestion term does not match the current username
+            // Or we do not currently have a suggestion term set
+            // Set it to the new term and fetch new suggestions
+            this.suggestionTerm = newVal;
+            this.setSuggestions();
+          }
         }
       },
       setSuggestions() {
@@ -192,8 +200,11 @@
           });
       },
       fillUsername(username) {
-        this.username = username;
-        this.showDropdown = false;
+        // Only do this if we have been passed a non-null value
+        if (username !== null && typeof username !== 'undefined') {
+          this.username = username;
+          this.showDropdown = false;
+        }
       },
     },
     vuex: {