Display options upon importing duplicate recipe URL #3408

lavanyamehn · 2024-11-23T05:32:34Z

The user can either continue to import a duplicate recipe or edit the existing recipe. This addresses issue #2857.

Currently translated at 5.9% (29 of 485 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/tr/

update compose configuration for pgbackup to include .env file

Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@10.2.0...10.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

…/pip/pillow-10.3.0 Bump pillow from 10.2.0 to 10.3.0

…/pip/recipe-scrapers-14.55.0 Bump recipe-scrapers from 14.52.0 to 14.55.0

…/pip/django-crispy-forms-2.1 Bump django-crispy-forms from 2.0 to 2.1

…/pip/pytest-cov-5.0.0 Bump pytest-cov from 4.1.0 to 5.0.0

…/pip/django-debug-toolbar-4.3.0 Bump django-debug-toolbar from 4.2.0 to 4.3.0

…/pip/beautifulsoup4-4.12.3 Bump beautifulsoup4 from 4.12.2 to 4.12.3

…/github_actions/awalsh128/cache-apt-pkgs-action-1.4.2 Bump awalsh128/cache-apt-pkgs-action from 1.4.1 to 1.4.2

Improve docker run speeds

…velop" This reverts commit d766927, reversing changes made to 4293ec7.

project level formatting with prettier project level formatting with yapf

…evelop" This reverts commit f14acc3.

Yapf prettier

This reverts commit c33c4ed.

This reverts commit cc24964.

This reverts commit 714242b.

scrape_me has been deprecated

remove reliance on custom text_scraper class changed url on test case to generic wildmode vs specific site

Currently translated at 15.3% (75 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/

Currently translated at 71.7% (409 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/

Currently translated at 84.0% (410 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/

Currently translated at 71.7% (409 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

--- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

…/pip/aiohttp-3.10.11 Bump aiohttp from 3.10.2 to 3.10.11

Currently translated at 100.0% (488 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

Currently translated at 94.5% (539 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/da/

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hr/

Currently translated at 30.9% (151 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hr/

The user can either continue to import a duplicate recipe or edit the existing recipe. This addresses issue TandoorRecipes#2857.

CLAassistant · 2024-11-23T05:32:39Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 8 committers have signed the CLA.

✅ vabene1111
✅ lavanyamehn
❌ smart2128
❌ johnnyip
❌ aija
❌ snippsysnappsy
❌ StudioIT
❌ weblate
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

lavanyamehn · 2024-11-23T05:39:24Z

I have already signed the CLA. Also, with respect to the "not to be a GitHub user" issue, is it because my email on my account is private?

vabene1111 · 2024-11-23T12:03:56Z

Hi, thanks for your PR.

Since I am currently working on #2976 I am not entirely sure if I want to merge this into the existing branch.

Also I think I would prefer if the API endpoint returned a list of existing recipes with the same URL and the client just showed an warning (found existing recipes with the same URL). This would reduce complexity and solve the issue just as well. What do you think.

vabene1111 · 2024-11-23T12:04:59Z

I have already signed the CLA. Also, with respect to the "not to be a GitHub user" issue, is it because my email on my account is private?

Honestly I am not sure, so far it has worked for everyone, if you did it its fine for me.

lavanyamehn · 2024-11-23T14:30:33Z

Hi, thanks for your PR.

Since I am currently working on #2976 I am not entirely sure if I want to merge this into the existing branch.

Also I think I would prefer if the API endpoint returned a list of existing recipes with the same URL and the client just showed an warning (found existing recipes with the same URL). This would reduce complexity and solve the issue just as well. What do you think.

Sure, I can remove the options I added (edit existing recipe and continue to import) and only display a warning message so the user can continue to import like normal.

Regarding the status of this PR, if you don't think it will get merged in the near future I am wondering if there is any other good first issue I can work on to support #2976. Contributing to open-source projects and getting a PR merged in is part of one of my courses so it would be great if you could guide me on how best to approach this, thanks!

lavanyamehn · 2024-11-23T14:32:03Z

I have already signed the CLA. Also, with respect to the "not to be a GitHub user" issue, is it because my email on my account is private?

Honestly I am not sure, so far it has worked for everyone, if you did it its fine for me.

This is what I see when I open the link, so not sure about it.

vabene1111 · 2024-11-23T20:39:35Z

thank you very much. Yes please make it so that the only change for now is just a "warning" message in the importer when it detects a duplicate (maybe by annotating a field to the response).

Regarding your other question: Sadly its currently pretty hard to contribute as some technical fundamentals need to be implemented first. What are the parts you would like to work on most, frontend or backend ?

This reverts commit ca9e1f8.

lavanyamehn · 2024-11-26T02:49:31Z

Updated this PR to only display a warning message.

If there is a small beginner friendly task on the backend, I could try to help.

atomkarinca and others added 30 commits April 1, 2024 22:04

Translated using Weblate (Turkish)

9095b3a

Currently translated at 5.9% (29 of 485 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/tr/

Update backup.md

21b1701

update compose configuration for pgbackup to include .env file

Merge pull request TandoorRecipes#3092 from TandoorRecipes/dependabot…

d35039f

…/pip/pillow-10.3.0 Bump pillow from 10.2.0 to 10.3.0

Merge pull request TandoorRecipes#3077 from TandoorRecipes/dependabot…

5465dad

…/pip/recipe-scrapers-14.55.0 Bump recipe-scrapers from 14.52.0 to 14.55.0

Merge pull request TandoorRecipes#3079 from TandoorRecipes/dependabot…

394dfb7

…/pip/django-crispy-forms-2.1 Bump django-crispy-forms from 2.0 to 2.1

Merge pull request TandoorRecipes#3078 from TandoorRecipes/dependabot…

e7e89bf

…/pip/pytest-cov-5.0.0 Bump pytest-cov from 4.1.0 to 5.0.0

Merge pull request TandoorRecipes#3080 from TandoorRecipes/dependabot…

db2c463

…/pip/django-debug-toolbar-4.3.0 Bump django-debug-toolbar from 4.2.0 to 4.3.0

Merge pull request TandoorRecipes#3081 from TandoorRecipes/dependabot…

66403c4

…/pip/beautifulsoup4-4.12.3 Bump beautifulsoup4 from 4.12.2 to 4.12.3

Merge pull request TandoorRecipes#3082 from TandoorRecipes/dependabot…

38e083f

…/github_actions/awalsh128/cache-apt-pkgs-action-1.4.2 Bump awalsh128/cache-apt-pkgs-action from 1.4.1 to 1.4.2

fixed changing categories of shopping items

ebecd60

Merge pull request TandoorRecipes#3055 from tooboredtocode/develop

c336d31

Improve docker run speeds

fix: rounding units

2293a5a

downgraded recipe scrapers to pass tests for now

0570be7

Revert "Merge pull request TandoorRecipes#3055 from tooboredtocode/de…

34ed5df

…velop" This reverts commit d766927, reversing changes made to 4293ec7.

Merge branch 'develop' into fixRounding

479c2bd

setup project level linting with flake8

1bdae45

project level formatting with prettier project level formatting with yapf

Reapply "Merge pull request TandoorRecipes#3055 from tooboredtocode/d…

90c8435

…evelop" This reverts commit f14acc3.

fix: image not working in docker compose environments

207ce85

document configurations required for formatting and linting

5ba8216

added property type delete admin

bbdd2fc

Merge pull request TandoorRecipes#3102 from smilerz/yapf_prettier

a1a4414

Yapf prettier

moved prettier configuration to .prettierrc

be32f17

tests for pk only nested serializer

b7b3fc1

Revert "moved prettier configuration to .prettierrc"

859b9e5

This reverts commit c33c4ed.

Revert "Revert "moved prettier configuration to .prettierrc""

e79aa7f

This reverts commit cc24964.

Revert "tests for pk only nested serializer"

e997cdd

This reverts commit 714242b.

upgrade recipe-scrapers

d6a4249

update recipe_scrapers to use scrape_html

e954488

scrape_me has been deprecated

change test_automations to use scrape_html

4d7d1fb

remove reliance on custom text_scraper class changed url on test case to generic wildmode vs specific site

Matjaž T and others added 16 commits November 16, 2024 14:09

Translated using Weblate (Slovenian)

31d960b

Currently translated at 15.3% (75 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/

Translated using Weblate (Slovenian)

67a99da

Currently translated at 71.7% (409 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

Translated using Weblate (Italian)

c38a9db

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/

Translated using Weblate (Slovenian)

71c4ed3

Currently translated at 84.0% (410 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/

Translated using Weblate (Slovenian)

68d5362

Currently translated at 71.7% (409 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

Added translation using Weblate (Croatian)

baf5400

Added translation using Weblate (Croatian)

3a3fa22

Bump aiohttp from 3.10.2 to 3.10.11

dfeaf8a

--- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

Merge pull request TandoorRecipes#3403 from TandoorRecipes/dependabot…

d2a0652

…/pip/aiohttp-3.10.11 Bump aiohttp from 3.10.2 to 3.10.11

Translated using Weblate (Slovenian)

68937a8

Currently translated at 100.0% (488 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/

Translated using Weblate (Slovenian)

ec4ded3

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

Translated using Weblate (Slovenian)

47e73f9

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/

Translated using Weblate (Danish)

98ac345

Currently translated at 94.5% (539 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/da/

Translated using Weblate (Croatian)

707f6c8

Currently translated at 100.0% (570 of 570 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hr/

Translated using Weblate (Croatian)

7036f4d

Currently translated at 30.9% (151 of 488 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hr/

Display options upon importing duplicate recipe URL

bb21c51

The user can either continue to import a duplicate recipe or edit the existing recipe. This addresses issue TandoorRecipes#2857.

lavanyamehn added 2 commits November 25, 2024 21:24

Revert "Display options upon importing duplicate recipe URL"

5d27386

This reverts commit ca9e1f8.

Changed functionality to only display a warning message

ec3cadc

Updated git email for CLA

7973bd3

lavanyamehn force-pushed the handle_duplicate_import_urls branch from de12d0c to 7973bd3 Compare November 26, 2024 22:57

lavanyamehn closed this Nov 26, 2024

lavanyamehn deleted the handle_duplicate_import_urls branch November 26, 2024 23:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display options upon importing duplicate recipe URL #3408

Display options upon importing duplicate recipe URL #3408

lavanyamehn commented Nov 23, 2024

CLAassistant commented Nov 23, 2024 •

edited

Loading

lavanyamehn commented Nov 23, 2024

vabene1111 commented Nov 23, 2024

vabene1111 commented Nov 23, 2024

lavanyamehn commented Nov 23, 2024

lavanyamehn commented Nov 23, 2024

vabene1111 commented Nov 23, 2024

lavanyamehn commented Nov 26, 2024

Display options upon importing duplicate recipe URL #3408

Display options upon importing duplicate recipe URL #3408

Conversation

lavanyamehn commented Nov 23, 2024

CLAassistant commented Nov 23, 2024 • edited Loading

lavanyamehn commented Nov 23, 2024

vabene1111 commented Nov 23, 2024

vabene1111 commented Nov 23, 2024

lavanyamehn commented Nov 23, 2024

lavanyamehn commented Nov 23, 2024

vabene1111 commented Nov 23, 2024

lavanyamehn commented Nov 26, 2024

CLAassistant commented Nov 23, 2024 •

edited

Loading