Commit Graph

223 Commits

Author SHA1 Message Date
Adria Navarro 42b75a1ec3 Use script 2023-10-03 19:55:23 +02:00
Adria Navarro 220adea647 Clean dependencies from string-templates 2023-09-26 12:53:09 +02:00
Adria Navarro 0f0533ff2b Merge branch 'develop' into fix/backend-core-test-types 2023-09-06 10:08:46 +02:00
Adria Navarro 73d9be4161 Allow silent scripts 2023-09-06 01:45:59 +02:00
Adria Navarro 4466c351d8 Merge branch 'develop' into chore/bootstrap-updates 2023-09-05 17:47:35 +02:00
Rory Powell 9ff9da0247 Remove remaining references to `yarn bootstrap` 2023-09-05 16:37:57 +01:00
Adria Navarro 5a4d032b0d Build dist/tests 2023-09-05 16:44:02 +02:00
Rory Powell cfde7c3e58 Move bootstrap to account-portal 2023-09-05 11:07:18 +01:00
Rory Powell 6ee0cc7ba5 Update link-dependencies script to copy all modules between budibase and account-portal 2023-08-30 11:07: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
Martin McKeaveney fd099658a0 revert develop into master 2023-08-17 10:28:15 +01:00
Martin McKeaveney 9e0f2a1d82 backmerge master 2023-08-14 18:24:51 +01:00
Martin McKeaveney b80c7d7fab add paths to the optional chaining 2023-08-14 17:44:24 +01:00
Martin McKeaveney 9b814e8231 updating build script to get QA core working again 2023-08-14 17:32:03 +01:00
Adria Navarro d66a020b3c Fix build script with no pro locally 2023-08-10 15:44:57 +03:00
Adria Navarro f6c042ae34 Remove hardcoded target in esbuild 2023-08-07 14:37:57 +03:00
Adria Navarro de0f3f7463 Merge branch 'develop' into backmerge-master-20230726 2023-07-26 12:50:52 +01:00
Adria Navarro 77f4fe43dc Add comments 2023-07-26 12:48:33 +02:00
Adria Navarro 9334e1d4b9 Don't bundle backend-core if there is no pro loaded 2023-07-26 12:47:35 +02:00
Martin McKeaveney 979883257e backmerge master 2023-07-19 17:11:15 +01:00
Martin McKeaveney 7afd77065f updating versionCommit tag 2023-07-19 14:57:48 +01:00
Adria Navarro 5a8d575602 Extract getcurrent version 2023-07-05 14:11:32 +02:00
Adria Navarro 6e1ddad9c1 Fix version commit 2023-06-27 17:02:51 +01:00
Adria Navarro 24d5d36cff Add dependencies on scripts 2023-06-26 11:54:24 +01:00
Adria Navarro d499200de4 Change path refs 2023-06-26 11:53:29 +01:00
Adria Navarro 50d082c385 Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-20 11:14:05 +01:00
Adria Navarro acfe69a3d5 Remove the doble deep format references 2023-06-19 18:34:51 +01:00
Adria Navarro fe3b3aaf53 Fix dependencies 2023-06-19 17:55:47 +01:00
Adria Navarro fdba5bf3ae Exclude package dependencies 2023-06-19 17:55:47 +01:00
Adria Navarro e73934a09c Clean packages 2023-06-19 17:55:47 +01:00
Adria Navarro e286008e08 Generate metafile 2023-06-19 17:55:47 +01:00
Adria Navarro 42bc17b891 Exclude package dependencies 2023-06-19 17:55:47 +01:00
Adria Navarro 8711bbdf50 aws sdk as external 2023-06-19 17:55:47 +01:00
Adria Navarro 99b4cf9b41 Esbuild, don't mark everything as external 2023-06-19 17:55:47 +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 689d423e05 Fix wrong message 2023-06-06 08:11:30 +01:00
Adria Navarro 5c7bca96e6 Always bundle pro 2023-06-02 14:50:55 +01:00
Andrew Kingston c0eaa60e13 Revert "Assign a new display column when deleting field (#10234)"
This reverts commit 358e49d43f.
2023-05-31 13:27:07 +01:00
melohagan 358e49d43f Assign a new display column when deleting field (#10234)
* Assign a new display column when deleting field

* lint

* WIP

* Unit tests WIP

* saveField unit tests

* deleteField unit tests

* TODO

* lint

* Stop invalid data types being auto primaryDisplay
2023-05-31 11:40:31 +01:00
Adria Navarro cbd18828fc Remove resolutions when syncing deps 2023-05-29 13:19:20 +02:00
Adria Navarro 47b2bfbc20 Remove custom resetProDependencies 2023-05-29 12:57:17 +02:00
Adria Navarro e3ce16d0c9 Update local versions to 0.0.0 2023-05-29 10:54:10 +02:00
Adria Navarro 844293cf98 Reset pro dependencies before the npm push 2023-05-26 14:38:41 +02:00
Adria Navarro bdda73a70b Respect tsconfig paths 2023-05-25 11:49:38 +02:00
Adria Navarro b264708af6 Merge remote-tracking branch 'origin/develop' into chore/esbuild 2023-05-24 14:17:32 +02:00
mike12345567 f3785892a9 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-05-17 12:45:28 +01:00
Rory Powell 8ae9a1996d Remove redundant yarn setup on pro bootstrap 2023-05-12 11:39:59 +01:00
Adria Navarro 67bd995aad Fix pro versioning on release 2023-05-05 15:55:16 +01:00
Adria Navarro 09462974e1 Use semver 2023-05-05 13:23:14 +01:00
Adria Navarro cc83d7458e Merge branch 'chore/npmless-builds' into chore/esbuild
# Conflicts:
#	packages/pro
#	yarn.lock
2023-05-04 10:32:58 +01:00
Adria Navarro efaf2adf05 Fix build 2023-05-03 18:05:32 +01:00
Adria Navarro cec2f88c25 Fix svelte issues 2023-05-03 18:05:32 +01:00
Adria Navarro 648db248dc Fix builds 2023-05-03 18:05:32 +01:00
Adria Navarro 561cd40666 Use tsconfig.json 2023-05-03 18:05:21 +01:00
Adria Navarro d7f7ad5b5f Build shared-core 2023-05-03 18:05:21 +01:00
Adria Navarro f426ba1ac3 Merge branch 'chore/npmless-builds' into chore/esbuild 2023-05-02 14:56:34 +01:00
mike12345567 4f7e56fed9 Making build script into a module, so that it can be used in a specialised server build which also builds the thread scripts as required for worker-farm. 2023-04-27 19:00:01 +01:00
mike12345567 91c1aaffa7 Adding ability to specify entrypoint. 2023-04-27 17:08:59 +01:00
mike12345567 49b45f5e67 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-25 17:37:56 +01:00
adrinr 7cc859087e Execute pro checks on preinstall 2023-04-24 20:01:59 +01:00
adrinr 1b8a780cb2 Clean scripts 2023-04-24 20:01:59 +01:00
adrinr f993a7a6b2 Fix script 2023-04-24 20:01:59 +01:00
adrinr 50a0662a99 Smart script 2023-04-24 20:01:59 +01:00
adrinr c9ab1f4a36 Script to update pro deps 2023-04-24 20:01:59 +01:00
adrinr 2f8c50cee1 Rename scripts 2023-04-24 20:01:59 +01:00
adrinr f52fc90dbc Fix 2023-04-24 20:01:58 +01:00
adrinr eaab3dfc46 Fix patching 2023-04-24 20:01:58 +01:00
adrinr 7e271fed18 Bump version via node script 2023-04-24 20:01:49 +01:00
adrinr 93179855a7 Update version script 2023-04-24 20:00:22 +01:00
adrinr f4b8f932c4 Add v prefix to tag 2023-04-24 19:58:54 +01:00
adrinr 7275600be9 Bump lerna.json only 2023-04-24 19:58:54 +01:00
mike12345567 657197b02d Updating server Dockerfile. 2023-04-24 18:24:09 +01: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
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
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
adrinr e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
Michael Drury 1bd1857533 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-20 11:35:29 +01:00
adrinr cfbb25449d Link pro only when it exists locally 2023-04-19 10:09:12 +01:00
mike12345567 af72b730e0 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-14 13:06:57 +01:00
adrinr 68769602cd Fix release pro script 2023-04-13 21:41:42 +01:00
mike12345567 361005b521 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-13 17:23:58 +01:00
adrinr ceacf38ed6 Bootstrap submodule 2023-04-13 10:44:28 +01:00
adrinr b8d9311b49 Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 09:41:59 +01:00
adrinr 181d0ee236 Run pro bootstrap if submodule exists 2023-04-12 18:36:58 +01:00
Rory Powell 3b9887c66c Use helm .Chart.AppVersion instead of specifying value (#9933)
* Use helm .Chart.AppVersion instead of specifying value

* Backwards compatibility with existing process for deploying chart from source where Chart.AppVersion hasn't been generated yet
2023-04-12 13:49:25 +01:00
adrinr 000e49a229 Bootstrap using submodule 2023-04-11 16:53:51 +01:00
adrinr 5ea8086be0 Remove scripts 2023-04-11 16:52:59 +01: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
adrinr 87aaf3b172 Use esbuild for worker 2023-03-31 12:32:41 +01:00
adrinr e8e77cc140 Use esbuild for server 2023-03-31 12:32:41 +01:00
Adria Navarro 158703daef Bug - BUDI-6068 filters do not work for google sheets (#9886)
* Add data-utils with filters

* Create data-utils

* Add data-utils to compiled code

* Reuse constants

* Fix tests

* Rename package to shared-core

* Namespace export shared-core

* Rely on rollup to bundle shared-core

* Revert "Rely on rollup to bundle shared-core"

This reverts commit e8b5a2bb9a.

* Updating version and removing private.

* Update version

* Increment versions.

* Implement sort

* Enabling sort

* v2.3.21-alpha.2

* Fix build

* Improve readability

* Move deepGet to shared helper

* Better type usage

* Fix types

* Configure types

* Fix vite refs

* Add dep

* Fixing depencencies on client

* Add missing dev command

* Fix loading issues

* Update versions to latest

* Multiple es6 and commonjs configs

* Config

* Use local packages on rollup for client

* Change shared-core and types entry points

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-03-09 08:50:26 +00:00
Michael Drury 03ff4daca3 Revert "pinning MinIO versions" 2023-03-08 13:35:26 +00:00
Martin McKeaveney d72114eba3 pinning MinIO versions 2023-03-08 12:17:15 +00:00
mike12345567 ef30c03fa6 Merge branch 'develop' of github.com:Budibase/budibase into feature/audit-logs 2023-02-21 17:26:24 +00:00
mike12345567 6ec5e97ce9 Required work to support the new lucene audit logs search indexing. 2023-02-17 16:26:55 +00:00
Rory Powell 89829965d4 Remove test on release-develop job (temporary) (#9711)
* Remove test on release-develop job (temporary)

* Remove test on release-develop job (temporary)

* Speed up pro release script by adding no verify flag to version update commits
2023-02-16 14:14:22 +00:00
mike12345567 c60b6da0ab Removing pro from backend-core. 2023-02-15 13:49:30 +00:00
mike12345567 1ed4f4b8fe Update on audit logs, getting the full write flow from events configured. 2023-02-15 12:37:32 +00:00
adrinr a4555dc641 Change install script to support only mac explicitly 2023-02-03 11:06:31 +00:00