Commit Graph

6564 Commits

Author SHA1 Message Date
Peter Clement 1f13a9619c fix save button 2021-07-20 12:30:11 +01:00
Andrew Kingston ee84cdcbdf Update drawer components to work with new styles 2021-07-20 10:58:07 +01:00
Peter Clement def2a31e75 only enable form save button when config has changed 2021-07-20 10:55:39 +01:00
Andrew Kingston d58d977cd0 Update navigation link editor drawer to work with new drawer styles 2021-07-20 10:52:46 +01:00
Peter Clement 6dce0a88a4 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +01:00
mike12345567 63dba7b574 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-19 16:24:19 +01:00
Budibase Release Bot f518890ae0 v0.9.78 2021-07-19 14:23:03 +00:00
mike12345567 2bee1b6b56 Linting. 2021-07-19 14:32:14 +01:00
mike12345567 85f7b056d2 Fixing an issue with lucene equality searching, strings weren't handled correctly. 2021-07-19 14:31:06 +01:00
Keviin Åberg Kultalahti ba22156bd8 implements nps form component 2021-07-19 09:28:34 +02:00
Budibase Release Bot 49f1c20f17 v0.9.77 2021-07-16 18:52:46 +00:00
Michael Drury db559e738b Fixing issue with update row after rows API changed. 2021-07-16 19:13:44 +01:00
Peter Clement 3fbd762979 More error handling around config saving 2021-07-16 14:07:48 +01:00
Peter Clement 2afb6ffe2d Better error handling around config saving 2021-07-16 10:51:58 +01:00
Rory Powell f1d8b5516e Add Okta and OneLogin logos 2021-07-16 10:15:38 +01:00
Budibase Release Bot 5b2c463ebf v0.9.76 2021-07-15 23:23:00 +00:00
Andrew Kingston 53f4d6b790 Remove padding from empty layouts and add option for full width layout content 2021-07-16 00:14:44 +01:00
Rory Powell 25fdde6d21 Default public config.config when missing 2021-07-15 16:50:57 +01:00
Rory Powell 833e3cb3bf Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-15 16:21:03 +01:00
Rory Powell 70601b7cc5 Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Peter Clement 4e75b7f4c9 add new logic to support oauth and oidc buttons 2021-07-15 15:49:10 +01:00
Rory Powell 90c0e7b2c1 Merge branch 'develop' into feature/oidc-support 2021-07-15 14:05:30 +01:00
Rory Powell 9e24bc14e7 Add database test configuration to auth package 2021-07-15 12:55:35 +01:00
Budibase Release Bot fb334c6f15 v0.9.75 2021-07-15 10:12:28 +00:00
Michael Drury 4101c45c4b
Merge pull request #1989 from Budibase/fix/email-explanation
Email template descriptions/information
2021-07-15 11:04:36 +01:00
Rory Powell 121a8e5e9a Auto generate callback url and supply id on login 2021-07-14 16:21:17 +01:00
Rory Powell 356a765c92 Invert logos config naming to prevent conflict 2021-07-14 15:48:29 +01:00
Andrew Kingston 65acfe21f3 Update styles of modal bindable input 2021-07-14 15:46:47 +01:00
Andrew Kingston bddb6591d6 Update styles of server binding panel used for formula fields and automation bindings 2021-07-14 15:46:31 +01:00
Andrew Kingston 6b2ffaa273 Use automation block title in drawer for automation bindings 2021-07-14 15:46:00 +01:00
Andrew Kingston e894bb5ddc Disable save button in drawerbindableinput when syntax is invalid 2021-07-14 15:45:05 +01:00
Andrew Kingston deb0b2998f Update drawer styles, drawer bindable inputs and settings bindable inputs 2021-07-14 14:21:11 +01:00
Rory Powell 3704c75af9 Casing change to config checklist 2021-07-14 14:13:04 +01:00
mike12345567 ccb0e1b354 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-14 13:54:39 +01:00
mike12345567 1fa0b3f204 Rewording email template descriptions. 2021-07-14 13:24:46 +01:00
mike12345567 da5024633b Linting. 2021-07-14 13:18:27 +01:00
mike12345567 3f56a316c5 Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain. 2021-07-14 11:23:24 +01:00
Peter Clement ab1a10dd1b Fix config form saving bugs 2021-07-13 21:47:36 +01:00
Budibase Release Bot be0559606a v0.9.74 2021-07-13 16:53:42 +00:00
Rory Powell aa31ed8261 Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-13 17:33:08 +01:00
Rory Powell 8f8d0008df Update OAuth -> Authentication header 2021-07-13 17:32:57 +01:00
Peter Clement 86a421646d Add UUID to each oidc config to distinguish each provider 2021-07-13 17:32:08 +01:00
Rory Powell fef63a1b8e Update config checklist to handle multiple sso sources 2021-07-13 17:30:17 +01:00
Martin McKeaveney eba8f104fd fix postgres query array value 2021-07-13 17:11:11 +01:00
Rory Powell 40013d45c3 Load oidc config by id 2021-07-13 17:07:48 +01:00
Rory Powell fe5a81efbc Update reference to microsoft logo to use most recent name 2021-07-13 16:35:54 +01:00
Rory Powell 83bf736f07 Remove reference to oracle logo to fix build 2021-07-13 16:24:30 +01:00
Peter Clement 2900743545 Add UUID to each oidc config to distinguish each provider 2021-07-13 15:52:21 +01:00
Peter Clement ca0f74eee8 improve structure of OIDC config 2021-07-13 14:55:14 +01:00
Rory Powell 0982968f79 Setup common test data 2021-07-13 12:08:58 +01:00
Rory Powell 62533e40d7 Add jest to auth package devDependencies 2021-07-13 10:49:27 +01:00
Rory Powell 4c9308462e Remove redundant check on requireLocalAccount 2021-07-13 10:46:27 +01:00
Rory Powell 1a7619367b Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Rory Powell d25d9edda1 Test google auth strategy 2021-07-13 10:17:14 +01:00
Rory Powell 4f397740e0 Add jest to auth package + test oidc strategy 2021-07-13 10:02:08 +01:00
Andrew Kingston 0cf5f4dc3d
Merge pull request #1969 from Budibase/empty-layout-tweaks
Empty layout tweaks
2021-07-12 19:17:41 +01:00
mike12345567 c6d80e2265 Adding float type to MySQL. 2021-07-12 11:10:11 +01:00
mike12345567 dc32c90aaa Fixing some issues discovered with the new SQL connectors were the input type would always be string (causing some SQL types to break) - parsing these before input to attempt to fix this problem - issue referenced in #1943. 2021-07-12 10:51:30 +01:00
Martin McKeaveney 742402f4c7 merge with master 2021-07-11 18:07:46 +01:00
Rory Powell e1bea33d9a Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Andrew Kingston 05a06bc38a Remove padding from empty layouts and add option for full width layout content 2021-07-10 11:56:32 +01:00
Christo 4b48ea94e4 Test: Add some basic tests for mongodb queries 2021-07-09 20:08:26 +02:00
Rory Powell 2e55e03571 Trim empty space on auth0 and microsoft logos 2021-07-09 18:31:52 +01:00
Budibase Release Bot 3b07d3143b v0.9.73 2021-07-09 17:29:06 +00:00
Christo c6b1ea9a0f Feat: Add collection fields as "extra" query config for MongoDB 2021-07-09 19:28:46 +02:00
Kyle Harrison b4afda7b09 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Andrew Kingston a9d4f09782
Merge pull request #1953 from Budibase/client-feature-flags
Client library updating and client library feature awareness
2021-07-09 16:52:45 +01:00
Andrew Kingston efb0c60464 Remove log statement, batch uploads and remove unecessary conditional 2021-07-09 16:42:09 +01:00
Rory Powell 97a62594ed Update clientId -> clientID 2021-07-09 16:21:42 +01:00
Peter Clement 09b148e2c8 linting 2021-07-09 15:55:01 +01:00
Peter Clement de075a7549 Fix OIDC logo conditional display 2021-07-09 15:50:46 +01:00
Peter Clement 90e6db2be1 Linting and Optimisation 2021-07-09 15:05:39 +01:00
Peter Clement 4ae29f6b54 Fix bug where OIDC icon was not being displayed due to misconfiguration 2021-07-09 14:18:03 +01:00
Andrew Kingston dbac6d5988 Reload the client preview whenever client library version changes 2021-07-09 13:23:49 +01:00
Andrew Kingston a74d2a8040 Remove leftover code from testing 2021-07-09 12:42:48 +01:00
Andrew Kingston 986785cacf Bundle latest client library with the server and use it when updating apps in production 2021-07-09 12:33:09 +01:00
Peter Clement 38a00ba50e Update login page to support user based oidc icon and name 2021-07-09 09:49:34 +01:00
Peter Clement 80a35d6ef0 Add oidc icon and name to public api for login page 2021-07-09 09:49:16 +01:00
Rory Powell 94aa6b3711 Remove review comment 2021-07-09 09:37:52 +01:00
Rory Powell 63b13fc360 Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
Rory Powell 87f05e7d06 Always maintain original user id. No longer remove old user during sync 2021-07-08 16:49:07 +01:00
Rory Powell 8bea18e696 sync third party profile on every login 2021-07-08 16:11:48 +01:00
Rory Powell 7db8658518 remove duplicate scope definition
scope can be defined both within the strategy declaration or when invoking passport
2021-07-08 15:21:54 +01:00
Peter Clement 883e07491b Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management 2021-07-08 14:29:28 +01:00
Andrew Kingston 6d0125540d Move standard components from server dev dependencies to real dependencies 2021-07-08 14:00:14 +01:00
Andrew Kingston 567d8577ba Add tests for updating and reverting client library version 2021-07-08 13:20:52 +01:00
Rory Powell db9078cebe Linting 2021-07-08 13:12:25 +01:00
Rory Powell aa601f3701 Integrate with configuration ui / support for email usernames 2021-07-08 13:04:04 +01:00
Andrew Kingston 6716bf2da1 Add endpoint to revert client app version 2021-07-08 12:56:54 +01:00
Andrew Kingston 888323dd7e Fix modal flashing when reverting app version and fix version number being incorrect 2021-07-08 12:56:35 +01:00
Andrew Kingston 08578af4ba Add application/json as a known file type 2021-07-08 12:55:51 +01:00
Peter Clement 6a3367389d fixing conflict with OIDCButton 2021-07-08 12:36:09 +01:00
Rory Powell ef8b9b40c1 Save email from third party user 2021-07-08 11:54:16 +01:00
Peter Clement fcb4518f25 Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management 2021-07-08 11:38:28 +01:00
Peter Clement b86691f7ef fix issue where oidc config form was not loading due to oidc_logos being undefined 2021-07-08 11:15:22 +01:00
Rory Powell 238d31e922 Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-08 11:12:45 +01:00
Rory Powell 5ec79acabf Merge google/oidc user authentication and surface user relevant error messages during authentication 2021-07-08 11:12:34 +01:00
mike12345567 2bee348721 Fixing test cases. 2021-07-08 00:30:55 +01:00
mike12345567 2fc606f5b5 Linting. 2021-07-07 23:30:14 +01:00
mike12345567 cc67e2caa6 Adding sessions API. 2021-07-07 23:29:19 +01:00
mike12345567 278d984006 Changing budibase -> internal/csv in datasource menu. 2021-07-07 17:46:39 +01:00
Peter Clement 4b518af605 Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management 2021-07-07 17:42:31 +01:00
Peter Clement 02df5960c2 Add OIDC icon to login page 2021-07-07 17:39:26 +01:00
Andrew Kingston c1432ee8ec Add UI to revert app version and initial work on app revert backend 2021-07-07 17:35:28 +01:00
mike12345567 34143a76a8 Merge branch 'feature/plus-table-internal' of github.com:Budibase/budibase into feature/user-session 2021-07-07 17:32:09 +01:00
mike12345567 4d0425b19f Internal table detail screens should still have limit one. 2021-07-07 17:31:03 +01:00
mike12345567 1c7f47dbf2 Merge branch 'feature/plus-table-internal' of github.com:Budibase/budibase into feature/user-session 2021-07-07 17:22:50 +01:00
mike12345567 900ed2334c Inverting logic as the type isn't always internal. 2021-07-07 17:21:56 +01:00
mike12345567 7581360e9e Merge branch 'develop' of github.com:Budibase/budibase into feature/user-session 2021-07-07 17:17:16 +01:00
mike12345567 79b7747714 Fixing session issues after testing a bit. 2021-07-07 17:15:53 +01:00
mike12345567 3ab4a5d83c Making it possible to create an internal table from the plus symbol. 2021-07-07 17:13:04 +01:00
mike12345567 b8928077e2 Making it possible to create an internal table from the plus symbol. 2021-07-07 17:12:13 +01:00
Andrew Kingston a6b5861cbc Add client libary update management from inside the builder 2021-07-07 17:07:42 +01:00
Andrew Kingston 948ad092e5 Fix crash when referencing a component definition that doesn't exist 2021-07-07 17:07:16 +01:00
Peter Clement 8426ffc036 Fix for icon upload issue 2021-07-07 16:18:18 +01:00
Rory Powell 1c39c2f063 Fallback to ID token to retrieve email when not available in passport profile (oidc userinfo) 2021-07-07 14:58:14 +01:00
Andrew Kingston b8d1809a2c Use client feature flags to conditionally show theme picker 2021-07-07 13:55:05 +01:00
Andrew Kingston db276468aa Use client features to determine when to show client preview on initial load 2021-07-07 13:54:44 +01:00
Andrew Kingston 7040ee48f4 Store client features in frontend store 2021-07-07 13:54:21 +01:00
Andrew Kingston 54236ee031 Add feature flags to manifest 2021-07-07 13:53:59 +01:00
Peter Clement b5f398da4d Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Rory Powell 42c8526ac2 Add info to 403 responses 2021-07-07 13:28:55 +01:00
Andrew Kingston 4dec87795a Update develop with master bugfix and add comments to explain loading events 2021-07-07 13:21:30 +01:00
Budibase Release Bot 4afd6f4fbe v0.9.72 2021-07-07 12:19:03 +00:00
Andrew Kingston bf6762dd66 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-07 13:16:26 +01:00
Andrew Kingston 4b4610f581 Fix iframe preview loading bug in old client library versions 2021-07-07 13:09:33 +01:00
Budibase Release Bot cdd85c4d11 v0.9.71 2021-07-07 10:52:11 +00:00
Andrew Kingston 70d29c32f8 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-07 11:48:38 +01:00
Andrew Kingston 19f2a2067e Improve handling of permission issues and routing issues, and add an error fallback message 2021-07-07 11:29:35 +01:00
Andrew Kingston 1ef2820b5d Expose the screens and layouts from the screen store in the client library 2021-07-07 11:28:53 +01:00
Andrew Kingston b6c6dba721 Don't attempt to enrich a user object whenever the role is PUBLIC to avoid 403s 2021-07-07 11:28:35 +01:00
Andrew Kingston 8c39c4792d Add error handling to builder preview and loading indicator 2021-07-07 11:10:23 +01:00
Andrew Kingston 7b841e709a Mock redis shutdown method to avoid errors 2021-07-07 09:34:56 +01:00
Andrew Kingston e00a37d707 Only clean up app tmp dir if it exists during testing 2021-07-07 09:34:40 +01:00
Andrew Kingston 8f97ea3771 Swap row and column icons 2021-07-07 09:28:11 +01:00
Martin McKeaveney e9d6ddb571 typo 2021-07-06 18:56:41 +01:00
Martin McKeaveney dbef8077f0 better naming, filter out public from inheritable roles 2021-07-06 18:55:34 +01:00
Martin McKeaveney da800dd3fc prevent editing public role in apps 2021-07-06 18:54:08 +01:00
Martin McKeaveney 93b562e2df make logged in users basic by default, prevent allowing users to be assigned as default in the UI 2021-07-06 18:43:04 +01:00
Andrew Kingston eb620ea3ce Add basic fallback error to real apps when client library fails to load 2021-07-06 18:37:21 +01:00
Andrew Kingston 0381204855 Don't reload client app on 403, just show an error instead 2021-07-06 18:37:06 +01:00
mike12345567 36c0e45761 WIP - first version of user sessions. 2021-07-06 18:10:04 +01:00
Martin McKeaveney 6af078a546 public role in builder backend UI 2021-07-06 17:19:53 +01:00
Martin McKeaveney 561f824606 default to public in UI 2021-07-06 17:19:03 +01:00
Martin McKeaveney 4e8b140c52 default users without roles to public role 2021-07-06 17:13:02 +01:00
Andrew Kingston bd6de7fe31 Remove redirect when user only has access to one app 2021-07-06 17:00:44 +01:00
Michael Drury 659d42311c
Merge pull request #1932 from Budibase/fix/sql-relationship-validation
Adding validation to SQL relationship modal
2021-07-06 15:55:41 +01:00
Andrew Kingston c4b7428aed Avoid filter editor sending a prop change when filter is not an array, which was causing extra 409s and causing issues with tables 2021-07-06 15:55:02 +01:00
Andrew Kingston 4bc1938966 Fix data provider filtering on datetime fields 2021-07-06 15:54:25 +01:00
Andrew Kingston 83a91a8943 Fix bug with tabs causing them to broadcast a change event on mount 2021-07-06 15:53:52 +01:00
mike12345567 fd6080b39e Making sure that keys cannot be duplicated for primary keys, this wouldn't have any function. 2021-07-06 15:45:14 +01:00
mike12345567 a9c6b10560 Quick fix, make sure auto-columns never sent to DB. 2021-07-06 13:55:05 +01:00
mike12345567 6e33ab581b Linting. 2021-07-06 13:11:29 +01:00
mike12345567 b7a5476135 Don't allow foreign key to be the primary key of a row (this would break things). 2021-07-06 13:10:02 +01:00
mike12345567 568128479f Linting. 2021-07-06 12:59:55 +01:00
mike12345567 478a851956 Adding validation to the SQL relationship creation modal. 2021-07-06 12:58:36 +01:00
Andrew Kingston dfc499c034 Fix data provider filtering on datetime fields 2021-07-06 12:01:01 +01:00
Andrew Kingston 50d59924ad
Merge pull request #1918 from Budibase/spectrum-apps
Spectrum themed apps
2021-07-06 11:43:52 +01:00
Rory Powell 0745eedbcc Improve error handling on openid-configuration request 2021-07-06 10:03:40 +01:00
Rory Powell 624dd20522 Use configuration url to retrieve oidc endpoints
The /.well-known/openid-configuration endpoint can be used to
retrieve the majority of configuration needed for oidc

