[ENG-11259] Merge develop into pbs-26-9 and fix migrations#11750
Merged
cslzchen merged 21 commits intoMay 22, 2026
Merged
Conversation
…1009 avoid 502 on creating preprint version from rejected version
Hotfix to avoid 502 on creating preprint version from rejected version
…enScience#11701) * allow angular url to be in next_url * renamed constant * added tests and debug mode * angular url * added tests and debug mode * edited comments * added sso_in_progress field to Institution model * Add tests * Add SSO availability field and update institution reactivation logic * Update SSO availability logic and add tests for institution deactivation * Apply suggestions from @cslzchen * Add CAS login URL property and implement copy modal in institution detail view * Refactor SSO URL generation and clean up unused code in institution model * Add management command to backfill SSO availability * Add sso_availability field to InstitutionSerializer and enable filtering by sso_availability in InstitutionList view * Add SSO Availability column to institutions list view * Add get_sso_institutions method to InstitutionManager and update InstitutionList queryset filtering * Add test for default filter excluding institutions with hidden SSO availability * Rename get_sso_institutions to get_non_hidden_institutions * Enhance institution population script with test institution generation and SSO state handling * Refactor institution update logic to handle non-existent institutions and improve logout URL generation * Implement validation for SSO availability in InstitutionForm * fix institution form unit tests * Refactor SSO availability validation in InstitutionForm and override post method in InstitutionChangeForm for custom behavior * Apply suggestion from @cslzchen * Enable/disable "Copy SSO URL" button based on CAS login URL availability * Improve SSO availability validation messages in InstitutionForm and enhance error handling in InstitutionChangeForm * Update SSO availability validation error message in InstitutionForm test * Disable "Copy SSO URL" button if institution is deactivated * Refactor SSO availability validation in InstitutionForm to ensure correct settings based on delegation protocol and institution status * Add merge migration * Rework auth views/routes/redirects * Fix incorrect handling of invalid session/cookie * Add local mode and update web_url_for to support angular domain * Update auth views to use updated web_url_for * Update auth views tests * Add login url builder and update logout url builder * Fix some tests * Update institution's CAS login url in admin * More auth view update and more tests fix * Fix the last couple of failures * Fix goodbye route --------- Co-authored-by: Ihor Sokhan <isokhan@exoft.net> Co-authored-by: Vlad0n20 <vlad.onischuk1234@gmail.com> Co-authored-by: Longze Chen <cslzchen@gmail.com>
OSF4I In-progress SSO Project - BE Piece
[ENG-11010] Registrations continue to get stuck archiving
…terForOpenScience#11700) * OSF to use latest djelme * fix test fails * fix poetry issue * add connection * remove connection, add proper setUp and tearDown * remove elasticsearch and elasticsearch-dsl * remove elasticsearch-dsl * remove sleep() and refresh indices * remove unused imports, comment out * chore: bump djelme dependency * wip: es8 djelme records (migration targets) * add new metrics * fix flake8 * add tests, use new version of djelme, consolidate into OsfCountedUsageRecord * add imports to init, flake8 * fix test, imports, flake8 * add security, flake8, fixes, add to test-build.yml * test-build update * test-build fix url * test-build fix naming * update test * add wait * remove wait * cleanup * add wait, downgrade djelme, flake8 * add elastic8 * fix test * timedepth constants * tidy gh actions with yaml anchors, health checks * simplify local elasticsearch8 config * bump djelme to get fixes * tests passing with djelme es8 - use elasticsearch_metrics.test.util - move "Es8" prefix to suffix - autofill fields on `save`, not `__init__` (to work with how esdsl loads search results) * fix(test): patch check_index_template * uncomment autouse fixture * remove unnecessary loop * plac8 flake8 * remove unused local env vars * better use waffle switch ELASTICSEARCH_METRICS * mock check mock save * remove the override * fix failing test * add background_migration queue (in the osf way) * wip * wip * quieter elastic logs * wip * wip * wip * wip * wip * wip * wip * wip * wip * chore: "fix' quotes * fix: background migration task module * fix: timestamp tz handling * fix: tests with djelme * fix: pageview_info optional * fix: tests * fix: preprint metric conversion * fix: osf_shell * per-deployment djelme index name prefix * better counted-usage autofill (and item_type iris) * osf-admin migrate_osfmetrics_6to8 * /_/metrics/raw-es8_metrics/... * better 6to8 error handling * fewer osfmetrics indexes * add es8 reports * flake8 * modify tests * flake8 * flake8 * fix to pass tests * flake8 * tests improve * flake8 * better match elasticsearch_metrics changes * fix: counted-usage with session-hour * fix(staging): elastic hostname with ip url * fix: s/check_metrics/djelme_backend_check * fix: /_/metrics/raw- passthru * fix: s/short_name/addon_shortname * fix: make unused fields optional * fix: item_type list in osfmetrics 6to8 * fix: es8 Field.serialize with skip_empty * fix: some optional osfmetrics report fields * fix: 0 session counts * avoid duplicate moderation events * fix(6to8): more relevant usage event count * fix: mirror reg mod event to es8 * fix: autofill referent * fix? double-counted usage * renames for consistency and clarity * fix: broken import * fix: idempotent event migration * allow clearing migration targets * fix: skip gv addons in storage_addon_usage * fix: es6 usage count to migrate * fix: monthly institution reporter * test: monthly_reporters_go smoke test * fix: reporters * fix: reporter tests * osf-admin: run specific osf-metrics reporters * more effective osf-metrics es8 cleanup * fix: monthly usage report with iris * cumulative preprint counts * fix: migrate 6to8 provider_ids * fix: osf-admin reporters go * fix: migrate 6to8 kwarg * fix: count es8 usage reports * fix: osf-admin daily reporters go * fix: usage reporter followup * fix: typo * fix: daily_reporter_go with filter * fix: align daily_reporters_go with monthly * fix: osfadmin monthly report select --------- Co-authored-by: Bohdan Odintsov <bodintsov@exoft.net>
Hotfix registration stuck archiving
…ience#11741) * fix: migrate pre-version preprint usage counts in osfmetrics 6to8 migration, when building cumulative view/download counts for preprints, make sure to include usage stored under the preprint's unversioned osfid with the osfid_v1 usage reports (since PreprintView/PreprintDownload started saving under versioned osfid) so those older views don't get lost in migration * remove setup from migrate_osfmetrics_6to8
…ce#11744) * fix: osfmetrics 6to8, item_type might be a list * fix: event vs report * fix: consistent osfid/osfid_v1 synonymity * fix: sort means sort * move usage-report scheduling to background task * reorder osfmetrics migration (strange first) * migrate usage reports independent of each other
cslzchen
changed the title
develop into pbs-26-9develop into pbs-26-9 and fix migrations
brianjgeiger
approved these changes
May 22, 2026
cslzchen
merged commit 03fabb9
into
CenterForOpenScience:feature/pbs-26-9
8 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ticket
ENG-11259
Purpose
Merge
developintopbs-26-9Changes
hotfix/26.8.2release/26.9.0release/26.9.1releass/26.10.0In addition, redo migration
0039_maintenancemodeto0040_maintenancemodedue to merge migration issues.Side Effects
N/A
QE Notes
N/A
CE Notes
N/A
Documentation
N/A