homeflowjs 0.13.8 → 0.13.12

package/__tests__/replace-image-dimensions.test.js

@@ -0,0 +1,72 @@
+import replaceImageDimensions from '../images/replaceImageDimensions';
+
+describe('replaceImageDimensions()', () => {
+  it('takes a path string, if string is null it will return an empty string', () => {
+    expect(replaceImageDimensions(null)).toEqual('');
+  });
+
+  it('takes a path string, if string is empty it will return an empty string', () => {
+    expect(replaceImageDimensions('')).toEqual('');
+  });
+
+  it('takes a path string, if string is undefined it will return an empty string', () => {
+    expect(replaceImageDimensions(undefined)).toEqual('');
+  });
+
+  it('takes a path with no dimensions or _x_ value and returns the updated path with width and height if set in options object', () => {
+    expect(
+      replaceImageDimensions('https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/HON230052_02.jpg', 1000, 1000),
+    ).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/1000x1000/HON230052_02.jpg',
+    );
+  });
+
+  it('takes an absolute path with _x_ returns the updated path with width and height if set in options object', () => {
+    expect(
+      replaceImageDimensions(
+        'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/_x_/HON230052_02.jpg',
+        1000,
+        1000,
+      ),
+    ).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/1000x1000/HON230052_02.jpg',
+    );
+  });
+
+  it('removes image path sizes 120x90 and replaces them with _x_ if options width and height are not set', () => {
+    expect(replaceImageDimensions('https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/120x90/HON230052_02.jpg')).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/_x_/HON230052_02.jpg',
+    );
+  });
+
+  it('removes image path sizes 120x90 and replaces them with width and height', () => {
+    expect(
+      replaceImageDimensions('https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/120x90/HON230052_02.jpg', 
+        1000,
+        1000,
+      ),
+    ).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/1000x1000/HON230052_02.jpg',
+    );
+  });
+
+  it('removes image path _x_ and replaces them with width and height', () => {
+    expect(
+      replaceImageDimensions('https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/_x_/HON230052_02.jpg', 1000, 1000),
+    ).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/1000x1000/HON230052_02.jpg',
+    );
+  });
+
+  it('removes image path width and replaces dimensions with default if width option is not set', () => {
+    expect(replaceImageDimensions('https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/220x_/HON230052_02.jpg')).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/_x_/HON230052_02.jpg',
+    );
+  });
+
+  it('removes image path height and replaces dimensions with default if height option is not set', () => {
+    expect(replaceImageDimensions('https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/_x220/HON230052_02.jpg')).toEqual(
+      'https://mr0.homeflow-assets.co.uk/files/photo/image/27190/2904/_x_/HON230052_02.jpg',
+    );
+  });
+});

package/images/replaceImageDimensions.js

@@ -1,33 +1,32 @@
-const replaceImageDimensions = (src, width = '_', height = '_') => {
-  if (!src) return null;
+const replaceImageDimensions = (src, width, height) => {
+  if (!src) return '';
 
-  const srcToArray = src.split('/');
-  // /files/photos/12345/6789/my-photo.jpg
-  const srcPathWithoutSize = !isNaN(srcToArray[srcToArray.length - 2])
-                            && !isNaN(srcToArray[srcToArray.length - 3]);
-  // /files/photos/12345/6789/_x_/my-photo.jpg
-  const srcPathWithSize = !isNaN(srcToArray[srcToArray.length - 3])
-                          && !isNaN(srcToArray[srcToArray.length - 4]);
-  const widthXheight = `${width}x${height}`;
-  const lastSlashIndex = src.lastIndexOf('/');
-  const secondTolastSlashIndex = src.lastIndexOf('/', lastSlashIndex - 1);
-  const pathBeforeFileName = src.substring(secondTolastSlashIndex, lastSlashIndex + 1);
-  let formatedSrc = null; // default to null
-  if ((srcPathWithoutSize || srcPathWithSize) && src.includes('_x_')) {
-    formatedSrc = src.replace('_x_', widthXheight);
-  }
-  if ((srcPathWithoutSize || srcPathWithSize) && !src.includes('_x_') && !pathBeforeFileName.includes('x')) {
-    formatedSrc = `${src.substring(0, lastSlashIndex + 1)}${widthXheight}${src.substr(lastSlashIndex)}`;
-  }
-  // src contains width or height set on the cms but not the component
-  if ((srcPathWithoutSize || srcPathWithSize) && !src.includes('_x_') && pathBeforeFileName.includes('x')) {
-    formatedSrc = src;
-  }
-  if (srcPathWithoutSize === srcPathWithSize) {
-    console.log('Source not supported', src);
-    formatedSrc = null;
+  const dimensions = `${width || '_'}x${height || '_'}`;
+
+  /**
+   * This will be used to add dimensions to a src that has no dimensions or _x_ values.
+   * For example /files/photos/12345/6789/my-photo.jpg => /files/photos/12345/6789/_x_/my-photo.jpg
+   */
+  function addDimensionsToPathWithoutSize(string) {
+    const lastSlashIndex = string.lastIndexOf('/');
+    return `${string.substring(0, lastSlashIndex + 1)}${dimensions}${string.substring(
+      lastSlashIndex,
+    )}`;
   }
-  return formatedSrc;
+
+  /**
+   * This covers:
+   * - Dimensions in format of 1000x1000
+   * - Dimensions in format of _x1000
+   * - Dimensions in format of 1000x_
+   * - Dimensions in format of _x_
+   * or
+   * - A path with no dimensions or _x_ values /files/photos/12345/6789/my-photo.jpg
+   */
+  const resizedPath = /\/(\d+|_)x(\d+|_)\//.test(src)
+    ? src.replace(/\/(\d+|_)x(\d+|_)\//, `/${dimensions}/`).trim() : addDimensionsToPathWithoutSize(src);
+
+  return resizedPath;
 };
 
 export default replaceImageDimensions;

package/instant-valuation/result-step/result-step.component.jsx

@@ -149,7 +149,7 @@ const ResultStep = ({
             </div>
           )}
 
-          { recentSales && <ValuationMap recentSales={recentSales} /> }
+          {!!recentSales?.length && <ValuationMap recentSales={recentSales} />}
 
           <div style={{ clear: 'both' }} />
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.13.8",
+  "version": "0.13.12",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-map/geonames-map.js

@@ -190,13 +190,13 @@ export default class GeonamesMap extends DraggableMap {
   }
 
   getMarkerBounds() {
-    const { polygon } = store.getState().search.currentSearch?.place;
+    const polygon = store.getState().search.currentSearch?.place?.polygon;
     if (this.viewport) {
       const viewportBounds = this.getViewportBounds();
       if (viewportBounds.flat().find(coordinate => coordinate === Infinity)) return null;
 
       return L.latLngBounds(...viewportBounds.map(bound => L.latLng(...bound)));
-    } else if (polygon && polygon.length) {
+    } else if (polygon && polygon?.length) {
       const polyBounds = [this.getTopRightPolygonCoordinates(polygon[0]), this.getBottomLeftPolygonCoordinates(polygon[0])];
       const options = Homeflow.get('custom_map_bounds_padding')
       const latLongBounds = L.latLngBounds(...polyBounds.map(bound => L.latLng(...bound)));