Commit Graph

3301 Commits

Author SHA1 Message Date
mike12345567 0e854473f0 Putting together the basics of the compose system, this is now functional, along with some handy scripts to make it work. This requires minimum docker 1.25.0 to run due to the use of --env-file. 2020-12-11 16:38:40 +00:00
Andrew Kingston cb7b5ae306 Fix lint 2020-12-11 16:19:56 +00:00
Andrew Kingston cae551fa77 Keep honouring selected screen access role after swapping to layout tab 2020-12-11 15:29:25 +00:00
Andrew Kingston 84e1f54fa0 Improve navigation when logging in and out, remove need to hard reload the page and replace with smooth transitions 2020-12-11 14:24:19 +00:00
Joe 2a55f2abf2 Text changed
Changing 'Invalid chart options' to 'Use the settings panel to build your chart'. I feel this is more appropriate.
2020-12-10 11:11:53 +00:00
Andrew Kingston 8022fc1230 Select new role when creating screen with a different role than the selected one 2020-12-09 19:04:46 +00:00
Andrew Kingston 48a1932bc3 Lint 2020-12-09 18:56:54 +00:00
Andrew Kingston 01ee1a1145 Reduce nav item selected state border radius slightly 2020-12-09 18:41:18 +00:00
Andrew Kingston 7768b9ace8 Allow multiple screens to have the same URL as long as role is different 2020-12-09 18:39:49 +00:00
Andrew Kingston e5a34871c7 Add role selection for viewing screens and smart handling of preview screen 2020-12-09 18:18:47 +00:00
mike12345567 90cfad1dad Linting. 2020-12-09 18:02:10 +00:00
mike12345567 a94ce70cee Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 18:01:38 +00:00
mike12345567 7b21acd8bd Updating API key controller in self-host mode to return self host API key. 2020-12-09 17:10:53 +00:00
mike12345567 1cbe3771ab Adding in self hosted API key. 2020-12-09 17:04:05 +00:00
Andrew Kingston 248a1f456f Fix empty screen list when deleting a table backing an autoscreen which is currently selected 2020-12-09 16:01:16 +00:00
Andrew Kingston e0d902d279 Fix merge bug 2020-12-09 15:58:34 +00:00
Andrew Kingston 045f0f1bfe Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-09 15:57:32 +00:00
Andrew Kingston c0c2583e09 Force white background behind prevrew iframe regardless of theme to better reflect what the real app will look like 2020-12-09 15:43:06 +00:00
Andrew Kingston 80e1c4f978 Fix z index in beta warning 2020-12-09 15:42:44 +00:00
Andrew Kingston b842a2addc Cache roles in store and add role selector for screens 2020-12-09 15:35:57 +00:00
mike12345567 9c9cdcc3de Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 15:21:34 +00:00
Andrew Kingston 74d7316e2f Allow role selection when creating new screen 2020-12-09 14:53:17 +00:00
Andrew Kingston 660345313c Navigate to new layout after creating it 2020-12-09 14:53:03 +00:00
Andrew Kingston 4e748dad2b Fix bugs around selecting screens and layouts when creating them 2020-12-09 14:51:42 +00:00
kevmodrome d0997efadb colorpicker for links in card component now works correctly 2020-12-09 15:27:24 +01:00
Andrew Kingston 1188a96877 Fix crash when adding a link 2020-12-09 14:14:10 +00:00
kevmodrome d454d1a2d1 fixes link text colors 2020-12-09 15:12:10 +01:00
Andrew Kingston fba15e6d70 Remove client CSS bundle from index.html template 2020-12-09 12:33:09 +00:00
mike12345567 6f9340c4d2 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/security-update 2020-12-09 12:30:49 +00:00
mike12345567 3959a18406 Removing the static CSS bundling from the server as it is no longer required. 2020-12-09 12:30:21 +00:00
Andrew Kingston 0bb192ce0c Purge all references to _css prop or saving stylesheets 2020-12-09 12:22:30 +00:00
kevmodrome 11ff8586d5 changes settings prop of card link color 2020-12-09 13:21:04 +01:00
Andrew Kingston 22932d7b52 Fix routing setting and add initial role ID setting to screens for testing 2020-12-09 12:16:00 +00:00
Andrew Kingston 31b3fac659 Fix crash when having a screen selected that was deleted 2020-12-09 11:37:09 +00:00
Andrew Kingston 05b9c3fa68 Fix selected row state not resetting properly 2020-12-09 11:31:50 +00:00
kevmodrome 2fcdf3483b adds colorpicker to card componeent 2020-12-09 12:00:17 +01:00
mike12345567 36432a490f Updating row controller to make sure that all user requests (bar deletion) are passed through correctly to the user controller so that any logic such as removing user password can be correctly held in the user controller logic. 2020-12-09 10:54:30 +00:00
mike12345567 4ce920df01 Updating row controller to make sure that all user requests (bar deletion) are passed through correctly to the user controller so that any logic such as removing user password can be correctly held in the user controller logic. 2020-12-09 10:52:18 +00:00
mike12345567 a464feba6d Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 10:02:33 +00:00
Martin McKeaveney 733c28e229 further tidy up 2020-12-08 18:57:19 +00:00
mike12345567 4d5ac0ee9e Updating builder/server in a few ways, to allow creating users with extra columns attached, allowing password to be updated in the builder and making sure that all row endpoints correctly pass through the user controller so that we can still have customised functionality for users (such as making sure password is never returned). 2020-12-08 17:33:08 +00:00
Martin McKeaveney fb569a4425 fixing bugs found during testing 2020-12-08 16:55:43 +00:00
mike12345567 a3a8f01452 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 16:12:29 +00:00
Andrew Kingston a926b23720 Sort routes to ensure the client router always matches correctly 2020-12-08 15:44:35 +00:00
Andrew Kingston 3c6be9d481 Sort path groupings 2020-12-08 15:34:15 +00:00
Andrew Kingston ff3e79696d Fix bug which caused autolinks to not be generated 2020-12-08 15:21:01 +00:00
Andrew Kingston e16e909c65 Fix indentation level in screen and layout trees 2020-12-08 15:11:26 +00:00
Andrew Kingston 495427082f Add custom renderer for user roles to show pretty names 2020-12-08 14:03:47 +00:00
mike12345567 2ad44fe60a Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 13:45:53 +00:00
mike12345567 48e40cde99 Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:41:07 +00:00
Andrew Kingston 77f049d1bd Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:16:53 +00:00
mike12345567 79cfc5ea01 Fixing an issue with power user not being usable. 2020-12-08 12:20:37 +00:00
mike12345567 9a63252666 Fixing automations to use recurseMustache from utilities. 2020-12-08 11:47:33 +00:00
Andrew Kingston 1c73786226 Update user editing to support new email field 2020-12-08 11:43:37 +00:00
Andrew Kingston b7cb7c59a0 Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 11:42:29 +00:00
Martin McKeaveney b7f628e250 lint 2020-12-08 11:23:06 +00:00
Martin McKeaveney 1a226214e9 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 11:12:27 +00:00
Martin McKeaveney 994f87e82b lint 2020-12-08 11:07:16 +00:00
Martin McKeaveney 5f0aa7e584 Merge branch 'master' into feature/page-refactor 2020-12-08 10:48:14 +00:00
Martin McKeaveney 3af1b7bad7 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 10:32:52 +00:00
Martin McKeaveney a803ee8f71 Different names for home and login screen 2020-12-08 10:32:45 +00:00
Andrew Kingston fd207af6ad Tidy up builder preview iframe 2020-12-08 10:16:01 +00:00
Andrew Kingston 5130bdf3cd Improve handling of routes and screens. Fix issue which could prevent logging in depending on order of screens in app definition 2020-12-08 10:15:33 +00:00
Andrew Kingston 88e6da5e49 Remove client bundle from being packaged with the builder 2020-12-08 10:14:02 +00:00
Martin McKeaveney 7fc7500fa3 merge with master 2020-12-07 21:32:45 +00:00
Martin McKeaveney c00af29fbc rename level to role in test 2020-12-07 21:28:16 +00:00
Martin McKeaveney 39473cb029 merge 2020-12-07 21:20:35 +00:00
Martin McKeaveney cffa809316 fix tests 2020-12-07 21:11:07 +00:00
Martin McKeaveney ccb6b59588 code review 2020-12-07 20:46:37 +00:00
Martin McKeaveney a7789067d3 fix layout bugs, some tidy up 2020-12-07 20:29:41 +00:00
Andrew Kingston b70512ada2 Add custom modal for creating and editing users 2020-12-07 19:05:39 +00:00
mike12345567 74f5197865 Merge branch 'username-email' of github.com:Budibase/budibase into feature/security-update 2020-12-07 18:08:20 +00:00
mike12345567 837778c250 Fixing test case and also making sure that external trigger does what its expected to. 2020-12-07 17:55:35 +00:00
mike12345567 ed292db82e Updating test so that it doesn't chain. 2020-12-07 17:42:31 +00:00
mike12345567 a9c2f7f20b Linting. 2020-12-07 17:24:10 +00:00
mike12345567 63f38ce99d Making chaining of automations through different row creation/deletions possible. 2020-12-07 17:23:53 +00:00
Martin McKeaveney a104e5c1e7 remove dupe import 2020-12-07 16:06:50 +00:00
Martin McKeaveney bc6ae452d1 fix layout selection issues 2020-12-07 16:06:20 +00:00
Andrew Kingston 4ddc61faa3 Remove log statement 2020-12-07 15:59:37 +00:00
Andrew Kingston 6d6b89b522 Fix crash when changing screen layout 2020-12-07 15:59:19 +00:00
Martin McKeaveney 3af5ec36b8 merge 2020-12-07 15:53:51 +00:00
Martin McKeaveney 74f138ee9a lint 2020-12-07 15:49:19 +00:00
Martin McKeaveney a9d0c68a60 component store refactor - remove concept of currentPreviewItem and currentComponentInfo 2020-12-07 15:27:46 +00:00
mike12345567 3339f364b6 Updating role constraints and making sure roles can't be deleted if they are in use. 2020-12-07 15:21:06 +00:00
Andrew Kingston f8f7a73a67 Fix URLs when clicking on screens 2020-12-07 10:32:58 +00:00
Martin McKeaveney 0439a101a3 replace appimage with native linux packages 2020-12-07 10:15:27 +00:00
Martin McKeaveney 6b5c1ffafa consolidate routing and component selection 2020-12-05 12:09:58 +00:00
Martin McKeaveney 40f6093198 allow renaming of layouts 2020-12-05 09:43:00 +00:00
Martin McKeaveney 64c4f0d300 deletion and error handling of layouts 2020-12-04 23:42:22 +00:00
Martin McKeaveney 3b049bc286 allow creation of custom layouts, moving layoutId prop to top level of screen 2020-12-04 23:16:07 +00:00
mike12345567 ffad7bb3d0 Some work towards replication of couch locally. 2020-12-04 17:10:01 +00:00
Andrew Kingston d628edffe0 Remove log statement 2020-12-04 14:52:48 +00:00
Andrew Kingston c33a3274d4 Fix new screen button placement 2020-12-04 14:52:40 +00:00
Martin McKeaveney 15279f2c41 lint 2020-12-04 14:46:21 +00:00
Andrew Kingston 049e046192 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-04 14:08:13 +00:00
Andrew Kingston dbe754dea4 Fix screen list UI width and tidy up unused imports 2020-12-04 14:07:56 +00:00
Andrew Kingston 5f811b9852 Remove log statement 2020-12-04 14:07:23 +00:00
Andrew Kingston f1d4b60b97 Add basic role by default to new screens 2020-12-04 14:06:55 +00:00
Andrew Kingston 155c375ada Update client library to work with template screens in real preview 2020-12-04 14:04:07 +00:00
Andrew Kingston 75e4b4f8cd Change screen templates to be functions which can be enriched by the application 2020-12-04 14:03:40 +00:00
Andrew Kingston 0eb599ee16 Fix bug with getting screen list in app definition 2020-12-04 14:02:58 +00:00
mike12345567 54e3c3a90f Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/security-update 2020-12-04 14:01:13 +00:00
Andrew Kingston cecf4e9bca Fix bug with checking user access 2020-12-04 14:01:10 +00:00
mike12345567 1c37299107 Fixing a caching bug found by cheeks. 2020-12-04 14:01:02 +00:00
mike12345567 bf82348f9f Hopefully a fix for the 4001 bug we have been experiencing. 2020-12-04 13:45:14 +00:00
Martin McKeaveney ad4e4e4679 update user id generation 2020-12-04 13:28:19 +00:00
Martin McKeaveney f05d696ef7 email as default user identifier 2020-12-04 12:22:45 +00:00
mike12345567 6f3c4ba0ea Hopefully a fix for the 4001 bug we have been experiencing. 2020-12-04 12:09:02 +00:00
mike12345567 ee37bca225 Quick fixes for self deployment. 2020-12-04 12:07:51 +00:00
Andrew Kingston 3aaf0e644a Update stat card to use new component SDK 2020-12-04 09:13:38 +00:00
Andrew Kingston 3164b45f95 Merge branch 'master' of github.com:Budibase/budibase into stat-card 2020-12-04 09:00:43 +00:00
Andrew Kingston a8a8b60a55 Fix variable name in returned message when deleting a role 2020-12-04 08:28:35 +00:00
Andrew Kingston 922256790c Update errors box to work better in dark theme 2020-12-04 08:27:59 +00:00
Andrew Kingston 1bc339679a Add modal for editing user roles 2020-12-04 08:27:42 +00:00
mike12345567 a5d2e9a3b9 Some work to not contact lambda or use quotas when deploying locally. 2020-12-03 17:45:20 +00:00
Martin McKeaveney 277524b86e accommodate login layout 2020-12-03 17:31:38 +00:00
Martin McKeaveney d88b0d3811 allow selection of layout 2020-12-03 15:25:17 +00:00
Martin McKeaveney a093297a4e tidy up 2020-12-03 15:19:19 +00:00
Martin McKeaveney 0a5eac2c7f more intelligent routing for screens and pages 2020-12-03 15:15:14 +00:00
mike12345567 3bcbb5f27c Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-03 15:01:41 +00:00
mike12345567 4b48e338e7 Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2020-12-03 15:01:28 +00:00
kevmodrome 234ec561ac lint fix 2020-12-03 15:39:24 +01:00
kevmodrome afac1857bc now uses RichText component in create/edit row modal on the backend 2020-12-03 15:37:04 +01:00
kevmodrome 5d686e22ff adds rollup-json to standard-components and adds RichText to Form component 2020-12-03 15:03:17 +01:00
mike12345567 623afd6459 Making public and basic roles accessible. 2020-12-03 12:28:30 +00:00
kevmodrome f25126e412 adds new richtext version and adds it to the Form component 2020-12-03 13:19:14 +01:00
mike12345567 2a41f57382 Linting and update to try and fix issues when screens are created, screen saving now generates CSS. 2020-12-03 12:08:33 +00:00
Andrew Kingston 88f15ab9d4 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-03 08:54:23 +00:00
Andrew Kingston 13a137ecd1 Update client app to work with layouts when running inside builder preview 2020-12-02 18:10:46 +00:00
mike12345567 622f295e21 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-02 18:07:30 +00:00
mike12345567 c0ccf67283 Quick fix and making sure CSS temp files in app directory don't get uploaded. 2020-12-02 18:07:17 +00:00
Martin McKeaveney c0c8c430ea serve app assets 2020-12-02 17:42:59 +00:00
mike12345567 19faffff83 Changing the role system to have permissions integrated rather than the permissions being per user. 2020-12-02 17:08:25 +00:00
Martin McKeaveney d7bff037bc tidy up 2020-12-02 17:07:30 +00:00
Martin McKeaveney 9b25a61706 allow editing of screen layout from modal 2020-12-02 16:15:14 +00:00
Martin McKeaveney f9736ec3bc component tree layout/screen agnostic 2020-12-02 15:19:38 +00:00
Martin McKeaveney e9297ee1c7 E2E working 2020-12-02 14:49:43 +00:00
mike12345567 a21e38a1a7 Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-02 14:18:49 +00:00
Martin McKeaveney 13824dcf09 merge 2020-12-02 14:15:07 +00:00
Andrew Kingston ce2bff5bab Move selection highlighting in builder preview in to client library and replace handlebars with mustache again 2020-12-02 13:49:24 +00:00
Martin McKeaveney 894eeb8757 merge 2020-12-02 13:44:44 +00:00
Martin McKeaveney ffc7e14bb2 fix preview save 2020-12-02 13:41:00 +00:00
mike12345567 4319c4bb3f Linting. 2020-12-02 13:27:20 +00:00
mike12345567 1a9f1aed9b Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/page-refactor 2020-12-02 13:26:57 +00:00
mike12345567 326551d2ed Linting. 2020-12-02 13:21:13 +00:00
mike12345567 05225f7787 Changing the naming of access levels to be roles. 2020-12-02 13:20:56 +00:00
Andrew Kingston 3ffeda9da9 Replace mustache usage in client library with handlebars instead 2020-12-02 12:46:36 +00:00
mike12345567 de26870303 Merge branch 'component-sdk' of github.com:Budibase/budibase into feature/self-hosting 2020-12-01 17:54:50 +00:00
mike12345567 3dde3e0581 Making sure deployment object is used everywhere to hide all underlying deployment properties. 2020-12-01 16:51:17 +00:00
Martin McKeaveney 1c2a869e26 merge 2020-12-01 16:31:40 +00:00