Merge pull request #6445 from Countly/av-log

Update app version log and generator

Author: widatama

CHANGELOG.md

@@ -5,6 +5,8 @@ Fixes:
 - [crashes] Fix free session and free user calculation
 - [dashboards] Delete associated widgets and reports when a dashboard is removed
 - [star-rating] Fix widget close post message
+- [core] Adjust level and update content of app version log
+- [populator] Update getVersion to generate valid semantic version
 
 Enterprise Fixes:
 - [crash_symbolication] Remove auto symbolication setting

api/parts/data/usage.js

@@ -1121,7 +1121,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
                 userProps.av_build = versionComponents.build;
             }
             else {
-                log.w("Invalid app version format: %s", params.qstring.metrics._app_version);
+                log.d("App version %s is not a valid semantic version. It cannot be separated into semantic version parts", params.qstring.metrics._app_version);
                 userProps.av_major = null;
                 userProps.av_minor = null;
                 userProps.av_patch = null;

plugins/populator/frontend/public/javascripts/countly.models.js

@@ -337,9 +337,13 @@
                 d = moment(seed);
             }
         }
-        var year = trimYear ? d.format('YY')[1] : d.format('YY');
+
+        var year = d.format('YY');
+        if (trimYear || year[0] === '0') {
+            year = d.format('YY')[1];
+        }
         var day = parseInt(d.format('DD')[0], 10) === 3 ? 2 : d.format('DD')[0];
-        return year + "." + d.format('MM') + "." + day;
+        return year + '.' + d.format('M') + '.' + day;
     }
     /**
      * 
@@ -2944,4 +2948,4 @@
     };
 
     countlyPopulator.defaultTemplates = defaultTemplates;
-}(window.countlyPopulator = window.countlyPopulator || {}));
+}(window.countlyPopulator = window.countlyPopulator || {}));