Merge pull request #39 from BuildFire/fix/deeplink-data

fix(widget): reading location id - PLUG-1871

Author: mas-iota

src/control/content/js/locations/index.js

@@ -1908,6 +1908,7 @@ const triggerWidgetOnLocationsUpdate = ({ realtimeUpdate = false, isCancel = fal
     let data = null;
     if (realtimeUpdate) {
       data = {
+        ...state.locationObj,
         id: state.locationObj.id,
         title: addLocationControls.locationTitle.value,
         subtitle: addLocationControls.locationSubtitle.value,

src/widget/js/util/helpers.js

@@ -149,7 +149,10 @@ export const shareLocation = () => {
 };
 
 export const bookmarkLocation = (locationId, e) => {
-  const location = state.listLocations.find((i) => i.id === locationId);
+  let location = state.listLocations.find((i) => i.id === locationId);
+  if (!location) {
+    location = state.selectedLocation.id === locationId ? state.selectedLocation : null;
+  }
   const { bookmarks } = state.settings;
 
   if (state.bookmarkLoading || !location || !bookmarks.enabled || !bookmarks.allowForLocations) return;

src/widget/widget.js

@@ -1632,7 +1632,7 @@ const navigateToLocationId = (locationId) => {
     refreshCategories()
       .then(() => WidgetController.getLocation(locationId))
       .then((response) => {
-        state.selectedLocation = response.data;
+        state.selectedLocation = { ...response.data, id: response.id };
         showLocationDetail();
       })
       .catch((err) => {