Commit Graph

2715 Commits

Author SHA1 Message Date
Dean eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567 3eff4d85d0 Adding a test case for the removal of automation logs from app sync, as well as adding to the publish/sync filter a check to not carry over automation logs. 2023-06-26 18:52:15 +01:00
Dean ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
mike12345567 baecab785d Handling the removal of the role_ prefix where applicable so that new role IDs present in the exact same way as built in roles. 2023-06-22 18:02:35 +01:00
Dean 998f1806aa Updated analytics tests to account for the embedded 2023-06-20 16:29:09 +01:00
Dean c1248eed12 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 10:08:18 +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
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 b0f40be409 Update bcrypt 2023-06-19 17:55:47 +01:00
Dean 2304032423 Added embed state, behaviours and event tracking to client app. UI/UX Refactoring 2023-06-16 12:30:08 +01:00
Jonny McCullagh 757ca6a166 Merge master develop (#10897)
* Binding drawer fixes

* Added missing headless flag for the bindable combobox

* Fix for QueryEditor width

* Fix svelte transitions in grid new row component breaking routify

* Bump version to 2.7.7

* fix REST connector failure to save

* Bump version to 2.7.8

* Bump version to 2.7.9

* Unexpected token when export data (#10721)

* Tidy ID string for JSON parse

* Display error for composite keys

* Unit test WIP

* directly assign the mock function on the datasource

* Unit tests for exportRows ID handling

---------

Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>

* Return all rows if oneOf value is falsey (#10638)

* Bump version to 2.7.10

* Make sure divider fields are left-most (#10627)

* Make sure divider fields are left most

* Refactor

* Bump version to 2.7.11

* Temporarily remove the focus store update as it triggers a full redraw of the component settings

* Linting

* Removed commented out code

* Bump version to 2.7.12

* Bump version to 2.7.13

* Do not show Business tag for Email action (#10867)

* Bump version to 2.7.14

* new deploy trigger (#10892)

* point the deploys at the new env

* Bump version to 2.7.15

---------

Co-authored-by: Dean <deanhannigan@gmail.com>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: Budibase Staging Release Bot <>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-06-14 16:18:09 +01:00
Michael Drury 6776f3d78c Merge pull request #10881 from Budibase/fix/budi-7026
Custom roles breaking app access when not published
2023-06-14 15:10:30 +01:00
Adria Navarro 4b065dda8b Fix exports/imports 2023-06-14 12:32:26 +01:00
mike12345567 1bdf55e966 Some type updates and fixes for test case. 2023-06-13 14:45:33 +01:00
mike12345567 bedc8e5cce Fix for custom roles that have not been published causing users to be unable to access an app completely. They should instead be treated as public users as their role isn't valid. 2023-06-12 18:39:30 +01:00
Adria Navarro 57c5facc6e Zip exports 2023-06-12 17:54:09 +01:00
Adria Navarro 70798a6b93 Clean 2023-06-12 17:50:07 +01:00
Adria Navarro ded738a566 Clean code 2023-06-12 17:49:12 +01:00
Adria Navarro 92a8c97aba Close streams 2023-06-12 17:34:12 +01:00
Adria Navarro 2971dfba9d Renames 2023-06-12 17:31:08 +01:00
Adria Navarro 551ca404b4 Decrypt file 2023-06-12 16:27:19 +01:00
Adria Navarro 1f4cdf348f Encrypt files 2023-06-12 11:49:38 +01:00
Adria Navarro 978591e2ba Enable encrypting 2023-06-09 16:26:48 +01:00
melohagan b88e5ecc95 Return all rows if oneOf value is falsey (#10638) 2023-06-09 13:02:29 +01:00
mike12345567 532583e66e Fixing develop currentapp.spec.js test case, when packages within backend-core import all of backend-core they can create cyclics that cause issues. 2023-06-08 13:47:16 +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
Rory Powell ad7f6cf5e2 Merge branch 'develop' into merge-master 2023-06-06 11:49:49 +01:00
Adria Navarro 25c921e340 Validate url 2023-06-06 11:29:49 +01:00
Adria Navarro d4ba73f331 Open continue 2023-06-06 11:29:49 +01:00
Adria Navarro 3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Andrew Kingston d70e49d74f Add event for tracking user collaboration 2023-06-06 10:11:51 +01:00
Rory Powell abbd8c5c8b Merge branch 'master' into develop 2023-06-05 23:19:43 +01:00
Andrew Kingston 680b70643c Merge pull request #10775 from Budibase/collaboration-fixes
Collaboration fixes
2023-06-02 18:03:11 +01:00
mike12345567 c13530ef32 Stop attempt at bundling ioredis-mock, only need to check at runtime. 2023-06-02 13:59:33 +01:00
mike12345567 ddeb25b68d Updating mock redis to only import if it is needed. 2023-06-02 11:52:50 +01:00
Andrew Kingston d8d3d71523 Update websocket logic to ignore events trigger by API requests originating from the same session 2023-06-01 17:14:32 +01:00
Michael Drury 13d987023a Updating ioredis to latest version and removing typing library as no longer required. 2023-06-01 10:39:16 +01:00
Michael Drury 9b23d3ba36 Pinning version of ioredis-mock. 2023-06-01 10:14:30 +01:00
Michael Drury fde94a262f Moving ioredis-mock dependency back to dev dependency in backend-core. 2023-06-01 10:13:54 +01:00
Michael Drury a3f9759a47 Reverting ioredis-mock removal for test cases - will come back to this in future as it currently breaks pro tests. 2023-06-01 00:02:55 +01:00
mike12345567 fba3ec987e Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-info-endpoint 2023-05-31 17:37:17 +01:00
mike12345567 249625ad1a Updating backend tests to actually utilise the redis container which is spun up as part of the tests, doing away with the somewhat problematic ioredis-mock which was breaking some tests due to the addition of the changes for multi-dev collab. 2023-05-31 17:18:01 +01:00
Andrew Kingston 8a2d4b7052 Merge branch 'develop' of github.com:Budibase/budibase into websocket-redis-integration 2023-05-31 16:28:14 +01:00
Andrew Kingston e3b5d711df Disable redis select command in tests 2023-05-31 16:27:49 +01:00
Andrew Kingston ffbbf04e86 Lint 2023-05-31 16:08:35 +01:00
Andrew Kingston 05e34076f7 Fully rewrite websocket redis integration to use individual keys per session, enable TTLs on sesisons, prune sessions when users connect and add a heartbeat to sockets 2023-05-31 15:13:22 +01:00
Andrew Kingston d926650232 Add back in functionality to select different redis DB's per client 2023-05-31 10:52:39 +01:00
Michael Drury 1547280514 Merge pull request #10739 from Budibase/fix/multi-dev-conflicts
Multidev lock and conflict management
2023-05-30 22:57:00 +01:00
Michael Drury 99607ca06e Reverting try twice change to writethrough. 2023-05-30 20:45:10 +01:00
Michael Drury 5249148d6c Updating writethrough test to be aware of the double attempt locks. 2023-05-30 20:20:22 +01:00
mike12345567 7c7bd4d5cb Fix for debugging with webstorm the old way (if desired), updating the builder middleware to be more multi-dev capable, ignoring 409s when attempting to update the last updated at for apps (if multiple devs hit at same time, only use one) also updating writethrough cache to retry once, with the extended TTL on locks, plus the multi-dev collab it can take a minute to update usage quota doc when a lot of updates occur at once. 2023-05-30 17:41:20 +01:00
Rory Powell 6230e62b9b Automation investigation logging + max doc size fix for automation log 2023-05-30 16:37:39 +01:00
Andrew Kingston be40d72f55 Merge pull request #10712 from Budibase/data-section-multidev
Multiple user collaboration for data section
2023-05-30 09:08:14 +01:00
Adria Navarro e3ce16d0c9 Update local versions to 0.0.0 2023-05-29 10:54:10 +02:00
Andrew Kingston 5e480a1527 Use socker.io redis adapter to broadcast events to all server instances 2023-05-25 08:48:56 +01:00
Budibase Release Bot df8e76b153 v2.6.23 2023-05-24 14:26:12 +00:00
Peter Clement 4d5a922684 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-24 15:05:58 +01:00
Budibase Release Bot 99b4370a75 v2.6.22 2023-05-24 07:52:24 +00:00
Adria Navarro f3dc4c320c Add missing nx scripts 2023-05-23 23:21:47 +02:00
Adria Navarro c3301e393e Optimise nx dependencies 2023-05-23 23:11:26 +02:00
mike12345567 22dc37a4ef Merge branch 'chore/esbuild' of github.com:Budibase/budibase into chore/esbuild 2023-05-23 18:22:06 +01:00
mike12345567 9d3d29f43a Setting version and adding types dependency to backend-core. 2023-05-23 18:21:47 +01:00
Adria Navarro 8d98a772fc Fix build order 2023-05-23 19:15:08 +02:00
Budibase Release Bot eb2984180f v2.6.21 2023-05-22 12:20:50 +00:00
Peter Clement d271bbdadb rename syncWebHooks to syncAutomations 2023-05-19 10:07:02 +01:00
Peter Clement f680fbd822 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-18 11:35:25 +01:00
Budibase Release Bot ad90dc7713 v2.6.20 2023-05-18 09:54:29 +00:00
Michael Drury 62e9777407 Merge pull request #10633 from Budibase/fix/live-app-user-updates
Production app user updates
2023-05-18 10:46:31 +01:00
Rory Powell a685f181da Merge branch 'master' into develop 2023-05-18 09:10:51 +01:00
Budibase Release Bot 8894f54960 v2.6.19 2023-05-18 07:54:19 +00:00
Rory Powell 55ee94892a Support setting object name for logged json objects 2023-05-17 22:18:50 +01:00
mike12345567 5fdd7d9076 Fixing an issue with the tenant ID not being found in self host (default) for identification purposes, stopping doc update queue from activating and working as expected. 2023-05-17 19:21:32 +01:00
Budibase Release Bot 30dd224a34 v2.6.18 2023-05-17 16:13:35 +00:00
Budibase Release Bot e4835d5f91 v2.6.17 2023-05-17 14:39:18 +00:00
Rory Powell 78daed6ec1 Lint 2023-05-17 15:31:14 +01:00
Rory Powell 0aff89a479 Merge pull request #10626 from Budibase/chore/automation-logging-updates
Automation logging updates
2023-05-17 14:58:16 +01:00
Rory Powell f41b134d31 Refactor to use param for doInAutomationContext 2023-05-17 14:57:29 +01:00
Rory Powell 6c412c7cd9 Test fix 2023-05-17 14:22:23 +01:00
Rory Powell 578b599428 Lint 2023-05-17 14:10:22 +01:00
Rory Powell ad37186665 Logging updates for automations 2023-05-17 13:54:20 +01:00
Adria Navarro 4f3139a47b Merge branch 'develop' into feature/datasource-conns 2023-05-17 12:00:56 +02:00
Budibase Release Bot ceeeb0ad8d v2.6.16 2023-05-16 15:05:12 +00:00
mike12345567 14806809e8 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-16 14:54:44 +01:00
Budibase Release Bot 4c4892a157 v2.6.15 2023-05-16 12:24:17 +00:00
Budibase Release Bot 897e08d0ec v2.6.14 2023-05-16 12:03:33 +00:00
Budibase Release Bot e26daac58f v2.6.13 2023-05-16 10:21:37 +00:00
Budibase Release Bot 005c3556d6 v2.6.12 2023-05-15 15:51:10 +00:00
mike12345567 1aad88adc8 Fix for CLI startup complaining about version not being found. 2023-05-15 15:52:59 +01:00
Peter Clement 007f5ca8a9 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-15 15:19:44 +01:00
Adria Navarro 5456866c45 Fix tests to use connection string instead of env 2023-05-15 13:54:32 +02:00
Adria Navarro 209ada0c38 Validate couchdb 2023-05-15 13:54:32 +02:00
Adria Navarro deb73be17d Merge branch 'develop' into budi-6158/allow_searching_users
# Conflicts:
#	packages/pro
2023-05-15 13:02:03 +02:00
Peter Clement c86c2b4096 add synchronous webhook functionality 2023-05-12 15:57:34 +01:00
Budibase Release Bot 6c694762e2 v2.6.11 2023-05-12 14:29:07 +00:00
jvcalderon 946cd45b3f Refactor: BUILDER_REFERER_PREFIX -> BUILDER_APP_PREFIX 2023-05-12 15:59:42 +02:00
jvcalderon a48fc00a54 Change the PUBLIC_API_PREFIX to prevent failures if we increase in the future the API version 2023-05-12 15:54:59 +02:00
José Vte. Calderón 8eac0d99f7 Update packages/backend-core/src/utils/tests/utils.spec.ts
Co-authored-by: Rory Powell <rory.codes@gmail.com>
2023-05-12 15:38:39 +02:00
jvcalderon 1f7ebe8502 Remove unneeded 'beforeEach' import 2023-05-12 15:34:57 +02:00
Budibase Release Bot eccb0edb0f v2.6.10 2023-05-11 17:35:07 +00:00
Budibase Release Bot 530c8ce8d7 v2.6.9 2023-05-10 13:43:51 +00:00
Adria Navarro 0d5c14f22a Rename view 2023-05-10 14:54:30 +02:00
Budibase Release Bot 86f0cd8353 v2.6.8 2023-05-08 15:52:34 +00:00
Martin McKeaveney b387f969d9 allow passwordless redis 2023-05-08 15:59:12 +01:00
jvcalderon d4d1bc03b3 Fix ESLint 2023-05-08 13:42:26 +02:00
jvcalderon 80d3b99b90 Provide some functions to check the path in the context 2023-05-08 13:26:00 +02:00
mike12345567 c880282be3 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-05 15:44:32 +01:00
Budibase Release Bot 1de22e3758 v2.6.7 2023-05-05 14:30:04 +00:00
Rory Powell 595db7d346 Merge pull request #10495 from Budibase/fix/custom-locks
Fix usage of custom locks
2023-05-05 15:21:58 +01:00
Rory Powell 1ba5eda149 Fix usage of custom locks 2023-05-05 14:42:21 +01:00
Budibase Release Bot 0f8d74157c v2.6.6 2023-05-05 11:50:53 +00:00
Budibase Release Bot eb5e962e65 v2.6.5 2023-05-05 11:18:39 +00:00
Michael Drury cfae0f6811 Merge pull request #10487 from Budibase/fix/automation-log-issue
Potential fix for automation log issue
2023-05-05 11:59:25 +01:00
Budibase Release Bot 76ad8bca7c v2.6.4 2023-05-05 10:47:43 +00:00
Budibase Release Bot 0aa270ad0a v2.6.3 2023-05-05 06:58:10 +00:00
mike12345567 0d7959f720 Fixing some un-identified listeners, queue messages not being correctly printed, also improving the mechanism for detecting if in the main thread or not. 2023-05-04 17:20:21 +01:00
Budibase Release Bot 2086b5d5dd v2.6.2 2023-05-04 13:33:20 +00:00
Martin McKeaveney 50de32a8a0 Merge pull request #10452 from Budibase/feature/clustering-support
attaching clustered mode to an env var
2023-05-04 14:25:23 +01:00
Martin McKeaveney 167dfd39d7 fix ts build 2023-05-04 13:32:17 +01:00
Budibase Release Bot 2774e92d83 v2.6.1 2023-05-04 10:39:20 +00:00
Budibase Release Bot 56eb0a318c v2.6.0 2023-05-04 10:00:54 +00:00
Adria Navarro ce0d527d75 Merge branch 'chore/npmless-builds' into chore/pipeline_npm_version_updates
# Conflicts:
#	packages/backend-core/package.json
#	packages/bbui/package.json
#	packages/builder/package.json
#	packages/cli/package.json
#	packages/client/package.json
#	packages/frontend-core/package.json
#	packages/sdk/package.json
#	packages/server/package.json
#	packages/shared-core/package.json
#	packages/string-templates/package.json
#	packages/types/package.json
#	packages/worker/package.json
#	yarn.lock
2023-05-04 10:29:45 +01:00
Budibase Release Bot 2506f61812 v2.5.10 2023-05-04 07:54:29 +00:00
Budibase Staging Release Bot 991e91e204 v2.5.10-alpha.1 2023-05-03 17:28:55 +00:00
Adria Navarro ba41fe97e1 Merge branch 'develop' into chore/npmless-builds 2023-05-03 18:00:12 +01:00
Budibase Staging Release Bot 9e986ac69d v2.5.10-alpha.0 2023-05-03 15:23:47 +00:00
Rory Powell e1a147e823 Merge branch 'master' into develop 2023-05-03 16:06:42 +01:00
Budibase Staging Release Bot 1fcc64154e v2.5.6-alpha.45 2023-05-03 13:14:55 +00:00
Rory Powell 7762235769 Merge branch 'develop' into pricing/hubspot-updates 2023-05-03 13:51:13 +01:00
Rory Powell 9647ac5dee Create hubspot expansions and churns as users are added and deleted 2023-05-02 20:08:51 +01:00
Budibase Staging Release Bot b911b04a03 v2.5.6-alpha.44 2023-05-02 18:09:57 +00:00
Michael Drury 8624fff9d0 Merge pull request #10470 from Budibase/fix/cli-further-fixes
CLI - fully disable pino logger
2023-05-02 19:01:34 +01:00
mike12345567 f61f9eba68 Linting. 2023-05-02 16:28:56 +01:00
mike12345567 552499b781 Re-writing the disabling of pino/logging - it seems that the pino logger is causing a variety of issues in the built CLI version - easier to offer an environment variable for backend-core which completely removes the logger. 2023-05-02 16:22:43 +01:00
Budibase Staging Release Bot cf2488cd35 v2.5.6-alpha.43 2023-05-02 14:42:41 +00:00
Adria Navarro 00cd09d6d4 Merge branch 'develop' into chore/npmless-builds 2023-05-02 14:47:03 +01:00
Adria Navarro 9ffd43b682 Merge branch 'chore/npmless-builds' into chore/pipeline_npm_version_updates 2023-05-02 14:07:44 +01:00
Budibase Staging Release Bot 9f7b212f22 v2.5.6-alpha.42 2023-05-02 08:44:05 +00:00
Rory Powell 38d0fd943a Remove business minimum quantity from backend 2023-04-29 22:06:41 +01:00
Budibase Staging Release Bot a89d7f1f46 v2.5.6-alpha.41 2023-04-29 09:06:58 +00:00
Martin McKeaveney e75e91e248 control all redis clustering through env var 2023-04-28 19:53:15 +01:00
Martin McKeaveney f73af919a7 attaching clustered mode to an env var 2023-04-28 19:09:22 +01:00
Budibase Release Bot 9e62b6dc4b v2.5.9 2023-04-28 16:26:24 +00:00
melohagan 8742fb39d3 is empty lucene query with OR fix (#10451)
* empty lucene query with OR fix

* Fix unit test
2023-04-28 17:17:32 +01:00
Budibase Staging Release Bot dadf6128bc v2.5.6-alpha.40 2023-04-28 11:05:14 +00:00
Rory Powell 56f43d3f45 Hubspot updates (#10442)
* Hubspot updates for per user pricing

* Lint
2023-04-28 11:12:04 +01:00
Rory Powell a20dfa588a Type updates for plan changed event 2023-04-27 21:58:42 +01:00
Budibase Staging Release Bot b654985ab9 v2.5.6-alpha.39 2023-04-27 16:18:51 +00:00
Budibase Staging Release Bot d223643e93 v2.5.6-alpha.38 2023-04-27 15:16:50 +00:00
Budibase Staging Release Bot 06cdb7c202 v2.5.6-alpha.37 2023-04-27 13:47:04 +00:00
Budibase Staging Release Bot ead89bf0bf v2.5.6-alpha.36 2023-04-27 09:31:32 +00:00