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

Modularization main merge master #2256

Merged
merged 183 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
f28532a
test(topic page): test simple topic page elements
yonadavGit Nov 3, 2024
d9c2ef3
merge(topic page): merge master into tests branch
yonadavGit Nov 3, 2024
7025b5b
tests(topic page): admin user tests
yonadavGit Nov 3, 2024
917e73c
tests(topic page): redirection test using timeout of 10 seconds
yonadavGit Nov 4, 2024
5207bf6
tests(topic page): create testUser from env vars
yonadavGit Nov 4, 2024
cb871b2
tests(topic page): fix typo
yonadavGit Nov 4, 2024
bcd594e
chore(playwright tests): add new env users secrets as env var to work…
yonadavGit Nov 10, 2024
03766da
ci: don't skip on manual workflow
BrendanGalloway Oct 9, 2024
69c5717
ci: don't skip on manual workflow
yonadavGit Nov 11, 2024
9ab8c54
fix(settings): remove celery settings from settings.py
yonadavGit Nov 11, 2024
984d64c
feat(email subscriptions): Modify subscribe endpoint to optionally in…
relyks Dec 3, 2024
aeaa139
chore(email subscriptions): Remove debugging statements
relyks Dec 3, 2024
752947e
docs(topics): document ImageCropper
nsantacruz Dec 3, 2024
617c05d
feat(topics): add secondary image cropper
nsantacruz Dec 3, 2024
d84e399
refactor(topics): refactor out small blue button
nsantacruz Dec 3, 2024
8bbf7fe
feat(topics): basic image cropping ui works
nsantacruz Dec 3, 2024
1d90956
chore(topics): change text to secondary picture
nsantacruz Dec 3, 2024
6c46f2f
refactor(topics): change param to slug
nsantacruz Dec 3, 2024
feb6db6
feat(topics): add secondary topic image api
nsantacruz Dec 3, 2024
15955cf
chore(topics): preparing code for secondary image upload
nsantacruz Dec 3, 2024
a1a9efa
Merge branch 'fix-profile-image-upload-callback' into secondary-topic…
nsantacruz Dec 3, 2024
078c671
refactor(topics): simplify file upload logic
nsantacruz Dec 4, 2024
93fd859
chore(topics): remove unused import
nsantacruz Dec 4, 2024
ec1481a
fix(topics): allow cross origin images in ImageCropper.jsx
nsantacruz Dec 4, 2024
75aeb0c
feat(topics): working secondary image upload
nsantacruz Dec 4, 2024
75c9d4d
chore(topics): change filename to not include user ID and to .png.
nsantacruz Dec 4, 2024
9d3fba9
fix(topics): add secondary to secondary images
nsantacruz Dec 4, 2024
25e0ea0
fix(topics): improve css for cropper
nsantacruz Dec 4, 2024
6a26be7
fix(topics): improve css for cropper
nsantacruz Dec 4, 2024
e67e5bf
feat(topics): use 4:3 ratio for crop box for topic images
nsantacruz Dec 4, 2024
941b624
refactor(topics): rename field to secondary_image_uri
nsantacruz Dec 5, 2024
f04a009
feat(topics): allow deleting and viewing secondary image
nsantacruz Dec 5, 2024
2485bdc
fix(topics): pass secondary image to TopicEditor.jsx and default valu…
nsantacruz Dec 5, 2024
6bd4c2c
chore(topics): fix typing
nsantacruz Dec 7, 2024
7a94f5e
chore(topics): update secondary image copy
nsantacruz Dec 7, 2024
48aa678
refactor(topics): use object spreading to modify crop which is more f…
nsantacruz Dec 7, 2024
583ac53
chore(topics): Revert using object spread for modifying crop since it…
nsantacruz Dec 7, 2024
84ff34d
chore(topics): add div to make new line
nsantacruz Dec 7, 2024
5583837
chore(topics): remove console logs
nsantacruz Dec 8, 2024
8d1db73
fix(topics): don't allow aspect ratio to differ from specified aspect…
nsantacruz Dec 8, 2024
7d0ebd5
feat(newsletter subscriptions): Add ability for sidebar ads to have a…
relyks Dec 9, 2024
b55098e
fix(newsletter subscriptions): Fixes incorrect naming of property so …
relyks Dec 9, 2024
21b898e
fix(bulktext): Fix API and ensure no broken topics
saengel Dec 10, 2024
4ace72e
chore(license): Add a license.md file
saengel Dec 10, 2024
c0a2cf2
fix(api): revert default param to None
saengel Dec 10, 2024
e5a7f91
fix(api): Cleaner approach
saengel Dec 11, 2024
c87edbc
feat(link): add helper function remove_links_from_csv.
YishaiGlasner Dec 11, 2024
0cabb10
feat(modtools): add option for removing links to links_upload_api.
YishaiGlasner Dec 11, 2024
caf6f11
feat(modtools): add tool for removing links.
YishaiGlasner Dec 11, 2024
7d5a4e7
fix(modtools): fix strings for link removing.
YishaiGlasner Dec 11, 2024
8029a14
chore(topics): add analytics to topic toc
nsantacruz Dec 11, 2024
dec3774
fix(remove links modtool): sort refs before querying.
YishaiGlasner Dec 12, 2024
e8fd443
fix(remove links modtool): typos in message.
YishaiGlasner Dec 12, 2024
5a255bd
fix(modtools): mistake in UI string.
YishaiGlasner Dec 12, 2024
1b9b83c
feat(modtools): change returned errors file's name.
YishaiGlasner Dec 12, 2024
23bd030
fix(topics): keep track of categories for all topics in toc, not just…
nsantacruz Dec 14, 2024
1a4e5ac
chore(topics): track clicks on trending topics
nsantacruz Dec 14, 2024
6b869c2
Merge pull request #2151 from Sefaria/secondary-topic-image
nsantacruz Dec 15, 2024
5f36cb0
Merge pull request #2177 from Sefaria/topic-toc-analytics
nsantacruz Dec 16, 2024
81decc6
ci: Only run pytests when pythin files are changed
edamboritz Dec 16, 2024
3cde51e
test(topics): fix topic tests by using pytest django fixtures
nsantacruz Dec 17, 2024
602ab7e
Merge pull request #2183 from Sefaria/continuous-action-python-filter
edamboritz Dec 17, 2024
043796a
test(topics): use test slug prefix to guarentee that slugs don't coll…
nsantacruz Dec 17, 2024
678e116
test(topics): use django_db_blocker.unblock() to make fixutes scope m…
nsantacruz Dec 17, 2024
cc9cc51
feat: Test larger memory and cpu footprint for linker
EliezerIsrael Dec 18, 2024
145bf82
Merge pull request #2187 from Sefaria/linker_resources
EliezerIsrael Dec 18, 2024
0b7945b
Merge pull request #2186 from Sefaria/fix-topic-test-dec-2024
nsantacruz Dec 18, 2024
1bd60b1
fix: reduce linker memory requests to fit in the node
EliezerIsrael Dec 18, 2024
e976fa4
Merge pull request #2189 from Sefaria/linker_resources
akiva10b Dec 18, 2024
0f14d8a
chore(requirements): update pytest
akiva10b Dec 18, 2024
fdc3db0
fix(Topic Playwright tests): compare urls with 'contains' instead of …
yonadavGit Dec 18, 2024
43b459e
chore(Docker): upgrade linker to cuda 12
akiva10b Dec 19, 2024
81363fa
chore(Topic Playwright tests):get rid of timeouts in tests
yonadavGit Dec 19, 2024
16a8ada
Merge pull request #2194 from Sefaria/up_cuda_12
akiva10b Dec 19, 2024
749bf4c
Merge branch 'master' into chore/sc-29905/write-more-playwright-tests…
yonadavGit Dec 19, 2024
956f772
chore(Topic Playwright tests): fix call to url includes
yonadavGit Dec 19, 2024
220e0ea
chore(Dockerfile): upgrade spacy cuda
akiva10b Dec 19, 2024
0a18102
Merge pull request #2195 from Sefaria/up_cuda_12
akiva10b Dec 19, 2024
14cd1b7
Merge pull request #2191 from Sefaria/chore/sc-29905/write-more-playw…
nsantacruz Dec 19, 2024
b0697cc
docs(local settings): add port number to docs explaining how to conne…
nsantacruz Dec 22, 2024
ffdf7e8
Merge pull request #2197 from Sefaria/fix-search-url-docs
nsantacruz Dec 22, 2024
bea087e
chore(license): Move to proper place in project
saengel Dec 22, 2024
a8c6bb0
refactor(link helper): change var name from success to links_removed.
YishaiGlasner Dec 23, 2024
f80829b
chore: remove print.
YishaiGlasner Dec 23, 2024
4ee1cad
chore(api): Add documentation for always_consonants
saengel Dec 23, 2024
f3a39fa
chore(license): Add license.md file in root of project
saengel Dec 23, 2024
879d892
chore(email subscriptions): Make some small updates for cleaner code …
relyks Dec 23, 2024
b2ef4df
Merge branch 'feature/sc-30355/update-api-subscribe-endpoint-for-mult…
relyks Dec 23, 2024
a676872
fix(email subscriptions): Fix referring to nonexistent field on excep…
relyks Dec 23, 2024
59e71f8
Merge pull request #2141 from Sefaria/feature/sc-30355/update-api-sub…
nsantacruz Dec 24, 2024
acd300b
Merge pull request #2174 from Sefaria/feature/sc-30751/delete-links
yitzhakc Dec 24, 2024
1304898
Merge pull request #2165 from Sefaria/feature/sc-30785/fix-bulktext-a…
yitzhakc Dec 24, 2024
4cbec78
Merge pull request #2202 from Sefaria/feature/sc-31135/document-the-p…
yitzhakc Dec 24, 2024
875c5a2
Merge pull request #2193 from Sefaria/chore/sc-30370/clarify-licensing
yitzhakc Dec 24, 2024
094af4a
fix(saved icon): old UserHistory objects are from this form: {he: <ve…
YishaiGlasner Jan 2, 2025
900c65a
Merge branch 'master' into rtl-client
YishaiGlasner Jan 2, 2025
dc1ea59
docs: typo.
YishaiGlasner Jan 5, 2025
23b4a60
chore: remove spave
YishaiGlasner Jan 6, 2025
5c83631
fix(acquire api-v3 text): encode versions uri for versionTitles that …
YishaiGlasner Jan 6, 2025
89d5e7c
Merge pull request #2215 from Sefaria/encode-uri
akiva10b Jan 6, 2025
45da3d4
fix(edit text): add default undefined value for deconstructing versio…
YishaiGlasner Jan 6, 2025
5fd38d2
fix(sidebar): show correctly rtl translation in sidebar.
YishaiGlasner Jan 7, 2025
a16f016
fix(text properties menu): type in 'Cantillation'.
YishaiGlasner Jan 7, 2025
7715ed1
fix(text properties menu accesibilty): add role to the menu.
YishaiGlasner Jan 7, 2025
31a5fc4
fix(text properties menu accesibilty): add roles radiogroup and radio…
YishaiGlasner Jan 7, 2025
451ec63
fix(text properties menu accesibilty): add roles radiogroup and radio…
YishaiGlasner Jan 7, 2025
4275fa0
fix(text properties menu accesibilty): add role switch, aria-labelled…
YishaiGlasner Jan 7, 2025
2160b8e
fix(text properties menu accessibility): add role button, aria-labell…
YishaiGlasner Jan 7, 2025
d44ceec
fix(text properties menu accessibility): change div to button.
YishaiGlasner Jan 7, 2025
1e304ce
fix(text properties menu accessibility): change layout button div to …
YishaiGlasner Jan 7, 2025
5fae492
fix(topic page): don't display unpublished sources
yonadavGit Jan 7, 2025
a0727a0
fix(text properties menu accessibility): change source/translation bu…
YishaiGlasner Jan 7, 2025
ce033c0
Merge pull request #2218 from Sefaria/sidebar-rtl-translation
akiva10b Jan 7, 2025
f1e9e62
Merge pull request #2219 from Sefaria/cantillation-type
akiva10b Jan 7, 2025
26df3e6
fix(edit text): right way for getting versionTitle when currVersions …
YishaiGlasner Jan 7, 2025
e84f7cd
Merge pull request #2216 from Sefaria/edit-withno-versionTitle
akiva10b Jan 7, 2025
ca4f055
Merge pull request #2221 from Sefaria/rtl-accessibility
akiva10b Jan 7, 2025
14f68e9
chore(topic page): can now publish only reviewed descriptions
yonadavGit Jan 7, 2025
5b09bf9
fix(text menu): fux the typo also in the ReaderDisplayOptionsMenu com…
YishaiGlasner Jan 7, 2025
9dae7b3
Merge pull request #2225 from Sefaria/cantillation-type
akiva10b Jan 7, 2025
10832bb
fix(mongodb): changed save and count to insert_one and count_documents
Jan 8, 2025
e15352b
fix(abstracttextrecord): word_count function was failing not graceful…
Jan 8, 2025
9257c6f
fix(mongodbapi): count_documents needs a query
Jan 8, 2025
e3ef236
feat(sheet): return language options to sheets.
YishaiGlasner Jan 8, 2025
b4e32d0
fix(errors): Update URL to match new devportal slug
saengel Jan 8, 2025
60f34bb
fix(history): add getStr to verify that even empty strings are returned
akiva10b Jan 8, 2025
cfd817d
refactor(TextSegment): do not send primary / translation text to html…
YishaiGlasner Jan 8, 2025
28f09fc
fix(history): return string when savedVersion?.[key]?.versionTitle is…
akiva10b Jan 8, 2025
2ac8b72
fix(history): remove debugger
akiva10b Jan 8, 2025
f86d5d1
Merge pull request #2222 from Sefaria/bug/sc-31480/topic-pages-are-sh…
akiva10b Jan 8, 2025
6436d1b
Merge branch 'master' into rtl-client
akiva10b Jan 8, 2025
dda0f4a
fix(sheet): show mixed layouts.
YishaiGlasner Jan 8, 2025
56e3b36
Merge pull request #2229 from Sefaria/fix_history
akiva10b Jan 8, 2025
a3de1f1
refactor(textSegment): explicit booleans for shouldPrimaryShow and sh…
YishaiGlasner Jan 8, 2025
2bc02ac
feat(content language): do not change language of content inn sidebar…
YishaiGlasner Jan 8, 2025
c57ce35
Merge pull request #2230 from Sefaria/refactor-textSegment
akiva10b Jan 8, 2025
d6ed51d
Merge pull request #2231 from Sefaria/sheets-language-toggle
akiva10b Jan 8, 2025
2140a0f
Merge pull request #2232 from Sefaria/fix-change-lang-sidebar
akiva10b Jan 8, 2025
212db7d
fix(editor): fix languages and layout in editor.
YishaiGlasner Jan 8, 2025
4d96885
Merge pull request #2234 from Sefaria/sheets-editor-layouts
akiva10b Jan 8, 2025
80a41e1
Merge branch 'master' into feature/sc-29891/add-email-newsletter-sign…
relyks Jan 9, 2025
05e6e0d
fix(Texts API): check for default child ref
stevekaplan123 Jan 9, 2025
2e878b4
Merge pull request #2235 from Sefaria/rtl-client-default-child2
stevekaplan123 Jan 9, 2025
5caecaa
Merge pull request #2228 from Sefaria/quick-url-fix
yitzhakc Jan 9, 2025
dc80657
fix(Connections Panel): derive section ref if not cached yet
stevekaplan123 Jan 9, 2025
7a887f3
fix(edit text): fix languages - langCode that sent to server depends …
YishaiGlasner Jan 9, 2025
59fa721
fix(translation open): show translation in the sidebar even when cont…
YishaiGlasner Jan 9, 2025
fdf0887
fix(englishAvailableTag): hide englishAvailableTag when content langu…
YishaiGlasner Jan 9, 2025
82e32c0
Merge pull request #2236 from Sefaria/rtl-client-section-ref
stevekaplan123 Jan 9, 2025
4bb5953
Merge pull request #2238 from Sefaria/fix-edit-text
akiva10b Jan 12, 2025
7e768bd
fix(Texts API): normalize ref before calling API
stevekaplan123 Jan 12, 2025
e8cc1c6
Merge branch 'rtl-client' of https://github.com/Sefaria/Sefaria-Proje…
stevekaplan123 Jan 12, 2025
ef8d584
chore: typo
YishaiGlasner Jan 12, 2025
bc64930
Merge pull request #2239 from Sefaria/show-translation-in-hebrew
akiva10b Jan 12, 2025
747e470
fix(Texts API): encode ref
stevekaplan123 Jan 12, 2025
a16c28e
Merge pull request #2240 from Sefaria/hide-englishAvailableTag
akiva10b Jan 12, 2025
ea59477
chore: RecentlyViewed should normRef
stevekaplan123 Jan 12, 2025
c96abd4
Merge pull request #2159 from Sefaria/feature/sc-29891/add-email-news…
edamboritz Jan 12, 2025
e83ef3d
Merge pull request #2241 from Sefaria/rtl-client-norm-url
akiva10b Jan 12, 2025
f51b869
fix(saved texts): check currVersion?.[key] for old saved versions dat…
YishaiGlasner Jan 12, 2025
29c8fd3
Merge pull request #2242 from Sefaria/saved-items
akiva10b Jan 13, 2025
8d09a15
fix(topic page): show manual descriptions
yonadavGit Jan 13, 2025
bd79ad3
fix(ssr): Add functionality for caching current text in textStore for…
akiva10b Jan 13, 2025
0d9c404
Merge branch 'rtl-client' of https://github.com/Sefaria/Sefaria-Proje…
akiva10b Jan 13, 2025
14a350a
chore(ssr): cleanup
akiva10b Jan 13, 2025
8aeec0e
fix(TextRange): create TextRange with section ref as key, so it won't…
YishaiGlasner Jan 14, 2025
5eb3afb
Merge pull request #2226 from Sefaria/feature/sc-31547/metrics-webpage
edamboritz Jan 14, 2025
c175297
chore(topic page): add comment to explain logic of marking source as …
yonadavGit Jan 14, 2025
bbc24b8
Merge pull request #2248 from Sefaria/prevent-recreating-textRange
akiva10b Jan 14, 2025
580678f
Merge pull request #2247 from Sefaria/rtl-cache-ssr
akiva10b Jan 14, 2025
2d0d584
Merge branch 'master' into rtl-client
akiva10b Jan 14, 2025
e418850
Merge pull request #2245 from Sefaria/bug/sc-31637/some-topic-page-so…
yonadavGit Jan 14, 2025
48130ca
fix(textColumn): revert oref as key
akiva10b Jan 14, 2025
b4a37c9
fix(TextRange): use sectionRef for key only if the ref is cached, oth…
YishaiGlasner Jan 14, 2025
f001d5f
Merge branch 'rtl-client' into prevent-recreating-textRange
YishaiGlasner Jan 15, 2025
06ca513
Merge pull request #2026 from Sefaria/rtl-client
akiva10b Jan 15, 2025
9ad7d5b
feat(ConnectionsPanel): add language toggle also in Hebrew interface.
YishaiGlasner Jan 15, 2025
27ace34
fix(ConnectionsPanel): align buttons to center.
YishaiGlasner Jan 15, 2025
426624f
chore: indentation.
YishaiGlasner Jan 15, 2025
063a6f8
Merge pull request #2254 from Sefaria/add-lang-toggle-he-ui
akiva10b Jan 16, 2025
8ae3b6e
Merge pull request #2251 from Sefaria/prevent-recreating-textRange
akiva10b Jan 16, 2025
6120c1e
Merge pull request #2255 from Sefaria/rtl-client
akiva10b Jan 16, 2025
e270723
Merge branch 'master' into modularization-main-merge-master
stevekaplan123 Jan 16, 2025
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
56 changes: 44 additions & 12 deletions .github/workflows/continuous.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,33 @@ jobs:
- name: Handle Jest Test Results
run: cat /home/runner/jestResults.json; STATUS=`jq ".numFailedTestSuites" /home/runner/jestResults.json`; exit $STATUS
if: ${{ always() }}
check-python-files:
runs-on: ubuntu-latest
outputs:
python_files_changed: ${{ steps.check-python-files.outputs.python_files_changed }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Check for Python file changes
id: check-python-files
uses: dorny/paths-filter@v2
with:
filters: |
python_files_changed:
- added|modified:
- '**/*.py'
- 'requirements.txt'
- 'setup.py'
- 'pyproject.toml'
sandbox-deploy:
name: "Continuous Testing: Sandbox Deploy"
concurrency:
group: dev-mongo
cancel-in-progress: false
needs: [ build-derived ]
if: github.event.pull_request.draft == false
needs: [ build-derived, check-python-files ]
if: >
github.event.pull_request.draft == false &&
needs.check-python-files.outputs.python_files_changed == 'true'
runs-on: ubuntu-latest
permissions:
contents: 'read'
Expand Down Expand Up @@ -236,7 +256,9 @@ jobs:
PROJECT_ID: "${{ secrets.DEV_PROJECT }}"
NAMESPACE: "${{secrets.DEV_SANDBOX_NAMESPACE}}"
sandbox-ready:
if: github.event.pull_request.draft == false
if: >
github.event.pull_request.draft == false &&
needs.check-python-files.outputs.python_files_changed == 'true'
needs: sandbox-deploy
runs-on: ubuntu-latest
steps:
Expand All @@ -256,8 +278,10 @@ jobs:
concurrency:
group: dev-mongo
cancel-in-progress: false
needs: [ sandbox-ready ]
if: github.event.pull_request.draft == false
needs: [ sandbox-ready, check-python-files ]
if: >
github.event.pull_request.draft == false &&
needs.check-python-files.outputs.python_files_changed == 'true'
permissions:
contents: 'read'
id-token: 'write'
Expand Down Expand Up @@ -376,11 +400,17 @@ jobs:
run: helm delete sandbox-${{ steps.get-sha.outputs.sha_short }} -n ${{ secrets.DEV_SANDBOX_NAMESPACE }} --debug --timeout 10m0s
if: steps.get-helm.outputs.count > 0
continuous-branch-protection:
needs: [ build-generic, build-derived, sandbox-deploy, sandbox-ready, pytest-job ]
needs:
- build-generic
- build-derived
- check-python-files
- sandbox-deploy
- sandbox-ready
- pytest-job
runs-on: ubuntu-latest
if: always()
steps:
- name:
- name:
run: |
if [ "${{ github.event_name }}" == "merge_group" ]; then
exit 0
Expand All @@ -391,10 +421,12 @@ jobs:
exit 1
fi
if [ "${{ github.event.pull_request.draft }}" == "false" ]; then
if [ "${{ needs.sandbox-deploy.result }}" != "success" ] || \
[ "${{ needs.sandbox-ready.result }}" != "success" ] || \
[ "${{ needs.pytest-job.result }}" != "success" ]; then
echo "One or more test jobs failed"
exit 1
if [ "${{ needs.check-python-files.outputs.python_files_changed }}" == "true" ]; then
if [ "${{ needs.sandbox-deploy.result }}" != "success" ] || \
[ "${{ needs.sandbox-ready.result }}" != "success" ] || \
[ "${{ needs.pytest-job.result }}" != "success" ]; then
echo "One or more Python-related test jobs failed"
exit 1
fi
fi
fi
7 changes: 6 additions & 1 deletion .github/workflows/integration-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,12 @@ jobs:

- name: Run Playwright tests
run: npx playwright test

env:
PLAYWRIGHT_SUPERUSER_EMAIL: "${{ secrets.PLAYWRIGHT_SUPERUSER_EMAIL }}"
PLAYWRIGHT_SUPERUSER_PASSWORD: "${{ secrets.PLAYWRIGHT_SUPERUSER_PASSWORD }}"
PLAYWRIGHT_USER_EMAIL: "${{ secrets.PLAYWRIGHT_USER_EMAIL }}"
PLAYWRIGHT_USER_PASSWORD: "${{ secrets.PLAYWRIGHT_USER_PASSWORD }}"

- name: Upload Playwright report
uses: actions/upload-artifact@v3
if: always()
Expand Down
Loading
Loading