From 43bb4685d3805edbe3ea37a950adaaa21010ce20 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 21 Feb 2023 05:26:25 +0100 Subject: [PATCH 1/7] Check that about !== 'null' cause the resolver has an undefinedToNull. --- webapp/pages/map.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 424061203..a1cdceff4 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -257,7 +257,7 @@ export default { ` description += - e.features[0].properties.about && e.features[0].properties.about.length > 0 + e.features[0].properties.about && e.features[0].properties.about !== 'null' && e.features[0].properties.about.length > 0 ? `
From f104bdcdd001afe4e2c3bf6b3e0127cb1dd72e36 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 21 Feb 2023 05:59:11 +0100 Subject: [PATCH 2/7] Correct linting. --- webapp/pages/map.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index a1cdceff4..9473606e6 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -257,7 +257,9 @@ export default {
` description += - e.features[0].properties.about && e.features[0].properties.about !== 'null' && e.features[0].properties.about.length > 0 + e.features[0].properties.about && + e.features[0].properties.about !== 'null' && + e.features[0].properties.about.length > 0 ? `
From df078f18d8663cfc79c61b5ac8298f7bec6fcae3 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 21 Feb 2023 06:01:42 +0100 Subject: [PATCH 3/7] Correct order of tests. --- webapp/pages/map.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 9473606e6..c0f052961 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -258,8 +258,8 @@ export default { ` description += e.features[0].properties.about && - e.features[0].properties.about !== 'null' && - e.features[0].properties.about.length > 0 + e.features[0].properties.about.length > 0 && + e.features[0].properties.about !== 'null' ? `
From c3b2379af0156a6ebeb80d375d25ad47721e1f47 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 21 Feb 2023 10:22:16 +0100 Subject: [PATCH 4/7] markers.geoJSON made 'null' out of a property that had null in it. So added a check on the value and set undefined if value is null. --- webapp/pages/map.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index c0f052961..753ace576 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -258,8 +258,7 @@ export default { ` description += e.features[0].properties.about && - e.features[0].properties.about.length > 0 && - e.features[0].properties.about !== 'null' + e.features[0].properties.about.length > 0 ? `
@@ -338,7 +337,7 @@ export default { id: user.id, slug: user.slug, name: user.name, - about: user.about, + about: user.about ? user.about : undefined, }, geometry: { type: 'Point', @@ -359,7 +358,7 @@ export default { id: group.id, slug: group.slug, name: group.name, - about: group.about, + about: group.about ? group.about : undefined, }, geometry: { type: 'Point', @@ -379,7 +378,7 @@ export default { id: this.currentUser.id, slug: this.currentUser.slug, name: this.currentUser.name, - about: this.currentUser.about, + about: this.currentUser.about ? this.currentUser.about : undefined, }, geometry: { type: 'Point', From b5de63f43f60d53bd9019e12f4cdbe20db2a7d11 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 21 Feb 2023 10:23:49 +0100 Subject: [PATCH 5/7] Remove lint fixe that isn't needed anymore. --- webapp/pages/map.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 753ace576..3779d4f18 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -257,8 +257,7 @@ export default {
` description += - e.features[0].properties.about && - e.features[0].properties.about.length > 0 + e.features[0].properties.about && e.features[0].properties.about.length > 0 ? `
From 5cd3725a0df32324c316bc003d816964b781d409 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 21 Feb 2023 11:39:51 +0100 Subject: [PATCH 6/7] Withdrew space. --- webapp/pages/map.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 3779d4f18..6f663b6b1 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -357,7 +357,7 @@ export default { id: group.id, slug: group.slug, name: group.name, - about: group.about ? group.about : undefined, + about: group.about ? group.about : undefined, }, geometry: { type: 'Point', From b45e4b5990dc418ecc1712a95f79d70679819372 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 28 Feb 2023 09:55:34 +0100 Subject: [PATCH 7/7] Refactor create user with defined about --- backend/src/db/factories.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js index 3e164d51b..ecc792736 100644 --- a/backend/src/db/factories.js +++ b/backend/src/db/factories.js @@ -65,7 +65,6 @@ Factory.define('basicUser') name: faker.name.findName, password: '1234', role: 'user', - about: faker.lorem.paragraph, termsAndConditionsAgreedVersion: '0.0.1', termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z', allowEmbedIframes: false, @@ -82,12 +81,28 @@ Factory.define('basicUser') Factory.define('userWithoutEmailAddress') .extend('basicUser') + .option('about', faker.lorem.paragraph) + .after(async (buildObject, options) => { + return neode.create('User', buildObject) + }) + +Factory.define('userWithAboutNull') + .extend('basicUser') + .option('about', null) + .after(async (buildObject, options) => { + return neode.create('User', buildObject) + }) + +Factory.define('userWithAboutEmpty') + .extend('basicUser') + .option('about', '') .after(async (buildObject, options) => { return neode.create('User', buildObject) }) Factory.define('user') .extend('basicUser') + .option('about', faker.lorem.paragraph) .option('email', faker.internet.exampleEmail) .option('avatar', () => Factory.build('image', {