Merge pull request #5737 from Countly/SER-1952

[SER-1952] Add cancel button to "create new app" form

Author: Cookiezaurs

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

@@ -849,6 +849,9 @@
                         return countlyGlobal.apps[key].plugins.consolidate.includes(self.selectedApp);
                     }
                 }) || [];
+            },
+            handleCancelForm: function() {
+                CountlyHelpers.goTo({url: "/manage/apps"});
             }
         },
         mounted: function() {

frontend/express/public/core/app-management/templates/app-management.html

@@ -188,13 +188,22 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
                                             </cly-inline-form-field>
                                         </div>
                                     </cly-form-step>
-                                    <div v-if="newApp" class="bu-has-text-right" @mouseenter="formScope.validate()">
+                                    <div v-if="newApp" class="bu-level-right">
                                         <el-button
-                                            :disabled="isDisabled() || !formScope.isSubmissionAllowed"
-                                            @click="formScope.submit()"
-                                            data-test-id="empty-page-create-new-app-button"
-                                            type="primary">{{i18n( newApp ? 'common.create' : 'common.apply')}}
+                                            @click="handleCancelForm"
+                                            data-test-id="create-new-app-cancel-button"
+                                            type="secondary"
+                                        >
+                                            {{i18n('common.cancel')}}
                                         </el-button>
+                                        <div class="bu-ml-2" @mouseenter="formScope.validate()">
+                                            <el-button
+                                                :disabled="isDisabled() || !formScope.isSubmissionAllowed"
+                                                @click="formScope.submit()"
+                                                data-test-id="empty-page-create-new-app-button"
+                                                type="primary">{{i18n( newApp ? 'common.create' : 'common.apply')}}
+                                            </el-button>
+                                        </div>
                                     </div>
                                     <cly-diff-helper 
                                         v-if="!edited"