Commit Graph

844 Commits

Author SHA1 Message Date
Andrew Kingston 2a9a05ad2d Merge branch 'nested-nav-links' of github.com:Budibase/budibase into nested-nav-links 2024-04-10 16:07:11 +01:00
Andrew Kingston b62c1e6fb3 Update navigation tests 2024-04-10 16:06:37 +01:00
Andrew Kingston e0f02941b9
Merge branch 'master' into nested-nav-links 2024-04-10 14:19:26 +01:00
Andrew Kingston 380a0e7d30 Add type and role to automatically created nav links and ensure cleanup from both links and sublinks when deleting screens 2024-04-10 14:19:05 +01:00
Adria Navarro bc0b42bda6 Fix test 2024-04-10 12:35:31 +02:00
melohagan 923ae021a1
Feature/nps survey (#13423)
* get process env in JS file

* Hard-code posthog token

* Set posthog key based on env

* Don't run posthog locally in dev

* fix

* Only run posthog analytics in prod

* Don't use posthog in dev

* Revert posthog code changes.

* Remove intercom

* lint
2024-04-09 15:24:03 +01:00
Adria Navarro d431f633d3 Use types 2024-04-03 12:02:55 +02:00
Andrew Kingston 567c3a6d10 Add optional chaining to fix log out and log in issue 2024-04-02 14:46:28 +01:00
Andrew Kingston 6c9127427c Fix issues with colours in app skeletons 2024-03-26 10:43:56 +00:00
Andrew Kingston 44114d9af1 Lint 2024-03-21 16:26:53 +00:00
Andrew Kingston c6fca37b43 Update dataprovider validation which was not aware of global bindings 2024-03-21 16:05:02 +00:00
Andrew Kingston 5acfc3143d Multiple performance improvements to component selection and hovering 2024-03-20 17:01:23 +00:00
Conor Webb 35e1114fac
Added a setting to allow the title's text alignment to be changed (#13235)
* Added setting to allow title text alignment to be set and changed

* Switched out for icons instead of a select as per feedback.

* Edited right icon to display the correct icon.

* Updated to use the paragrah alignment component icons.

* Added button list component

* Reworked template to use BarButtonList over ActionButton component

* Updated selectedArray name to alignmentOptions provides better meaning
2024-03-19 16:13:28 +00:00
Gerard Burns fbec6d6eff Merge branch 'master' into component-collapse-redo 2024-03-15 14:38:46 +00:00
Gerard Burns f632e67f44 merge master 2024-03-15 14:05:18 +00:00
Dean b8277fc60f Merge remote-tracking branch 'origin/feature/app-list-actions' into feature/app-favourites 2024-03-15 10:01:38 +00:00
Dean f2dbeed6e8 Merge remote-tracking branch 'origin/feature/app-list-actions' into feature/app-favourites 2024-03-15 09:20:02 +00:00
Dean 4949ea1bcd PR feedback 2024-03-15 09:09:44 +00:00
Andrew Kingston b6eab42c18 Merge branch 'cheeks-lab-day-binding-eval' of github.com:Budibase/budibase into cheeks-snippets-poc 2024-03-14 16:24:16 +00:00
Andrew Kingston 542a1111c6
Merge branch 'master' into cheeks-lab-day-binding-eval 2024-03-14 16:22:03 +00:00
Gerard Burns 61f2746cf9 linting 2024-03-14 15:51:48 +00:00
Gerard Burns d1affc2586 wip 2024-03-14 15:21:55 +00:00
Gerard Burns 89371c5f5f remove node collapsing magic string 2024-03-14 13:24:34 +00:00
Gerard Burns ece7060b6b Merge branch 'master' into component-collapse-redo 2024-03-14 10:49:34 +00:00
Dean 9755d40203 Merge remote-tracking branch 'origin/feature/app-list-actions' into feature/app-favourites 2024-03-14 09:52:01 +00:00
Sam Rose 02158a0fb1
Merge branch 'master' of github.com:budibase/budibase into budi-7664-sqs-self-host-ui-for-detecting-lack-of-sqs-support-2 2024-03-14 09:24:02 +00:00
Andrew Kingston 75dc2b174b Merge branch 'master' of github.com:Budibase/budibase into cheeks-lab-day-binding-eval 2024-03-12 17:04:34 +00:00
Andrew Kingston b13d2d3803 Merge branch 'master' of github.com:Budibase/budibase into cheeks-snippets-poc 2024-03-12 15:38:23 +00:00
Adria Navarro e754c660ee Fix edition of groups with groups 2024-03-12 08:56:36 +01:00
Adria Navarro 4b2c16998c Fix SCIM groups edition 2024-03-12 08:51:01 +01:00
Andrew Kingston af10b65d51 Merge branch 'cheeks-lab-day-binding-eval' of github.com:Budibase/budibase into cheeks-snippets-poc 2024-03-11 13:55:12 +00:00
Andrew Kingston b1c4c910d8
Merge branch 'master' into cheeks-lab-day-binding-eval 2024-03-11 13:49:06 +00:00
Sam Rose 3550ae8c1a
Merge branch 'master' of github.com:budibase/budibase into budi-7664-sqs-self-host-ui-for-detecting-lack-of-sqs-support-2 2024-03-11 13:45:08 +00:00
Dean e3fba2aa05 Merge remote-tracking branch 'origin/feature/app-list-actions' into feature/app-favourites 2024-03-11 10:11:01 +00:00
Andrew Kingston ce0ad154da Merge branch 'master' of github.com:Budibase/budibase into cheeks-lab-day-binding-eval 2024-03-11 09:33:46 +00:00
Dean fec52c11e8 Merge remote-tracking branch 'origin/feature/app-list-actions' into feature/app-favourites 2024-03-08 14:26:05 +00:00
Adria Navarro c955135f51 Lint 2024-03-07 14:11:19 +01:00
Adria Navarro 73c141c0fb Merge branch 'feat/BUDI-8046' into display_scim_sync_per_row 2024-03-07 13:33:59 +01:00
Andrew Kingston cb7f33de77 Add automatic naming of snippets 2024-03-06 20:27:46 +00:00
Andrew Kingston 4d271ccb53 Add real snippet saving and fix snippet evaluation in client apps 2024-03-06 19:07:16 +00:00
Andrew Kingston 84fb0dd9de Add local state manipulation of snippets 2024-03-06 13:33:00 +00:00
Dean f494611bd8 Merge remote-tracking branch 'origin/master' into feature/form-screen-template 2024-03-06 10:13:58 +00:00
Dean e3603a81d5 App favouriting 2024-03-06 09:33:17 +00:00
Andrew Kingston 706f9b5d4a Update snippets to be an array 2024-03-05 19:11:34 +00:00
Andrew Kingston fa685962a8 Merge branch 'master' of github.com:Budibase/budibase into cheeks-lab-day-binding-eval 2024-03-05 11:46:48 +00:00
melohagan ee0f0abad2
Fix/rename mysql column (#13186)
* Rebuild table schema when adding new column to get externalType

* Added MySQL integration test suite

* Add test for emitting datasource on save new column

* Update packages/server/src/integration-test/mysql.spec.ts

Co-authored-by: Sam Rose <hello@samwho.dev>

* remove duplicate tests

* Use UUID

* update account portal

* Remove _add for internal save

* Internal DB add column unit test

* rename column test

* update modules

* fix tests

---------

Co-authored-by: Sam Rose <hello@samwho.dev>
2024-03-04 15:55:45 +00:00
melohagan 5fabe14f62
Revert "Rebuild table schema when adding new column to get externalType (#13165)" (#13184)
This reverts commit a59647e158.
2024-03-04 12:20:27 +00:00
melohagan a59647e158
Rebuild table schema when adding new column to get externalType (#13165)
* Rebuild table schema when adding new column to get externalType

* Added MySQL integration test suite

* Add test for emitting datasource on save new column

* Update packages/server/src/integration-test/mysql.spec.ts

Co-authored-by: Sam Rose <hello@samwho.dev>

* remove duplicate tests

* Use UUID

* update account portal

---------

Co-authored-by: Sam Rose <hello@samwho.dev>
2024-03-04 11:21:43 +00:00
Gerard Burns 7cd0ce371d wip 2024-03-04 08:17:58 +00:00
Gerard Burns f1208919ee linting 2024-03-04 08:07:15 +00:00
Gerard Burns 2f90d7f431 wip 2024-03-04 08:05:50 +00:00
Andrew Kingston 87e8b89075 Merge branch 'master' of github.com:Budibase/budibase into cheeks-lab-day-binding-eval 2024-02-29 19:12:52 +00:00
Adria Navarro cfdb0d98a2 Move responsability to the store 2024-02-28 14:41:31 +01:00
Dean ea978923cb Merge remote-tracking branch 'origin/master' into feature/form-screen-template 2024-02-23 11:32:16 +00:00
Dean 78969a33f4 Fixes 2024-02-23 11:05:39 +00:00
melohagan 896b879ce7
Feature/query array schema (#13118)
* Revert "Revert "Add nestedSchemaFields to RestQueryViewer (#13102)""

This reverts commit 6545af12fa.

* Revert "Revert "Dynamic schema generation for query arrays: bug fix and refactor (#13…""

This reverts commit ae4bc362c3.
2024-02-22 17:06:08 +00:00
Dean d7fa333fce Merge remote-tracking branch 'origin/master' into feature/form-screen-template 2024-02-22 16:30:05 +00:00
Gerard Burns de0414afbe
Update Svelte Major Version to 4 (#13036)
* update svelte versions

* temporarilly disable svelte warnings

* change bbap version pointed to

* remove sub module specifying svelte version

* point at updated account-portal

* add type declaration for svelte in the server

* add svelte transformer for server jest tests

* remove svelte from bbui package.json

* get builder tests working

* linting fixes

* prettier fixes

* fix server test

* fix another server test

* fix server serverlog test

* account-portal-version

* pin master version of pro

* revert hbs doc file in server to use triple braces, ensures nothing gets escaped
2024-02-22 13:19:29 +00:00
Martin McKeaveney ae4bc362c3
Revert "Dynamic schema generation for query arrays: bug fix and refactor (#13…"
This reverts commit 0c9d13c79a.
2024-02-21 21:30:22 +00:00
melohagan 0c9d13c79a
Dynamic schema generation for query arrays: bug fix and refactor (#13082)
* Bug fix and refactor

* lint

* Refactor

* refactor

* lint

* type fixes

* Unit test fix and refactor

* refactor

* Make name option for preview, required for query

* Refactor unit tests

* Fix test

* update account-portal

* Revert "update account-portal"

This reverts commit e378f8d702.

* simplify set iteration

* comment
2024-02-21 15:33:13 +00:00
Sam Rose 5c2a93a956
Merge branch 'master' of github.com:budibase/budibase into budi-7664-sqs-self-host-ui-for-detecting-lack-of-sqs-support-2 2024-02-16 16:52:13 +00:00
Andrew Kingston dc077da5ae Improve how component context is retrieved for live eval and provide extra context from grid and card blocks 2024-02-16 14:21:03 +00:00
mike12345567 d5932605b7 Fixing an issue where app routing information was requested before the app store was fully brought online, meaning that routing information wasn't always successfully retrieved. 2024-02-15 15:49:12 +00:00
Andrew Kingston 9371661f0b Merge branch 'master' of github.com:Budibase/budibase into cheeks-lab-day-binding-eval 2024-02-15 15:40:16 +00:00
Dean 0aa75fc7cb Merge remote-tracking branch 'origin/master' into feature/form-screen-template 2024-02-15 15:26:14 +00:00
Dean b0cd3d4d03 Refactored tours. Tours will end if a TourWrap is removed from screen. 2024-02-15 15:23:13 +00:00
Gerard Burns 2fbbd295fc
fix arrow navigation behavior (#13040) 2024-02-15 11:16:00 +00:00
Gerard Burns b12aa639d3
Allow Collapsing Selected Components, Add Hotkeys for Collapsing Components (#12764)
* wip

* fix spelling

* wip

* linting

* change order of fix version of linting

* lint fix

* linting
2024-02-15 10:53:58 +00:00
Andrew Kingston ab96d6ee01 Merge branch 'master' of github.com:Budibase/budibase into cheeks-lab-day-binding-eval 2024-02-14 16:25:01 +00:00
Dean 5c5dc4c155 Merge remote-tracking branch 'origin/master' into feature/form-screen-template 2024-02-14 14:32:15 +00:00
Dean 2d8d0a50bc Lint 2024-02-07 14:53:16 +00:00
Dean a5dfbe3c89 Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2024-02-07 14:45:06 +00:00
Andrew Kingston 94544c4008 Remove legacy concept of database store 2024-02-06 15:40:51 +00:00
Andrew Kingston 1efd5725c7 Add some new resolution aliases and simplify long nasty relative import paths 2024-02-05 12:08:45 +00:00
Andrew Kingston e7ac33bf43 Remove legacy concept of currentAsset 2024-02-05 11:59:54 +00:00
Andrew Kingston 05e1dee992 Add missing await and batch some more API calls for speed 2024-02-05 11:49:43 +00:00
Andrew Kingston ff499d1461 Move selected layout out of layout store 2024-02-05 11:29:39 +00:00
Andrew Kingston 48677aeaab Move derived component stores out of main component store 2024-02-05 11:26:47 +00:00
Andrew Kingston b04d92f8b2 Pull derived selected screen store out of main screen store 2024-02-05 11:24:34 +00:00
Andrew Kingston 1650f37329 Treat component store the same as other stores, and move component utils into helpers 2024-02-05 11:22:33 +00:00
Andrew Kingston 090460a8f5 Run all builder data hydration API calls in parallel to speed up builder loading 2024-02-05 11:15:48 +00:00
Andrew Kingston 233df4c27c Remove legacy nested builder directory and move screen templates and utils into better locations 2024-02-01 09:55:30 +00:00
Andrew Kingston 69dae35e2a Ensure component settings is always an array and improve performance by minimizing store retrievals 2024-01-31 16:06:20 +00:00
Sam Rose a268e55607
Plumbing for showing a maintenance page when SQS is required but missing. 2024-01-30 17:31:11 +00:00
Dean 1d9a03e13c Fix for onboarding flow. App sync on created passed incorrect data 2024-01-30 15:45:59 +00:00
Dean 68543b12ee Removed test file 2024-01-30 12:07:50 +00:00
Dean 1bd08b6879 Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2024-01-30 11:49:32 +00:00
Dean b73156e0c7 Added more componet store unit test converage. Added more fixtures. Refactored some component caching logic causing issus with testing in to the component store 2024-01-29 15:21:52 +00:00
mike12345567 2a21556402 Get rid of schemaFields on backend. 2024-01-22 13:29:14 +00:00
Dean 4945a6ee99 Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2024-01-18 10:40:21 +00:00
Dean 1779a5ee19 Lint 2024-01-17 17:40:09 +00:00
Dean 30db237071 Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2024-01-17 17:17:01 +00:00
Peter Clement 394a8c4d94 more naming updates 2024-01-15 10:11:16 +00:00
Peter Clement bbdd3f017f Merge remote-tracking branch 'origin/master' into feat/automation-features 2024-01-11 10:56:45 +00:00
Adria Navarro 72410d1f28 Lint 2024-01-08 13:10:40 +01:00
Adria Navarro 83dce5de26
Update error message
Co-authored-by: Sam Rose <hello@samwho.dev>
2024-01-08 12:48:04 +01:00
Peter Clement 734ad2c1ae further work for triggering automations from other automations 2024-01-03 11:59:15 +00:00
Adria Navarro f8ce1ee365 Use redirect instead of goto 2023-12-19 12:29:57 +01:00
Adria Navarro 8515221cdf Use store 2023-12-19 12:29:57 +01:00
Adria Navarro bfd52b6c50 Use routify 2023-12-19 12:29:57 +01:00
Gerard Burns 7ef09b6fec
Fix Deleting and Remaking Relationships to the User Table (#12453)
* Fix Deleting and Remaking Relationships to the User Table

* change tables store related tables fetching

* lint
2023-12-05 15:01:35 +00:00
Andrew Kingston 018d42b440 Be explicit when checking if a user is a creator or not when displaying their global role in the user table list and user details page 2023-11-24 17:05:31 +00:00
Andrew Kingston 7f17d2f943 Allow creating creator users via users store 2023-11-24 16:34:58 +00:00
Andrew Kingston fd5dd8dd72 Dedupe and clean up some role logic and constants, and display roles properly in user list 2023-11-23 14:12:10 +00:00
Dean aeca7ccf79 Remove incorrect import 2023-11-06 11:39:16 +00:00
Dean 03f90500e5 Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2023-11-06 11:29:10 +00:00
Dean c96fefdba7 Consolidated all stores into stores/builder. Store refactoring and added store console debug flag 2023-11-06 11:22:00 +00:00
Dean a916c2a3ed Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2023-11-01 17:36:39 +00:00
Dean d5a67ad23b Migrated layouts to the class structure, number of fixes across the new stores and refactoring 2023-11-01 17:27:18 +00:00
Dean bcbed2400c Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2023-10-30 13:08:37 +00:00
Dean 79da5956b8 Patch from original environment 2023-10-30 12:46:44 +00:00
mike12345567 bc8e84b815 Fixing datasource error states causing a datasource to fail to be built fully - this was simply a frontend issue of the error not being handled on creation. 2023-10-20 12:19:04 +01:00
Sam Rose 39292e88a8 Correct error message to say sheets when it's a Google sheet. 2023-10-16 17:11:51 +01:00
Sam Rose b7ff1d60f1 Wire up the frontend to show the new datasource errors. 2023-10-16 16:36:42 +01:00
Sam Rose 37fe91e488 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-16 16:05:45 +01:00
Sam Rose 85b3af2971 Refactor DatasourcePlus's buildSchema to return a value, rather than rely on member variables. 2023-10-12 16:27:18 +01:00
Samuel Martineau 84d30e4f4a Merge branch 'Budibase:develop' into allow-plugins-contribute-datasourceplus 2023-10-02 17:49:34 -04:00
mike12345567 4168b45a77 PR comments. 2023-09-27 11:14:14 +01:00
Samuel Martineau 08bbfa09c2 Merge branch 'Budibase:develop' into allow-plugins-contribute-datasourceplus 2023-09-26 21:28:26 -04:00
Samuel-Martineau 2aac1c992a Correct bugs with Datasource+ plugins 2023-09-26 21:26:40 -04:00
mike12345567 a8c96848a5 Adding a quick check incase too many related tables - switch to just fetching everything. 2023-09-26 17:13:16 +01:00
mike12345567 7bd84bd048 Some typing fixes as well as a fix for the frontend issue of tables not correctly having their schemas updated in the table store when relationships added. 2023-09-26 17:01:30 +01:00
Andrew Kingston e659f35225 Merge branch 'develop' into cheeks-lab-day-portal-poc 2023-09-14 13:26:11 +01:00
Martin McKeaveney b748149068 fix for app backups not being shown 2023-09-07 19:06:58 +01:00
Andrew Kingston dd8b89d4e0 Update side bar to use square styles in line with the builder 2023-09-06 13:14:35 +01:00
Peter Clement ff8ee8d987 Merge remote-tracking branch 'origin/develop' into fix/per-app-fixes 2023-09-05 10:37:57 +01:00
Peter Clement c16fd53b0a add developer label back and improve invite flow 2023-09-05 09:58:05 +01:00
Adria Navarro a1da8e495c Merge branch 'develop' into BUDI-7393/display_inheritance_permission 2023-09-04 09:53:34 +02:00
Adria Navarro bb8aacd830 Improve messaging 2023-09-01 17:23:47 +02:00
Adria Navarro 0dc03abe5f Display dependant info 2023-09-01 17:03:33 +02:00
Adria Navarro 466f1e6132 Display inherit option 2023-09-01 10:52:06 +02:00
Adria Navarro bbc484e2c4 Handle frontend levels 2023-08-31 13:00:51 +02:00
Peter Clement 2360e5d8a5 Merge remote-tracking branch 'origin/develop' into feat/per-app-builder-fe 2023-08-31 11:07:39 +01:00
Peter Clement 61e2aad44b remove more reference of developer 2023-08-31 10:59:50 +01:00
Peter Clement ddf9e734f4 pr comments and bug fixes 2023-08-31 10:36:27 +01:00
Adria Navarro 566f9ecd22 Create remove permission js api 2023-08-31 10:53:25 +02:00
Adria Navarro ce11a5a852 Lock feature based on ff 2023-08-29 12:47:15 +02:00
Peter Clement d5aa975593 add per app builder support when adding groups 2023-08-24 15:42:32 +01:00
Peter Clement 6b14353dcb update side panel to enable selecting of creator role 2023-08-24 11:40:00 +01:00
Andrew Kingston ffe82e18e9 Remove log 2023-08-04 15:07:44 +01:00
Andrew Kingston cd2231630f Improve updating of viewV2 state and restore grid<>builder sync for datasource definitions 2023-08-04 14:54:45 +01:00
Andrew Kingston 19ca7e4a0a Fix issue with viewV2 renaming 2023-08-03 13:40:36 +01:00
Andrew Kingston f5e5a883cf Enable renaming views and lint 2023-08-03 13:31:44 +01:00
Andrew Kingston 858a0796bd Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-02 14:50:40 +01:00
mike12345567 a8ff2da768 Removing isAdmin and isBuilder flags from the auth store, using SDK only. 2023-08-01 11:30:04 +01:00
mike12345567 d62b2bdbe0 switching to global builder role for plugin API, dis-allowing per app builders to delete apps and updating UI to reflect these updates. 2023-07-27 18:09:30 +01:00
Andrew Kingston 150961fcf2 WIP: split views into separate stores, fix datasource list, use unique data table for views V2 2023-07-26 13:23:31 +01:00
Adria Navarro df40420470 On view created 2023-07-25 15:54:10 +02:00
Adria Navarro 0b17d6026a Fix delete 2023-07-25 15:54:10 +02:00
Adria Navarro 48e966d5d6 Fix fetch 2023-07-25 15:54:10 +02:00
Adria Navarro a602dcc5ec Refactor after merge 2023-07-25 15:54:10 +02:00
Adria Navarro 1e9ce06504 Allow deleting views 2 2023-07-25 15:54:10 +02:00
mike12345567 c375f860ba Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-24 13:46:49 +01:00
mike12345567 3abe5d4cb2 Frontend work to support logging in as an app builder - also making sure when a new app is created that the user is assigned app access to it. 2023-07-20 18:34:12 +01:00
mike12345567 b84b8dd988 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-20 14:25:04 +01:00
Rory Powell 5ac024a655 Merge branch 'develop' into feature/offline-license 2023-07-20 12:27:04 +01:00
mike12345567 e469abb679 reworking frontend to use shared core functions to check if is admin or builder (needs further expansion). 2023-07-19 18:05:02 +01:00
Martin McKeaveney 8c5177facb Merge pull request #10858 from Budibase/labday/debug-panel
Labday/debug panel
2023-07-18 12:25:37 +01:00
Rory Powell 4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Adria Navarro 5fd004b86e Remove view on deletion 2023-07-12 09:46:37 +02:00
Adria Navarro fd0018c1bc Download logs section 2023-07-11 10:44:10 +02:00
Martin McKeaveney abce52d846 merge 2023-07-06 21:58:19 +01:00
Rory Powell 1ba3665ed4 Updates to upgrade page to change config based on offlineMode value 2023-07-06 20:47:12 +01:00
Gerard Burns d4f2364ca4 Fix google sheets import (#11131) 2023-07-04 16:52:20 +01:00
Dean 854950581c App metadata screen fixes, copy code button casing and delete app button hidden on publish 2023-06-29 09:53:13 +01:00
Adria Navarro fe86428cc4 Display fields 2023-06-28 14:33:52 +01:00
Andrew Kingston 8c9d4a9126 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:09:59 +01:00
Gerard Burns c749209172 PR Feedback 2023-06-27 15:49:17 +01:00
Gerard Burns 4387eb2a67 Update datasource config to use tabs 2023-06-27 14:33:11 +01:00
Andrew Kingston 8587aef506 Tidy 2023-06-27 14:25:09 +01:00
Andrew Kingston a7c6f9a60a Allow deleting external tables that you created 2023-06-27 12:11:58 +01:00
Andrew Kingston 17e7a2d59e Ensure tables and queries are kept in sync when datasource changes occur 2023-06-27 12:03:51 +01:00
Andrew Kingston 9e3711a4c6 Fix data check logic 2023-06-26 18:14:12 +01:00
Andrew Kingston 73ea1022eb Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 18:13:56 +01:00
Andrew Kingston 4d3ea4cc3e Merge pull request #11029 from Budibase/use-modal-for-editing-datasources-v3
Use modal for editing datasources v3
2023-06-26 18:11:16 +01:00
Andrew Kingston b7603f8bf1 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 17:56:11 +01:00
Andrew Kingston a3204ad17a Update data section routing to properly handle datasource entities/table sync and handle having no data 2023-06-26 16:34:22 +01:00
Dean b6caebe431 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-26 15:51:31 +01:00
Gerard Burns 6b36b8824e PR Feedback 2023-06-26 15:49:42 +01:00
Gerard Burns 88582b871e replace use of datasources.save with datasources.update 2023-06-26 14:15:04 +01:00
Gerard Burns 3771ab2ffc Update datasource config editing 2023-06-26 13:31:16 +01:00
Gerard Burns 1606ca0c84 Refactor Datasource Creation Modal (#10783) 2023-06-26 09:52:02 +01:00
mike12345567 3d3efadb37 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-23 15:19:49 +01:00
Dean fd8400bee5 PR feedback and removed some comments 2023-06-23 11:56:59 +01:00
Dean 602ea9bc4e General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours. 2023-06-20 12:33:18 +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
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
Dean c2f8d54a8a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 10:59:28 +01:00
Andrew Kingston f2ce876c5f Refresh tables list when some other user adds a datasource 2023-06-15 09:39:27 +01:00
Andrew Kingston 5e5dc902d1 Broadcast datasource change via websocket when making changes to tables 2023-06-15 09:04:21 +01:00
Martin McKeaveney 0be749f537 hide in cloud 2023-06-10 16:19:09 +01:00
Martin McKeaveney 7e45773d02 diagnostics panel 2023-06-10 16:16:52 +01:00
Dean 6836ca8573 Merge commit 2023-06-09 11:47:05 +01:00
Martin McKeaveney 746afaf573 initial work on debug panel 2023-06-08 19:50:29 +01:00
mike12345567 dab1db2271 Updating datasource save API to allow specifying a filter for which tables to fetch and then linking this up with the new frontend. 2023-06-06 18:27:03 +01:00
Martin McKeaveney c53b7b0a44 Merge pull request #10789 from Budibase/collaboration-lock-transfer
Transfer lock to next oldest session when disconnecting from the builder
2023-06-05 17:47:40 +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
Andrew Kingston 4a0e23a171 Transfer lock to next oldest session when disconnecting from the builder 2023-06-05 13:54:17 +01:00
Andrew Kingston 53f1a4e67d Update builder socket to ignore own events, and ensure table creation updates state without depending on the websocket 2023-06-02 09:04:50 +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
Gerard Burns 23ee9f4af8 Post Sign Up Onboarding Changes (#10701)
* wip

* PR Feedback

* Fixes

* PR Feedback

* PR Feedback

* PR Feedback
2023-05-30 12:54:57 +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
mike12345567 7ba21d836b Merge branch 'develop' of github.com:Budibase/budibase into feature/sync-automations 2023-05-26 16:42:01 +01:00
Andrew Kingston 5cf4753853 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-24 15:14:32 +01:00
Peter Clement 4d5a922684 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-24 15:05:58 +01:00
Adria Navarro 237cda064c Simplify integration features 2023-05-24 10:50:51 +02:00
Adria Navarro 5681f47a38 Clean schema error messages while changing datasources 2023-05-23 11:00:55 +02:00
Andrew Kingston 53eceec978 Update comments 2023-05-22 16:01:12 +01:00
Andrew Kingston cfa07a68ae Handle table, query and datasource events using builder socket 2023-05-22 15:59:44 +01: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
jvcalderon 14a7e77e39 ESLint 2023-05-15 16:52:48 +02:00
jvcalderon 327a8299f2 Extract isCloud information from admin storage 2023-05-15 16:43:14 +02:00
jvcalderon 8c71b1fc19 Check error limit conditions explicitly 2023-05-15 14:27:59 +02:00
jvcalderon 17e2a4d7e4 Refactor -> Avouid explicit usage of pricing url 2023-05-15 09:00:20 +02:00
jvcalderon fc846e1580 Merge branch 'develop' into user-limit-ui 2023-05-15 08:38:45 +02:00
Peter Clement c86c2b4096 add synchronous webhook functionality 2023-05-12 15:57:34 +01:00
jvcalderon 58878ac57c Adds account locking if user limit is exceeded 2023-05-11 08:20:52 +02:00
Adria Navarro bbd0690518 Type response 2023-05-05 16:32:27 +01:00
Rory Powell e1a147e823 Merge branch 'master' into develop 2023-05-03 16:06:42 +01:00
Rory Powell 972e2257b7 [draft] Pricing/fixes (#10424)
* Fix qa core suite

* Update package.json

* Lint

* Handle conflict on account metadata

* Fix issue adding users via csv import when on paid plan

* Fix user invites

* Lint
2023-04-27 08:25:53 +01:00
Martin McKeaveney 779d5fe53c Merge pull request #9836 from Budibase/fix/lastName-validation-accept-invite
Fix to clear empty lastName string when accepting an invite to budibase
2023-04-24 09:35:16 +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
mike12345567 060dc05afa Removing export all apps functionality from cloud - this was a very niche feature and often confusing, now there is a consistent flow for starting out in self host. 2023-04-20 17:19:17 +01:00
Andrew Kingston 55ce83c444 Grid UI in data section (#10329)
* Add WIP spreadsheet

* Add footer and improve styles

* Refactor to use IDs and support changing text values inline

* Add inline editing of options fields

* Add row deletion and fix sizing

* Add ability to add new rows

* Fix z-index issue with option cells

* Remove deletion notification and fix selection

* Add gap between items in an options cell

* Tweak options cell to be pixel perfect

* Fix padding around sheet not working when scrolling

* Add resizable columns and add support for all themes

* Allow multiselect component and field to support text values

* Generate inclusion schema when importing multiselect columns

* Add support for multiselect type

* Add number cell

* Add functional date cell

* Disable editing autocolumns

* Make sticky column the primary display and fix opening options cells

* Improve display of relationship cell and options cell

* Support empty dates and use CSS variables for easier styling

* Use more CSS variables and add utils to spreadsheets

* Add drag and drop column reordering

* Break out reordering logic into new stores

* Rename reordering to reorder

* Break out other components from spreadsheet for cleaner code

* Break out spreadsheet body into its own component

* Split into more modular components and try virtual rendering

* Test absolute positioning

* Optimise virtual rendering for both columns and rows to handle infinitely large datasets

* Optimise scrolling and virtual rendering performance

* Fix columnn reordering

* Migrate sheet to data section, improve reordering and reszing

* Clean up more sheet state and increase performance

* Fix multiple issues with z-index, reordering and resizing

* Fix date cells in sheets

* Separate data fetching logic from main sheet and tidy up

* Add infinite scroll, improve row fetching, add error handling, fix svelte store updates

* Fix overly thin scrollbars in firefox

* Use nicer checkboxes and fix some hover styles

* Fix issue reordering columns in firefox and increase performance

* Tidy up

* Use search endpoint instead of get endpoint to fetch individual rows so that relationship enrichment occurs

* Tidy up

* Fix relationship issues when creating rows

* Optimise resetting data to smoothly transition when changing datasource

* Add WIP virtual dom implementation to massively increase performance

* Refactor spreadsheet into more discreet components

* Fix multiple issues, clean up rendering, improve performance

* Tune cell sizes

* Fix some scroll issues and add shadow to sticky column

* Fix issue when no primary display is set

* Add padding to sheet

* Improve styles

* Allow reordering columns to be the first column after sticky column

* Fix row hover state not being removed

* Update hovered row on wheel

* Update scroll styles and z-index

* Improve scroll logic and handle horizontal wheel events

* Simplify and improve z index styles

* Fix styles when using no sticky columns

* Improve rendering performance

* Improve performance by removing keyed each blocks and fix reorder target styling

* Ensure scroll top is always properly reset and add config store

* Allow configuring selecting rows and adding rows

* Integrate sheet into data section better

* Add back in functional delete row button

* Refactor stores and make state more modular

* Lint and remove unused deps

* Remove add column button

* Fix options cells being unable to scroll

* Add WIP initial multi-user websocket implementation for sheets

* Add WIP multi-user UI for sheet interface

* Fix issues with not disconnecting users when swapping datasource and improve multi-user UI

* Update layout and remove logging

* WIP column popovers for dataspace sheets

* Add popovers to sheet column headers, improve mouse UX

* Tidy reordering stuff

* Refactor resizing logic into store and improve UX around hover events when resizing/reordering

* Add column sorting and reordering via popover

* Handle context menu events in header cells

* Fully integrates sheets with datasection and remove lots of old stuff

* Fix buttons being highlighted when filters are set

* Add flags for controlling editing and adding rows in sheets

* Count context menu clicks when considering the click outside handler

* Prevent adding rows to users table and remove log

* Expose loading state of sheet and improve column highlighting logic

* Small style updates

* Update delete button and allow horizontal scrolling

* Add context menu to sheets with deletion and duplication features

* Improve UX around selecting rows and cells

* Add basic keyboard interactions to dataspaces

* Improve keyboard navigation in sheets

* Remove unnecessary searching through large rows array

* Fix issue with deleting rows and fix relationship cells displaying undefined

* Improve loading state

* Update menu width

* Merge with new shared-core and moved lucene utils

* Improve rendering performance and simplify component props

* Remove new row component and improve mouse interactions

* Tidy up buttons above sheets and add FAB for adding rows

* Optimise sheet data loading and add sort button

* Update sorting and remove logs

* Add sheet button to control column visibilty, improve sorting, improve disabled states

* Fix bug with select placeholders and fix sorting loops causing endless refreshes

* Update filter button to look consistent and add double click to resize columns to default width

* Ensure all derived stores have default values

* Reset scrolling when datasource changes and fix wasted pagination calls

* Improve performance by removing searches through the full row array

* Add advanced key handling for spreadsheets and improve blur and focus UX

* Ensure the selected cell is always visible

* Add icons for all data types

* Add new long form text cell

* Add boolean cell

* Add ability to focus first cell via tab

* Add cells for formulae and JSON

* Remove console logs

* Add attachment cell

* Increase padding to account for attachment dropdown

* Prevent deleting autocolumns via keyboard

* Fix attachments overflowing

* Improve sort button, remove header more icons unless hovered and highlight sorted column

* Add functional relationship cell

* Improve relationship cell

* Fix race conditions and edge cases in relationship cell

* Update user avatar colours

* Improve preservation of column widths in sheets when making schema changes

* Remove redundant sheet schema context and fix issues with mutating table schema

* Disable websocket in sheets

* Rollback state changes when row saving fails

* Fix one-to-many relationships allowing selecting multiple rows on both sides

* Remove log

* Make sheet gutter width customisable

* Allow expanding rows using existing edit row modal

* Fix text cell not using full width

* Sort columns to put autocolumns last

* Add new footer for adding rows, improve store memoization, support inverting all data types

* Improve animations for adding rows and handle add row failure

* Ensure all sheet feature flags work as expected and fix multi row deletion

* Fix options ordering

* Fix add row button not appearing when horizontal scrollbar is hidden

* Fix selecting newly created rows

* Remove log and add notification when creating or editing columns

* Move new row component to top, automatically invert cell renderers when required

* Add resizable rows

* Fix overlapping long form text borders

* Fix scroll not working in new row

* Update new row component, fix z-index issues, improve UX

* Large refactors to row creation, naming and sheet APIs

* Refactor stores to fix dependency issues, use modals for adding rows, simplify sheet

* Fix resize overlays

* Add custom colors for drop shadows and blue-100 to all themes, fix sticky column shadow

* Increase horizontal padding when scrolling to a selected cell

* Add multiple validation improvements

* Add validation to duplicating rows

* Remove log

* Restore missing event handler

* Improve data fetch reset logic, fix issues with stale cache in spreadsheets

* Fix issue with cell colors, improve row API interactions to avoid relationship issues due to API response differences

* Fix filters not working

* Simplify logic for reordering and add new overlay. Simplify sheet cells

* Fix importing and exporting with sheets

* Fix reorder overlay z-index issue

* Fix issue when no display column exists

* Fix issue with display column not being able to be unset

* Add persitence to column size and order in sheets

* Improve sheet integration with data section and add horizontal cell inversion

* Fix double click resizing of sticky column

* Make column visibility persistent and refactor column updating

* Improve sheet loading states

* Add beta button to sheet, tidy up constants

* Work around table API inconsistencies to handle table schema updates

* Add additional reorder options and improve beta button

* Improve sorting

* Add copy and paste to spreadsheet and add immediate editing of cells without additional click

* Remove copy/paste rows, remove move to start/end, improve copy/paste for cell values

* Fix dependency ordering

* Refactor other sheet stores to improve dependency ordering

* Fix errors not showing in sticky column and clear cell value on backspace press

* Rewrite relationship cell and update default column widths

* Ensure dynamic row height is properly accounted for

* Update text cells, number cells, long form field cells and relationship cells to respect row height

* Fix row heights with sticky column

* Update JSON, boolean and date cells to respect row height

* Update attachment cell to respect row height

* Use unique background for focused cell

* Standardise shadows across cell types

* Persist row height as table metadata

* Improve a few design issues

* Clean up

* Fix relationship cells not being readonly

* Lint

* Fix icon padding in relationship picker

* Improve styles in relationship dropdown

* Update shadow

* Update relationship icons

* Update relationship icons

* Update error label max size and position

* Prevent using invalid data types as display columns

* Add menu option to edit rows in modal

* Prevent sheet handling key events sourcing from modals

* Standardise menu overlay shadow and add count to relationship cells when hovering

* Improve relationship cell performance

* Remove spellcheck from text fields

* Fix resize overlay handler height

* Fix reorder overlay height

* Remove unused code and change selected table faster in data section

* Fix table selection not working when on datasource page

* Improve sheet loading state

* Add rowHeight property to table types

* Restore builder middleware

* Remove any naming of dataspaces

* Lint

* Disable row import button for users table and add optional chaining to spreadsheetsocket invocations to fix tests

* Use unique user edit modal for editing users in sheets

* Add schemaOverrides prop to sheet and use it to customise user table schema

* Update number icon

* Fix primary display column not properly disabling certain menu options

* Merge

* Update beta button position slightly

* Update beta button text

* Fix HMR for custom plugins which was broken due to signed minio links

* Add maze link to grid

* Update koa <> socket.io integation to improve fake koa context and allow current app middleware

* Rename sheet to grid

* Fix menu postiion, fix copy and paste in menu not working

* Remove commented out usages of websocket emissions for grid
2023-04-20 15:56:24 +01:00
Gerard Burns d36cd3b1f8 Builder Unit Test PoC (#10173)
* wip

* wip
2023-04-18 14:37:29 +01:00
Adria Navarro e1669c8260 Merge pull request #10022 from Budibase/feature/scim
Feature - SCIM endpoints
2023-04-03 13:22:01 +02:00
adrinr faa1c27d29 Refresh sql columns on defining relationships 2023-03-31 10:53:50 +01:00
Rory Powell 38e6d61709 Explictly check for google datasource configured (#10165)
* Explictly check for google datasource configured

* Unit tests for getGoogleDatasourceConfig

* Update /api/global/configs/public test + lint
2023-03-30 13:40:59 +01:00
mike12345567 26aeac357d Removing tenancy validity check, instead depending on the PLATFORM_URL environment variable for determining tenant ID. 2023-03-29 16:19:35 +01:00
mike12345567 b6be98fa4e Making logic around logout very explicit. 2023-03-29 14:22:07 +01:00
mike12345567 70d91acc41 Adding a check for the tenant ID - to make sure it is a real tenant before forcing the user out of the platform based on it. 2023-03-29 14:19:54 +01:00
adrinr 204b6d2950 Fix config type 2023-03-29 09:31:07 +01:00
adrinr d615e1daed Create feature store 2023-03-28 16:46:23 +01:00
adrinr 0c5d33a642 Show SCIM banner if SCIM enabled 2023-03-28 16:46:23 +01:00
Dean eb3e38bb61 Removed the license agreement toggle 2023-03-27 15:32:45 +01:00
Dean 8131d9dc6f Branding feature flag changes, config trimming and some fixes 2023-03-27 15:17:14 +01:00
Dean bfd7e49c72 Template fixes and updates to the file picker. Error handling added to display a warning when navigating to an unpublished or invalid app url. 2023-03-21 09:20:43 +00:00
Dean 253ee413a2 Working commit 2023-03-16 09:07:21 +00:00
Dean 5ce52cad06 Working commit 2023-03-13 12:33:16 +00:00
Dean e8c6fc6acf Merge remote-tracking branch 'origin/develop' into feature/whitelabelling 2023-03-08 13:01:55 +00:00
mike12345567 ae3671ea42 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-03-07 17:49:44 +00:00
Dean 5b9fbbc3b4 Various fixes for update self behaviour 2023-03-07 13:35:18 +00:00
Dean e4512ba91f Merge commit 2023-03-07 12:18:48 +00:00
Rory Powell a80d963c88 Hide upgrade button on enterprise plan 2023-03-02 08:58:54 +00:00
Peter Clement 692d10d4be lint 2023-03-01 14:54:00 +00:00
Peter Clement a192ea0caa Only allow admins to access audit logs 2023-03-01 14:48:10 +00:00
Dean fd5743a9da Fix to clear empty lastName string when accepting an invite to budibase 2023-03-01 12:11:51 +00:00