Commit Graph

4835 Commits

Author SHA1 Message Date
Adria Navarro 16752bb437 More cleanups 2023-10-03 22:37:00 +02:00
Adria Navarro 429530a34d Clean predocker steps 2023-10-03 19:55:23 +02:00
Adria Navarro 62e1a12fe4 Log errors on retry 2023-10-02 13:01:25 +02:00
Martin McKeaveney 65af2ed7c2 backmerge from master 2023-09-27 17:06:57 +01:00
Adria Navarro 41c56217c4 Merge branch 'develop' into chore/clean_unused_dependencies 2023-09-26 18:30:39 +02:00
Adria Navarro f600ad7711 Editing scripts 2023-09-26 18:08:37 +02:00
Adria Navarro c68cfc5042 Remove unused devDependencies on worker 2023-09-26 16:37:10 +02:00
Adria Navarro 7feaf58f7f Fix dependencies from backend-core 2023-09-26 12:53:09 +02:00
Adria Navarro aee590bbba Update lint 2023-09-25 09:42:48 +02:00
Martin McKeaveney 6d4e3082e3 type tidy up and lint 2023-09-24 22:07:40 +01:00
Martin McKeaveney b979b29313 e2e secure microsoft auth 2023-09-23 00:10:12 +01:00
Adria Navarro 02ab0a134e Update ts to 5.x 2023-09-22 18:17:19 +02:00
mike12345567 5f82b79d40 Removing test logs. 2023-09-14 11:42:04 +01:00
mike12345567 26c6393f06 Adding retries to 409 test. 2023-09-14 11:11:05 +01:00
mike12345567 4ca9ea97b6 Get server/worker tests to run. 2023-09-14 10:55:41 +01:00
Adria Navarro 3b69acc166 Merge branch 'develop' into update-node-types 2023-09-07 19:50:39 +02:00
Michael Drury fe39bdfbfb Merge branch 'develop' into fix/shared-core-dev 2023-09-07 16:33:05 +01:00
Adria Navarro 7bd91ebb7f Fix 2023-09-07 16:25:13 +02:00
Adria Navarro 205d33f172 Clean cypress refs 2023-09-07 15:37:22 +02:00
Adria Navarro f691987e65 Update node types 2023-09-07 11:21:41 +02:00
mike12345567 c361588bd4 Updating the yarn dev process to not include a removal of the dist directory as part of the streamed watchers - this seems to create a problem for shared core and moving this up a level to a parallel run before the watchers massively improves stability. 2023-09-06 18:17:44 +01:00
Peter Clement 70c71c13bf remove redudant delete 2023-09-05 12:20:39 +01:00
Peter Clement c16fd53b0a add developer label back and improve invite flow 2023-09-05 09:58:05 +01:00
Peter Clement 6d3a7727eb fixes for perr app builder and refactoring based on comments 2023-09-05 09:25:06 +01:00
Peter Clement 24abd91600 Fix issue around adding of admin users 2023-09-04 09:37:10 +01:00
Peter Clement ddf9e734f4 pr comments and bug fixes 2023-08-31 10:36:27 +01:00
Peter Clement 7c8914207b fix invite user flow 2023-08-30 16:43:24 +01:00
Peter Clement 8b8bce186c builder side panel changes to support inviting creators 2023-08-29 14:41:56 +01:00
mike12345567 67104d7cb3 Quick hacks to try and help with the stability of some failing tests. 2023-08-23 18:05:58 +01:00
mike12345567 11f56c2632 Updating error message in test. 2023-08-23 15:22:25 +01:00
Michael Drury 5a00b87343 Merge branch 'develop' into feature/group-per-app-builders 2023-08-23 15:07:45 +01:00
mike12345567 cad787a909 Removing old docker-compose.test.yaml that was causing flakiness and getting worker using mock redis. 2023-08-23 15:07:12 +01:00
mike12345567 656870db8b Adding last of support for per app group builder support, enriching the user on self return, as well as adding the functionality required to server middlewares. 2023-08-22 18:14:08 +01:00
Adria Navarro 5dca30986e Merge branch 'develop' into chore/fix_os_contributor 2023-08-21 10:27:22 +03:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
mike12345567 ba5e390b3f Quick PR comments. 2023-08-17 17:44:59 +01:00
mike12345567 95b8a4ea10 Adding feature flagging, the option to only start the automations, or the API, meaning we can split the service if needed. 2023-08-17 16:39:25 +01:00
Adria Navarro 5b29e879a4 Fix dev when no pro loaded 2023-08-10 16:03:37 +03:00
mike12345567 33257db010 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-09 11:39:46 +01:00
melohagan a5fb25e41e Allow null for firstName and lastName (#11482) 2023-08-09 10:38:04 +01:00
Adria Navarro 12d6911ae3 Update docker images to 18.x 2023-08-07 14:38:16 +03:00
Adria Navarro 1ef8d118cb Remove unnecessary package.json/gitHead 2023-08-02 12:04:54 +02:00
Adria Navarro fcba916f0c Add bail in jest 2023-08-02 11:25:52 +02:00
Adria Navarro c279849340 Fix orders on server/worker 2023-08-02 10:17:58 +02:00
Adria Navarro 4b5751003f Revert "Remove composite"
This reverts commit f9115f1554bbadadc3a0ef91d00d170fa05e45b6.
2023-08-01 19:23:48 +02:00
Adria Navarro 5347504c12 Fix nodemon watch 2023-08-01 19:23:31 +02:00
Adria Navarro 250a4e890f Remove composite 2023-08-01 19:23:23 +02:00
Adria Navarro e011ccd0c4 Merge branch 'develop' into chore/typecheck_tests 2023-08-01 16:49:06 +01:00
Adria Navarro 96c598688f Run tests checks for worker 2023-08-01 12:52:12 +02:00
Adria Navarro 202963c864 Fix type tests 2023-08-01 12:52:12 +02:00
mike12345567 dce38908c9 PR comments (backend). 2023-08-01 10:56:47 +01:00
mike12345567 7a74ce98f1 Moving user functions in UserDB to fully static as none of the class properties ever change - simplifying currying. 2023-07-31 18:46:21 +01:00
mike12345567 31f9693185 Quick update to SCIM now that user functionality is available from backend-core. 2023-07-31 17:10:27 +01:00
mike12345567 8522cb94d3 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-28 17:10:43 +01:00
Adria Navarro 6d5eef4e42 Update 2023-07-28 17:11:48 +02:00
Adria Navarro d332c30b58 Remove ts-jest 2023-07-28 17:11:48 +02:00
Adria Navarro baf1c1ff07 Update swc deps 2023-07-28 17:11:48 +02:00
Adria Navarro 95f66ebd9d Fix types 2023-07-28 17:11:48 +02:00
Adria Navarro 5f1565886f Unify jest 2023-07-28 17:11:48 +02:00
mike12345567 72438f531d Update for worker, get builder endpoints working for app builders. 2023-07-28 15:39:59 +01:00
mike12345567 1403bf26c6 Quick fixes based on raising PR, types and tests. 2023-07-28 13:58:20 +01:00
mike12345567 454f832b75 Updates after running through tests, adding mocking of app builders feature for test cases to work. 2023-07-28 12:58:05 +01:00
mike12345567 2080126da2 Final cleanup when running services. 2023-07-27 18:58:09 +01:00
mike12345567 c8712eda00 Fixing some missing functions. 2023-07-27 18:53:58 +01:00
mike12345567 812f1af5ca Moving app builder API into pro, along with the changes involved with achieving this. 2023-07-27 18:46:55 +01:00
mike12345567 d8f50f139e Frontend update for app builders, handling when in the builder portal and don't have any app access, as well as allowing viewing of apps from the portal. 2023-07-27 17:52:56 +01:00
mike12345567 eefac0fe08 Quick updates based on latest lerna version, as well as some fixes after running through flows (post refactoring). 2023-07-26 18:13:18 +01:00
mike12345567 64a5426d36 Updates to remove app builder concept, denying access to app creation for app builders. 2023-07-26 17:32:21 +01:00
mike12345567 c277b065db Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:40:17 +01:00
mike12345567 8253ad0a2e Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:24:29 +01:00
Adria Navarro de0f3f7463 Merge branch 'develop' into backmerge-master-20230726 2023-07-26 12:50:52 +01:00
Adria Navarro 2e54b40d55 Build backend-core before dev script 2023-07-26 12:48:33 +02:00
mike12345567 43bfb943a3 Some fixes post testing. 2023-07-25 18:52:59 +01:00
mike12345567 66fbdfe4e8 Breaking out pro components back into the worker user SDK, and attempting to separate the pro components as much as possible from the user SDK itself, so that it can be easily re-created in other services. 2023-07-25 18:39:40 +01:00
mike12345567 90371b9d69 Refactoring users core to move into backend, allowing app builder endpoints to move into pro. 2023-07-25 17:48:57 +01:00
Rory Powell 8590f865b5 Merge branch 'master' into merge-master 2023-07-25 15:32:16 +01:00
Rory Powell a477feaada Lint 2023-07-25 14:14:24 +01:00
Rory Powell 143e6597db Fix issues with tests when running with pro from npm 2023-07-25 13:18:56 +01:00
mike12345567 d9c8e26f65 Re-writing APIs based on most recent discussion about RBAC and per app builders. 2023-07-24 18:29:46 +01:00
mike12345567 c375f860ba Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-24 13:46:49 +01:00
Rory Powell 5c4d29e349 Merge branch 'develop' into feature/offline-license 2023-07-24 10:06:04 +01:00
mike12345567 87d80e08f5 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-21 17:34:27 +01:00
Rory Powell 797f281f6d OpenAPI 3.0 docs for offline license and license key endpoints 2023-07-20 21:24:40 +01:00
Rory Powell 55efb6e618 fix pro mock 2023-07-20 21:24:40 +01:00
Rory Powell c8fc67d230 Lint 2023-07-20 21:24:19 +01:00
Rory Powell 34d9f1c4f8 Request / response renames 2023-07-20 21:22:54 +01:00
Rory Powell 90e869dc04 /api/global/license/offline/identifier API 2023-07-20 21:21:39 +01:00
Rory Powell c0568b9153 api / license.spec.ts updates 2023-07-20 21:21:39 +01:00
Rory Powell 20c87b44b1 Allow pro to be mocked in worker 2023-07-20 21:21:39 +01:00
Rory Powell 6c3d01375b Move license keys to their own module 2023-07-20 21:21:39 +01:00
Rory Powell 7c18a7a443 db / licenseInfo.spec.ts 2023-07-20 21:21:39 +01:00
Rory Powell 8e2a551a15 Be more explicit about offline license vs offline license token 2023-07-20 21:21:39 +01:00
Rory Powell 0e80766125 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-20 21:21:39 +01:00
Rory Powell 6aeb31c355 Move OFFLINE_MODE to backend-core environment 2023-07-20 21:21:39 +01:00
Rory Powell 5ac024a655 Merge branch 'develop' into feature/offline-license 2023-07-20 12:27:04 +01:00
mike12345567 85dea47a31 Moving user admin/builder functions to shared-core for frontend to use. 2023-07-19 16:19:34 +01:00
mike12345567 39746e0bf0 Main body of work to handle the new approach of per app builders support. 2023-07-18 16:57:48 +01:00
Andrew Kingston cd8414e6a1 Fix getting started checklist links 2023-07-18 16:14:59 +01:00
mike12345567 e30509c4f9 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-18 11:32:38 +01:00
Adria Navarro 2698e47ec4 Type internal db.get 2023-07-18 11:41:51 +02:00
Rory Powell 22b2edb2bf OpenAPI 3.0 docs for offline license and license key endpoints 2023-07-17 20:55:26 +01:00
mike12345567 a04443c059 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-17 18:06:04 +01:00
Rory Powell 31422cd3ec fix pro mock 2023-07-14 20:56:50 +01:00
Rory Powell 4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Adria Navarro 6e2a8e0ab9 Rename .log extensions 2023-07-11 13:09:51 +02:00
Adria Navarro 0b5717cde5 Renamings 2023-07-11 10:44:10 +02:00
Adria Navarro fd0018c1bc Download logs section 2023-07-11 10:44:10 +02:00
Adria Navarro b64ea43d20 System logs only for self hosted 2023-07-11 10:44:10 +02:00
Adria Navarro bb28d09eab Add logs endpoint 2023-07-11 10:44:09 +02:00
Rory Powell 7c4fe15781 Request / response renames 2023-07-10 16:12:19 +01:00
Rory Powell 574c361f6b /api/global/license/offline/identifier API 2023-07-08 13:07:10 +01:00
Rory Powell 7831579e98 api / license.spec.ts updates 2023-07-07 21:15:40 +01:00
Rory Powell 19d3e12177 Allow pro to be mocked in worker 2023-07-07 16:55:11 +01:00
Rory Powell 1fa5cd519c Move license keys to their own module 2023-07-07 11:48:12 +01:00
Rory Powell 700d8131d1 db / licenseInfo.spec.ts 2023-07-07 11:34:10 +01:00
Rory Powell d02f474fd1 Be more explicit about offline license vs offline license token 2023-07-06 21:26:46 +01:00
Rory Powell efe53bb217 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-06 20:46:25 +01:00
Rory Powell 586bca16d0 Move OFFLINE_MODE to backend-core environment 2023-07-06 20:44:48 +01:00
mike12345567 6d24a30d91 Basic refactor work, the types required for the new API endpoints. 2023-07-05 18:28:04 +01:00
Adria Navarro f2d41addbd Unify prettier 2023-06-28 14:33:51 +01:00
Michael Drury f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Dean eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567 8882801315 Fixing lookup of custom role by ID in test case. 2023-06-26 17:01:50 +01:00
Dean 8f9a1d4bba PR feedback 2023-06-26 10:23:57 +01:00
Dean 10108fb543 Null checking logo configs 2023-06-26 10:22:03 +01:00
Dean 6f24772f49 PR Feedback 2023-06-23 16:40:40 +01:00
Dean ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
Adria Navarro 2f548d834f Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-23 10:43:57 +01:00
mike12345567 38be94fa07 Fix for test case. 2023-06-20 12:36:05 +01:00
Adria Navarro 50d082c385 Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-20 11:14:05 +01:00
mike12345567 3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
Michael Drury c5270ee323 Merge pull request #10959 from Budibase/fix/integration-tests
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
Adria Navarro acfe69a3d5 Remove the doble deep format references 2023-06-19 18:34:51 +01:00
mike12345567 289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00
Adria Navarro fe3b3aaf53 Fix dependencies 2023-06-19 17:55:47 +01:00
Martin McKeaveney 7c49dd716c remove console log 2023-06-15 15:29:29 +01:00
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
melohagan c0578d4cc2 Send meeting invite via automation email smtp (#10787)
* Pass calendar props into sendSmtpEmail

* Add calendar event to message

* Add Checkbox and DatePicker automation field UI

* Add URL prop

* Add url to sendSmtpEmail unit test

* Refactor

* Code review comments

* Make location optional

* Add EmailInvite type

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +01:00
mike12345567 e07dfab98c Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-07 18:05:29 +01:00
mike12345567 b2a21addc3 Updating release workflows to use a script instead of repeating and adding scripts for updating and resetting dependencies if attempting to build packages locally. 2023-06-07 17:18:59 +01:00
Adria Navarro d8fc37a760 Revert "Merge pull request #10808 from Budibase/undo_wrong_merge_from_develop"
This reverts commit 4ccc98103c, reversing
changes made to 500424c651.
2023-06-07 14:08:47 +01:00
Adria Navarro d21274ef2b Remove frozen-lockfile from dockerfiles 2023-06-07 09:05:34 +01:00
Adria Navarro deeba8bae3 Revert "Merge branch 'develop' into master"
This reverts commit 6f29c978e0, reversing
changes made to 1c6ff73c19.
2023-06-06 22:06:34 +01:00
Adria Navarro fe9a220717 Add yarn.lock 2023-06-06 14:45:20 +01:00
Adria Navarro 12b69dc37d Remove --configuration=production 2023-06-06 14:45:20 +01:00
Adria Navarro 3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Dean 0a7669ad2d PR feedback 2023-06-05 16:26:27 +01:00
Dean f20653d4ca Branding fixes 2023-06-05 15:20:04 +01:00
Rory Powell e00eb171be WIP logo url fixes 2023-06-05 14:01:46 +01:00
Michael Drury adbdaf394a Small update to make sure that save/patch calls to the rows API (all DS+) return the squashed relationships, not the whole structure. 2023-06-01 18:18:12 +01:00
Adria Navarro e3ce16d0c9 Update local versions to 0.0.0 2023-05-29 10:54:10 +02:00
Adria Navarro baeb465a95 Fix dockerfile 2023-05-26 14:02:03 +02:00
Adria Navarro 296de6b1b8 Fix dockerfile 2023-05-26 14:01:35 +02:00
Adria Navarro 7a439b8e01 Remove nx/esbuild refs 2023-05-26 13:59:50 +02:00
Adria Navarro 489ca561b7 Check types 2023-05-26 13:54:10 +02:00
Adria Navarro 099f6fe311 Build worker using build script 2023-05-26 13:53:37 +02:00
Adria Navarro 35d5df7ef0 Use local refs 2023-05-26 10:10:55 +02:00
Martin McKeaveney 8061c700c6 Merge pull request #10425 from Budibase/feature/chatgpt-automationblock
Feature/chatgpt automationblock
2023-05-25 13:39:57 +01:00
Adria Navarro 73f99b99d2 Adding conflicting externals 2023-05-25 14:25:50 +02:00
Adria Navarro 429dc8f6d2 Tidy up tsconfigs 2023-05-25 11:49:18 +02:00
Martin McKeaveney 77c2e309dd merge 2023-05-24 17:35:04 +01:00
mike12345567 733e724eb3 PR comments. 2023-05-24 16:38:24 +01:00
Adria Navarro 0c7b58523a More nx config 2023-05-24 13:08:39 +02:00
Martin McKeaveney bbab2a9adc merge 2023-05-24 11:25:49 +01:00
Adria Navarro 71a713c688 Add missing nx scripts 2023-05-24 11:51:55 +02:00
Adria Navarro 1be822398f Undo run in band 2023-05-23 12:46:24 +02:00
Adria Navarro d1ce04736e Addressing PR comments 2023-05-23 11:54:10 +02:00
Adria Navarro 8b912dc8ed Build all 2023-05-23 11:46:20 +02:00
Adria Navarro 931458094b Rename 2023-05-23 11:43:57 +02:00
Adria Navarro 9f9c2d66e0 Remove runinband for actions 2023-05-22 17:02:44 +02:00
Adria Navarro 73372d5f5d Optimise builds 2023-05-22 12:42:14 +02:00
Adria Navarro a174804aec Do not build sourcemap on pro 2023-05-22 12:33:10 +02:00
Adria Navarro dd58d6ed76 Optimise check types 2023-05-22 12:31:49 +02:00
Adria Navarro 5fd32618be Fix sourcemaps 2023-05-22 12:06:52 +02:00
Adria Navarro a24c4eb320 Generate package.json 2023-05-22 11:56:41 +02:00
Adria Navarro 2ce968fcfc Rename file to .js 2023-05-22 11:32:44 +02:00
Adria Navarro 07e0f189bb Fix docker run 2023-05-19 19:56:19 +02:00
Adria Navarro 040d5f2dcb Copy dist to dist 2023-05-19 18:30:48 +02:00
Adria Navarro c7bbd9be2f Fix integration tests 2023-05-19 18:00:53 +02:00
Adria Navarro 986d4c4740 Merge branch 'develop' into chore/esbuild 2023-05-19 17:26:47 +02:00
Adria Navarro e030dd866d Fix cluster 2023-05-19 16:26:49 +02:00
Adria Navarro f27c4ae55a Use nx/esbuild for worker docker & dev 2023-05-19 14:45:05 +02:00
Adria Navarro 0a2335a047 Merge pull request #10622 from Budibase/chore/improve_pipeline_times
Chore - Improve pipeline run time
2023-05-19 13:18:21 +02:00
Adria Navarro e47aef13d5 Fix jest refs 2023-05-19 10:36:23 +02:00
Adria Navarro 0850ee7b8c Fix flakiness 2023-05-18 17:38:23 +02:00
Adria Navarro 0895f9f44d Check types 2023-05-18 11:29:51 +02:00
mike12345567 f3785892a9 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-05-17 12:45:28 +01:00
mike12345567 55ec808a82 Fixing comment. 2023-05-16 15:47:38 +01:00
Adria Navarro 0882046ea2 Test search by email 2023-05-10 14:53:30 +02:00
Adria Navarro 999dcebb74 Merge branch 'develop' into budi-6158/allow_searching_users 2023-05-10 12:40:08 +02:00
Adria Navarro f0194ac96b Pro referencing 0.0.1 2023-05-10 12:39:24 +02:00
Adria Navarro c05a93f875 Test last page search 2023-05-10 12:33:11 +02:00
Adria Navarro 3de3ddfa62 Add tests 2023-05-10 12:33:11 +02:00
Adria Navarro 63244e1dde Add test 2023-05-10 12:33:11 +02:00
Adria Navarro 8bbfa7e0ab Dynamic groups for testing 2023-05-10 12:31:09 +02:00
Adria Navarro ad257366cf Merge branch 'develop' into budi-6158/paginage-group-users 2023-05-10 10:37:38 +02:00
Adria Navarro a4e97f768b Add group name limit 2023-05-08 13:26:26 +02:00
Adria Navarro cd47bc20a2 Test name trimming 2023-05-08 12:45:30 +02:00
Adria Navarro 1b44f8b18b Do not allow empty names on request 2023-05-08 12:42:51 +02:00
Adria Navarro 752790f3c9 Do not allow undefined names on request 2023-05-08 12:41:48 +02:00