Merge pull request #1269 from osmlab/prerelease

v3.6.4

Author: nrotstan

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on
 This project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v3.6.4] - 2020-06-09
+### Added
+- Updated community translations
+
+### Fixed
+- Error during display of certain users with missing avatars
+
 
 ## [v3.6.3] - 2020-06-08
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maproulette3",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.0.0-beta.44",

src/components/CardChallenge/CardChallenge.js

@@ -60,7 +60,7 @@ export class CardChallenge extends Component {
         )}
       >
         <header className="mr-card-challenge__header" onClick={this.props.cardClicked}>
-          <div>
+          <div className="mr-max-w-full">
             <Taxonomy {...this.props} {...this.props.challenge} />
             <h3 className="mr-card-challenge__title">
               <Link

src/components/FeaturedChallenges/FeaturedChallengesWidget.js

@@ -73,7 +73,7 @@ const FeaturedList = props => {
     <CardChallenge
       {...props}
       key={challenge.id}
-      className="mr-card-challenge--featured mr-bg-transparent"
+      className="mr-card-challenge--featured mr-bg-transparent mr-w-full"
       challenge={challenge}
       isExpanded
       permanentlyExpanded

src/interactions/User/AsAvatarUser.js

@@ -1,4 +1,5 @@
 import _get from 'lodash/get'
+import _isEmpty from 'lodash/isEmpty'
 import defaultPic from '../../static/images/user_no_image.png'
 
 /**
@@ -14,9 +15,13 @@ export class AsAvatarUser {
   }
 
   profilePic(size) {
-    const urlParts = this.rawAvatarURL().replace(/\?s=\d+/, '?').split('?')
-    return /user_no_image/.test(this.rawAvatarURL()) ? defaultPic :
-           `${urlParts[0]}?s=${size}&${urlParts.slice(1).join('?')}`
+    const rawURL = this.rawAvatarURL()
+    if (_isEmpty(rawURL) || /user_no_image/.test(rawURL)) {
+      return defaultPic
+    }
+
+    const urlParts = rawURL.replace(/\?s=\d+/, '?').split('?')
+    return `${urlParts[0]}?s=${size}&${urlParts.slice(1).join('?')}`
   }
 }
 

src/interactions/User/AsAvatarUser.test.js

@@ -0,0 +1,14 @@
+import AsAvatarUser from './AsAvatarUser'
+import defaultPic from '../../static/images/user_no_image.png'
+
+describe('profilePic', () => {
+  it("returns default pic if user has empty avatar URL", () => {
+    const user = AsAvatarUser({avatarURL: ""})
+    expect(user.profilePic(200)).toEqual(defaultPic)
+  })
+
+  it("returns default pic if server is assigned default user_no_image avatar", () => {
+    const user = AsAvatarUser({avatarURL: "https://maproulette.org/images/user_no_image.jpg"})
+    expect(user.profilePic(200)).toEqual(defaultPic)
+  })
+})

src/lang/de.json

@@ -22,7 +22,7 @@
   }
 
   &__title {
-    @apply mr-my-1;
+    @apply mr-my-1 mr-max-w-full mr-break-words;
 
     a {
       @apply mr-text-white;