Commit Graph

642 Commits

Author SHA1 Message Date
Peter Clement 70ac7b81c3 add base audit logs ui 2023-02-13 09:47:08 +00:00
Gerard Burns dd343a5946 New App Onboarding (#9489)
* New App Onboarding

* Lint

* Move app creation onboarding into its own route

* Fix quiet action button variant

* Fix alt attribute background image flashing

* Update routing logic and redirects to show app creation onboarding

* Navigate to data rather than design upon initial app creation to allow tour to function properly

* Tidy up popover logic and remove tip functionality

* Fix binding popovers

* Lint

* Silence spammy warnings from the builder

* Exclude SVG files from rollup plugin image to fix spectrum icons

* Fix help menu icon colours not working in light themes

* Tweak help menu styles

---------

Co-authored-by: Andrew Kingston <andrew@kingston.dev>
2023-01-31 19:34:32 +00:00
deanhannigan 7540cad45c Merge pull request #9467 from Budibase/feature/auth-screens-redesign
Selfhost onboarding UX/UI updates
2023-01-31 16:13:46 +00:00
Andrew Kingston c280e44b26 Merge branch 'develop' of github.com:Budibase/budibase into develop 2023-01-31 15:50:00 +00:00
Andrew Kingston ca399568e2 Use real testimonials on testimonial page 2023-01-31 15:49:41 +00:00
Andrew Kingston e0ba99621c Update background of split page to use purplish gradient, and also fix it to dark theme 2023-01-31 15:48:35 +00:00
Dean 680a9acb4f Merge remote-tracking branch 'origin/develop' into feature/configurable-data-export 2023-01-31 15:08:46 +00:00
Andrew Kingston 767236a841 Add min-height to split page to align small pages in onboarding flow and match designs 2023-01-31 08:23:20 +00:00
Dean d37c0e4b5d UI Onboarding UI/UX auth refactoring 2023-01-27 13:44:57 +00:00
Rory Powell da2c809a09 Merge branch 'develop' into feature/environment-variables 2023-01-27 11:27:11 +00:00
Peter Clement 9175cab4ca add environmentVariables feature to constants 2023-01-26 15:34:03 +00:00
Andrew Kingston f068f20c61 Add suffix setting to fancy input component and fix lint warning 2023-01-25 15:57:47 +00:00
mike12345567 63d882efc6 Adding frontend event publishing for events like upgrade panel opened. 2023-01-23 19:18:02 +00:00
mike12345567 557a9a8eeb Adding an API for publishing an event from the frontend. 2023-01-23 18:56:44 +00:00
Andrew Kingston 549e4e0dc5 Onboarding core components (#9412)
* Update BB logo to black

* Update top nav bar and core layout

* Add redesign for apps pages

* Update user and groups pages

* More WIP portal redesign!

* Fix top nav colours and fix selected tab not updating

* Remove log

* Update copy on settings pages

* Update and standardise page headers and subtitles, and remove side nav titles

* Update font styles to allow for easy customisation

* Update button styles to always use newStyles, update auth page styles

* Update settings pages to new designs

* Update structure for account pages

* Add initial rewrite of app overview section

* Update config checklist to properly center

* Update app overview version and name/url screens

* Add tooltip to explain why URL cannot be changed until unpublishing

* Update overview automation history tab

* Update overview backups page

* Rewrite app overview access tab

* Update table hover colours

* Remove scrolling from tables when not required and stop selects from updating their own state locally

* Update table styles to support flexible column widths much better

* Fix extremely long strings in breadcrumbs not wrapping

* Fix multiple issues with long text overflow

* Fix flashing in version settings page

* Fix loading bugs in app backups page

* Add sidebar for portal and use it for automation history. Fix multiple overflow and scrolling issues

* Tidy up

* Update user details page to use tables and match designs

* Update users detail page

* Update user and group details pages with new tables

* Fix automation error linking from apps page and improve automation fetching logic in automation history

* Move theme and API key into user profile dropdown instead of settings

* Move settings before account and show plugins for devs

* Convert plugins page to table and update components and modals

* Update links when going back from the builder

* Update plugin search placeholder

* Fix URLs in app overview

* Properly handle text overflow in plugins table

* Remove getting started checklist

* Fix checklist removal and fix profile modal

* Update email details page to match new designs

* Cleanup

* Add licensing and env logic to determine which account links to show

* Update upgrade button URL for cloud accounts

* Update app list to use a more compact style

* Make core page layout responsive and update apps list to be responsive

* Update mobile design of apps page

* Update more pages to be responsive and add mobile specific components

* Refactor main portal page into multiple components

* Update multiple pages to be responsive and improve loading experience

* Make automation history page responsive

* Update backups page to be responsive

* Update pickers to use absolutely positioned root popover so that overflow does not matter

* Fix some responsive styles

* Fix update link in app overview

* Improve dropdown logic

* Lint

* Update click outside handler to handle modals properly

* Remove log

* Fix mobile menu upgrade button not closing menu

* Hide groups page if disabled at tenant level

* Centralise menu logic and show full menu on mobile

* Update app access assignment and fix backups table

* Ensure avatars cannot be squished

* Standardise disabled field text colour

* Allow developer users to access users, groups and usage pages

* Allow readonly access to users and groups for developer users

* Remove logs

* Improve users page loading experience

* Improve responsiveness on apps list page and fix discussions link styles

* Update spacing on user and group detail page and fix usage page showing wrong copy

* Fix logo override not working

* Pin minio version to an old one that supports the fs backend in dev

* Shrink upgrade button

* Shrink user dropdown

* Update assignment modal text

* Remove clickable visual styles from plugins

* Always show groups section in app access page

* Update app overview button styles to include more CTAs

* Hide edit and view links in more menu on overview page unless on mobile

* Make usage stats responsive and fix layout issues

* Add core page layout for onboarding to frontend-core

* Add initial work on fancy form components for onboarding

* Add checkbox component and add error handling to fancy form fields

* Add fancy select and improve other fancy components

* Update fancy components and fix select rounded corners

* Fix mobile styles for split pages

* Revert google button

* Fix links not working with click handlers

* Fix label animation

* Improve styles of fancy components

* Improve mobile compatibility with fancy button radio

* Revert changes to builder files for testing

* Tidy up small UI issues

* Improve some minor design issues

* Fix issue with scroll padding not being applied

* Ensure unauthorised users cannot view pages they should not be able to

* Lint
2023-01-23 15:38:43 +00:00
Dean 45b907cfde Merge remote-tracking branch 'origin/develop' into feature/configurable-data-export 2023-01-23 11:43:15 +00:00
mike12345567 3b219dc4ef Adding a warning for missing ENCRYPTION_KEY variable to the portal. 2023-01-18 17:29:56 +00:00
Andrew Kingston d92f1a7097 Portal redesign (#9336)
* Update BB logo to black

* Update top nav bar and core layout

* Add redesign for apps pages

* Update user and groups pages

* More WIP portal redesign!

* Fix top nav colours and fix selected tab not updating

* Remove log

* Update copy on settings pages

* Update and standardise page headers and subtitles, and remove side nav titles

* Update font styles to allow for easy customisation

* Update button styles to always use newStyles, update auth page styles

* Update settings pages to new designs

* Update structure for account pages

* Add initial rewrite of app overview section

* Update config checklist to properly center

* Update app overview version and name/url screens

* Add tooltip to explain why URL cannot be changed until unpublishing

* Update overview automation history tab

* Update overview backups page

* Rewrite app overview access tab

* Update table hover colours

* Remove scrolling from tables when not required and stop selects from updating their own state locally

* Update table styles to support flexible column widths much better

* Fix extremely long strings in breadcrumbs not wrapping

* Fix multiple issues with long text overflow

* Fix flashing in version settings page

* Fix loading bugs in app backups page

* Add sidebar for portal and use it for automation history. Fix multiple overflow and scrolling issues

* Tidy up

* Update user details page to use tables and match designs

* Update users detail page

* Update user and group details pages with new tables

* Fix automation error linking from apps page and improve automation fetching logic in automation history

* Move theme and API key into user profile dropdown instead of settings

* Move settings before account and show plugins for devs

* Convert plugins page to table and update components and modals

* Update links when going back from the builder

* Update plugin search placeholder

* Fix URLs in app overview

* Properly handle text overflow in plugins table

* Remove getting started checklist

* Fix checklist removal and fix profile modal

* Update email details page to match new designs

* Cleanup

* Add licensing and env logic to determine which account links to show

* Update upgrade button URL for cloud accounts

* Update app list to use a more compact style

* Make core page layout responsive and update apps list to be responsive

* Update mobile design of apps page

* Update more pages to be responsive and add mobile specific components

* Refactor main portal page into multiple components

* Update multiple pages to be responsive and improve loading experience

* Make automation history page responsive

* Update backups page to be responsive

* Update pickers to use absolutely positioned root popover so that overflow does not matter

* Fix some responsive styles

* Fix update link in app overview

* Improve dropdown logic

* Lint

* Update click outside handler to handle modals properly

* Remove log

* Fix mobile menu upgrade button not closing menu

* Hide groups page if disabled at tenant level

* Centralise menu logic and show full menu on mobile

* Update app access assignment and fix backups table

* Ensure avatars cannot be squished

* Standardise disabled field text colour

* Allow developer users to access users, groups and usage pages

* Allow readonly access to users and groups for developer users

* Remove logs

* Improve users page loading experience

* Improve responsiveness on apps list page and fix discussions link styles

* Update spacing on user and group detail page and fix usage page showing wrong copy

* Fix logo override not working

* Pin minio version to an old one that supports the fs backend in dev

* Shrink upgrade button

* Shrink user dropdown

* Update assignment modal text

* Remove clickable visual styles from plugins

* Always show groups section in app access page

* Update app overview button styles to include more CTAs

* Hide edit and view links in more menu on overview page unless on mobile

* Make usage stats responsive and fix layout issues

* Add comment to docker-compose config
2023-01-18 13:56:53 +00:00
mike12345567 3659768c42 Merge branch 'develop' of github.com:Budibase/budibase into feature/environment-variables 2023-01-17 15:25:17 +00:00
Gerard Burns 48e1695318 JSON import changes (#9288)
* JSON import changes

* Fix lockfiles

* PR Feedback, fix tests

* fix tests

* pr feedback
2023-01-17 15:07:52 +00:00
Peter Clement f00034544f reuse modal for edit and create and add delete function 2023-01-13 16:39:26 +00:00
Peter Clement a0dacc9717 add create store method and tidy up 2023-01-12 16:09:05 +00:00
mike12345567 03df57d077 Adding in basic implementation of variable usage, getting from pro and enriching through new datasource SDK. 2023-01-11 17:57:51 +00:00
Dean 4479c2477c Merge remote-tracking branch 'origin/develop' into feature/configurable-data-export 2023-01-10 09:39:11 +00:00
Peter Clement 7378d21fea environment variables ui boilerplate 2023-01-09 16:48:39 +00:00
Andrew Kingston 395b4d7ad8 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-portal-redesign 2023-01-06 15:22:28 +00:00
Andrew Kingston 66674c7277 Ensure view names are properly encoded to handle certain special characters (#9145) 2022-12-22 13:09:07 +00:00
Andrew Kingston ab29c10936 Update app overview version and name/url screens 2022-12-20 08:48:20 +00:00
Martin McKeaveney 84ab7862d1 fixes for google sheets, admin checklist, and deleting an app from API (#8846)
* fixes for google sheets, admin checklist, and deleting an app from API

* code review

* splitting unpublish endpoint, moving deploy endpoint to applications controller. Still to do public API work and move deployment controller into application controller

* updating REST method for unpublish in API test

* unpublish and publish endpoint on public API, delete endpoint unpublishes and deletes app

* removing skip_setup from prodAppDb call

* removing commented code

* unit tests and open API spec updates

* unpublish, publish unit tests - delete still in progress

* remove line updating app name in API test

* unit tests

* v2.1.46

* Update pro version to 2.1.46

* v2.2.0

* Update pro version to 2.2.0

* Fix for budibase plugin skeleton, which utilises the old import style.

* Fix side nav styles

* v2.2.1

* Update pro version to 2.2.1

* using dist folder to allow importing constants for openAPI specs

* v2.2.2

* Update pro version to 2.2.2

* Fix for user enrichment call (updating to @budibase/nano fork) (#9038)

* Fix for #9029 - this should fix the issue users have been experiencing with user enrichment calls in apps, essentially it utilises a fork of the nano library we use to interact with CouchDB, which has been updated to use a POST request rather than a GET request as it supports a larger set of data being sent as query parameters.

* Incrementing Nano version to attempt to fix yarn registry issues.

* v2.2.3

* Update pro version to 2.2.3

* Fix SQL table `_id` filtering (#9030)

* Re-add support for filtering on _id using external SQL tables and fix filter key prefixes not working with _id field

* Remove like operator from internal tables and only allow basic operators on SQL table _id column

* Update data section filtering to respect new rules

* Update automation section filtering to respect new rules

* Update dynamic filter component to respect new rules

* v2.2.4

* Update pro version to 2.2.4

* lock changes (#9047)

* v2.2.5

* Update pro version to 2.2.5

* Make looping arrow point in right direction (#9053)

* v2.2.6

* Update pro version to 2.2.6

* Types/attaching license to account (#9065)

* adding license type to account

* removing planDuration

* v2.2.7

* Update pro version to 2.2.7

* Environment variable type coercion fix (#9074)

* Environment variable type coercion fix

* Update .gitignore

* v2.2.8

* Update pro version to 2.2.8

* tests passing

* all tests passing, updates to public API response

* update unpublish call to return 204, openAPI spec and unit

* fixing API tests

Co-authored-by: Budibase Release Bot <>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Rory Powell <rory.codes@gmail.com>
2022-12-19 13:18:00 +00:00
Andrew Kingston 090ae5df49 Master => Develop (#9049)
* v2.1.46

* Update pro version to 2.1.46

* v2.2.0

* Update pro version to 2.2.0

* Fix for budibase plugin skeleton, which utilises the old import style.

* Fix side nav styles

* v2.2.1

* Update pro version to 2.2.1

* using dist folder to allow importing constants for openAPI specs

* v2.2.2

* Update pro version to 2.2.2

* Fix for user enrichment call (updating to @budibase/nano fork) (#9038)

* Fix for #9029 - this should fix the issue users have been experiencing with user enrichment calls in apps, essentially it utilises a fork of the nano library we use to interact with CouchDB, which has been updated to use a POST request rather than a GET request as it supports a larger set of data being sent as query parameters.

* Incrementing Nano version to attempt to fix yarn registry issues.

* v2.2.3

* Update pro version to 2.2.3

* Fix SQL table `_id` filtering (#9030)

* Re-add support for filtering on _id using external SQL tables and fix filter key prefixes not working with _id field

* Remove like operator from internal tables and only allow basic operators on SQL table _id column

* Update data section filtering to respect new rules

* Update automation section filtering to respect new rules

* Update dynamic filter component to respect new rules

Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: Budibase Release Bot <>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
2022-12-15 12:13:42 +00:00
Dean cdcefa16bb Filtering and sort on data row export 2022-12-13 10:13:17 +00:00
Andrew Kingston d4a7412163 Update filter labels to reflect that more than and less than also include equal to 2022-12-07 09:00:29 +00:00
Andrew Kingston ce9feed5f2 Ensure all search requests specify a sort field to avoid random sorting 2022-11-17 14:15:24 +00:00
Peter Clement 4461da195b Merge remote-tracking branch 'origin/master' into fix/peter-fixes 2022-11-02 12:09:48 +00:00
Peter Clement d034800c76 Email onboarding not respecting group selection 2022-11-02 09:58:38 +00:00
Andrew Kingston cf7a4a4e6d Merge pull request #8376 from Budibase/cheeks-lab-day-grid
Grid component + builder performance improvements
2022-10-25 08:20:37 +01:00
mike12345567 cf1843002d Merge branch 'feature/app-backups' of github.com:Budibase/budibase into feature/backups-ui 2022-10-24 15:50:45 +01:00
Peter Clement 1aca8756f6 pr comments 2022-10-24 15:09:32 +01:00
Peter Clement 146cdaa131 add pro check and default state 2022-10-24 15:00:00 +01:00
mike12345567 1064095d94 Updating frontend to allow searching by type and trigger. 2022-10-21 17:03:01 +01:00
mike12345567 1eac53230e Adding restore work - new modal to create a backup. 2022-10-20 18:46:16 +01:00
mike12345567 6256b5f73d Merge branch 'feature/backups-ui' of github.com:Budibase/budibase into feature/backups-ui 2022-10-20 17:48:03 +01:00
mike12345567 0c2ae220a2 Updating rendering of table - as per Andy's new designs based on the restore event. 2022-10-20 17:43:54 +01:00
Peter Clement d138d5ebaa add ability tofilter by range 2022-10-20 16:10:09 +01:00
Andrew Kingston 73a229b9ec Add proper validation for nesting illegal combinations of components 2022-10-20 16:03:53 +01:00
Peter Clement 62ada4f7cc integrate download and update and update datepicker 2022-10-20 15:09:43 +01:00
Peter Clement 047d605f2f add restore funtionality 2022-10-20 13:33:50 +01:00
Peter Clement f5c9e22d42 fix paging and add deletion 2022-10-20 11:46:04 +01:00
Peter Clement 627b0afa18 lint 2022-10-19 16:11:25 +01:00
Peter Clement 3e7d631031 add paging and add more custom table renderers 2022-10-19 16:08:34 +01:00
Peter Clement 7ae1e3a3ee add apis and svelte store 2022-10-18 19:00:19 +01:00
Andrew Kingston 3f429ff3ce Lint and prevent scrolling to selected component when starting dragging 2022-10-14 19:45:47 +01:00
Andrew Kingston e9769b0721 Add throttle utility as an improved debounce 2022-10-08 15:03:44 +01:00
mike12345567 2421f16a8c Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-10-06 16:58:33 +01:00
Mel O'Hagan 969c67f767 Use OG class properties for iOS13 support 2022-10-05 15:53:06 +01:00
Mel O'Hagan 3ce821477f Don't cast datetime is checking (not)empty 2022-10-03 16:06:00 +01:00
deanhannigan 3520843e4a Merge pull request #8014 from Budibase/feature/automation-log-filter-by-license
Feature/automation log filter by license
2022-10-03 10:49:24 +01:00
Andrew Kingston 34ec25af1d Fix fetchRow not working in internal API 2022-09-30 16:23:31 +01:00
Dean 67437c3db1 Centralised licensing types to frontend-core contants. Some minor refactoring 2022-09-29 09:17:22 +01:00
Andrew Kingston 143ee04d9e Update casing in 'does not contain' filter operator 2022-09-28 15:08:14 +01:00
Michael Drury 6adb30fc1c Merge pull request #7981 from Budibase/feature/group-app-add
Add apps to a group from within groups interface
2022-09-26 19:18:44 +01:00
Martin McKeaveney 57bbf28119 merge with master 2022-09-26 17:57:23 +01:00
mike12345567 2acdf6b7eb Feature to allow adding apps from within the groups interface, rather than having to go to apps individually to do this. 2022-09-26 17:54:00 +01:00
Michael Drury 89f6f1174b PR comments. 2022-09-23 22:21:51 +01:00
mike12345567 6bef55843a Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-23 17:10:30 +01:00
Andrew Kingston 69071dd5c2 Update nord color overrides 2022-09-23 15:57:57 +01:00
Rory Powell c528ac1f71 Support deleting license key from self host install 2022-09-23 15:54:59 +01:00
Mel O'Hagan 25ef6599e6 Sort type can change. Removed falsey check. 2022-09-23 09:30:05 +01:00
mike12345567 7406086c12 Switching over app role assignment to use the new backend rather than being performed in the frontend. 2022-09-21 22:58:06 +01:00
mike12345567 f07ea5cc7e Updating user API to user a single bulk endpoint rather than case sensitive named endpoints. 2022-09-21 18:05:45 +01:00
mike12345567 4d9de7f658 Updates to use new backend API for adding/removing users from groups. 2022-09-21 16:58:47 +01:00
mike12345567 1be71933ca Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-16 17:02:08 +01:00
Rory Powell f7fa9969f4 Fixes 2022-09-15 11:59:46 +01:00
Peter Clement 3304f11560 Merge pull request #7766 from Budibase/fix/pc-fixes
Bug fixes #6836 and #7242
2022-09-14 14:39:10 +01:00
Peter Clement 449fa7b14b remove uneeded log 2022-09-14 11:19:09 +01:00
Peter Clement f38856431d fix issue with date range filtering in automations 2022-09-13 17:11:37 +01:00
melohagan abdb156559 Merge pull request #7333 from Budibase/feature/select-tables-to-fetch
Allow list of named tables to be fetched
2022-09-13 11:19:49 +01:00
mike12345567 e7cfdd4fde Updating add/delete process to have better notifications, removing some errors. 2022-09-12 17:43:13 +01:00
mike12345567 828066de46 Merge branch 'develop' of github.com:Budibase/budibase into feature/plugin-management-ui 2022-09-12 15:34:34 +01:00
Rory Powell 45a43baee2 Merge branch 'master' into develop 2022-09-12 14:05:36 +01:00
Andrew Kingston 899aea9d00 Copy backend implementation for removing key numbering to ensure consistent behaviour 2022-09-12 09:07:25 +01:00
Andrew Kingston cc3f4c1221 Fix client side searching not working due to field prefixes 2022-09-12 09:01:21 +01:00
Peter Clement e6f127c33f update upload request to handle source correctly 2022-09-06 10:37:49 +01:00
NEOLPAR 7d8940f0cb Merge branch 'plugins-dev-experience' into feature/plugin-management-ui 2022-09-05 09:38:24 +01:00
mike12345567 320cbfada3 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-31 15:53:32 +01:00
NEOLPAR e5446d2f8a plugin create npm 2022-08-30 21:37:08 +01:00
Peter Clement a8eb172953 lint 2022-08-30 10:50:25 +01:00
Peter Clement b9b8d59005 add plugins ui 2022-08-30 10:49:19 +01:00
Martin McKeaveney 02c93071ee merge 2022-08-30 10:33:37 +01:00
Andrew Kingston 23a91b89a7 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-22 11:27:04 +01:00
Rory Powell 7d1a32f729 Merge branch 'master' into develop 2022-08-19 14:15:49 +01:00
Andrew Kingston 5c5e4bcccb Fix issue with falsey lucene values being ignored 2022-08-19 14:11:58 +01:00
Mel O'Hagan fb51090752 Allow list of named tables to be fetched 2022-08-17 18:16:11 +01:00
melohagan 5b9b071f62 Merge pull request #7243 from Budibase/bug/sev2/orphaned-minio-attachment
Delete attachments on field clear from minio bucket
2022-08-17 16:48:27 +01:00
Andrew Kingston 32025ef76d Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-17 16:13:27 +01:00
Andrew Kingston 3caae00d38 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-keyboard-shortcuts-develop 2022-08-17 14:20:34 +01:00
Mel O'Hagan c5196c7a37 Only allow bindings type for Is In Conditional UI 2022-08-16 13:36:48 +01:00
mike12345567 4683c57e02 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-15 16:17:54 +01:00
Mel O'Hagan 1200f4d2a0 Allow delete attachments from builder data section 2022-08-15 15:46:55 +01:00
mike12345567 ae9ae26bd4 Merge branch 'develop' of github.com:Budibase/budibase into feature/multiselect-filters 2022-08-15 12:24:41 +01:00
Mel O'Hagan 5171fc09fb Delete attachments on field clear 2022-08-12 11:29:57 +01:00
mike12345567 c9c468a424 Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-11 16:36:07 +01:00
mike12345567 76d427001a Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-11 16:34:01 +01:00
Andrew Kingston d33a59e2b0 Add API endpoint to fetch list of plugins to core API 2022-08-11 15:28:19 +01:00
Andrew Kingston ed751212eb Add plugin upload to core API client, add response to plugin upload endpoint 2022-08-11 10:37:57 +01:00
Rory Powell 664cb2b0b0 Merge branch 'master' into develop 2022-08-10 14:36:49 +01:00
Rory Powell 54df92a8c3 Add timezone to served events 2022-08-10 11:29:11 +01:00
Rory Powell 500e697974 Trigger served events on ping endpoint 2022-08-10 11:01:54 +01:00
Michael Drury f8e978f321 Merge pull request #7049 from Budibase/fix/2585
Updating filters to allow multiple uses of the same property and exposing allOr option
2022-08-09 11:00:38 +01:00
Andrew Kingston 6302ee5551 Fix users not being added to group when invited via email 2022-08-08 16:40:32 +01:00
Andrew Kingston fbbba2e32e Remove leftover code 2022-08-08 14:29:12 +01:00
Andrew Kingston 5acce00d14 Add new UserFetch for searching users table and use in users page. Add debounce utility 2022-08-05 15:57:21 +01:00
Andrew Kingston bfe248c856 Update multi-user invite endpoint 2022-08-03 19:20:33 +01:00
Andrew Kingston c2fb17e948 Fix users invited by email not being able to take priveleged roles 2022-08-03 15:16:26 +01:00
mike12345567 129c966226 Updating the filter system to allow adding multiple filter properties of the same name at once, as well as enabling the use of the allOr property from within the UI - resolves an old issue #2585. 2022-08-02 18:34:58 +01:00
Andrew Kingston f40da5d63d Update hover background colour for nord theme 2022-08-02 10:02:04 +01:00
Andrew Kingston 98864c9614 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-keyboard-shortcuts-develop 2022-08-01 19:08:30 +01:00
mike12345567 4f01a7fb80 Merge branch 'master' of github.com:Budibase/budibase into fix/6737 2022-08-01 19:00:17 +01:00
mike12345567 de3ceeb119 Adding mechanism to allow displaying an error on data retrieval for tables. 2022-08-01 18:56:59 +01:00
Andrew Kingston ae62184e7d Update modal background colours to be themeable and use theme colours for nord and midnight 2022-08-01 09:54:30 +01:00
Peter Clement c3a4941119 Merge pull request #6989 from Budibase/pc/fixes
User Management UI fixes
2022-08-01 09:39:55 +01:00
mike12345567 aa3ad62a9b Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-29 16:14:45 +01:00
Mel O'Hagan 6e8ddc1cab Add Is in filter for options type 2022-07-29 14:41:41 +01:00
Mel O'Hagan 1bdc0658e7 Merge branch 'develop' into feature/multiselect-filters 2022-07-29 14:23:12 +01:00
Andrew Kingston 3ebb2e193f Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-29 13:48:27 +01:00
Peter Clement 8a77aca540 more efficient fetching of total users per app 2022-07-29 13:10:00 +01:00
mike12345567 b20ef0c146 Linting. 2022-07-28 13:40:04 +01:00
mike12345567 348f7e2d1c Fixing some issues with automations + lucene filtering (with string templating on the backend) as well as type coercion in the query rows action. 2022-07-28 13:39:11 +01:00
Mel O'Hagan 406362b3f9 Merge branch 'develop' into feature/multiselect-filters 2022-07-27 18:08:37 +01:00
Mel O'Hagan 03daaa5a9c Add multiselect contains filters to custom query 2022-07-27 17:54:49 +01:00
Mel O'Hagan 1afb64d7f9 Support for string bindings as array 2022-07-27 17:34:42 +01:00
Andrew Kingston 30256bbb8d Add groundwork for custom themes based off other themes 2022-07-27 16:37:35 +01:00
Mel O'Hagan 17bb56a772 Has any of MySQL filter 2022-07-27 13:19:47 +01:00
Andrew Kingston a307d91faf Slightly darken nord borders 2022-07-27 13:11:36 +01:00
Andrew Kingston 8c69cb8130 Slightly increase hover contrast in nord theme 2022-07-27 13:08:40 +01:00
Andrew Kingston b9fdce9316 Slightly darken borders in nord theme 2022-07-27 13:07:01 +01:00
Mel O'Hagan b5dbeb49e4 Has any filter InternalDB 2022-07-27 13:02:46 +01:00
Andrew Kingston 31ddce3ada Merge branch 'master' of github.com:Budibase/budibase into design-updates 2022-07-27 11:19:39 +01:00
Mel O'Hagan 291e13641d Merge branch 'develop' into feature/multiselect-filters 2022-07-27 10:18:07 +01:00
Peter Clement 548e8d518c Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-26 20:19:33 +01:00
mike12345567 d30e27d27d Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-26 17:25:55 +01:00
Mel O'Hagan 93f60ec095 NotContains internalSearch 2022-07-26 17:21:58 +01:00
Andrew Kingston 678434fe2d Tweak midnight theme 2022-07-26 13:45:08 +01:00
Andrew Kingston 3290bc78d7 Add midnight theme 2022-07-26 13:41:46 +01:00
Andrew Kingston 8da7586ba2 Update tooltip to use theme colour rather than static grey 2022-07-26 13:41:18 +01:00
Andrew Kingston ec6e17748a Merge branch 'master' of github.com:Budibase/budibase into nord-theme 2022-07-26 11:46:28 +01:00
Peter Clement 25d13d4a72 move bulk update / delete functionality out of controller 2022-07-25 16:58:30 +01:00
Andrew Kingston d1b18bd20d Update role colours 2022-07-25 15:23:37 +01:00
Andrew Kingston 303bfd5be4 Make block searching on dates useful by using a range of the whole day 2022-07-22 11:10:20 +01:00
Peter Clement ad1cf0726f Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-21 11:47:08 +01:00
Peter Clement 88f1db74b7 updating license check to search for feature 2022-07-21 09:52:01 +01:00
Mel O'Hagan 9f8eb695d8 Merge branch 'develop' into feature/contains-filter 2022-07-19 18:10:12 +01:00
Peter Clement 94d999faf9 Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-19 14:54:29 +01:00
Mel O'Hagan ac378e1839 Contains now works for internalSearch array type 2022-07-19 14:11:40 +01:00
Andrew Kingston f0e84b94f5 Fix bug with sequential helper 2022-07-15 13:09:48 +01:00
Andrew Kingston 0d2509a7f6 Update sequential helper to properly queue promises 2022-07-15 13:08:14 +01:00
Peter Clement 819ce4e360 Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-14 13:32:51 +01:00
Peter Clement f980d55af3 some user table fixes 2022-07-13 15:46:10 +01:00
Peter Clement eff78240a6 improve performance of adding users and groups 2022-07-11 15:29:39 +01:00
Andrew Kingston 16116f2877 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-07-11 10:33:50 +01:00
mike12345567 53ead79de2 Updating user search endpoint to allow searching by app ID with a new view, as well as updating user page to have a search input again. 2022-07-06 16:09:05 +01:00
Peter Clement 00ef0e3ef9 Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-05 16:04:01 +01:00
Peter Clement 3de2123dc4 group / user app assignment 2022-07-05 09:21:59 +01:00
mike12345567 21a78d6fc8 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-07-01 15:14:12 +01:00
Martin McKeaveney 836af2ffbe Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-07-01 00:34:50 +01:00
mike12345567 1efd77c790 Updating to maintain the old worker API for deprecation purposes, but removing from frontend usage. 2022-06-30 16:01:14 +01:00
mike12345567 062d834950 Updating user page to search through the backend and building a basic pagination store that can be used for it. 2022-06-30 15:39:26 +01:00
mike12345567 98c486655b Adding user pagination, removing usages of the global user list from builder and replacing with direct user lookups where possible, still need to apply filtering to username/email serverside. 2022-06-29 19:11:00 +01:00
Peter Clement 45fc55278e add InputPicker component and finish onboarding flow 2022-06-29 19:04:18 +01:00
Mel O'Hagan 78217d825b Merge branch 'develop' into feature/in-not-in-filter 2022-06-29 09:05:28 +01:00
Andrew Kingston 748a7de1ec Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-29 09:01:48 +01:00
Martin McKeaveney 0c04ac58a6 move logic to cloud URL to backend 2022-06-28 22:45:05 +01:00
Martin McKeaveney 3f26814f39 adding external call for preview URL 2022-06-28 19:26:59 +01:00
Martin McKeaveney 251520bcd1 adding types 2022-06-28 12:16:23 +01:00
Mel O'Hagan c0967ffe01 Remove console log 2022-06-27 14:37:15 +01:00
Mel O'Hagan 3a65c87714 Handle number 'Is in' 2022-06-27 14:32:20 +01:00
Martin McKeaveney 2a15ac97bb adding endpoint to cloud to check for beta access 2022-06-27 14:28:25 +01:00
Mel O'Hagan 08f1ddddd0 Handle number types custom query 2022-06-27 13:54:03 +01:00
Mel O'Hagan de01b684f0 Split string by comma if not array 2022-06-27 13:38:43 +01:00
Mel O'Hagan c5cfe0539c Add 'Is in' filter option to number type 2022-06-27 13:36:03 +01:00
Mel O'Hagan ea94983e69 Remove NotIn constant 2022-06-24 21:36:38 +01:00
Mel O'Hagan abcf9752c1 Removed notOneOf 2022-06-24 21:29:19 +01:00
mike12345567 a60c41e58b Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-24 17:43:59 +01:00
Mel O'Hagan 36a59632c4 Add (not)oneOf filter methods 2022-06-24 14:41:08 +01:00
Mel O'Hagan 848b42dad5 Add In/NotIn constants 2022-06-24 14:39:16 +01:00
Andrew Kingston 0dbc4fcd3c Pull in more work from new design UI 2022-06-24 14:31:35 +01:00
mike12345567 063540fe0a Getting notifications working correctly, linking to errors in a better way, generally improving UI, getting some final touches here and there. 2022-06-22 20:23:18 +01:00
Peter Clement d952b9a3bb updated store and finished groups tab 2022-06-22 13:55:31 +01:00
Andrew Kingston a0d83eefaa Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-22 12:49:46 +01:00
Andrew Kingston 680849d561 Merge pull request #6392 from Budibase/custom-csv-export
Add option to customise which columns are exported in export data action
2022-06-22 12:49:10 +01:00
Andrew Kingston ad57889c79 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-21 15:10:58 +01:00
mike12345567 2d04c57575 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-21 14:25:09 +01:00
Mel O'Hagan bb083899a0 prettier 2022-06-21 09:41:08 +01:00
Mel O'Hagan a2572889e9 Change constant to pascal case 2022-06-21 09:40:37 +01:00
Mel O'Hagan 48046b4b90 Add constants for sql int max min ranges 2022-06-20 17:26:35 +01:00
Andrew Kingston 6845f86689 Add option to customise which columns are exported in export data action 2022-06-20 12:32:13 +01:00
Peter Clement b7cc71a623 saving and fetching groups from couch 2022-06-15 16:51:30 +01:00
Andrew Kingston b5d635c83f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-15 15:32:33 +01:00
mike12345567 c4ab4b5af8 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-15 15:08:48 +01:00
Andrew Kingston 12961806ff Invalidate cached API responses when bad response statuses are recevied and invalidate entire API cache when switching role 2022-06-09 15:33:41 +01:00
Martin McKeaveney 02320c0ee0 Beta tab initial test for E2E, needs styled 2022-06-08 10:20:47 +01:00
Andrew Kingston d059433f1f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-07 08:45:57 +01:00
Martin McKeaveney d15dfb83fc new ui functionality working from S3 bucket 2022-06-06 23:30:36 +01:00
Rory Powell 33f44f6ee7 Remove todos 2022-06-06 11:11:13 +01:00
Martin McKeaveney dabbab4c83 rough implementation 2022-06-03 12:50:38 +01:00
mike12345567 fe84c0f21c Adding pagination control to the API and to the frontend, as well as getting view working as expected, emitting different key combinations to be able to search by any pattern. 2022-06-01 22:39:51 +01:00
mike12345567 34759c7916 Adding real history to the history tab, getting storage to couch and retrieval + api working. 2022-06-01 16:01:06 +01:00
Rory Powell 2a00f6498d Merge branch 'feature/posthog-v2' into feature/event-backfill 2022-05-29 00:25:40 +01:00
Rory Powell 857cd2d735 Merge branch 'develop' into feature/posthog-v2 2022-05-28 23:03:31 +01:00
Andrew Kingston 416baf556c Update order of schema enrichment in data fetch 2022-05-24 10:29:58 +01:00
Andrew Kingston d84150d26f Enrich data fetch subscriptions with additional JSON schema fields 2022-05-24 10:23:23 +01:00
Andrew Kingston fcf682b827 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-23 11:54:24 +01:00
Rory Powell 4841c84861 Merge branch 'feature/posthog-v2' into feature/event-backfill 2022-05-23 10:29:33 +01:00
Rory Powell 70fff5c7b9 Merge branch 'develop' into feature/posthog-v2 2022-05-23 09:04:00 +01:00
mike12345567 2acf1053d9 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-19 21:25:41 +01:00
Peter Clement 2f1401a576 Merge pull request #5966 from Budibase/feat/qa-templates
Return QA templates when environment variable is set
2022-05-19 15:08:17 +01:00
Andrew Kingston 27788626ec Remove some log statements 2022-05-19 09:17:09 +01:00
Peter Clement 2fb7777c5d Return QA templates when TEST_ENV environmentvariable is set 2022-05-18 16:21:17 +01:00
mike12345567 e61efc5474 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-18 10:56:44 +01:00
mike12345567 c528896e2d Finishing off UI, expanding settings menus from 80ch to 90ch as they were quite restricted and made the usage UI a bit difficult to view. Added a DISABLE_DEVELOPER_LICENSE env variable for testing. 2022-05-17 17:44:40 +01:00
Andrew Kingston 08a98b4b95 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-17 12:59:15 +01:00
mike12345567 b24a108d80 Porting UI, still needs testing. 2022-05-16 18:13:59 +01:00
Mel O'Hagan db2cfd077f Allow SMTP config to be cleared 2022-05-12 16:57:54 +01:00
Mel O'Hagan 827f78f8a0 Add deleteConfig to API 2022-05-12 16:57:05 +01:00
Andrew Kingston 316d5d682f Improve role colours and ordering 2022-05-10 14:02:00 +01:00
Andrew Kingston afa5f5e6cd Move some role logic to frontend core and enable client library to preferentially route to home screens 2022-04-28 15:13:33 +01:00
Rory Powell 1caf4b1965 Merge branch 'develop' into feature/posthog-v2 2022-04-27 16:32:00 +01:00
Rory Powell d2a4e0a934 Merge branch 'develop' into feature/licensing 2022-04-20 14:59:36 +01:00
Mel O'Hagan 9b5ad2dacc Get latest RevId if not provided 2022-04-20 11:51:01 +01:00
Rory Powell 03ba6d914f Merge branch 'develop' into feature/licensing 2022-04-12 16:18:41 +01:00
Andrew Kingston 0427b9dc7f Merge branch 'develop' of github.com:Budibase/budibase into nord-theme 2022-04-04 12:19:29 +01:00
Rory Powell 75d5c0c0b9 Merge branch 'feature/licensing' into feature/posthog-v2 2022-03-28 09:47:34 +01:00
Rory Powell 3e5e95a9c1 Add analytics to backend-core. Update server posthog usage 2022-03-25 13:04:34 +00:00
Rory Powell 715d42d3e6 Merge branch 'develop' into feature/licensing 2022-03-21 17:13:16 +00:00
Martin McKeaveney aaf84b6995 updating analytics endpoint, removing old NPS survey 2022-03-21 08:00:03 +00:00
Peter Clement a2c3257515 send export file from backend 2022-03-16 10:22:06 +00:00
Andrew Kingston 55a68890af Add nord theme 2022-03-15 11:18:34 +00:00
Rory Powell 7698e9293c Self Host <-> Licensing integration 2022-03-09 21:16:22 +00:00
Rory Powell 7151c86224 Merge branch 'develop' into labday/status-banner 2022-03-08 16:31:07 +00:00
Martin McKeaveney 14cffcd6ff merge 2022-03-08 12:40:41 +01:00
Martin McKeaveney 975eb0b99e merge from master 2022-03-08 12:34:27 +01:00
Peter Clement ed2c210db8 Add button action allowing for export of client row selection 2022-03-07 12:06:11 +00:00
Andrew Kingston 3d7e5c6313 Fix relative usage of S3 upload API calls 2022-03-07 09:57:03 +00:00
Martin McKeaveney 7c971586aa Merge pull request #4621 from mslourens/show_current_version
fix getting the current version
2022-03-06 21:57:47 +01:00
Andrew Kingston e58fa37b6e Merge pull request #4750 from Budibase/fix/option-picker-values
Fixes for 409s and option picker values
2022-03-03 12:37:59 +00:00
Andrew Kingston 0f295afb04 Make component setting updates sequential to prevent 409s 2022-03-01 11:11:56 +00:00
mike12345567 4086c8f439 Fixes for review comments. 2022-02-28 18:39:05 +00:00
Rory Powell 9e0a10955a Add status banner that reacts to cypress healthcheck failures 2022-02-24 14:41:24 +00:00
Maurits Lourens 225bea021d fix getting the current version 2022-02-22 10:10:41 +01:00
mike12345567 6cbf186ead Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-21 14:34:06 +00:00
Rory Powell 814b5ae5ab Merge branch 'master' into develop 2022-02-18 11:57:54 +00:00
Martin McKeaveney e8d5d54f5d bug fix for handlebars expression, show budibase version in updates panel 2022-02-17 10:12:35 +01:00
mike12345567 f0b02cf9a9 Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-16 15:30:48 +00:00
mike12345567 e5289ddcee Fixing #4522 - frontend-core refactor changed how some of these endpoints were used. 2022-02-16 13:13:40 +00:00
mike12345567 edd4a3233e Shifting over all of self API, deprecating old endpoints. 2022-02-14 18:11:35 +00:00
mike12345567 3fb3a5e47d Moving APIs around after some discussion, creating a self API to make it obvious. 2022-02-10 18:34:55 +00:00
Michael Drury 911f2780ef Start of API key modal. 2022-02-09 20:30:52 +00:00
Andrew Kingston 14eca1b461 Merge branch 'frontend-core' of github.com:Budibase/budibase into experimental-hbs-caching 2022-02-01 16:49:59 +00:00
Andrew Kingston de12e0dc79 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:46:00 +00:00
Andrew Kingston 21a771ff70 Merge in client bundle size reductions 2022-01-31 19:02:59 +00:00
Andrew Kingston fcd79ed70a Merge branch 'client-bundle-size-reduction' into experimental-hbs-caching 2022-01-31 18:58:19 +00:00
Andrew Kingston a3f13508d8 Disable API caching by default and deep clone data fetch config to avoid direct mutation side effects 2022-01-26 17:44:14 +00:00
Andrew Kingston 29f47198c6 Remove built-in patch functionality from core API client and instead manually patch client library API endpoints 2022-01-25 19:22:43 +00:00
Andrew Kingston bd04d627d2 Add missing API client documentation and fix S3 upload endpoints to make them consistent 2022-01-25 16:54:55 +00:00
Andrew Kingston 673deddc8c Fix JSON content missing from handled API errors 2022-01-25 08:25:16 +00:00
Andrew Kingston 25df85b91f Fix custom API response parsing not working 2022-01-25 08:10:49 +00:00
Andrew Kingston a8f9138001 Fix email template update endpoint 2022-01-25 08:04:56 +00:00
Andrew Kingston b75401edfb Remove log 2022-01-24 19:15:06 +00:00
Andrew Kingston bed1f0e092 Fix issue with create app endpoint sending json content type header 2022-01-24 19:06:18 +00:00
Andrew Kingston ba669dbcf4 Include missing layout endpoints 2022-01-24 16:50:33 +00:00
Andrew Kingston c08fadc7b0 Move API client in builder to top level under src and fix some endpoints not being imported 2022-01-24 16:38:36 +00:00
Andrew Kingston 30fa72665a Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-24 15:46:54 +00:00
Andrew Kingston db3b4c0b8c Update remaining builder stores to use new core API and handle errors properly 2022-01-24 14:32:27 +00:00
Andrew Kingston 453386696f Refactor all backend stores and their usages to use new core API and handle errors 2022-01-24 12:37:22 +00:00
Andrew Kingston 816ced96df Update all API usages in builder components directory 2022-01-24 10:44:37 +00:00
Andrew Kingston 59349f2451 Add lots more work on refactoring builder to use core API 2022-01-21 15:09:27 +00:00
Andrew Kingston f100ae42fd Add more work on API refactor in builder 2022-01-21 09:10:59 +00:00
Andrew Kingston e6cddcca3e Add more builder API refactor updates 2022-01-20 19:53:55 +00:00
Andrew Kingston 6319760b8c More work on builder API refactor 2022-01-20 19:27:15 +00:00
Andrew Kingston 6a7aed1c0d Update parts of builder with core API refactor 2022-01-20 18:42:30 +00:00
Andrew Kingston b74815d41b Add URL to error objects 2022-01-20 14:27:43 +00:00
Andrew Kingston 21443b0e53 Tidy core API client 2022-01-20 13:55:07 +00:00
Andrew Kingston 978c3984e9 Extract error mesages better when throwing errors in core api client 2022-01-20 13:37:06 +00:00
Andrew Kingston d494e53786 Remove static functions from data fetch models 2022-01-20 11:50:18 +00:00
Andrew Kingston 6a07e727cd Fix recursion issue with applying API method patches 2022-01-20 11:26:43 +00:00
Andrew Kingston 1ec3a91cae Update usages of utils and helpers in the builder 2022-01-20 11:19:37 +00:00
Andrew Kingston aab7adce03 Update remaining dependency issues in client 2022-01-20 10:16:13 +00:00
Andrew Kingston e3258a0caf Add helpers into BBUI rather than frontend core and fix A11y issue 2022-01-20 10:14:39 +00:00
Andrew Kingston 6e58820b45 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-20 09:43:23 +00:00
Andrew Kingston 6694bdc651 Add core API implementation and update most of client library to use it 2022-01-20 09:40:53 +00:00
Andrew Kingston 9d4f18f1ce Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-19 13:54:39 +00:00
Andrew Kingston 0201841b90 Add initial work on frontend-core refactor 2022-01-18 09:39:19 +00:00