Merge pull request #2676 from LumbardhAgaj/fix/active-app-error-on-create

Fix/active app error on create app

Author: can-keklik

Gruntfile.js

@@ -176,6 +176,7 @@ module.exports = function(grunt) {
                     'frontend/express/public/core/events/javascripts/countly.details.views.js',
                     'frontend/express/public/core/user-management/javascripts/countly.overview.models.js',
                     'frontend/express/public/core/user-management/javascripts/countly.overview.views.js',
+                    'frontend/express/public/core/app-management/javascripts/countly.models.js',
                     'frontend/express/public/core/app-management/javascripts/countly.views.js',
                     'frontend/express/public/core/logs/javascripts/countly.views.js',
                     'frontend/express/public/core/token-manager/javascripts/countly.views.js',

frontend/express/public/core/app-management/javascripts/countly.models.js

@@ -0,0 +1,28 @@
+/*global countlyVue */
+(function(countlyAppManagement) {
+    countlyAppManagement.getVuexModule = function() {
+        var getInitialState = function() {
+            return {
+                selectedAppId: null,
+                isDiscarded: false,
+            };
+        };
+
+        var actions = {
+            setSelectedAppId: function(context, payload) {
+                context.commit('setSelectedAppId', payload);
+            }
+        };
+
+        var mutations = {
+            setSelectedAppId: function(state, value) {
+                state.selectedAppId = value;
+            }
+        };
+        return countlyVue.vuex.Module("countlyAppManagement", {
+            state: getInitialState,
+            actions: actions,
+            mutations: mutations,
+        });
+    };
+}(window.countlyAppManagement = window.countlyAppManagement || {}));

frontend/express/public/core/app-management/javascripts/countly.views.js

@@ -1,4 +1,4 @@
-/*global countlyAuth, ELEMENT, app, countlyGlobal, CV, countlyVue, countlyCommon, CountlyHelpers, jQuery, $, Backbone, moment, sdks, countlyPlugins, countlySession, countlyLocation, countlyCity, countlyDevice, countlyCarrier, countlyDeviceDetails, countlyAppVersion, countlyEvent, _ ,*/
+/*global countlyAuth, ELEMENT, app, countlyGlobal, CV, countlyVue, countlyCommon, CountlyHelpers, jQuery, $, Backbone, moment, sdks, countlyPlugins, countlySession, countlyLocation, countlyCity, countlyDevice, countlyCarrier, countlyDeviceDetails, countlyAppVersion, countlyEvent, _ , countlyAppManagement*/
 (function() {
     var ManageAppsView = countlyVue.views.create({
         mixins: [ELEMENT.utils.Emitter],
@@ -11,7 +11,7 @@
                 set: function(value) {
                     this.newApp = false;
                     this.selectedApp = value;
-                    this.broadcast('AppSettingsContainerObservable', 'selectedApp', value);
+                    this.$store.dispatch('countlyAppManagement/setSelectedAppId', value);
                     this.uploadData.app_image_id = countlyGlobal.apps[this.selectedApp]._id + "";
                     this.app_icon["background-image"] = 'url("appimages/' + this.selectedApp + '.png")';
                     this.unpatch();
@@ -528,7 +528,7 @@
 
                                 //find next app
                                 var nextAapp = (self.appList[index2]) ? self.appList[index2].value : self.appList[0].value;
-                                self.$store.dispatch("countlyCommon/setActiveApp", nextAapp);
+                                self.$store.dispatch("countlyCommon/updateActiveApp", nextAapp);
                                 self.selectedApp = nextAapp;
                                 self.uploadData.app_image_id = countlyGlobal.apps[self.selectedApp]._id + "";
                                 self.app_icon["background-image"] = 'url("appimages/' + self.selectedApp + '.png")';
@@ -726,14 +726,14 @@
         },
         mounted: function() {
             var appId = this.$route.params.app_id || countlyCommon.ACTIVE_APP_ID;
-            this.broadcast('AppSettingsContainerObservable', 'selectedApp', appId);
+            this.$store.dispatch('countlyAppManagement/setSelectedAppId', appId);
         }
     });
 
     var getMainView = function() {
         return new countlyVue.views.BackboneWrapper({
             component: ManageAppsView,
-            vuex: []
+            vuex: [{clyModel: countlyAppManagement}]
         });
     };
 

frontend/express/views/dashboard.html

@@ -1861,6 +1861,7 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam
 		<script language="javascript" type="text/javascript" src="<%- cdn %>core/user-analytics-overview/javascripts/countly.views.js?<%= countlyVersion %>"></script>
         <script language="javascript" type="text/javascript" src="<%- cdn %>core/geo-countries/javascripts/countly.views.js?<%= countlyVersion %>"></script>
         <script language="javascript" type="text/javascript" src="<%- cdn %>core/geo-countries/javascripts/countly.widgets.geo.js?<%= countlyVersion %>"></script>
+        <script language="javascript" type="text/javascript" src="<%- cdn %>core/app-management/javascripts/countly.models.js?<%= countlyVersion %>"></script>
         <script language="javascript" type="text/javascript" src="<%- cdn %>core/app-management/javascripts/countly.views.js?<%= countlyVersion %>"></script>
         <script language="javascript" type="text/javascript" src="<%- cdn %>core/user-management/javascripts/countly.models.js?<%= countlyVersion %>"></script>
         <script language="javascript" type="text/javascript" src="<%- cdn %>core/user-management/javascripts/countly.views.js?<%= countlyVersion %>"></script>

plugins/push/frontend/public/javascripts/countly.views.js

@@ -1740,7 +1740,6 @@
                 viewModel: JSON.parse(JSON.stringify(initialAppLevelConfig)),
                 modelUnderEdit: Object.assign({}, { rate: "", period: ""}),
                 uploadedIOSKeyFilename: '',
-                selectedAppId: this.$route.params.app_id || countlyCommon.ACTIVE_APP_ID,
                 isHuaweiConfigTouched: false,
                 isIOSConfigTouched: false,
                 AddTestUserDefinitionTypeEnum: countlyPushNotification.service.AddTestUserDefinitionTypeEnum,
@@ -1769,6 +1768,16 @@
             },
             selectedTestUsersRows: function() {
                 return this.testUsersRows[this.selectedTestUsersListOption];
+            },
+            selectedAppId: function() {
+                return this.$store.state.countlyAppManagement.selectedAppId;
+            }
+        },
+        watch: {
+            selectedAppId: function() {
+                this.iosAuthConfigType = countlyPushNotification.service.IOSAuthConfigTypeEnum.P8;
+                this.resetConfig();
+                this.reconcilate();
             }
         },
         methods: {
@@ -1877,12 +1886,6 @@
                 this.resetConfig();
                 this.reconcilate();
             },
-            onSelectApp: function(appId) {
-                this.selectedAppId = appId;
-                this.iosAuthConfigType = countlyPushNotification.service.IOSAuthConfigTypeEnum.P8;
-                this.resetConfig();
-                this.reconcilate();
-            },
             isKeyEmpty: function(platform) {
                 if (platform === this.PlatformEnum.ANDROID) {
                     return !this.viewModel[platform].firebaseKey;
@@ -2149,10 +2152,9 @@
         mounted: function() {
             this.addKeyFileReaderLoadListener(this.onKeyFileReady);
             this.addDiscardEventListener(this.onDiscard);
-            this.addSelectedAppEventListener(this.onSelectApp);
             this.reconcilate();
         },
-        destroyed: function() {
+        beforeDestroy: function() {
             this.removeKeyFileReaderLoadListener(this.onKeyFileReady);
         }
     });

plugins/push/package-lock.json

@@ -20,9 +20,9 @@
     "notifications"
   ],
   "dependencies": {
-    "jsonwebtoken": "^8.0.1",
-    "node-forge": "^1.2.1",
-    "xxhash-addon": "^1.4.0"
+    "jsonwebtoken": "8.0.1",
+    "node-forge": "1.2.1",
+    "xxhash-addon": "1.4.0"
   },
   "private": true
 }