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

Feature/addons service #10759

Open
wants to merge 212 commits into
base: feature/addons_service
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
921d37f
Merge branch 'hotfix/23.16.3'
mfraezz Nov 22, 2023
207de84
Routing changes for Preprints Modernization
adlius Nov 1, 2023
b69ab65
Fix ResolveGuid tests
mfraezz Nov 30, 2023
109576f
Merge branch 'hotfix/23.16.4'
mfraezz Nov 30, 2023
3d3bfdc
Merge branch 'hotfix/23.16.4' into develop
mfraezz Nov 30, 2023
7810a1e
Add AGU Conference campaign
Nov 20, 2023
9e0322d
Rename, reword template
mfraezz Nov 28, 2023
c41bb4f
Merge branch 'hotfix/23.16.5'
mfraezz Dec 7, 2023
ee87e96
Merge branch 'hotfix/23.16.5' into develop
mfraezz Dec 7, 2023
561d81e
[ENG-4823] Add Collection Metadata Options (#10499)
Johnetordoff Dec 14, 2023
af35c28
Add UNVERIFIED Domain classification
Dec 15, 2023
740696e
Merge branch 'hotfix/23.16.6'
mfraezz Dec 18, 2023
3ee8410
Merge branch 'hotfix/23.16.6' into develop
mfraezz Dec 18, 2023
1722bbd
Add merge migration
mfraezz Dec 18, 2023
1d626fa
[ENG-4823] Add Collection Metadata Options (#10499)
Johnetordoff Dec 14, 2023
54ad5d8
Add merge migration
mfraezz Dec 18, 2023
7961a72
Merge branch 'hotfix/23.16.7'
mfraezz Jan 5, 2024
28a5cd6
Merge branch 'hotfix/23.16.7' into develop
mfraezz Jan 5, 2024
f9b2d28
Update sitemap for preprint routes, file downloads
mfraezz Jan 8, 2024
db04722
Merge branch 'hotfix/23.16.8'
mfraezz Jan 8, 2024
3fc6a9e
Merge branch 'hotfix/23.16.8' into develop
mfraezz Jan 8, 2024
900b33a
use content instead of sanitized text for spam filter.
Jan 5, 2024
73477de
Merge branch 'hotfix/23.16.9'
mfraezz Jan 9, 2024
393c965
Merge branch 'hotfix/23.16.9' into develop
mfraezz Jan 9, 2024
a8ace8e
Avoid 401 when indexing withdrawn preprints
mfraezz Jan 10, 2024
bc7e871
Merge branch 'hotfix/23.16.10'
mfraezz Jan 10, 2024
4c6627a
Merge branch 'hotfix/23.16.10' into develop
mfraezz Jan 10, 2024
e480613
Add actions to update domain notes
mfraezz Jan 10, 2024
fa0942c
Merge branch 'hotfix/23.16.11'
mfraezz Jan 10, 2024
4efd88a
Merge branch 'hotfix/23.16.11' into develop
mfraezz Jan 10, 2024
45029e4
fix: multiple funding awards from the same funder (#10512)
aaxelb Jan 17, 2024
0c1ec25
[ENG-4335] subjects on projects (#10324)
aaxelb Jan 18, 2024
754e062
[ENG-5011] Subject.get_semantic_iri
aaxelb Jan 18, 2024
bb3fc77
Merge branch 'hotfix/23.16.12'
mfraezz Jan 18, 2024
424cc01
Merge branch 'hotfix/23.16.12' into develop
mfraezz Jan 18, 2024
e6b0e29
[ENG-3696] Make gotoFileEvents always open in new tab (#10482)
Johnetordoff Jan 23, 2024
5754704
[ENG-5208]: Fix python bootstrapping in docker build (#10518)
ly-mariia Jan 25, 2024
13f633d
ENG-5208 (#10522)
ly-mariia Jan 29, 2024
a653b35
[ENG-5136] datacite 4.5 (#10529)
aaxelb Feb 13, 2024
42e2f3f
[EMG-4804] Cedar Project PR - BE (#10498)
cslzchen Feb 23, 2024
a250d1e
[ENG-5206] Parse v1 Profilewebsites for NotableDomains (#10524)
Johnetordoff Feb 26, 2024
0baf23e
Bump version and update CHANGELOG
mfraezz Feb 26, 2024
0e55541
Merge branch 'release/24.01.0'
mfraezz Feb 26, 2024
8a5eccd
Merge branch 'release/24.01.0' into develop
mfraezz Feb 26, 2024
21eef4f
[ENG-5282] metrics api docs (#10545)
aaxelb Mar 7, 2024
392334a
Ensure Sanction auto-approves do not fail silently
mfraezz Mar 15, 2024
2324d95
Merge branch 'hotfix/24.01.1'
mfraezz Mar 15, 2024
c977471
Merge branch 'hotfix/24.01.1' into develop
mfraezz Mar 15, 2024
924753e
allow request `request_identifier_update` to create DOIs
Mar 19, 2024
75ea18a
Merge branch 'hotfix/24.01.2'
mfraezz Mar 19, 2024
56f052b
Merge branch 'hotfix/24.01.2' into develop
mfraezz Mar 19, 2024
5ef8481
Use public schema for function
mfraezz Mar 20, 2024
1c9068a
Merge branch 'hotfix/24.01.3'
mfraezz Mar 20, 2024
99693db
Merge branch 'hotfix/24.01.3' into develop
mfraezz Mar 20, 2024
1d11db8
ENG-5429 fix styling for advisory board section (#10570)
uditijmehta Mar 21, 2024
1b08b80
[ENG-5356] Unlimit the number of highlighted subjects are displayed (…
Johnetordoff Mar 25, 2024
9770f06
Exclude self when looking for users to merge
mfraezz Mar 25, 2024
e9f9749
Merge branch 'hotfix/24.01.4'
mfraezz Mar 25, 2024
bfbeb1d
Merge branch 'hotfix/24.01.4' into develop
mfraezz Mar 25, 2024
0bc46d7
Prevent iterable TypeError
mfraezz Mar 26, 2024
82b8469
Merge branch 'hotfix/24.01.5'
mfraezz Mar 26, 2024
17cfb1b
Merge branch 'hotfix/24.01.5' into develop
mfraezz Mar 26, 2024
36a9e47
add waffling for GV (#10571)
Johnetordoff Mar 28, 2024
3448bba
[ENG-5352][ENG-5267][ENG-5144] Messaging for Account Status Changes (…
Johnetordoff Apr 11, 2024
65af66a
[ENG-4658] Add default "No description included" text in node descrip…
Johnetordoff Apr 15, 2024
ea8578b
Remove spurious Glacier helper function
mfraezz Apr 17, 2024
2fe1384
[ENG-5141] Conditionally rerouting oauth callback to gravyvalet (#10591)
adlius Apr 17, 2024
60935db
Merge branch 'hotfix/24.01.6'
mfraezz Apr 18, 2024
f27a698
Merge branch 'hotfix/24.01.6' into develop
mfraezz Apr 18, 2024
04aa1e8
adjust serialization to include embargo end date (#10596)
uditijmehta Apr 18, 2024
7511b03
Deactivate "Welcome to OSF" email
mfraezz Apr 22, 2024
2482e55
Merge branch 'hotfix/24.01.7'
mfraezz Apr 22, 2024
a990cf2
Merge branch 'hotfix/24.01.7' into develop
mfraezz Apr 22, 2024
3b0ebcb
Update CHANGELOG, bump version
mfraezz Apr 30, 2024
e49c8d7
Merge branch 'release/24.02.0'
mfraezz Apr 30, 2024
fb266c6
Merge branch 'release/24.02.0' into develop
mfraezz Apr 30, 2024
b6ea6c2
ENG-4839 Add advertiseOnDiscoverPage Flag to Provider Model and Admin…
uditijmehta May 9, 2024
cf4ab0d
[ENG-5140] Update get_auth for GV and readability (#10584)
Johnetordoff May 10, 2024
2d8e4c1
[ENG-5140] #2 Update get_auth for GV and readability (#10613)
Johnetordoff May 13, 2024
8483e57
Fix get auth number two (#10614)
jwalz May 13, 2024
01430c7
add DraftRegistration file permission test (#10622)
Johnetordoff May 23, 2024
8181da6
add DraftRegistration file permission test (#10626)
Johnetordoff May 24, 2024
491ecab
Configurable GV Mock + HMAC Auth (#10623)
jwalz May 24, 2024
7c8173f
Set Default Resource Type for Registrations to "Study Registration" (…
uditijmehta Jun 7, 2024
00a17ec
[ENG - 5008] Support Unicode and special characters in file names dur…
uditijmehta Jun 11, 2024
2516120
Fix RelationshipPostMakesNoChanges exception in project creation (#10…
uditijmehta Jun 20, 2024
aa426e4
[ENG-5178] Allow unauthenticated users to see public files (#10645)
jwalz Jun 21, 2024
19845f8
[ENG-5699] Framework for getting Addon Info from GV (#10641)
jwalz Jun 21, 2024
b6cecc0
[ENG-5718] Use `make_auth` to avoid assumptions about `auth.user` (#1…
jwalz Jun 24, 2024
7420e68
[ENG-5762] Get GV set up in osf docker configs (#10643)
opaduchak Jun 28, 2024
998649d
Ensure Assumed-HAM users do not get autobanned
mfraezz Jul 1, 2024
efa7b46
Merge branch 'hotfix/24.02.1'
mfraezz Jul 1, 2024
1ba5acc
Merge branch 'hotfix/24.02.1' into develop
mfraezz Jul 1, 2024
c47481a
Update CHANGELOG, bump version
mfraezz Jul 8, 2024
764fd47
Merge branch 'release/24.03.0'
mfraezz Jul 8, 2024
422a4ad
Merge branch 'release/24.03.0' into develop
mfraezz Jul 8, 2024
ed3fadd
[ENG-5030] Preprints Phase 2 - BE (#10617)
cslzchen Jul 8, 2024
bdbcc63
Update CHANGELOG, bump version
mfraezz Jul 8, 2024
a23d6c4
Merge branch 'release/24.04.0'
mfraezz Jul 8, 2024
3583f02
Merge branch 'release/24.04.0' into develop
mfraezz Jul 8, 2024
9cec4c2
[ENG-3685] Add permissions for withdrawn registration files (#10650)
uditijmehta Jul 9, 2024
ed34ace
Allow DOI metadata updates to be queued
mfraezz Jul 9, 2024
f174dc1
Merge branch 'hotfix/24.04.1'
mfraezz Jul 9, 2024
529c585
Merge branch 'hotfix/24.04.1' into develop
mfraezz Jul 9, 2024
799cb57
Fix signature
mfraezz Jul 9, 2024
cdb0aa2
Merge branch 'hotfix/24.04.2'
mfraezz Jul 9, 2024
905ea6b
Merge branch 'hotfix/24.04.2' into develop
mfraezz Jul 9, 2024
30604a0
Check Registration READ perms on the Registration
mfraezz Jul 11, 2024
84bc6c5
Merge branch 'hotfix/24.04.3'
mfraezz Jul 11, 2024
a7f970a
Merge branch 'hotfix/24.04.3' into develop
mfraezz Jul 11, 2024
34d5641
Revert "[ENG-3685] Add permissions for withdrawn registration files (…
felliott Jul 12, 2024
975ddb5
[ENG-4903] Fixes issue with email confirmation links failing due to d…
uditijmehta Jul 17, 2024
55aa055
Re-add permissions changes for files on withdrawn registrations (#10671)
jwalz Jul 17, 2024
9bd22d1
split apart change provider views from general preprint view and mach…
Jul 18, 2024
f2f54f2
restrict state changes more and allow no-ops
Jul 18, 2024
1a7b743
[ENG-4527] Fix citation to use registered date (#10678)
uditijmehta Jul 19, 2024
25ec327
Merge pull request #10677 from Johnetordoff/add-admin-button-to-chang…
Johnetordoff Jul 19, 2024
3d4efcb
add exception handling in case state doesn't change
Jul 19, 2024
706ae6d
Merge pull request #10682 from Johnetordoff/add-admin-button-to-chang…
Johnetordoff Jul 19, 2024
8cb3723
[CR][ENG-5681] Great Big Python Upgrade (#10648)
felliott Jul 22, 2024
c703b0a
Update CHANGELOG, bump version
mfraezz Jul 22, 2024
63d7b8b
Merge branch 'release/24.05.0'
mfraezz Jul 22, 2024
1c677a0
Merge branch 'release/24.05.0' into develop
mfraezz Jul 22, 2024
fa23519
update dataverse dep revision to get changes
felliott Jul 23, 2024
bdce57b
Merge branch 'hotfix/24.05.1'
mfraezz Jul 23, 2024
a24ec14
Merge branch 'hotfix/24.05.1' into develop
mfraezz Jul 23, 2024
f105587
correct body location for api.ia POST requests
felliott Jul 24, 2024
7541bc5
update reqs to pull from github commit shas
felliott Jul 24, 2024
b29530f
remove deprecated version stanza from docker-composes
felliott Jul 24, 2024
7289981
update Dockerfile for recent lints
felliott Jul 24, 2024
68a970a
use correct version of module for metrics
felliott Jul 26, 2024
d2b27f0
Merge branch 'hotfix/24.05.2'
mfraezz Jul 29, 2024
dc84403
Merge branch 'hotfix/24.05.2' into develop
mfraezz Jul 29, 2024
c63042b
[CR][ENG-5997] merge develop into b-and-i branch (#10691)
felliott Jul 30, 2024
0b6a3da
[ENG-2814] Allow Read-only and Read/Write contributors to view a proj…
uditijmehta Aug 1, 2024
99d8b70
fixed docker-compose requirements for local setups with venv inside p…
opaduchak Aug 8, 2024
f03c6e6
add admin screen to manage duplicate notifications
Aug 9, 2024
493a2c1
fix flake8 errors
Aug 9, 2024
0632b3a
Shorten lines; rename script for test clarity
Aug 9, 2024
406c027
Hotfixes for: double-encoded urls + dep upgrades
felliott Aug 9, 2024
9cbdfaf
Merge branch 'hotfix/24.05.3'
mfraezz Aug 9, 2024
3920a29
Merge branch 'hotfix/24.05.3' into develop
mfraezz Aug 9, 2024
8568ae6
refactor handle_duplicate_notifications and add tests
Aug 12, 2024
b5d0d3c
Merge pull request #10701 from uditijmehta/feature/duplicate-notifica…
Johnetordoff Aug 12, 2024
9d02957
[ENG-2562] add system tags to users created via institutional sign up…
Johnetordoff Aug 14, 2024
c468eaa
Merge branch 'develop' into feature/b-and-i-24-14
felliott Aug 16, 2024
aa0c9e3
removed all travis mentions and replaced them with CI
opaduchak Aug 9, 2024
7797c91
fixed case where it was more appropriate
opaduchak Aug 9, 2024
b5ba66c
renamed files with travis in their names
opaduchak Aug 9, 2024
7f2dc54
Merge pull request #10706 from felliott/feature/remove-travis
felliott Aug 16, 2024
0b47028
fix issues identified after PR merge
Aug 16, 2024
a97fcee
Make resubmissions more like submissions
Aug 19, 2024
6335dc3
Make resubmissions more like submissions (#10709)
Johnetordoff Aug 20, 2024
def2089
update resubmission email to full template HTML
Aug 20, 2024
d3b7da2
add user draft preprints and tests
Aug 21, 2024
6822ad9
make moderator digest respect resubmission in it's message
Aug 20, 2024
8a19a14
Merge branch 'feature/b-and-i-24-14' of https://github.com/CenterForO…
Aug 21, 2024
6354984
move duplicate notification handling to node detail page
Aug 21, 2024
91194f0
Move notification deletion to a dedicated view and remove obsolete du…
Aug 21, 2024
7ee3ba1
remove command file
Aug 22, 2024
a9e1ab2
Merge pull request #10707 from uditijmehta/feature/duplicate-notifica…
uditijmehta Aug 22, 2024
2f8d96b
Merge pull request #10710 from Johnetordoff/fix-preprint-emails
Johnetordoff Aug 22, 2024
a44b909
add PreprintDraftSerializer
Aug 21, 2024
89af2e4
add preprint draft relationship to user
Aug 23, 2024
ff34652
schedule metrics reporters in their own tasks
aaxelb Aug 23, 2024
647cf1b
stop trying to send metrics reports to keen
aaxelb Aug 23, 2024
979eded
Don't record preprint metrics from contributors
mfraezz Aug 23, 2024
0bae41c
Merge branch 'hotfix/24.05.4'
mfraezz Aug 23, 2024
4084e4d
Merge branch 'hotfix/24.05.4' into develop
mfraezz Aug 23, 2024
0e97823
Merge pull request #10711 from Johnetordoff/user-preprint-drafts
Johnetordoff Aug 26, 2024
1616b7e
revert resend confirmation to synchronous version
Aug 26, 2024
14216c1
Merge pull request #10720 from uditijmehta/temp-sync-email-debug
uditijmehta Aug 26, 2024
f09940a
Update README-docker-compose.md (#10705)
jwalz Aug 27, 2024
464aa73
Add logging to post-commit handlers
Aug 27, 2024
d90d75e
Add logging to post-commit handlers
Aug 27, 2024
a519f4f
Update commit to warning level
Aug 27, 2024
aebef61
Update commit to warning level
Aug 27, 2024
05dec43
Update commit to warning level
Aug 27, 2024
370c979
Update commit to warning level
Aug 27, 2024
d6e1394
Merge remote-tracking branch 'upstream/feature/b-and-i-24-14' into de…
Aug 27, 2024
6f4c7b8
Revert "Add logging to post-commit handlers"
Aug 29, 2024
e811358
Merge branch 'feature/b-and-i-24-14' of https://github.com/CenterForO…
Aug 29, 2024
a3f4747
remove debugging
Aug 29, 2024
b2b68b5
remove debugging
Aug 29, 2024
5391b55
add debugging
Aug 29, 2024
ef74fec
Merge pull request #10724 from uditijmehta/debug/async-email-502
uditijmehta Aug 30, 2024
72f5275
filter out deleted preprint drafts (#10731)
Johnetordoff Aug 30, 2024
5d83a42
don't pass all headers to do_check_spam
felliott Aug 26, 2024
940a005
Merge branch 'hotfix/24.05.5'
mfraezz Aug 30, 2024
a2aa164
Merge branch 'hotfix/24.05.5' into develop
mfraezz Aug 30, 2024
520e1ce
Revert "Add logging to post-commit handlers"
uditijmehta Aug 30, 2024
28463fd
Merge pull request #10732 from CenterForOpenScience/revert-10724-debu…
uditijmehta Aug 30, 2024
2d458e9
[ENG-6197] Update Docker Compose files to run ES6 on ARM (#10728)
Johnetordoff Sep 2, 2024
97cba74
Update force_archive.LOGS_WHITELIST
mfraezz Sep 2, 2024
6718a6d
Merge branch 'hotfix/24.05.6'
mfraezz Sep 2, 2024
63365d8
Merge branch 'hotfix/24.05.6' into develop
mfraezz Sep 2, 2024
df41bb4
Merge remote-tracking branch 'upstream/develop' into feature/b-and-i-…
cslzchen Sep 11, 2024
82ce846
Merge branch 'feature/b-and-i-24-18' into release/24.06.0
cslzchen Sep 12, 2024
09be32c
Update CHANGELOG, bump version
cslzchen Sep 12, 2024
06782e9
Merge branch 'release/24.06.0'
cslzchen Sep 12, 2024
4cb9cc4
Merge tag '24.06.0' into develop
cslzchen Sep 12, 2024
b71494a
Fix task name for clear_expired_sessions in celery schedule
cslzchen Sep 12, 2024
b09206e
Merge branch 'hotfix/24.06.1'
cslzchen Sep 12, 2024
63d7f5f
Merge tag '24.06.1' into develop
cslzchen Sep 12, 2024
701ff57
[ENG-5028] [ENG-5920] Preprints Affiliation Project PR (BE) (#10745)
cslzchen Sep 18, 2024
8f273d2
Update changelog and bump version
cslzchen Sep 18, 2024
5b31809
Merge branch 'release/24.07.0'
cslzchen Sep 18, 2024
ff828d8
Merge tag '24.07.0' into develop
cslzchen Sep 18, 2024
f2e58ec
Remove calls to mark_safe
mfraezz Sep 18, 2024
4eefa52
Clean up local-ci
mfraezz Sep 18, 2024
73dbff8
Merge branch 'hotfix/24.07.1' into develop
mfraezz Sep 18, 2024
b6af2d7
Merge branch 'develop' into feature/addons_service
brianjgeiger Sep 20, 2024
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
filter out deleted preprint drafts (#10731)
## Purpose

The preprint draft list includes deleted preprints, that's a litttle strange, lets fix that.

## Changes

- uses view query for filter out preprints that have been deleted
- adds test cases

Co-authored-by: John Tordoff <>
  • Loading branch information
Johnetordoff committed Aug 30, 2024
commit 72f52752ae57f36dc67266d22c5fa1bfe0c76ea6
1 change: 1 addition & 0 deletions api/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ def get_default_queryset(self):
user = self.get_user()
return user.preprints.filter(
machine_state='initial',
deleted__isnull=True,
)

def get_queryset(self):
Expand Down
29 changes: 28 additions & 1 deletion api_tests/users/views/test_user_draft_preprint.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
PreprintProviderFactory,
)
from api.base.settings.defaults import API_BASE

from django.utils import timezone

@pytest.mark.django_db
class TestPreprintDraftList:
Expand Down Expand Up @@ -97,6 +97,20 @@ def abandoned_public_preprint(self, admin, provider, subject, public_project):
machine_state='initial'
)

@pytest.fixture()
def deleted_preprint(self, admin, provider, subject, public_project):
preprint = PreprintFactory(
creator=admin,
provider=provider,
project=public_project,
is_published=False,
is_public=False,
machine_state='initial',
)
preprint.deleted = timezone.now()
preprint.save()
return preprint

def test_gets_preprint_drafts(self, app, admin, abandoned_public_preprint, abandoned_private_preprint, published_preprint):
res = app.get(
f'/{API_BASE}users/{admin._id}/draft_preprints/',
Expand Down Expand Up @@ -131,3 +145,16 @@ def test_get_projects_logged_in_as_write_user(self, app, admin, write_contrib, a
expect_errors=True
)
assert res.status_code == 403

def test_deleted_drafts_excluded(self, app, admin, abandoned_public_preprint, abandoned_private_preprint, published_preprint, deleted_preprint):
res = app.get(
f'/{API_BASE}users/{admin._id}/draft_preprints/',
auth=admin.auth
)
assert res.status_code == 200

ids = [each['id'] for each in res.json['data']]
assert abandoned_public_preprint._id in ids
assert abandoned_private_preprint._id in ids
assert published_preprint._id not in ids
assert deleted_preprint._id not in ids # Make sure deleted preprints are not listed
Loading