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

Merge Staging into Production, 2023-Dec-05 edition #1196

Merged
merged 45 commits into from Dec 8, 2023
Merged

Conversation

jacobdgm
Copy link
Contributor

@jacobdgm jacobdgm commented Dec 5, 2023

Things that have been updated:

  • All pages
    • global search bar
      • search bar switches from Incipit search to CantusID search when numerals are present, instead of when non-letter characters are present
      • for chants displayed in the search preview, we now use the chant's source's siglum, rather than the chant's siglum
  • Admin Area
    • added django-reversion for version control of objects in database, traces of which can be found in many places in the Admin Area
  • Chant Create
    • Link to Differentiae Database website has been tweaked
  • Chant Edit
    • Added link to differentiae database website
  • Chant Search
    • when user lands on this page via the global search page, the same policy for Incipit vs. Cantus ID search is followed as in the search preview, and the proper fields are auto-populated (see All pages > global search bar, above)
  • Source Create
    • Provenance autocomplete widget now does icontains search instead of istartswith
  • Source Edit
    • Provenance autocomplete widget now does icontains search instead of istartswith
  • json-cid API
    • keys have been added and updated:
      • added: "sequence"
      • added: "cantus_id"
      • updated: "fulltext" is now "full_text"
  • management/commands
    • commands deleted:
      • sync_chants
      • sync_feasts
      • sync_genres
      • sync_indexers
      • sync_sequences
      • sync_source_creation_date
      • sync_sources
      • add_all_users
      • update_differentia_new
      • merge_indexer_user
      • replace_indexer_fields
      • populate_volpiano_new_fields
      • populate_next_chant_fields
      • populate_is_last_chant_in_feast
      • populate_chant_and_melody_counts
      • add_unknown_source
      • add_prefix (commit, which was mislabelled)
      • add_differentiae
    • commands renamed
      • populate_chant_fields -> touch_all_chants

lucasmarchd01 and others added 15 commits November 30, 2023 21:05
Delete management commands we no longer need
Update json-cid API to conform to new specification
Use icontains for provenance autocomplete
so that we only search by Cantus ID when the search term contains at least one number, rather than one non-letter character
where we should have returned the chant's source's siglum
search bar, Chant Search page: Update policy on when we search by incipit and when we search by Cantus ID
Merge Develop into Staging, 2023-Dec-05 edition
@jacobdgm
Copy link
Contributor Author

jacobdgm commented Dec 5, 2023

Upon merging this PR, the following tasks will be required while updating the Production server:

  • run migrate, collectstatic, createinitialrevisions

Once the new code is running on Production, the following tasks will need to be completed

  • update documentation for json-cid API
  • let Jan know that the json-cid API has been updated

@jacobdgm jacobdgm marked this pull request as ready for review December 5, 2023 21:02
Copy link

@annamorphism annamorphism left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all the user-facing changes look good to me!

@dchiller
Copy link
Contributor

dchiller commented Dec 7, 2023

@jacobdgm Is this the one where you'd like us to check them off?

@dchiller
Copy link
Contributor

dchiller commented Dec 7, 2023

Approving....everything looks good to me except for the one about the admin area, which I can't access :)

The only one that acts buggy is this one:

when user lands on this page via the global search page, the same policy for Incipit vs. Cantus ID search is followed as in the search preview, and the proper fields are auto-populated (see All pages > global search bar, above)

The auto-population works, but it shows up first without it populated and then takes a few seconds to populate...any idea why that is taking time?

@jacobdgm
Copy link
Contributor Author

jacobdgm commented Dec 7, 2023

The auto-population works, but it shows up first without it populated and then takes a few seconds to populate...any idea why that is taking time?

We have some JS that runs when the page loads. Maybe this could be refactored to make it happen more instantaneously.

I'll let you create an issue for this if you think it's important enough to address. We could maybe refactor several pages to use get_initial, but I've not yet succeeded in making this work.

@dchiller
Copy link
Contributor

dchiller commented Dec 7, 2023

I'll let you create an issue for this if you think it's important enough to address. We could maybe refactor several pages to use get_initial, but I've not yet succeeded in making this work.

I see now that this is not a change impacted by this PR -- I just tested that it happens (if interestingly with a shorter lag) on production as well right now. All good.

@jacobdgm
Copy link
Contributor Author

jacobdgm commented Dec 7, 2023

so I found #1205, but this is a bug already present on Production, and not big enough IMO to prevent us from taking the current changes to Production.

@jacobdgm jacobdgm merged commit e8bf4af into production Dec 8, 2023
@jacobdgm
Copy link
Contributor Author

jacobdgm commented Dec 8, 2023

These changes are now up on Production! Waiting for createinitialrevisions to finish running for the version history to fully come online, but all tests are passing and things seem to be working as expected!

Update: createinitialrevisions has completed, and a cursory examination suggests it's working as expected! Hooray!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants