Commit Graph

3301 Commits

Author SHA1 Message Date
mike12345567 f2b19aab3f 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 a3992acfa8 Fix lint 2020-12-11 16:19:56 +00:00
Andrew Kingston 672fe3fcc9 Keep honouring selected screen access role after swapping to layout tab 2020-12-11 15:29:25 +00:00
Andrew Kingston 6937c8e054 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 1f203ae586 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 ef9415ae3b Select new role when creating screen with a different role than the selected one 2020-12-09 19:04:46 +00:00
Andrew Kingston db40514eb1 Lint 2020-12-09 18:56:54 +00:00
Andrew Kingston c8d7ef40ca Reduce nav item selected state border radius slightly 2020-12-09 18:41:18 +00:00
Andrew Kingston 3abacb3b65 Allow multiple screens to have the same URL as long as role is different 2020-12-09 18:39:49 +00:00
Andrew Kingston bd488463cb Add role selection for viewing screens and smart handling of preview screen 2020-12-09 18:18:47 +00:00
mike12345567 6718287a65 Linting. 2020-12-09 18:02:10 +00:00
mike12345567 8426998e77 Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 18:01:38 +00:00
mike12345567 1904ec8bb4 Updating API key controller in self-host mode to return self host API key. 2020-12-09 17:10:53 +00:00
mike12345567 bc5f520a03 Adding in self hosted API key. 2020-12-09 17:04:05 +00:00
Andrew Kingston ce917b5005 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 52dd9760c5 Fix merge bug 2020-12-09 15:58:34 +00:00
Andrew Kingston fdbb8ac61c Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-09 15:57:32 +00:00
Andrew Kingston 5f37cabd24 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 fdfe16a649 Fix z index in beta warning 2020-12-09 15:42:44 +00:00
Andrew Kingston 4dd0d5b016 Cache roles in store and add role selector for screens 2020-12-09 15:35:57 +00:00
mike12345567 3c2ca11d31 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 15:21:34 +00:00
Andrew Kingston 5882f76c9a Allow role selection when creating new screen 2020-12-09 14:53:17 +00:00
Andrew Kingston 112fce654c Navigate to new layout after creating it 2020-12-09 14:53:03 +00:00
Andrew Kingston 31f0b51039 Fix bugs around selecting screens and layouts when creating them 2020-12-09 14:51:42 +00:00
kevmodrome 71fa1e1700
colorpicker for links in card component now works correctly 2020-12-09 15:27:24 +01:00
Andrew Kingston b5637dbffc Fix crash when adding a link 2020-12-09 14:14:10 +00:00
kevmodrome 19cd58a5ac
fixes link text colors 2020-12-09 15:12:10 +01:00
Andrew Kingston 0d1ab8ce56 Remove client CSS bundle from index.html template 2020-12-09 12:33:09 +00:00
mike12345567 b73210bf9d Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/security-update 2020-12-09 12:30:49 +00:00
mike12345567 c3abc9fed4 Removing the static CSS bundling from the server as it is no longer required. 2020-12-09 12:30:21 +00:00
Andrew Kingston a8a7a94eff Purge all references to _css prop or saving stylesheets 2020-12-09 12:22:30 +00:00
kevmodrome a91fc28eb9
changes settings prop of card link color 2020-12-09 13:21:04 +01:00
Andrew Kingston c65425d631 Fix routing setting and add initial role ID setting to screens for testing 2020-12-09 12:16:00 +00:00
Andrew Kingston 68ed9e9f32 Fix crash when having a screen selected that was deleted 2020-12-09 11:37:09 +00:00
Andrew Kingston 2e68f51b8f Fix selected row state not resetting properly 2020-12-09 11:31:50 +00:00
kevmodrome a300120b96
adds colorpicker to card componeent 2020-12-09 12:00:17 +01:00
mike12345567 40d855df10 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 c490e97573 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 3a2a1a504d Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 10:02:33 +00:00
Martin McKeaveney e48be7a109 further tidy up 2020-12-08 18:57:19 +00:00
mike12345567 2928a379b0 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 f355a16ca4 fixing bugs found during testing 2020-12-08 16:55:43 +00:00
mike12345567 f9d2e4e4e1 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 16:12:29 +00:00
Andrew Kingston c9514cefc6 Sort routes to ensure the client router always matches correctly 2020-12-08 15:44:35 +00:00
Andrew Kingston e472150f30 Sort path groupings 2020-12-08 15:34:15 +00:00
Andrew Kingston 36ca1143e1 Fix bug which caused autolinks to not be generated 2020-12-08 15:21:01 +00:00
Andrew Kingston 0f1ae6a28a Fix indentation level in screen and layout trees 2020-12-08 15:11:26 +00:00
Andrew Kingston 882092784a Add custom renderer for user roles to show pretty names 2020-12-08 14:03:47 +00:00
mike12345567 1f8e5006ad Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 13:45:53 +00:00
mike12345567 bc399df6fd Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:41:07 +00:00
Andrew Kingston 9054a8014a Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:16:53 +00:00
mike12345567 57029e737b Fixing an issue with power user not being usable. 2020-12-08 12:20:37 +00:00
mike12345567 130f69caf5 Fixing automations to use recurseMustache from utilities. 2020-12-08 11:47:33 +00:00
Andrew Kingston d0f2d4c2cd Update user editing to support new email field 2020-12-08 11:43:37 +00:00
Andrew Kingston 1acdcd173c Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 11:42:29 +00:00
Martin McKeaveney 71fa39ef7e lint 2020-12-08 11:23:06 +00:00
Martin McKeaveney a2318238ae Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 11:12:27 +00:00
Martin McKeaveney cbfe0f8409 lint 2020-12-08 11:07:16 +00:00
Martin McKeaveney 642437e5be
Merge branch 'master' into feature/page-refactor 2020-12-08 10:48:14 +00:00
Martin McKeaveney 5f7ed62a77 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 10:32:52 +00:00
Martin McKeaveney ae00e54d91 Different names for home and login screen 2020-12-08 10:32:45 +00:00
Andrew Kingston df37177239 Tidy up builder preview iframe 2020-12-08 10:16:01 +00:00
Andrew Kingston 2657008b14 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 0a9f6c3d33 Remove client bundle from being packaged with the builder 2020-12-08 10:14:02 +00:00
Martin McKeaveney efe50230e7 merge with master 2020-12-07 21:32:45 +00:00
Martin McKeaveney 1c40c3dbdd rename level to role in test 2020-12-07 21:28:16 +00:00
Martin McKeaveney d8aa699bfa merge 2020-12-07 21:20:35 +00:00
Martin McKeaveney 2123c06df5 fix tests 2020-12-07 21:11:07 +00:00
Martin McKeaveney 0e837899a4 code review 2020-12-07 20:46:37 +00:00
Martin McKeaveney 6e664b3795 fix layout bugs, some tidy up 2020-12-07 20:29:41 +00:00
Andrew Kingston e7c929ed84 Add custom modal for creating and editing users 2020-12-07 19:05:39 +00:00
mike12345567 e4ef92555c Merge branch 'username-email' of github.com:Budibase/budibase into feature/security-update 2020-12-07 18:08:20 +00:00
mike12345567 8a57f61607 Fixing test case and also making sure that external trigger does what its expected to. 2020-12-07 17:55:35 +00:00
mike12345567 bc9a8ef0e3 Updating test so that it doesn't chain. 2020-12-07 17:42:31 +00:00
mike12345567 616f3bc81c Linting. 2020-12-07 17:24:10 +00:00
mike12345567 5c084599ec Making chaining of automations through different row creation/deletions possible. 2020-12-07 17:23:53 +00:00
Martin McKeaveney 32d5a83b09 remove dupe import 2020-12-07 16:06:50 +00:00
Martin McKeaveney a014db4185 fix layout selection issues 2020-12-07 16:06:20 +00:00
Andrew Kingston a3dd9f1978 Remove log statement 2020-12-07 15:59:37 +00:00
Andrew Kingston 743dc950cd Fix crash when changing screen layout 2020-12-07 15:59:19 +00:00
Martin McKeaveney 7fa252ec07 merge 2020-12-07 15:53:51 +00:00
Martin McKeaveney b4fad77aae lint 2020-12-07 15:49:19 +00:00
Martin McKeaveney 81fe27f8f3 component store refactor - remove concept of currentPreviewItem and currentComponentInfo 2020-12-07 15:27:46 +00:00
mike12345567 c56bdd0751 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 a8c715efa5 Fix URLs when clicking on screens 2020-12-07 10:32:58 +00:00
Martin McKeaveney 79d482bfb1 replace appimage with native linux packages 2020-12-07 10:15:27 +00:00
Martin McKeaveney 274708b4e0 consolidate routing and component selection 2020-12-05 12:09:58 +00:00
Martin McKeaveney de5e7d38ba allow renaming of layouts 2020-12-05 09:43:00 +00:00
Martin McKeaveney 8775c594a1 deletion and error handling of layouts 2020-12-04 23:42:22 +00:00
Martin McKeaveney 84434741d1 allow creation of custom layouts, moving layoutId prop to top level of screen 2020-12-04 23:16:07 +00:00
mike12345567 2291a5acdb Some work towards replication of couch locally. 2020-12-04 17:10:01 +00:00
Andrew Kingston ca543e5756 Remove log statement 2020-12-04 14:52:48 +00:00
Andrew Kingston 8e2f5b379c Fix new screen button placement 2020-12-04 14:52:40 +00:00
Martin McKeaveney 8980895dac lint 2020-12-04 14:46:21 +00:00
Andrew Kingston 244451ca7b Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-04 14:08:13 +00:00
Andrew Kingston d1940bafc9 Fix screen list UI width and tidy up unused imports 2020-12-04 14:07:56 +00:00
Andrew Kingston a5f78c3f8e Remove log statement 2020-12-04 14:07:23 +00:00
Andrew Kingston 69b2261768 Add basic role by default to new screens 2020-12-04 14:06:55 +00:00
Andrew Kingston 58c2659e94 Update client library to work with template screens in real preview 2020-12-04 14:04:07 +00:00
Andrew Kingston 2aa9208479 Change screen templates to be functions which can be enriched by the application 2020-12-04 14:03:40 +00:00
Andrew Kingston 175be609b9 Fix bug with getting screen list in app definition 2020-12-04 14:02:58 +00:00
mike12345567 5e61deb489 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/security-update 2020-12-04 14:01:13 +00:00
Andrew Kingston 883b3761d5 Fix bug with checking user access 2020-12-04 14:01:10 +00:00
mike12345567 f0d447abcd Fixing a caching bug found by cheeks. 2020-12-04 14:01:02 +00:00
mike12345567 e80fb466e6 Hopefully a fix for the 4001 bug we have been experiencing. 2020-12-04 13:45:14 +00:00
Martin McKeaveney 87af1f916f update user id generation 2020-12-04 13:28:19 +00:00
Martin McKeaveney d6b00d5ebe email as default user identifier 2020-12-04 12:22:45 +00:00
mike12345567 4d57955844 Hopefully a fix for the 4001 bug we have been experiencing. 2020-12-04 12:09:02 +00:00
mike12345567 643cff06ea Quick fixes for self deployment. 2020-12-04 12:07:51 +00:00
Andrew Kingston 3b57ef3b0f Update stat card to use new component SDK 2020-12-04 09:13:38 +00:00
Andrew Kingston 2cb4f1228a Merge branch 'master' of github.com:Budibase/budibase into stat-card 2020-12-04 09:00:43 +00:00
Andrew Kingston 8feea17521 Fix variable name in returned message when deleting a role 2020-12-04 08:28:35 +00:00
Andrew Kingston d9df2a60eb Update errors box to work better in dark theme 2020-12-04 08:27:59 +00:00
Andrew Kingston c346630dfe Add modal for editing user roles 2020-12-04 08:27:42 +00:00
mike12345567 4fed10ccdf Some work to not contact lambda or use quotas when deploying locally. 2020-12-03 17:45:20 +00:00
Martin McKeaveney af24967c88 accommodate login layout 2020-12-03 17:31:38 +00:00
Martin McKeaveney 8ec836970c allow selection of layout 2020-12-03 15:25:17 +00:00
Martin McKeaveney 7254f23227 tidy up 2020-12-03 15:19:19 +00:00
Martin McKeaveney a0b4062a1f more intelligent routing for screens and pages 2020-12-03 15:15:14 +00:00
mike12345567 5c4fb1da63 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-03 15:01:41 +00:00
mike12345567 0c0cb503e7 Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2020-12-03 15:01:28 +00:00
kevmodrome 17d61442bc
lint fix 2020-12-03 15:39:24 +01:00
kevmodrome 6e7bd09588
now uses RichText component in create/edit row modal on the backend 2020-12-03 15:37:04 +01:00
kevmodrome 0725b3bd6d
adds rollup-json to standard-components and adds RichText to Form component 2020-12-03 15:03:17 +01:00
mike12345567 5d9175b981 Making public and basic roles accessible. 2020-12-03 12:28:30 +00:00
kevmodrome 619011d7e8
adds new richtext version and adds it to the Form component 2020-12-03 13:19:14 +01:00
mike12345567 b65a554ede 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 2986579846 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-03 08:54:23 +00:00
Andrew Kingston 3ab5c834f7 Update client app to work with layouts when running inside builder preview 2020-12-02 18:10:46 +00:00
mike12345567 8686f45869 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-02 18:07:30 +00:00
mike12345567 eb5e1ea6d4 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 c7a4503dd2 serve app assets 2020-12-02 17:42:59 +00:00
mike12345567 65302e1dd9 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 f386d0c72b tidy up 2020-12-02 17:07:30 +00:00
Martin McKeaveney 4466923c84 allow editing of screen layout from modal 2020-12-02 16:15:14 +00:00
Martin McKeaveney 504565c3fc component tree layout/screen agnostic 2020-12-02 15:19:38 +00:00
Martin McKeaveney 8cae8e1705 E2E working 2020-12-02 14:49:43 +00:00
mike12345567 fa8d8fcfea Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-02 14:18:49 +00:00
Martin McKeaveney f70db5df36 merge 2020-12-02 14:15:07 +00:00
Andrew Kingston 859ae5f8a4 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 48318030a2 merge 2020-12-02 13:44:44 +00:00
Martin McKeaveney 4a51618c11 fix preview save 2020-12-02 13:41:00 +00:00
mike12345567 c7ba0a9cce Linting. 2020-12-02 13:27:20 +00:00
mike12345567 c832ed36d4 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/page-refactor 2020-12-02 13:26:57 +00:00
mike12345567 abe3bdabad Linting. 2020-12-02 13:21:13 +00:00
mike12345567 05d5feb9fd Changing the naming of access levels to be roles. 2020-12-02 13:20:56 +00:00
Andrew Kingston 0a72b0e21b Replace mustache usage in client library with handlebars instead 2020-12-02 12:46:36 +00:00
mike12345567 8a14707a95 Merge branch 'component-sdk' of github.com:Budibase/budibase into feature/self-hosting 2020-12-01 17:54:50 +00:00
mike12345567 a381463c33 Making sure deployment object is used everywhere to hide all underlying deployment properties. 2020-12-01 16:51:17 +00:00
Martin McKeaveney 5674bfc8fa merge 2020-12-01 16:31:40 +00:00