Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dim/dui3 main merge jan #3785

Merged
merged 340 commits into from
Jan 9, 2025
Merged
Changes from 1 commit
Commits
Show all changes
340 commits
Select commit Hold shift + click to select a range
0fd5e2b
WEB-1611: Zoom to Cursor Fix (#3562)
AlexandruPopovici Nov 26, 2024
c841bb4
fix(helm chart): add Gendo feature flag to frontend-2 (#3563)
iainsproat Nov 26, 2024
f381dc3
gergo/workspaceDefaultPlan (#3561)
gjedlicska Nov 27, 2024
a043624
fix(gatekeeper): parse cancellation date properly (#3564)
gjedlicska Nov 27, 2024
9c29ca0
Add SSO indicator to Wrapper (#3565)
andrewwallacespeckle Nov 27, 2024
1800dbb
feat(server): improved subscription testing DX + tests for common sub…
fabis94 Nov 27, 2024
7a652fd
feat(fe2): Update isSsoAuthenticated composable (#3566)
andrewwallacespeckle Nov 27, 2024
b4ecb30
fix(fe2): Update delete sso provider composable (#3568)
andrewwallacespeckle Nov 27, 2024
a90bc3a
fix(fe2): workspace region settings broken if non-admin + Workspace.s…
fabis94 Nov 27, 2024
fd5f316
fix(automate): automate module multi region (#3531)
cdriesler Nov 27, 2024
4a0f69e
fix(sso): delete via id (#3570)
cdriesler Nov 27, 2024
8fc111c
fix(fe2): Small sso bugfuxes (#3571)
andrewwallacespeckle Nov 28, 2024
ec02e63
feat(gatekeeper): upgrade workspace plan (#3572)
gjedlicska Nov 28, 2024
562902d
fix(sso): distinguish between missing and invalid sso user profile (#…
cdriesler Nov 28, 2024
b2cebea
Fix: Various billing fixes (#3569)
Mikehrn Nov 28, 2024
ec27e39
feat(workspaces): add workspace creation state (#3578)
gjedlicska Nov 28, 2024
9ad3fb8
fix(sso): continue with sso from any verified email (#3577)
cdriesler Nov 29, 2024
1ac972f
feat(file imports): adds an experimental IFC parser (#3525)
adamhathcock Nov 29, 2024
126ce4f
fix(ui-components): Base.vue unnecessary label padding (#3582)
fabis94 Nov 29, 2024
0024b2f
fix(server/multi-region/sql): use parameter binding to prevent secret…
iainsproat Nov 29, 2024
9429e47
Feat: Disable WS delete on active plans (#3583)
Mikehrn Nov 29, 2024
23d644e
fix(fe2): Swap cache for workspaceProjectsUpdated subscription (#3575)
andrewwallacespeckle Nov 29, 2024
0f13b8d
Fix: Updated button text conditional (#3584)
Mikehrn Nov 29, 2024
e312110
Automate Public Beta (#3472)
cdriesler Nov 29, 2024
54085d1
fix(logging): taskScheduler should use pino parameters (#3586)
iainsproat Nov 29, 2024
b202b89
Fix: Update alerts (#3588)
Mikehrn Dec 2, 2024
4e37a0e
chore(automate): drop specklecon templates (#3587)
cdriesler Dec 2, 2024
75d2372
Fix: Update price plan to new design (#3590)
Mikehrn Dec 2, 2024
450ad95
fix(multiregion): add join for stream_commits
alemagio Dec 2, 2024
f227a9b
fix(activitystream): move activity creation after transaction commimt
alemagio Dec 2, 2024
51579b7
fix(server): various fixes related to subs + further improved utils +…
fabis94 Dec 2, 2024
bf441ae
Fix: remove old fragment (#3594)
Mikehrn Dec 2, 2024
827288c
Feat: Remove inline workspace creation (#3591)
Mikehrn Dec 2, 2024
22cdd33
Merge pull request #3592 from specklesystems/alessandro/web-2233-onbo…
alemagio Dec 2, 2024
498fea4
Feat: disable settings access if active SSO session is required (#3589)
Mikehrn Dec 2, 2024
2d41213
Fix: Billing switch (#3596)
Mikehrn Dec 2, 2024
481ef4e
Feat: Change BillingAlert to CommonAlert (#3593)
Mikehrn Dec 2, 2024
dc681df
Dont autocomplete client secret (#3597)
andrewwallacespeckle Dec 2, 2024
3319dd7
fix(sso): repair error handling during validation flow (#3551)
cdriesler Dec 2, 2024
1447af2
fix(workspaces): randomize first default logo (#3600)
cdriesler Dec 2, 2024
bde5431
feat(logging): improve error handling around db migrations (#3599)
iainsproat Dec 2, 2024
67b785a
chore(automate): include workspace in automate mixpanel events (#3601)
cdriesler Dec 2, 2024
b41b08d
fix(sso): oidc state parameter (#3598)
cdriesler Dec 2, 2024
3b51fc6
fix(helm chart): consistent spelling of workspaces (#3595)
iainsproat Dec 2, 2024
0c044c6
Refill form on sso validation (#3603)
andrewwallacespeckle Dec 2, 2024
114c762
Benjamin/web 2246 various copy fixes (#3604)
benjaminvo Dec 3, 2024
256a43f
Explain features in the plan component (#3606)
benjaminvo Dec 3, 2024
6e3d8a9
feat(workspaces): all workspaces start trial now (#3602)
gjedlicska Dec 3, 2024
c68090a
feat(projects): filter projects, that are not available under sso (#3…
gjedlicska Dec 3, 2024
16897b8
feat(fe2): show custom data residency restriction disclaimer (#3605)
fabis94 Dec 3, 2024
453d1c2
fix(sso): keep secrets secret (#3607)
cdriesler Dec 3, 2024
1dd782e
fix(cli): user proper plan name as choice (#3611)
gjedlicska Dec 3, 2024
c6b8cbc
feat(fe2): extra confirmation for setting default region (#3609)
fabis94 Dec 3, 2024
f3b28f2
Minor spacing changes to be consistent (#3610)
benjaminvo Dec 3, 2024
3f8e1a1
fix(fe2): minor default region setting ui issues (#3612)
fabis94 Dec 3, 2024
e9b2810
Fix: Date in trial (#3617)
Mikehrn Dec 3, 2024
95d8f16
A couple of copy changes (#3608)
benjaminvo Dec 3, 2024
84e04e4
fix(ci): rover checks running against fe1 schema (#3614)
fabis94 Dec 3, 2024
22080a2
Update billing summary for trial plans (#3620)
benjaminvo Dec 3, 2024
9f2659a
fix(fe2): Allow server:admin access to all workspace settings (#3618)
andrewwallacespeckle Dec 3, 2024
9c97f91
fix(automate): drop public functions (#3623)
cdriesler Dec 3, 2024
101a0b2
fix(workspaces): no default discovery (#3622)
cdriesler Dec 3, 2024
a0d2831
fix(server/logging): use structured message template not string forma…
iainsproat Dec 3, 2024
b4aa0f7
fix(sso): disable slug edit if sso enabled (#3621)
cdriesler Dec 3, 2024
384640d
fix(error): improve error message when subscriptions & publications f…
iainsproat Dec 3, 2024
5b5aa7a
feat(multiRegion): do not recreate the pub subs in production (#3624)
gjedlicska Dec 4, 2024
cdf9c48
refactor(env vars): rename AUTOMATE_ENCRTYPTION_KEYS_PATH with ENCRYP…
iainsproat Dec 4, 2024
2ba2ef2
feat(gatekeeper): lower checkout session expiry (#3626)
gjedlicska Dec 4, 2024
8f4593e
Feat: Workspace creation wizard (#3625)
Mikehrn Dec 4, 2024
9982f3e
Update wizard copy (#3628)
benjaminvo Dec 4, 2024
9a3feed
No condition on click event (#3629)
andrewwallacespeckle Dec 4, 2024
a09da96
Fixed icon (#3630)
Mikehrn Dec 4, 2024
ce3941c
fix(automate): cascade delete automations with projects (#3627)
cdriesler Dec 4, 2024
20c36d4
Feat: Added invite event (#3631)
Mikehrn Dec 4, 2024
bafbe97
Feat: Enable workspace wizard (#3634)
Mikehrn Dec 5, 2024
3caaeb6
Add items-center (#3636)
andrewwallacespeckle Dec 5, 2024
4b6e7af
feat(fe2): scope comment mentions to parent project collaborators (#3…
fabis94 Dec 5, 2024
083999d
chore(server/logging): use message template instead of runtime format…
iainsproat Dec 5, 2024
b2087e7
feat(local dev): multi-region blob storage (#3639)
iainsproat Dec 5, 2024
97344e0
fix(local dev): use non-conflicting ports (#3641)
iainsproat Dec 5, 2024
ba19d75
Add custom-help-text prop to TextInput. Fix slug help (#3640)
andrewwallacespeckle Dec 5, 2024
9b1b1df
feat(server/feature flags): adds multi-region blob storage ff (#3643)
iainsproat Dec 5, 2024
8927490
chore(automate): track redirects from beta site (#3633)
cdriesler Dec 5, 2024
dab1bc7
fix(automate): update empty state (#3642)
cdriesler Dec 5, 2024
abaf66c
Feat: Update creation event, add more properties to workspace (#3637)
Mikehrn Dec 5, 2024
298e097
fix(helm chart): set a default value in Helm Chart for workspacesMult…
iainsproat Dec 5, 2024
2f44ae2
Trigger mention dialog after a single character (#3644)
benjaminvo Dec 5, 2024
384510f
Fix: Only set once for hasSpeckleMembers (#3646)
Mikehrn Dec 5, 2024
091cff6
chore(automate): function and automation creation funnel events (#3647)
cdriesler Dec 5, 2024
e160ea0
feat(fe2): Billing - Add tooltips to disabled buttons (#3615)
andrewwallacespeckle Dec 5, 2024
4e6f199
fix(fe2): Upgrading from annual to monthly billing tooltip (#3650)
andrewwallacespeckle Dec 5, 2024
02be49f
fix(automate): redirect github auth flow to workspace if possible (#3…
cdriesler Dec 6, 2024
888e45c
Add Gendo Mixpanel event (#3654)
benjaminvo Dec 9, 2024
6c471c0
Feat: Send webhook for upgrade event (#3649)
Mikehrn Dec 9, 2024
648e077
Feat: Improve information in upgrade modal (#3655)
Mikehrn Dec 9, 2024
f3e0a83
chore(automate): add in-app demo calendar link (#3657)
cdriesler Dec 9, 2024
62863a8
feat(server): allow using frontend proxy in fe2 mode too (#3658)
gjedlicska Dec 9, 2024
61098f1
chore(workspaces): track deleted workspace in mixpanel (#3656)
cdriesler Dec 9, 2024
e94c9e7
feat(workspaces): add readOnly field to workspace gql type
alemagio Dec 9, 2024
b08f25d
feat(workspaces): add readOnly logic for workspace
alemagio Dec 9, 2024
0a735e8
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 9, 2024
1104211
Fix: Fix webhook (#3660)
Mikehrn Dec 9, 2024
510a079
Update text if plan is cancelled (#3663)
benjaminvo Dec 9, 2024
8d0cbad
feat(server): multi region blob support (#3653)
fabis94 Dec 10, 2024
e7613a6
Fixed TAS Shapecast (#3661)
AlexandruPopovici Dec 10, 2024
c1eeb20
fix(sso): fallback resolver (#3667)
cdriesler Dec 10, 2024
95733b4
Chore(workspaces): Add support links to billing settings (#3665)
benjaminvo Dec 10, 2024
4777093
Fix: Improve creation wizard state management (#3666)
Mikehrn Dec 10, 2024
abdd8e3
Fix: Hide disclaimer if FF is enabled (#3668)
Mikehrn Dec 10, 2024
45c6263
feat(gatekeeper): expire trail workspace plans
gjedlicska Dec 10, 2024
ee3ac48
Feat: Change default workspace avatars (#3670)
Mikehrn Dec 11, 2024
27a0600
feat(server): multi-region aware liveness and readiness checks (#3468)
iainsproat Dec 11, 2024
f5312cc
Fix: Fix CommonAlert icon (#3671)
Mikehrn Dec 11, 2024
10969c8
Fix: workspace avatar (#3674)
Mikehrn Dec 11, 2024
0a2bebd
fix(server): check for multi-region when retrieving all registered db…
iainsproat Dec 11, 2024
fb7a768
refactor(gatekeeper): use exhaustive switch pattern
gjedlicska Dec 11, 2024
f5c2979
fix(logging): remove duplicate log (#3678)
iainsproat Dec 11, 2024
2a72631
feat(gatekeeper): expire trail workspace plans (#3669)
gjedlicska Dec 11, 2024
229a19c
gergo/workspaceAdmin (#3677)
gjedlicska Dec 11, 2024
68938ba
feat(gatekeeper): show subscription seats (#3679)
gjedlicska Dec 11, 2024
fd2d638
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 12, 2024
ded5b0a
fix(workspaces): make sure to return from switch statement (#3680)
gjedlicska Dec 12, 2024
17c1c3e
Merge branch 'main' of github.com:specklesystems/speckle-server into …
gjedlicska Dec 12, 2024
8197bb7
feat(multi-region): metrics for knex for all regional databases (#3580)
iainsproat Dec 12, 2024
c6301f8
Fix: Hide seat counts and pricing for academia and unlimited plans (#…
Mikehrn Dec 12, 2024
9e0e6a9
SpeckleInstancedMeshes now recrete their shadow depth material whenev…
AlexandruPopovici Dec 12, 2024
60ff23d
Toggle-able Basit Mode (#3672)
AlexandruPopovici Dec 12, 2024
15bc673
chore(billing): fix test
alemagio Dec 12, 2024
222f3dd
Feat: Add upgraded and failed event (#3683)
Mikehrn Dec 12, 2024
ad61f1d
Feat: Change server invite to new design (#3676)
Mikehrn Dec 12, 2024
87221ca
feature(fe2): View mode FE integration (#3651)
andrewwallacespeckle Dec 12, 2024
b86a579
Fix: Remove automations from General settings query (#3686)
Mikehrn Dec 13, 2024
f1a9a37
fix(server): use correct types for Timeout (#3687)
iainsproat Dec 13, 2024
09cc2a2
Update view mode names (#3688)
benjaminvo Dec 13, 2024
a4c33fb
Update Controls.vue (#3689)
andrewwallacespeckle Dec 13, 2024
bd24ec7
Fix: Update Automate run label colors (#3690)
Mikehrn Dec 13, 2024
764c373
update ifc importer to have better memory usage (#3691)
adamhathcock Dec 13, 2024
eeac2be
Re-add resize panels (#3692)
andrewwallacespeckle Dec 13, 2024
59bcd99
Close control menus on click outside (#3693)
andrewwallacespeckle Dec 13, 2024
c186b23
feat(gatekeeper): send workspace trial expiry emails
gjedlicska Dec 13, 2024
dbc439e
feat(gatekeeper): use daily cron tab for trial emails
gjedlicska Dec 13, 2024
3cbf7a1
Merge branch 'main' of github.com:specklesystems/speckle-server into …
gjedlicska Dec 13, 2024
4be7eb8
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 16, 2024
a8decee
chore(core): setup hooks system for core module
alemagio Dec 13, 2024
11beefe
feat(gatekeeper): readOnly validation logic
alemagio Dec 13, 2024
3b67a51
fix(server): correct type in notifications helper (#3694)
iainsproat Dec 16, 2024
6d3ba0d
chore(server): errors for database append additional context (#3698)
iainsproat Dec 16, 2024
89caea3
chore(knex): adds comments around config choices. No code changes (#3…
iainsproat Dec 16, 2024
663ee0b
fix(server): app initialization starts metrics after multiregion (#3697)
iainsproat Dec 16, 2024
c4def81
feat(server options): allow connection timeouts to be configured (#3701)
iainsproat Dec 16, 2024
1f7620a
chore(logging): log migration of databases (#3700)
iainsproat Dec 16, 2024
38eeba2
fix(gatekeeper): fix crontab
gjedlicska Dec 17, 2024
0115e65
feat(database monitor): handles multi-region and connection pooling (…
iainsproat Dec 17, 2024
da49ec6
feat(core): user projects filterable by workspace
alemagio Dec 17, 2024
cb134f3
Fix: Invite banner mixpanel event (#3704)
Mikehrn Dec 17, 2024
09e9356
Fix: Various workspace wizard fixes (#3705)
Mikehrn Dec 17, 2024
f4f3ccf
Feat: Add Workspace Wizard step viewed events (#3706)
Mikehrn Dec 17, 2024
52e7880
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 17, 2024
8afe68e
Change trial email copy
benjaminvo Dec 17, 2024
866e31a
Feat: Add seat info to invite modal (#3710)
Mikehrn Dec 18, 2024
29bcb66
Fix: Unable to delete project from workspace settings (#3708)
Mikehrn Dec 18, 2024
f50a95f
Feat: Change blog to tutorials (#3713)
Mikehrn Dec 18, 2024
047f21a
Feat: Billing info on change role (#3715)
Mikehrn Dec 18, 2024
a363f0e
feat(workspaces): expose graphql field readonly for workspace type (#…
alemagio Dec 18, 2024
d3a10e4
Feat: Add seats and estimated bill (#3684)
Mikehrn Dec 18, 2024
6fc7c06
Offline Object Loader (#3717)
AlexandruPopovici Dec 18, 2024
571338c
feat(feature flags): consolidate multi region & multi region blob sto…
iainsproat Dec 18, 2024
a6d7aad
feat(database monitor): query configured postgres values (#3711)
iainsproat Dec 18, 2024
53237b4
Update NewReply.vue (#3718)
andrewwallacespeckle Dec 18, 2024
25010e3
fix(monitoring): lag should be a positive value (#3719)
iainsproat Dec 19, 2024
0d2af68
chore(server/stats): disable deprecated ServerStats (#3714)
iainsproat Dec 19, 2024
1d98e6c
Feat: New workspace invite modal (#3723)
Mikehrn Dec 19, 2024
0402149
Fix: Keep footer background for embedded models (#3724)
Mikehrn Dec 19, 2024
3b82b62
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 20, 2024
8003c1c
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 20, 2024
67f395e
Feat: Upgrade Mixpanel browser and enable session replay (#3725)
Mikehrn Dec 20, 2024
ca46ae6
chote(core): fix tests
alemagio Dec 20, 2024
ff04755
feat(gatekeeper): readOnly validation for version and commit creation
alemagio Dec 16, 2024
47eb26f
chote(core): fix tests
alemagio Dec 20, 2024
b1e4834
feat(workspaces): create workspace_join_requests table and domain types
alemagio Dec 20, 2024
1ba905d
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 20, 2024
5d44cf1
chore: Track embed views (#3726)
benjaminvo Dec 20, 2024
6040e2c
Fix: Update move project modal (#3712)
Mikehrn Dec 20, 2024
f9664c5
Make it Snow (#3729)
AlexandruPopovici Dec 20, 2024
be898db
feat(fe2): New workspace page layout (#3716)
andrewwallacespeckle Dec 20, 2024
452d577
Update colour variables (#3722)
andrewwallacespeckle Dec 20, 2024
58e51ca
Use new colour variable (#3732)
andrewwallacespeckle Dec 20, 2024
cfb7c6b
Fix: tooltip on members table (#3730)
Mikehrn Dec 20, 2024
a1d23a2
Fix: fix follow tooltips in viewer mode (#3728)
Mikehrn Dec 20, 2024
1851f74
Adjust badge text colour (#3733)
andrewwallacespeckle Dec 20, 2024
d54eeb5
Xmas: Let it snow (#3731)
Mikehrn Dec 20, 2024
1a3bb53
Update ProjectList.vue (#3734)
andrewwallacespeckle Dec 20, 2024
f6f0459
Editable Description field (#3735)
andrewwallacespeckle Dec 20, 2024
6fc2d20
Snow Doesn't Stay (#3736)
AlexandruPopovici Dec 20, 2024
81f1401
Fix(workspace): Tiny polishing in new workspace homepage (#3737)
benjaminvo Dec 20, 2024
e67b53b
Merge pull request #3695 from specklesystems/alessandro/web-2310-retu…
alemagio Dec 20, 2024
b4296f3
Revert change to IconEdit (#3739)
andrewwallacespeckle Dec 20, 2024
66f7e98
feat(gatekeeper): remove 14 days trial expiration email
alemagio Dec 20, 2024
98c6161
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 20, 2024
b337ae3
Measurements Units Fixes (#3741)
AlexandruPopovici Dec 20, 2024
5c3887f
feat(gatekeeper): add text email
alemagio Dec 23, 2024
fa4022a
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 23, 2024
cc5b69b
Merge pull request #3699 from specklesystems/alessandro/web-2309-retu…
alemagio Dec 23, 2024
49e56e3
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 23, 2024
c0f293a
Add label-position prop to TextArea (#3738)
andrewwallacespeckle Dec 23, 2024
f8bb0ee
refactor(fe2): various changes to workspace avatar (#3740)
andrewwallacespeckle Dec 23, 2024
2e9fe26
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 23, 2024
218de0e
Fix: Dont show tooltip on all workspace avatars (#3745)
Mikehrn Dec 23, 2024
baea53e
Disable uploads, project creation and moving when read only (#3744)
Mikehrn Dec 23, 2024
71e92ea
Fix: Improve email validation and copy (#3743)
Mikehrn Dec 23, 2024
52aa0e1
Fix: Align settings sidebar with main sidebar (#3746)
Mikehrn Dec 23, 2024
ad2d760
Feat: Add confirmation dialog for pending invite cancelation (#3747)
Mikehrn Dec 23, 2024
bb1a531
Feat: Add ID for server admins in users table (#3748)
Mikehrn Dec 23, 2024
6e92d12
Fix: Workspace avatar URL (#3749)
Mikehrn Dec 23, 2024
e0e9878
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Dec 23, 2024
934b148
Merge pull request #3703 from specklesystems/gergo/web-2124-set-up-em…
alemagio Dec 30, 2024
efdc53a
feat(gatekeeper): fix tests
alemagio Dec 30, 2024
b98a081
feat(gatekeeper): disable tests when workspace module is disabled
alemagio Dec 30, 2024
35eb209
fix(POST /api/file): REST API endpoint returns json content-type (#3463)
iainsproat Jan 2, 2025
82c7814
feat(server): track wp trial expiratiom email sends (#3753)
fabis94 Jan 2, 2025
2de3136
Feat: Snow instead of Santa (#3756)
Mikehrn Jan 2, 2025
e7c8411
Feat: Update trial banner text on final day of trial (#3755)
Mikehrn Jan 2, 2025
ce9f154
fix(server): diff upload and download can handle JSON parsing errors …
iainsproat Jan 3, 2025
f8072fa
fix(server/blobstorage): handles errors with missing content-type hea…
iainsproat Jan 3, 2025
457c532
feat(server): allow ratelimiting to be explicitly disabled (#3757)
iainsproat Jan 3, 2025
5024ebb
Fix: Updates to trial expired state (#3762)
Mikehrn Jan 3, 2025
66b0db5
chore(fe2): upgrade nuxt and related deps to 3.15.0 (#3761)
fabis94 Jan 6, 2025
ab9e8bb
feat(server): ProjectVersionsUpdatedMessage.modelId always filled (#3…
fabis94 Jan 6, 2025
da6dbb9
fix(knex): bump knex from 2.4.1 to 2.5.1 to resolve leaking db connec…
iainsproat Jan 6, 2025
a0e6b2c
Fix: Revert notification changes (#3763)
Mikehrn Jan 6, 2025
360208c
feat(fe2): remove blob storage constraint disclaimer
fabis94 Jan 6, 2025
4e615fd
Revert "feat(fe2): remove blob storage constraint disclaimer"
fabis94 Jan 6, 2025
adae124
feat(fe2): remove blob storage constraint disclaimer (#3764)
fabis94 Jan 6, 2025
c252339
refactor(blobstorage): tests converted to typescript (#3742)
iainsproat Jan 7, 2025
1886ec0
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Jan 7, 2025
e0f39da
Merge branch 'main' of github.com:specklesystems/speckle-server into …
alemagio Jan 7, 2025
01cb1b5
feat(workspaces): test clarifications
alemagio Jan 7, 2025
0fa4e2f
Fix: Order server permission list ABC (#3774)
Mikehrn Jan 7, 2025
17c6f71
feat(fe2 helm chart): allows nodejs inspect flag to be enabled (#3770)
iainsproat Jan 7, 2025
da10e35
Fix: Small UI fixes for auth screens (#3775)
Mikehrn Jan 7, 2025
78773aa
fix(github action): bump image in github action (#3776)
iainsproat Jan 7, 2025
c791362
feat(users): bulk lookup users by email (#3720)
cdriesler Jan 7, 2025
be51d29
Make controls scroll when needed (#3768)
andrewwallacespeckle Jan 8, 2025
2d40640
fix(auth): remove direct form value mutation in SSO login (#3779)
andrewwallacespeckle Jan 8, 2025
8cadddf
fix(metrics): speckle_server_apollo_calls built with correct register…
iainsproat Jan 8, 2025
7ddf740
Merge pull request #3707 from specklesystems/alessandro/web-2348-list…
alemagio Jan 9, 2025
d75e7a3
Merge pull request #3727 from specklesystems/alessandro/web-2357-crea…
alemagio Jan 9, 2025
a4c23d5
Merge branch 'main' into dim/dui3-main-merge-jan
didimitrie Jan 9, 2025
d789d4e
Merge branch 'main' into dim/dui3-main-merge-jan
didimitrie Jan 9, 2025
e13be36
fix: removed unused file
didimitrie Jan 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Benjamin/web 2246 various copy fixes (#3604)
* Call it data residency

* Change expected bill copy

* Update alert copy and add a renew action

* Fix typo

* Make billing tooltip more explanatory

* Remove decimals from expected bill value
  • Loading branch information
benjaminvo authored Dec 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 114c762e13462a022332e75182c0c3a7b48fb99b
21 changes: 15 additions & 6 deletions packages/frontend-2/components/billing/Alert.vue
Original file line number Diff line number Diff line change
@@ -51,6 +51,9 @@ const isTrial = computed(
const isPaymentFailed = computed(
() => planStatus.value === WorkspacePlanStatuses.PaymentFailed
)
const isScheduledForCancelation = computed(
() => planStatus.value === WorkspacePlanStatuses.CancelationScheduled
)
const trialDaysLeft = computed(() => {
const createdAt = props.workspace.plan?.createdAt
const trialEndDate = dayjs(createdAt).add(31, 'days')
@@ -65,11 +68,11 @@ const title = computed(() => {
}
switch (planStatus.value) {
case WorkspacePlanStatuses.CancelationScheduled:
return `Your ${props.workspace.plan?.name} plan subscription is scheduled for cancellation`
return `Your workspace subscription is scheduled for cancellation`
case WorkspacePlanStatuses.Canceled:
return `Your ${props.workspace.plan?.name} plan subscription has been cancelled`
return `Your workspace subscription has been cancelled`
case WorkspacePlanStatuses.Expired:
return `Your free ${props.workspace.plan?.name} plan trial has ended`
return `Your free trial has ended`
case WorkspacePlanStatuses.PaymentFailed:
return "Your last payment didn't go through"
default:
@@ -84,11 +87,11 @@ const description = computed(() => {
}
switch (planStatus.value) {
case WorkspacePlanStatuses.CancelationScheduled:
return 'Your workspace subscription is scheduled for cancellation. After the cancellation, your workspace will be in read-only mode.'
return 'Once the current billing cycle ends your workspace will enter read-only mode. Renew your subscription to undo.'
case WorkspacePlanStatuses.Canceled:
return 'Your workspace has been cancelled and is in read-only mode. Upgrade your plan to continue.'
return 'Your workspace has been cancelled and is in read-only mode. Subscribe to a plan to regain full access.'
case WorkspacePlanStatuses.Expired:
return "The workspace is in a read-only locked state until there's an active subscription. Upgrade your plan to continue."
return "The workspace is in a read-only locked state until there's an active subscription. Subscribe to a plan to regain full access."
case WorkspacePlanStatuses.PaymentFailed:
return "Update your payment information now to ensure your workspace doesn't go into maintenance mode."
default:
@@ -116,6 +119,12 @@ const actions = computed((): AlertAction[] => {
onClick: () => billingPortalRedirect(props.workspace.id),
disabled: !props.workspace.id
})
} else if (isScheduledForCancelation.value) {
actions.push({
title: 'Renew subscription',
onClick: () => billingPortalRedirect(props.workspace.id),
disabled: !props.workspace.id
})
}

return actions
10 changes: 5 additions & 5 deletions packages/frontend-2/components/settings/workspaces/Billing.vue
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
</h3>
<template v-if="statusIsTrial">
<p class="text-heading-lg text-foreground inline-block">
{{ billValue }}
{{ billValue }} per month
</p>
<p class="text-body-xs text-foreground-2 flex gap-x-1 items-center">
{{ billDescription }}
@@ -252,8 +252,8 @@ const billValue = computed(() => {
const guestPrice = seatPrice.value[Roles.Workspace.Guest] * guestSeatCount.value
const memberPrice = seatPrice.value[Roles.Workspace.Member] * memberSeatCount.value
const totalPrice = guestPrice + memberPrice
if (statusIsTrial.value) return `£${totalPrice}.00`
return `£0.00`
if (statusIsTrial.value) return `£${totalPrice}`
return `£0`
})
const billDescription = computed(() => {
const memberText =
@@ -266,10 +266,10 @@ const billDescription = computed(() => {
const billTooltip = computed(() => {
const memberText = `${memberSeatCount.value} member${
memberSeatCount.value === 1 ? '' : 's'
} £${seatPrice.value[Roles.Workspace.Member]}`
} at £${seatPrice.value[Roles.Workspace.Member]}/month`
const guestText = `${guestSeatCount.value} guest${
guestSeatCount.value === 1 ? '' : 's'
} £${seatPrice.value[Roles.Workspace.Guest]}`
} at £${seatPrice.value[Roles.Workspace.Guest]}/month`

return `${memberText}${guestSeatCount.value > 0 ? `, ${guestText}` : ''}`
})
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<p>You are about to upgrade your workspace to the following plan:</p>
<CommonCard class="font-medium bg-foundation !p-3 my-2">
Workspace {{ startCase(plan) }} plan,
{{ billingInterval === BillingInterval.Yearly ? 'anual' : 'monthly' }}
{{ billingInterval === BillingInterval.Yearly ? 'annual' : 'monthly' }}
</CommonCard>
<p>Do you want to proceed?</p>
</div>
2 changes: 1 addition & 1 deletion packages/frontend-2/lib/billing/helpers/types.ts
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ export enum PlanFeaturesList {
PrivateAutomateFunctions = 'Private automate functions',
DomainSecurity = 'Domain security',
SSO = 'Single Sign-On (SSO)',
CustomDataRegion = 'Custom data region',
CustomDataRegion = 'Custom data residency',
PrioritySupport = 'Priority support'
}