Merge pull request #195 from SFDO-Community/feature/supplies-bug-fix

TRACTION-453 | Added namespace check before firing application event
SFDO-Community · Jun 30, 2020 · f5b4912 · f5b4912
2 parents 38af408 + 43fb98f
commit f5b4912
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/force-app/main/default/aura/accountPicker/accountPicker.cmp b/force-app/main/default/aura/accountPicker/accountPicker.cmp
@@ -28,6 +28,8 @@
     <aura:registerEvent name="setFacility" type="c:setFacilityEvent"/>
 
     <!-- MARKUP -->
+    <c:appUtils aura:id="utils"></c:appUtils>
+
     <div class="c-container" style="{! 'background-color: ' + v.cardBackgroundColor}">
         <lightning:layout multipleRows="true" class="slds-box">
             <lightning:layoutItem size="12" class="slds-p-around--x-small">

diff --git a/force-app/main/default/aura/accountPicker/accountPickerController.js b/force-app/main/default/aura/accountPicker/accountPickerController.js
@@ -25,7 +25,7 @@
         component.set("v.divisions", null);
         if(component.get("v.selectedDivision") != null) {
             component.set("v.selectedDivision", null);
-            helper.fireFacilitySetEvent(component);
+            helper.handlefireFacilitySetEvent(component, helper);
         }
     },
 
@@ -39,7 +39,7 @@
     handleHospitalChange: function (component, event, helper) {
         if(component.get("v.selectedDivision") != null) {
             component.set("v.selectedDivision", null);
-            helper.fireFacilitySetEvent(component);
+            helper.handlefireFacilitySetEvent(component, helper);
         }
         helper.getDivisions(component, event, helper);
 
@@ -52,6 +52,6 @@
      * @param helper
      */
     handleDivisionChange: function (component, event, helper) {
-        helper.fireFacilitySetEvent(component);
+        helper.handlefireFacilitySetEvent(component, helper);
     },
 })
diff --git a/force-app/main/default/aura/accountPicker/accountPickerHelper.js b/force-app/main/default/aura/accountPicker/accountPickerHelper.js
@@ -2,6 +2,7 @@
  * Created by Heather Purvis on 2020-03-24.
  */
 ({
+    NAMESPACE : null,
     /**
      * @description Gets relevant accounts for each picklist for this user
      * @param component
@@ -165,16 +166,40 @@
         return options;
     },
 
+    /**
+     * @description Fires an event containing the division selected up to the parent component
+     * @param component
+     */
+    handlefireFacilitySetEvent: function (component, helper) {
+        if(typeof this.NAMESPACE === 'undefined') {
+            helper.getOrgNamespace(component, helper);
+        } else {
+            helper.fireFacilitySetEvent(component);
+        }
+    },
+
     /**
      * @description Fires an event containing the division selected up to the parent component
      * @param component
      */
     fireFacilitySetEvent: function (component) {
-        let setEvent = $A.get("e." + "c" + ":setFacilityEvent");
+        let setEvent = $A.get("e." + this.NAMESPACE + ":setFacilityEvent");
         setEvent.setParams({ "facilityId" : component.get("v.selectedDivision" )});
         setEvent.fire();
     },
 
+    getOrgNamespace: function (component, helper) {
+        let utils = component.find('utils');
+        utils.getOrgNamespace().then(result => {
+            if (result) {
+                this.NAMESPACE = result;
+            } else {
+                this.NAMESPACE = 'c'
+            }
+            helper.fireFacilitySetEvent(component);
+        });
+    },
+
     /**
      * @description Displays a toast message of the given type, with given title and body
      * @param       title - Title of toast message
@@ -192,4 +217,5 @@
 
         toastEvent.fire();
     },
+
 })