Skip to content

Merge unstable changes into search recommendations#4802

Merged
akolson merged 155 commits intolearningequality:search-recommendationsfrom
akolson:merge-into-search-recs
Nov 1, 2024
Merged

Merge unstable changes into search recommendations#4802
akolson merged 155 commits intolearningequality:search-recommendationsfrom
akolson:merge-into-search-recs

Conversation

@akolson
Copy link
Copy Markdown
Member

@akolson akolson commented Oct 31, 2024

Summary

Description of the change(s) you made

This pr updates the search-recommendations branch to the latest unstable.

References

Comments

Contributor's Checklist

PR process:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

dependabot bot and others added 30 commits June 19, 2024 00:40
@dependabot
Bump docker/build-push-action from 5 to 6
aea4929 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@ozer550
Add rectifying migration command
c9231fe
@dependabot
Bump gunicorn from 20.1.0 to 23.0.0
e23c22a 
Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 23.0.0.
- [Release notes](https://github.com/benoitc/gunicorn/releases)
- [Commits](benoitc/gunicorn@20.1.0...23.0.0)

---
updated-dependencies:
- dependency-name: gunicorn
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@ozer550
change filter method to get
a8adee4
@dependabot
Bump webpack from 5.81.0 to 5.94.0
326d394 
Bumps [webpack](https://github.com/webpack/webpack) from 5.81.0 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.81.0...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump flask-cors from 4.0.1 to 5.0.0
2a963bb 
Bumps [flask-cors](https://github.com/corydolphin/flask-cors) from 4.0.1 to 5.0.0.
- [Release notes](https://github.com/corydolphin/flask-cors/releases)
- [Changelog](https://github.com/corydolphin/flask-cors/blob/main/CHANGELOG.md)
- [Commits](corydolphin/flask-cors@4.0.1...5.0.0)

---
updated-dependencies:
- dependency-name: flask-cors
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump axios from 1.7.2 to 1.7.7
76d343b 
Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.7.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.7.2...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@ozer550
add filter based on last modified
1d867c5
@ozer550
refine the migrations
5641e14
@akolson
Adds padding to and centers Show more pagination button
64fe92f
@akolson
Fixes resource count bug
aa8bad3
@akolson
add translations for Show more button
e2b0509
@LianaHarris360
Move helpText to LicenseDropdown component
368a487
@nikkuAg @rtibbles
Upload bloom format files in studio
717d01f
@nikkuAg @rtibbles
Add migrations for bloom format
8311a7c
@nikkuAg @rtibbles
Update the le-utils version to include blood format
e7e51c8
@rtibbles
Update migrations.
6a2259b
@rtibbles
Fix linting and brittle file upload tests for bloompub upload.
de70311
@rtibbles
Ensure that we can upload and display bloompub files properly.
69be8e5
@akolson
fixes pagination and count issues
9e9bb7d
@akolson
Fixes inconsistent display of the 'Show more' button
28e9672
@akolson
Fixes failing tests
96df2e8
@LianaHarris360
Add comment explaining hardcoded styling
a188b31
@akolson
Remove cross component translator for Show more translation
a14e6c5
@AlexVelezLl
Fix save quick edit modals
4f10ab0
@AlexVelezLl
fix linting issues
6c3e03b
@AlexVelezLl
Add tests for mixed options in EditBooleanMapModal
ea91300
@rtibbles
Merge pull request learningequality#4590 from nikkuAg/bloomPub
1016852 
Upload bloom format files in studio
@AllanOXDi
Merge pull request learningequality#4742 from AlexVelezLl/fix-save-qu…
cc0b008 
…ick-edit-modal

Fix save quick edit modals
@AlexVelezLl
Fix selection on inherit metadata
7c55455
akolson added 23 commits October 31, 2024 18:59
@akolson
adds tests for embed_content method
36fa8e5
@akolson
add docstring to embed methods
b71344f
@akolson
updates embed_content to use methods as building blocks
0ab478c
@akolson
Implements extract content urls
3fba736
@akolson
Runs recommendations cache migrations
10e67f4
@akolson
clean up and tests
f884ae5
@akolson
Remove extra migrations
c8c70b9
@akolson
Adds new migration
a12e4c5
@akolson
implements feedback
087493b
@akolson
Use values to query dictionary
a935c09
@akolson
Improves cache implementation
5fa30d8
@akolson
Adjusts docstring description
08b8c3b
@akolson
Adds unique constraint to cache model
96b8d25
@akolson
Adds indexes for optimized data querying
e872f1c
@akolson
Adds migrations
e433650
@akolson
Writes queries to get main_tree_id
12e5155
@akolson
Reruns migrations
cce9cb3
@akolson
adds more tests
3ff40f3
@akolson
Fixes failing tests
a853e1e
@akolson
adds more tests
3e3d8d9
@akolson
cte implementation initial commit
d96fabe
@akolson
Implements CTE to get recommendations
8bb9111
@akolson
Reruns conflicting migrations
920344e
@akolson akolson force-pushed the merge-into-search-recs branch from 078638c to 920344e Compare October 31, 2024 15:59
@akolson akolson merged commit 3accf66 into learningequality:search-recommendations Nov 1, 2024
@akolson akolson deleted the merge-into-search-recs branch January 9, 2026 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjester bjester bjester approved these changes

Assignees

No one assigned

Labels

TODO: needs review

Projects

None yet

Milestone

Studio Project: Search Recommendations

Development

Successfully merging this pull request may close these issues.