Commit Graph

2832 Commits

Author SHA1 Message Date
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
Budibase Staging Release Bot f8d4e95fbd v2.5.6-alpha.35 2023-04-27 07:34:19 +00:00
Budibase Staging Release Bot aad034e53e v2.5.6-alpha.34 2023-04-26 16:16:22 +00:00
Budibase Staging Release Bot f6a0a66437 v2.5.6-alpha.33 2023-04-26 14:58:55 +00:00
Budibase Staging Release Bot e178afe171 v2.5.6-alpha.32 2023-04-26 13:47:10 +00:00
Budibase Staging Release Bot 457c1ce0a1 v2.5.6-alpha.31 2023-04-26 12:16:31 +00:00
Budibase Staging Release Bot 26007dcd69 v2.5.6-alpha.30 2023-04-25 19:44:40 +00:00
Rory Powell aee52af7f0 Add feature and quota overrides to qa core for cloud tests (#10417)
* Fix qa core suite

* Update package.json

* Lint
2023-04-25 20:36:27 +01:00
Budibase Staging Release Bot ca85d48ca6 v2.5.6-alpha.29 2023-04-25 16:52:46 +00:00
mike12345567 19b568891e Merge branch 'develop' of github.com:Budibase/budibase into chore/npmless-builds 2023-04-25 17:44:17 +01:00
Budibase Staging Release Bot 2d2a368f23 v2.5.6-alpha.28 2023-04-25 10:50:10 +00:00
Budibase Staging Release Bot 5b4b3b6fd1 v2.5.6-alpha.27 2023-04-25 09:11:46 +00:00
Budibase Staging Release Bot 8804b9f5a2 v2.5.6-alpha.26 2023-04-24 19:15:05 +00:00
adrinr 9387d37d3b Use 0.0.1 2023-04-24 20:00:22 +01:00
adrinr ad547f32e2 Add latest back 2023-04-24 20:00:22 +01:00
adrinr 92115c5b95 Remove latest references 2023-04-24 19:59:46 +01:00
adrinr 25bc89a9b6 Remove package versions 2023-04-24 19:58:40 +01:00
Budibase Staging Release Bot 9056cd41c7 v2.5.6-alpha.25 2023-04-24 18:31:54 +00:00
Budibase Staging Release Bot dfe28d171c v2.5.6-alpha.24 2023-04-24 17:41:06 +00:00
Adria Navarro 640bb2004b Merge pull request #10324 from Budibase/chore/remove_package.json_dependency
Chore - Remove package.json dependency
2023-04-24 19:34:15 +02:00
Budibase Staging Release Bot 88a6cd50dd v2.5.6-alpha.23 2023-04-24 16:58:46 +00:00
Budibase Staging Release Bot 19e8836870 v2.5.6-alpha.22 2023-04-24 16:43:56 +00:00
Adria Navarro c47ff6ccfb Merge branch 'develop' into chore/remove_package.json_dependency 2023-04-24 18:42:55 +02:00
Budibase Staging Release Bot 4786ce58ed v2.5.6-alpha.21 2023-04-24 16:01:58 +00:00
Budibase Staging Release Bot 9ee56025f1 v2.5.6-alpha.20 2023-04-24 12:45:50 +00:00
Michael Drury 1b3d92ae86 Merge pull request #10369 from Budibase/chore/pro_as_submodule
Chore - use pro as submodule
2023-04-24 13:26:30 +01:00
Budibase Staging Release Bot 360b828e66 v2.5.6-alpha.19 2023-04-24 11:10:02 +00:00
Budibase Staging Release Bot 4a8a6c8bbc v2.5.6-alpha.18 2023-04-24 10:38:25 +00:00
Budibase Release Bot 2f2084a426 v2.5.8 2023-04-24 08:47:42 +00:00
Budibase Staging Release Bot 548ba5a07a v2.5.6-alpha.17 2023-04-24 08:45:56 +00:00
Martin McKeaveney 86dc082f57 Merge pull request #10366 from Budibase/budi-5186-dynamic-filter-contains-option
Dynamic filter contains option
2023-04-24 09:32:58 +01:00
Rory Powell ec06f13aa6 Per user pricing (#10378)
* Update pro version to 2.4.44-alpha.9 (#10231)

Co-authored-by: Budibase Staging Release Bot <>

* Track installation and unique tenant id on licence activate (#10146)

* changes and exports

* removing the extend

* Lint + tidy

* Update account.ts

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>

* Type updates for loading new plans (#10245)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS` (#10247)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete + migration (#10250)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Lint

* Types and structures for user subscription quantity sync (#10280)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing for licensing (#10346)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing

* Lint

* Pricing/billing page (#10353)

* bbui updates for billing page

* Require all PlanTypes in PlanMinimums for compile time safety

* fix test package utils

* Incoming user limits warnings (#10379)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* Types and test updates for subscription quantity changes in account-portal (#10372)

* Add chance extensions for `arrayOf`. Update events spies with license events

* Add generics to doInTenant response

* Update account structure with quota usage

* User count limits (#10385)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* user limit messaging on add users modal

* user limit messaging on import users modal

* update licensing store to be more generic

* some styling updates

* remove console log

* Store tweaks

* Add startDate to Quota type

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>

* Lint

* Support custom lock options

* Reactivity fixes for add user modals

* Update ethereal email creds

* Add warn for getting invite from code error

* Extract disabling user import condition

* Handling unlimited users in modals logic and adding start date processing to store

* Lint

* Integration testing fixes (#10389)

* lint

---------

Co-authored-by: Mateus Badan de Pieri <mateuspieri@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Peter Clement <PClmnt@users.noreply.github.com>
2023-04-24 09:31:48 +01:00
Budibase Release Bot 93f7bd54d8 v2.5.7 2023-04-21 17:29:12 +00:00
Budibase Staging Release Bot b3d989e249 v2.5.6-alpha.16 2023-04-21 13:45:11 +00:00
Budibase Staging Release Bot 06e6c20cf1 v2.5.6-alpha.15 2023-04-21 11:43:34 +00:00
Budibase Staging Release Bot c196fc1f3e v2.5.6-alpha.14 2023-04-21 11:24:59 +00:00
Mel O'Hagan e9c3958e86 Merge branch 'develop' into budi-5186-dynamic-filter-contains-option 2023-04-21 10:46:17 +01:00
Budibase Staging Release Bot 91e7fe8ec1 v2.5.6-alpha.13 2023-04-21 07:16:47 +00:00
Mel O'Hagan 458b23fc1b Add escape for forward slash 2023-04-20 21:57:48 +01:00
adrinr afc5c99c6f Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule"
This reverts commit df18119b56, reversing
changes made to 676b85dbd8.
2023-04-20 19:48:29 +01:00
Budibase Staging Release Bot 269cbc8b2c v2.5.6-alpha.12 2023-04-20 18:35:09 +00:00
adrinr e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
Mel O'Hagan 66a573dcc9 Fix fuzzy search internal DB 2023-04-20 18:14:41 +01:00
Mel O'Hagan 68ba2402a0 Fix substring regex 2023-04-20 17:51:58 +01:00
Mel O'Hagan e58cd0a106 Check substring if contains not array 2023-04-20 17:30:45 +01:00
Budibase Release Bot 5a9c7d83b1 v2.5.6 2023-04-20 14:30:34 +00:00
Budibase Release Bot 5c292bbecd v2.5.5 2023-04-20 08:51:41 +00:00
Adria Navarro 22d42afe8f Merge pull request #10267 from Budibase/chore/pro_as_submodule
Chore - use pro as submodule
2023-04-19 18:23:28 +02:00
adrinr b128306262 Increase writethrough cache timeout 2023-04-19 16:47:48 +01:00
Budibase Staging Release Bot 34b3781b59 v2.5.6-alpha.6 2023-04-19 13:29:39 +00:00
adrinr 98b372965c Merge branch 'develop' into chore/pro_as_submodule 2023-04-19 10:22:48 +01:00
Budibase Staging Release Bot 06ec04dcec v2.5.6-alpha.5 2023-04-18 16:40:23 +00:00
Michael Drury 42c37eea46 Merge pull request #10276 from Budibase/labday/automation-plugins
Automation step plugins
2023-04-18 17:33:25 +01:00
mike12345567 3b03766f9e Adding plugin validation unit tests. 2023-04-18 16:36:03 +01:00
Budibase Staging Release Bot a13cdefd01 v2.5.6-alpha.4 2023-04-18 13:44:25 +00:00
adrinr 37158594f7 Merge branch 'develop' into chore/pro_as_submodule 2023-04-18 12:21:38 +01:00
Budibase Staging Release Bot 287ba01691 v2.5.6-alpha.3 2023-04-18 09:44:21 +00:00
Budibase Staging Release Bot 443319f4a5 v2.5.6-alpha.2 2023-04-17 16:55:49 +00:00
mike12345567 b4e6cbce7a Some final updates to get tests passing again, issue with publisher tenant ID being the 'unique' format which cannot actually be used. 2023-04-17 15:59:59 +01:00
adrinr 1dcb6b32b2 Remove not required references 2023-04-17 15:54:13 +01:00
mike12345567 b6f14a3f55 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 14:58:40 +01:00
adrinr eeb0daa98a Update builds to exclude the package.json 2023-04-17 14:20:36 +01:00
adrinr 8e95121ac8 Implement find version 2023-04-17 14:07:49 +01:00
mike12345567 453d5cc0e6 Further PR comments. 2023-04-17 14:03:54 +01:00
adrinr e5227febd8 Use version from environment 2023-04-17 14:02:50 +01:00
Budibase Staging Release Bot b62633587f v2.5.6-alpha.1 2023-04-17 11:33:21 +00:00
Budibase Staging Release Bot b81be5d686 v2.5.5-alpha.4 2023-04-17 10:51:12 +00:00
Adria Navarro 6ee0702316 Merge pull request #10323 from Budibase/chore/remove_old_zlib_ref
Chore - Remove zlib npm references
2023-04-17 12:38:19 +02:00
Budibase Staging Release Bot f9c5fd489b v2.5.5-alpha.3 2023-04-17 10:30:38 +00:00
adrinr 33c3b67f8c Merge branch 'develop' into chore/remove_old_zlib_ref 2023-04-17 11:28:43 +01:00
Michael Drury 408aefceb3 Merge pull request #10303 from Budibase/permissions-test
Permissions test
2023-04-17 11:23:42 +01:00
Budibase Staging Release Bot 457e1d7a1a v2.5.5-alpha.2 2023-04-17 09:34:23 +00:00
adrinr ac4e45a433 Replace usages 2023-04-17 10:27:37 +01:00
mike12345567 d506ef52f8 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 10:16:15 +01:00
adrinr b91d518e54 Remove zlib npm references 2023-04-17 10:06:15 +01:00
Mateus Badan de Pieri de968b5332 changin syntax to permission function 2023-04-17 10:04:50 +01:00
Budibase Staging Release Bot e60b09b03e v2.5.5-alpha.1 2023-04-17 09:01:24 +00:00
Mateus Badan de Pieri 643ca614a4 changing test to it 2023-04-16 22:27:02 +01:00
Michael Drury ef5bcc4b66 Main body of PR comments, switching event handling to be a publisher of async events, a generic event; then adding a new async document update processor, which can later be converted to be part of the event processing pipeline. 2023-04-15 00:37:22 +01:00
Michael Drury 0ba5887d9c Merge branch 'fix/BUDI-6754' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-15 00:33:50 +01:00
Michael Drury 941947f04c Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-14 22:42:02 +01:00
Budibase Staging Release Bot 8e87a5e700 v2.5.5-alpha.0 2023-04-14 16:45:33 +00:00
mike12345567 b36702ca72 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-04-14 17:32:04 +01:00
adrinr 83a7ab64b4 Update @types/jest 2023-04-14 12:54:24 +01:00
Budibase Staging Release Bot e8e704259e v2.4.44-alpha.26 2023-04-14 11:34:48 +00:00
Budibase Staging Release Bot 9f4a340927 v2.4.44-alpha.25 2023-04-14 11:18:12 +00:00
Mateus Badan de Pieri 5180ac29d2 final functions being tested 2023-04-14 12:16:01 +01:00
adrinr 1a26877f08 v2.4.44-alpha.24 2023-04-14 12:10:49 +01:00
Budibase Staging Release Bot 788b7b6492 v2.4.44-alpha.23 2023-04-14 11:03:56 +00:00
Mateus Badan de Pieri b0075998bf Merge branch 'permissions-test' of https://github.com/Budibase/budibase into permissions-test 2023-04-14 11:45:37 +01:00
Mateus Badan de Pieri 2f98ce9772 reverting some breaking changes 2023-04-14 11:45:27 +01:00
mike12345567 b7192c37b9 Merge branch 'develop' of github.com:Budibase/budibase into permissions-test 2023-04-14 11:43:02 +01:00
Mateus Badan de Pieri 038476523f doesHaveBasePermission tests 2023-04-14 11:39:52 +01:00
Mateus Badan de Pieri 696eea9f92 exporting function to test 2023-04-14 11:39:36 +01:00
Budibase Staging Release Bot fc971ed3ad v2.4.44-alpha.22 2023-04-14 10:17:37 +00:00
Mateus Badan de Pieri fa83c5d7a1 added get allowed levels (not working yet) 2023-04-14 10:29:52 +01:00
Mateus Badan de Pieri 9bf580e761 Merge branch 'develop' into permissions-test 2023-04-14 10:27:35 +01:00
Mateus Badan de Pieri 62b5e08cde primary test cases, level to number working already 2023-04-14 10:25:38 +01:00
Budibase Release Bot 52aa5f1a66 v2.5.4 2023-04-14 09:05:38 +00:00
Budibase Staging Release Bot a529556e07 v2.4.44-alpha.21 2023-04-13 18:55:33 +00:00
adrinr 0aa5b3da03 Merge branch 'develop' into chore/yarn_workspaces 2023-04-13 19:29:45 +01:00
Budibase Staging Release Bot c9ffbe46e1 v2.4.44-alpha.20 2023-04-13 12:39:28 +00:00
adrinr f585bb793d Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 10:59:52 +01:00
adrinr 3672acd68e Fix backend-core tests 2023-04-13 10:54:35 +01:00
adrinr 07a82925ba Add missing dependency 2023-04-13 10:54:35 +01:00
adrinr d56129f3fc Remove types 2023-04-13 10:54:35 +01:00
adrinr 18582c83f5 Add missing types 2023-04-13 10:54:35 +01:00
adrinr 36c412e57b Remove unused yarn.lock 2023-04-13 10:54:35 +01:00
Budibase Staging Release Bot a89b04203e v2.4.44-alpha.19 2023-04-13 09:27:17 +00:00
adrinr b8d9311b49 Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 09:41:59 +01:00
Budibase Staging Release Bot 1e9ae6aec1 v2.4.44-alpha.18 2023-04-12 21:27:37 +00:00
adrinr 0319610095 Fix backend-core tests 2023-04-12 21:46:08 +01:00
mike12345567 23e99ca4b7 Adding group and user tests for user sync. 2023-04-12 19:59:05 +01:00
adrinr 123a762b60 Add missing dependency 2023-04-12 19:43:57 +01:00
adrinr e217286e7b Remove types 2023-04-12 19:41:23 +01:00
adrinr b41157d740 Add missing types 2023-04-12 19:08:19 +01:00
adrinr e6dc4e5fa0 Remove unused yarn.lock 2023-04-12 18:49:29 +01:00
mike12345567 1129d19412 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-12 17:09:29 +01:00
Budibase Staging Release Bot 4eb5201f6a v2.4.44-alpha.17 2023-04-12 15:38:04 +00:00
mike12345567 a9fb09424b Merge branch 'develop' of github.com:Budibase/budibase into labday/automation-plugins 2023-04-12 14:27:50 +01:00
Budibase Staging Release Bot 9afbb300fa v2.4.44-alpha.16 2023-04-12 13:07:38 +00:00
mike12345567 3eb718ea6d Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-12 13:42:46 +01:00
Budibase Staging Release Bot ad393a829d v2.4.44-alpha.15 2023-04-12 12:42:23 +00:00
Michael Drury 0911cc05cf Merge pull request #10272 from Budibase/test/coverage-bckend-core
Test/coverage bckend core
2023-04-12 13:32:04 +01:00
Budibase Staging Release Bot f65a308ffd v2.4.44-alpha.14 2023-04-12 10:58:55 +00:00
Mateus Badan de Pieri df38368eaf removing tests 2023-04-12 11:06:01 +01:00
mike12345567 ada052e043 Merging in develop - fixing some test cases which broke in the process. 2023-04-12 10:56:21 +01:00
Budibase Staging Release Bot a4e2c41c1c v2.4.44-alpha.13 2023-04-12 09:07:40 +00:00
Mateus Badan de Pieri f427763308 export function to make test easier 2023-04-12 02:29:30 +01:00
Mateus Badan de Pieri ef0293bc6c encryption tests 100% 2023-04-12 02:25:53 +01:00
mike12345567 1aafdbe9a7 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-11 17:28:14 +01:00
adrinr 5ea8086be0 Remove scripts 2023-04-11 16:52:59 +01:00
adrinr f882993091 Name and its fields are optional 2023-04-11 16:12:18 +01:00
Budibase Release Bot fb268f1655 v2.5.3 2023-04-11 13:46:26 +00:00
Budibase Staging Release Bot 08dbee5384 v2.4.44-alpha.12 2023-04-11 13:42:48 +00:00
adrinr c77ed3d737 Renames 2023-04-11 13:39:13 +01:00
adrinr e1279ffecd Use proper errors instead of string throwing 2023-04-11 13:39:13 +01:00
mike12345567 e54b48465b Merge branch 'develop' of github.com:Budibase/budibase into labday/automation-plugins 2023-04-11 13:31:39 +01:00
Budibase Staging Release Bot 6aefc6b643 v2.4.44-alpha.11 2023-04-11 12:28:43 +00:00
mike12345567 c4a4bdc9da Fixing tenancy.spec.ts - mocking was a bit messed up, moving it all around to work as expected. 2023-04-11 10:54:04 +01:00
Mateus Badan de Pieri de613d2b28 latest version 2023-04-11 10:22:47 +01:00
Michael Drury 1c7c06e983 Bulk of the automation plugin system, supporting custom plugins. 2023-04-10 23:48:54 +01:00
Michael Drury 4badd04e33 Some automation fixes and adding option to disable logging for CLI. 2023-04-10 22:33:53 +01:00
Budibase Staging Release Bot a3c0510ed7 v2.4.44-alpha.10 2023-04-10 18:53:08 +00:00
Budibase Release Bot 1b0635e957 v2.5.2 2023-04-07 21:30:39 +00:00
mike12345567 400a112a4b Refactoring automation steps to be better defined in Typescript, which allows writing the validator for automations. 2023-04-06 18:11:44 +01:00
mike12345567 0803b08217 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-05 17:59:18 +01:00
Mateus Badan de Pieri f1b7ff0f7c fixing expect on throw 2023-04-05 16:30:00 +01:00
Mateus Badan de Pieri b0df710a2a tweaks on some tests 2023-04-05 16:13:39 +01:00
Budibase Staging Release Bot efa1ea7b1b v2.4.44-alpha.9 2023-04-05 14:41:48 +00:00
Rory Powell 77ffb8d86d Run integration suite in CI again / auto detect tenancy / refactors (#10209)
* qa-core-ci-fixes

* global setup and teardown wip

* Updates to logs and setup

* Remove date and console mocking

* Update CI to spin up minimal dev env

* Update readme

* Fix scopeBackend.sh

* Ensure docker services are initialised before starting worker

* Lint

* Fix admin user being created on startup (#10219)

* use regular bootstrap and build

* Lint

* Temp: re-use global setup to get around app limit in QA
2023-04-05 15:33:56 +01:00
Mateus Badan de Pieri 6bd950717c mocked correctly 2023-04-05 14:14:55 +01:00
Budibase Staging Release Bot f02f996744 v2.4.44-alpha.8 2023-04-05 12:18:30 +00:00
Budibase Staging Release Bot 244b911efb v2.4.44-alpha.7 2023-04-04 14:53:06 +00:00
Budibase Staging Release Bot e94a05887f v2.4.44-alpha.6 2023-04-04 14:18:08 +00:00
Rory Powell 976b3a55ca Update logging to support dd trace attributes (#10086)
* Update logging middleware to integrate with pino for console logging

* Remove elastic apm references, use updated core middlewares

* Remove redundant LOG_LEVEL definitions

* Remove no longer needed jest logging overrides

* lint

* Backwards compat between console log helpers and pino

* Configurable DISABLE_HTTP_LOGGING

* Don't log 4xx as errors

* Remove redundant ENABLE_4XX_HTTP_LOGGING

* Cleanup migrations and event logging

* Improve bb-alert logging

* Add DISABLE_HTTP_LOGGING to helm chart

* Add ops endpoints for testing

* Disable http logging in dev

* Backwards compatible tracing implementation

* Naming update on http logging env var

* lint

* Update packages/backend-core/src/environment.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>

* Merge

* Lint

* Fix console.warn failing mock by replacing with alerts mock instead

* Lint

---------

Co-authored-by: Adria Navarro <adria@revityapp.com>
2023-04-04 15:08:46 +01:00
mike12345567 e128642bce Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-04 13:37:59 +01:00
Budibase Release Bot 917c5100ad v2.5.1 2023-04-04 09:24:27 +00:00
Budibase Staging Release Bot 7bc049c02b v2.4.44-alpha.5 2023-04-04 09:09:48 +00:00
Michael Drury ff98ba5a0a Adding a document update queue based on the events which can be used to track when certain documents have changed, using this for users and groups to detect when a re-sync is needed. 2023-04-04 00:25:15 +01:00
adrinr c0d7f2329a Extract valid email util 2023-04-03 16:42:30 +01:00
Budibase Staging Release Bot 2c9b354a1b v2.4.44-alpha.4 2023-04-03 15:13:42 +00:00
Budibase Release Bot be8dfd2ef1 v2.5.0 2023-04-03 13:10:52 +00:00
Budibase Staging Release Bot 52cc24121e v2.4.44-alpha.3 2023-04-03 11:33:44 +00:00
Adria Navarro e1669c8260 Merge pull request #10022 from Budibase/feature/scim
Feature - SCIM endpoints
2023-04-03 13:22:01 +02:00
Budibase Staging Release Bot 1c84b14582 v2.4.44-alpha.2 2023-04-03 11:09:04 +00:00
Mateus Badan de Pieri b6fd3b7cf7 primary tests cases 2023-04-03 11:28:20 +01:00
Budibase Release Bot 051d39690a v2.4.44 2023-04-02 18:15:15 +00:00
Budibase Staging Release Bot 97cfcb6b93 v2.4.44-alpha.1 2023-03-31 23:01:55 +00:00
Budibase Staging Release Bot 5e3cf7af1b v2.4.44-alpha.0 2023-03-31 22:37:36 +00:00
Mateus Badan de Pieri e6ac534fca isUserInAppTenant tests working 2023-03-31 15:07:28 +01:00
mike12345567 906d614c64 Merge branch 'merge-master-develop' of github.com:Budibase/budibase into merge-master-develop 2023-03-31 13:51:20 +01:00
Budibase Staging Release Bot 329beee00d v2.4.42-alpha.8 2023-03-31 12:34:45 +00:00
Michael Drury 1c6465edcb Merge pull request #10172 from Budibase/fix/budi-6797
Googlesheets onboarding - fix in cloud, disable self host
2023-03-31 13:19:29 +01:00
Rory Powell e9322be28f Merge branch 'develop' into merge-master-develop 2023-03-31 12:39:22 +01:00
Budibase Staging Release Bot 99bea8e7ce v2.4.42-alpha.7 2023-03-31 11:31:30 +00:00
Rory Powell 44aa19a99a Merge branch 'master' into merge-master-develop 2023-03-31 12:26:04 +01:00
Adria Navarro cfb93063b2 Merge pull request #10153 from Budibase/budi-6803-delete-users-when-group-removed
BUDI-6803 - Remove users that should not be there anymore when syncGlobalUsers
2023-03-31 13:15:11 +02:00
Budibase Staging Release Bot 9c8fcacf2a v2.4.42-alpha.6 2023-03-31 11:08:33 +00:00
Budibase Staging Release Bot 889ea356e6 v2.4.42-alpha.5 2023-03-31 10:43:16 +00:00
mike12345567 75baba76d6 Resolving PR comments. 2023-03-31 11:38:09 +01:00
Budibase Release Bot 2118bcea3a v2.4.43 2023-03-31 09:42:50 +00:00
Rory Powell 79bec7d86d Add force exit, -e flag and streaming to tests (#10151)
* Add force exit, -e flag and streaming to tests

* Temp remove script usage from worker tests

* Revert "Temp remove script usage from worker tests"

This reverts commit 5e0ed2e92d.

* Always fail test

* Ignore server test package from coverage report

* Unscope server only

* Run all server tests again

* Update backend core test script to fail when any command fails and force exit

* Don't try to require client in test

* Port memory limit fix from develop

* Remove always failing test and commented out block for client require

* Fixing some issues with test cases.

* Revert assertions in internalSearch.spec.js

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-03-31 10:32:13 +01:00
adrinr 48b964378b Remove all app cookie references (not really needed anymore) 2023-03-31 09:01:40 +01:00