Additionally refactor the callback url to be generated on the server
side as this is a fixed endpoint.

Add linting fixes
2021-07-06 10:03:40 +01:00
Bernhard Hayden 65c436145a Proof of concept OIDC implementation 2021-07-06 10:03:40 +01:00
Andrew Kingston fe62356808 Remove inline-block from links as it is not needed 2021-07-06 09:24:02 +01:00
mike12345567 6a8fd12805 Linting. 2021-07-05 18:16:04 +01:00
mike12345567 4e4b8f244e Giving the system the ability to make auto increment columns auto-columns in postgres or mysql. 2021-07-05 18:11:23 +01:00
Andrew Kingston 80679cba13 Merge branch 'develop' of github.com:Budibase/budibase into spectrum-apps 2021-07-05 17:41:26 +01:00
Andrew Kingston 322ea442d8 Fix cypress test 2021-07-05 17:37:38 +01:00
mike12345567 c10e2da4f5 Fixing issue with TS definitions. 2021-07-05 17:33:36 +01:00
mike12345567 13fab4ba60 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-05 17:17:32 +01:00
Andrew Kingston 7ecb593e0f Remove ES6 optional chaining from server package 2021-07-05 17:05:34 +01:00
Andrew Kingston 2317e87436 Preserve whitespace in card description 2021-07-05 16:47:44 +01:00
Andrew Kingston f227f0623f Lint 2021-07-05 16:47:30 +01:00
Budibase Release Bot 54dae1b5a2 v0.9.70 2021-07-05 14:38:21 +00:00
mike12345567 abc19bc2c1 Linting. 2021-07-05 15:16:32 +01:00
mike12345567 b4d91769cc Fixing issue with single quotes in strings breaking JSON parsing. 2021-07-05 15:14:45 +01:00
Andrew Kingston 77ae0e58b8 Add placholder color to color picker component to represent undefined color choice 2021-07-05 14:31:10 +01:00
Peter Clement f61c5b8143 Add validation to backend for OIDC configuration 2021-07-05 14:27:19 +01:00
Peter Clement 904ce29315 Front End form for OIDC configuration 2021-07-05 14:25:42 +01:00
Andrew Kingston a84d1d2ec8 Update remaining static color variables to spectrum instead 2021-07-05 14:02:49 +01:00
Andrew Kingston d5cfcc8ba7 Fix mobile drawer not using spectrum colours 2021-07-05 13:56:04 +01:00
mike12345567 58c5ddaa90 Review comments. 2021-07-05 11:06:39 +01:00
mike12345567 8254880fa8 Quick fixes for UI, making sure relationships UI not displayed unless tables exist and fixing issue with through being sent up with one-to-many. 2021-07-05 11:03:54 +01:00
mike12345567 dcd4774693 Re-working UI after some review. 2021-07-05 10:48:28 +01:00
Andrew Kingston 1b094b43ef Fix font family issue with date pickers 2021-07-05 10:24:44 +01:00
Andrew Kingston a3d1b959fc Update list and detail autoscreens to be theme aware and use new designs 2021-07-05 10:20:20 +01:00
Andrew Kingston af8f616624 Remove built-in padding from forms to be consistent with every other component 2021-07-05 10:19:59 +01:00
Andrew Kingston 0422b3cdf3 Add quiet prop to button 2021-07-05 10:19:27 +01:00
Andrew Kingston c9259aee36 Add quiet prop to buttons and size styles to form 2021-07-05 10:19:07 +01:00
mike12345567 f3f2af1c1d Linting. 2021-07-05 09:38:01 +01:00
Andrew Kingston 4c9279bd91 Update colors of selection and hover indicators in client apps 2021-07-05 09:37:06 +01:00
mike12345567 1314edeef1 Allowing user firstname and lastname to be updated through user portal. 2021-07-05 09:29:16 +01:00
Andrew Kingston 07ed0b1217 Merge branch 'develop' of github.com:Budibase/budibase into spectrum-apps 2021-07-05 09:03:24 +01:00
mike12345567 7caf185e01 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-03 11:28:38 +01:00
mike12345567 2e18abd342 Linting. 2021-07-03 11:16:29 +01:00
mike12345567 e170d9d146 Re-writing a bit so that it is aware some functionality is SQL only, makes future plus endpoints easier. 2021-07-03 11:15:01 +01:00
mike12345567 579bce8a6a Fixing little UI bugs. 2021-07-03 10:26:37 +01:00
mike12345567 3dc877f315 Linting. 2021-07-02 18:44:01 +01:00
mike12345567 ec889320bc Fixing issue with many to many through junction table not realising some exist, or some need deleted - as well as removing limit from details screen, this was blocking join statements and served no purpose (its already a search by equals). 2021-07-02 18:42:01 +01:00
mike12345567 922e209c72 Updating server test cases. 2021-07-02 14:49:47 +01:00
mike12345567 499c28d883 Linting. 2021-07-02 14:36:24 +01:00
mike12345567 56d83864ea Removing console logs and simplifying the relationship name. 2021-07-02 14:35:05 +01:00