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.

Sign up for GitHub

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

Jump to bottom

Merge release/2.023.37 #4687

Merged
merged 77 commits into from
Oct 17, 2023
Merged

Merge release/2.023.37 #4687

merged 77 commits into from
Oct 17, 2023

Conversation

LMNTL
Copy link
Contributor

@LMNTL LMNTL commented Oct 17, 2023 •
edited

Checklist

  1. If you've added code that should be tested, add tests
  2. If you've changed APIs, update (or create!) the documentation
  3. Ensure the tests pass
  4. Make sure that your code lints and that you've followed our coding style
  5. Write a title and, if necessary, a description of your work suitable for publishing in our release notes
  6. Mention any related issues in this repository (as #ISSUE) and in other repositories (as kobotoolbox/other#ISSUE)
  7. Open an issue in the docs if there are UI/UX changes

Description

Merge release/2.023.37 into beta

Notes

The two files that should be looked at from this PR are jsapp/js/account/usage.api.ts and jsapp/js/api.ts, which required manual intervention after/during merge. fetchWithHeaders from release/2.023.37 has been removed, and its one reference refactored.

LMNTL and others added 30 commits September 25, 2023 16:37
@LMNTL
return plans and add-ons separately in subscriptionStore
367782b
@LMNTL
account for subscription add-ons in usage calculations, merge price a…
014e568 
…nd product metadata
@LMNTL
show free tier override based on owner join date instead of user join…
49e1dbe 
… date
@noliveleger
Deleted projects not taken into account in storage calculation
487b6ea
@noliveleger
Remove join queries to retrieve KC counters
fad634f
@noliveleger
Split _get_per_asset_usage() into multiple smaller methods
d752780
@noliveleger
Fix unit tests
2ef043b
@noliveleger
Add unit test for service usage with projects in trash bin
be48d59
@LMNTL
Merge pull request #4661 from kobotoolbox/fix-user-storage-with-delet…
c4cd7ad 
…ed-projects

WIP - Fix user storage with deleted projects
@noliveleger
Coerce user list to a list to avoid joins
00da7df
@jnm
Merge pull request #4665 from kobotoolbox/remove-joins-daily-counters
be4fd6c 
Improve `/api/v2/service_usage` endpoint response
@LMNTL
use detail view in service usage endpoint instead of POSTing
a0395d1
@LMNTL
add test for detail view
a34a7db
@LMNTL
add warning to usage page that data may be cached
8dddf6b
@LMNTL
allow promotion codes in stripe checkout
9622dfb
@LMNTL
refactor active_subscription_billing_details
2b0b061
@LMNTL
GET from /service_usage/ORGANIZATION_ID/ instead of POST
13e259d
@LMNTL
Merge branch 'release/2.023.37' into cache-service-usage
adcdf27
@JacquelineMorrissette
Add check that socialaccounts don't use kobo as ID
c7ca817
@LMNTL
rename subscriptionResponse to planResponse
f408e60
@LMNTL
default to user's join date if they're not in an organization
2fcd101
@noliveleger
Merge pull request #4653 from kobotoolbox/add-social-account-check
4a4ea5f 
Add check that `SOCIALACCOUNT_PROVIDERS` don't use kobo as ID
@LMNTL
remove stray print statement
fd8cfae
@LMNTL
remove banner from usage page warning about stale data
4976146
@LMNTL
don't save() if not needed
9473816
@LMNTL
add formatRelativeTime to js utils
5496a78
@LMNTL
add fetchWithHeaders utility function
13f25c4
@LMNTL
use fetchWithHeaders in getOrganization
5ffe981
@LMNTL
get request cache date in useUsage
960e388
@LMNTL
display 'last updated' time on Usage page
d3b099c
noliveleger and others added 22 commits October 10, 2023 09:43
@noliveleger
Cannot create a per-asset disclaimer without global one
bf809ab
@jnm
Merge pull request #4677 from kobotoolbox/fix-enketo-disclaimer
391545e 
Enforce `Default` when only one form disclaimer is set
@LMNTL
better comments
723f9b3
@LMNTL
bump ES target for typescript
ef72a2d
@LMNTL
update return type now that Object.entries is recognized
0697ff7
@LMNTL
refactor getFreeTierLimits
b211bd6
@noliveleger
Use custom manager for KobocatAttachment model
d9b06af
@noliveleger
Remove undeclared variables
8432f81
@noliveleger
Add unit tests for preview with form disclaimer
4a244ee
@LMNTL
Merge pull request #4679 from kobotoolbox/fix-preview-with-enketo-footer
1109451 
Fix 500 error when previewing multilanguage forms with disclaimer message
@LMNTL
use first() when getting org owner join date
ca0732e
@LMNTL
Merge pull request #4660 from kobotoolbox/storage-addons-frontend
5ed6a45 
Show storage add-ons in usage limits
@noliveleger
Make fullname required by default
0488bfe
@noliveleger
Fix unit tests
bf1ca5d
@JacquelineMorrissette
Merge pull request #4682 from kobotoolbox/require-fullname-field
6c40a42 
Make `name` field required by default
@noliveleger
Use "deleted_at" instead of "replaced_at"
fc75e4a
@noliveleger
Merge branch 'release/2.023.37' into do-not-use-soft-deleted-attachments
45babca
@noliveleger
Cast array type when using PostgreSQL array_position
429feeb
@noliveleger
Apply requested changes for PR#4686
2b590f7
@bufke
Merge pull request #4686 from kobotoolbox/fix-array-position-postgres
eb1e7f3 
Fix 500 error when loading projects list with PostgreSQL 13 and older
@LMNTL
Merge remote-tracking branch 'origin/release/2.023.37' into beta
fc96ad6
@LMNTL
remove fetchWithHeaders and use fetchGet with options instead
5e0a721
@LMNTL LMNTL requested a review from p2edwards October 17, 2023 17:52
@LMNTL LMNTL merged commit 5c38755 into beta Oct 17, 2023
4 checks passed
@LMNTL LMNTL deleted the merge-release/2.023.37 branch October 17, 2023 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p2edwards p2edwards p2edwards approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@LMNTL @p2edwards @noliveleger @jnm @JacquelineMorrissette @bufke