Fix/Check priority ranking when there is an existing alert (#298)

* Add priority to appModel and check priority ranking when there is an existing alert

* Apply suggestions from code review

Co-Authored-By: Collin <[email protected]>

* Style fix

Co-authored-by: Collin <[email protected]>

Author: ShobhitAd

app/controller/sdl/Abstract/Controller.js

@@ -919,7 +919,8 @@ SDL.SDLController = Em.Object.extend(
               dayColorScheme: isDayColorSchemeDefined ? params.dayColorScheme : SDL.SDLModelData.data.defaultColorScheme,
               nightColorScheme: isNightColorSchemeDefined ? params.nightColorScheme : SDL.SDLModelData.data.defaultColorScheme,
               policyAppID: params.policyAppID,
-              webEngineApp: isWebEngineApp
+              webEngineApp: isWebEngineApp,
+              priority: params.priority ? params.priority : 'NONE'
             }
           )
         );
@@ -938,7 +939,8 @@ SDL.SDLController = Em.Object.extend(
               dayColorScheme: isDayColorSchemeDefined ? params.dayColorScheme : SDL.SDLModelData.data.defaultColorScheme,
               nightColorScheme: isNightColorSchemeDefined ? params.nightColorScheme : SDL.SDLModelData.data.defaultColorScheme,
               policyAppID: params.policyAppID,
-              webEngineApp: isWebEngineApp
+              webEngineApp: isWebEngineApp,
+              priority: params.priority ? params.priority : 'NONE'
             }
           )
         );

app/controller/sdl/RController.js

@@ -308,7 +308,8 @@ SDL.RController = SDL.SDLController.extend(
               dayColorScheme: "dayColorScheme" in params ? params.dayColorScheme : SDL.SDLModelData.defaultTemplateColorScheme,
               nightColorScheme: "nightColorScheme" in params ? params.nightColorScheme : SDL.SDLModelData.defaultTemplateColorScheme,
               policyAppID: params.policyAppID,
-              webEngineApp: isWebEngineApp
+              webEngineApp: isWebEngineApp,
+              priority: params.priority ? params.priority : 'NONE'
             }
           )
         );
@@ -329,7 +330,8 @@ SDL.RController = SDL.SDLController.extend(
               dayColorScheme: "dayColorScheme" in params ? params.dayColorScheme : SDL.SDLModelData.data.defaultColorScheme,
               nightColorScheme: "nightColorScheme" in params ? params.nightColorScheme : SDL.SDLModelData.data.defaultColorScheme,
               policyAppID: params.policyAppID,
-              webEngineApp: isWebEngineApp
+              webEngineApp: isWebEngineApp,
+              priority: params.priority ? params.priority : 'NONE'
             }
           )
         );
@@ -348,7 +350,8 @@ SDL.RController = SDL.SDLController.extend(
               dayColorScheme: "dayColorScheme" in params ? params.dayColorScheme : SDL.SDLModelData.defaultTemplateColorScheme,
               nightColorScheme: "nightColorScheme" in params ? params.nightColorScheme : SDL.SDLModelData.defaultTemplateColorScheme,
               policyAppID: params.policyAppID,
-              webEngineApp: isWebEngineApp
+              webEngineApp: isWebEngineApp,
+              priority: params.priority ? params.priority : 'NONE'
             }
           )
         );

app/model/sdl/Abstract/Model.js

@@ -1119,10 +1119,22 @@ SDL.SDLModel = Em.Object.extend({
    */
   onUIAlert: function(message, alertRequestId) {
 
+    let appModel = SDL.SDLController.getApplicationModel(message.appID)
+
     if (!SDL.AlertPopUp.active) {
-      SDL.AlertPopUp.AlertActive(message, alertRequestId);
+      SDL.AlertPopUp.AlertActive(message, alertRequestId, appModel.priority);
       return true;
     } else {
+      let currentAlertPriority = SDL.AlertPopUp.priority
+      if (currentAlertPriority && currentAlertPriority in SDL.SDLModel.data.appPriority
+         && appModel.priority in SDL.SDLModel.data.appPriority) {
+          if (SDL.SDLModel.data.appPriority[currentAlertPriority] > SDL.SDLModel.data.appPriority[appModel.priority]) {
+            // Enum is arranged in descending order (EMERGENCY being the highest, NONE being the lowest)
+            SDL.AlertPopUp.deactivate('ABORTED', 'Lower priority than the incoming alert')
+            SDL.AlertPopUp.AlertActive(message, alertRequestId, appModel.priority);
+            return true;
+          }
+      }
       SDL.SDLController.alertResponse(this.data.resultCode.REJECTED,
         alertRequestId
       );

app/model/sdl/Abstract/data.js

@@ -457,6 +457,17 @@ SDL.SDLModelData = Em.Object.create(
       'GENERIC_ERROR': 22,
       'USER_DISALLOWED': 23
     },
+    /** 
+     * Enum with app priority rankings 
+     */
+    appPriority: {
+      'EMERGENCY': 0,
+      'NAVIGATION': 1,
+      'VOICE_COMMUNICATION': 2,
+      'COMMUNICATION': 3,
+      'NORMAL': 4,
+      'NONE': 5
+    },
     /**
      * Info navigationApp data for ShowConstantTBT request
      *

app/view/sdl/AlertPopUp.js

@@ -220,7 +220,7 @@ SDL.AlertPopUp = Em.ContainerView.create(
         }
       }
     },
-    AlertActive: function(message, alertRequestId) {
+    AlertActive: function(message, alertRequestId, priority) {
       var self = this;
       this.set('alertRequestId', alertRequestId);
       this.set('cancelID', message.cancelID);
@@ -258,6 +258,7 @@ SDL.AlertPopUp = Em.ContainerView.create(
                                                                         // for
                                                                         // Alert
                                                                         // popUp
+      this.set('priority', priority);
       clearTimeout(this.timer);
       this.timer = setTimeout(
         function() {

ffw/BasicCommunicationRPC.js

@@ -500,8 +500,11 @@ FFW.BasicCommunication = FFW.RPCObserver
           }
         }
         if (notification.method == this.onAppRegisteredNotification) {
+          let appModel = Object.assign(notification.params.application, {
+            "priority": notification.params.priority ? notification.params.priority : 'NONE'
+          }); 
           SDL.SDLModel.onAppRegistered(
-            notification.params.application, notification.params.vrSynonyms
+            appModel, notification.params.vrSynonyms
           );
           this.OnFindApplications();
           const mainWindowID = 0;