Merge pull request #160 from alikaakati/master

nteske · web-flow · commit dbf3a9884260 · 2021-11-24T15:26:37.000+01:00
Fixed markers error on null values
diff --git a/src/control/content/components/LocationsActionBar.js b/src/control/content/components/LocationsActionBar.js
@@ -20,7 +20,7 @@ class LocationsActionBar extends React.Component {
   onFileChange() {
     const file = this.fileInput.files[0];
     const reader = new FileReader();
-
+    console.log(file);
     reader.onload = (e) => {
       const rows = csv.parse(e.target.result).slice(1);
       const { places } = this.props;
@@ -42,6 +42,7 @@ class LocationsActionBar extends React.Component {
           description,
           image,
         ] = row;
+        console.log(locations);
         const selectedCategory = [];
 
         const cat = Number.isInteger(categories)
@@ -134,6 +135,8 @@ class LocationsActionBar extends React.Component {
       if (!promises.length) {
         while (locations.length) {
           let paginatedLocations = locations.splice(0, 500);
+          console.log("paginated locations");
+          console.log(paginatedLocations[0]);
           this.props.onMultipleSubmit(paginatedLocations);
         }
       } else {
@@ -143,6 +146,8 @@ class LocationsActionBar extends React.Component {
           window.locs = locs;
           while (locs.length) {
             let paginatedLocations = locs.splice(0, 500);
+            console.log("paginated locations");
+            console.log(paginatedLocations);
             this.props.onMultipleSubmit(paginatedLocations);
           }
         });
@@ -289,6 +294,7 @@ class LocationsActionBar extends React.Component {
               )}
             </div>
           </div>
+
           <div className="col-xs-8">
             <input
               onChange={() => this.onFileChange()}
diff --git a/src/control/content/content.js b/src/control/content/content.js
@@ -490,6 +490,7 @@ class Content extends React.Component {
    * @param   {Object} locations Locations array
    */
   onMultipleLocationSubmit(locations) {
+
     locations = locations.filter((location) => typeof location === "object");
     let locationsForUpdate = [];
     let locationsForInsert = [];
@@ -520,13 +521,46 @@ class Content extends React.Component {
           console.error(err);
         } else if (result && result.data && result.data.length) {
           const newDataCount = result.data.length;
+
           for (let skip = 0; skip < newDataCount; skip += 50) {
             buildfire.datastore.search(
-              { filter: {}, skip, limit: 50 },
+              { filter: {}, skip, limit: 50, sort:{createdOn : -1} },
               "places-list",
               (err, innerResult) => {
                 if (err) return;
+
                 innerResult.forEach((item) => {
+                  console.log("GOING TO ADD TO SEARCH ENGINE");
+                  if(item && item.id && item.data.title){
+                    let insertData = {
+                      tag: "place-data",
+                      title: item.data.title,
+                      description: item.data.description ? item.data.description.replace(/(<([^>]+)>)/gi, "") : "",
+                      imageUrl: item.data.image ? item.data.image : "",
+                      keywords: item.data.subtitle ? item.data.subtitle : "",
+                      data: {
+                        placeId: item.id,
+                      },
+                    };
+  
+              
+                    SearchEngine.insert(insertData, (callbackData) => {
+                      console.log(callbackData);
+                    });
+                    
+
+                  }
+
+                  
+                  
+                  
+                  
+                  
+                  
+                  
+                  
+                  
+                  
                   Deeplink.getById(item.id, (err, locationDeeplink) => {
                     if (!err && locationDeeplink) {
                       locationDeeplink.name = item.data.title
diff --git a/src/widget/index.html b/src/widget/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta charset="utf-8">
-    <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBOp1GltsWARlkHhF1H_cb6xtdR1pvNDAk"></script>
+    <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBOp1GltsWARlkHhF1H_cb6xtdR1pvNDAk&sensor=false"></script>
     <script src="../../../scripts/_bundles/buildfire_lightcarousel.min.js"></script>
     <link rel="stylesheet" href="https://cdn.quilljs.com/1.0.0/quill.snow.css"/>
     <script src="../../../scripts/buildfire/components/toast/toast.js"></script>
diff --git a/src/widget/js/map.js b/src/widget/js/map.js
@@ -1,5 +1,4 @@
 import Handlebars from "./lib/handlebars"
-
 import { stringsConfig } from "../js/shared/stringsConfig";
 import "../js/shared/strings";
 
@@ -166,6 +165,7 @@ window.mapView = {
         };        
 
         // Add a marker clusterer to manage the markers.
+        console.log("is error from here");
         mapView.settings.markerClusterer = new MarkerClusterer(map, app.state.markers, clusterOptions);
 
     },
@@ -222,22 +222,24 @@ window.mapView = {
           });
         } 
         if (skip) return;
-        let marker = new google.maps.Marker({
-            position: place.address,
-            markerData: place,
-            map: map,
-            icon: mapView.createMarker(iconType)
-        });
-
-        if(place.address){
-            let lat = place.address.lat,
-                lng = place.address.lng;
-
-            app.state.markers.push(marker);
-            app.state.bounds.extend({lat, lng});
-            if (mapView.settings.markerClusterer) mapView.settings.markerClusterer.addMarker(marker);
-
-            marker.addListener('click', () => {mapView.markerClick(place, marker)});
+        if(place && place.address && place.address.lat && place.address.lng){
+            let marker = new google.maps.Marker({
+                position: place.address,
+                markerData: place,
+                map: map,
+                icon: mapView.createMarker(iconType)
+            });
+    
+            if(place.address){
+                let lat = place.address.lat,
+                    lng = place.address.lng;
+    
+                app.state.markers.push(marker);
+                app.state.bounds.extend({lat, lng});
+                if (mapView.settings.markerClusterer) mapView.settings.markerClusterer.addMarker(marker);
+    
+                marker.addListener('click', () => {mapView.markerClick(place, marker)});
+            }
         }
     },
     markerClick: (place, marker) => {
@@ -389,5 +391,6 @@ window.mapView = {
 
         window.originalHeight = (app.views.mapView) ? app.views.mapView.getBoundingClientRect().height: 0;
 
-    }
+    },
+
 };
diff --git a/src/widget/js/shared/Deeplink.js b/src/widget/js/shared/Deeplink.js
@@ -24,7 +24,6 @@ export default class Deeplink {
         console.error(err, '<<< ERROR WHILE REGISTERING DEEP LINK.');
         return callback(err);
       }
-
       callback(null, { 
         deeplinkId: result && result.data && result.data.deeplinkId ? result.data.deeplinkId : null,
         deeplinkData: new Deeplink(result && result.data ? result.data : null)
diff --git a/src/widget/list.html b/src/widget/list.html
@@ -1 +1,3 @@
 <div class="listViewFilter" id="filter"></div>
+<div style="padding: 20px;">
+</div>
diff --git a/src/widget/map.html b/src/widget/map.html
@@ -2,3 +2,4 @@
 <div id="googleMap" style="height:100%;width:100%;position:absolute;"></div>
 <div class="mapCenter" id="mapCenter"></div>
 <div class="listViewFilter" id="mapFilter"></div>
+

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ export default class Deeplink {`
`24`	`24`	`console.error(err, '<<< ERROR WHILE REGISTERING DEEP LINK.');`
`25`	`25`	`return callback(err);`
`26`	`26`	`}`
`27`		`-`
`28`	`27`	`callback(null, {`
`29`	`28`	`deeplinkId: result && result.data && result.data.deeplinkId ? result.data.deeplinkId : null,`
`30`	`29`	`deeplinkData: new Deeplink(result && result.data ? result.data : null)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`<div class="listViewFilter" id="filter"></div>`
	`2`	`+<div style="padding: 20px;">`
	`3`	`+</div>`