feat: enable attributes / personal search on OBF, OPF, OPFF, new config + logos for OPF & OPFF #10757
Conversation
This file contains 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
github-actions
bot
added
🧬 Taxonomies
alexgarel
approved these changes
Sep 17, 2024
conf/nginx/sites-available/opf
Outdated
| include snippets/ssl-params.conf; | ||
|
|
||
| # Product Opener needs a root domain + a wildcard for all subdomains | ||
| server_name *.new.openproductsfacts.org openproductsfacts.org *.openproductsfacts.org; |
There was a problem hiding this comment.
we may remove the .new now :-)
| log4perl.PatternLayout.cspec.J = sub { my $context = Log::Log4perl::MDC->get_context; use JSON::MaybeXS; my $json_utf8 = JSON::MaybeXS->new->utf8(1)->allow_nonref->canonical; my $str = $json_utf8->encode($context); return $str; } | ||
|
|
||
| log4perl.appender.LOGFILE=Log::Log4perl::Appender::File | ||
| log4perl.appender.LOGFILE.filename=/srv/opf/logs/log4perl.log |
There was a problem hiding this comment.
for the future: if we could read the conf, and change filename afterward in perl code (in startup_apache2.pl) it would be great to avoid so much duplication just for filepath changing !
html/images/favicon/readme.md
Outdated
There was a problem hiding this comment.
do we really need to put this ?
There was a problem hiding this comment.
well that way we remember how we created them if we need to recreate them
lib/ProductOpener/Products.pm
Outdated
| if (defined $server) { | ||
| $product_ref->{server} = $server; | ||
|
|
||
| # If the product is on another server, set the server field so that it will be saved in the other server if we save it |
taxonomies/petfood/ingredients.txt
Outdated
| "text_element": { | ||
| "type": "summary", | ||
| "html": ` | ||
| <p>[% edq(f_lang('f_equal_to_driving_km_in_a_petrol_car', { 'kilometers' => driving_per_unit_rounded } )) %]</p> |
There was a problem hiding this comment.
You can use a back quote ` in json ?
In this case we should have a ebq function (escape back quote).
There was a problem hiding this comment.
@alexgarel it's not in normal JSON, it's to ease the creation of JSON for knowledge panels. It also handles the escaping of quotes that may be inside.
templates/api/knowledge-panels/environment/carbon_footprint_product.tt.json
Outdated
Show resolved
Hide resolved
templates/api/knowledge-panels/secondhand/donated_products.tt.json
Outdated
Show resolved
Hide resolved
templates/api/knowledge-panels/secondhand/donated_products.tt.json
Outdated
Show resolved
Hide resolved
Co-authored-by: Alex Garel <[email protected]>
…oduct.tt.json Co-authored-by: Alex Garel <[email protected]>
…json Co-authored-by: Alex Garel <[email protected]>
…json Co-authored-by: Alex Garel <[email protected]>
…ts-server into obf-attributes
|
|
Given how large it is, we should tweak the wording of the donation message |
|
We should not link to https://world.pro.openproductsfacts.org/ which gives a HTTPS error. |
|
@teolemon as this is in production already, I will go ahead and merge the PR, and I'll address the issues you raised in new PRs. |
This was referenced Sep 18, 2024
Open
stephanegigandet
pushed a commit
that referenced
this pull request
Oct 2, 2024
🤖 I have created a release *beep* *boop* --- ## [2.45.0](v2.44.0...v2.45.0) (2024-10-02) ### Features * Add short name, value and evaluation to knowledge panels ([#9683](#9683)) ([bb5c3e2](bb5c3e2)) * enable attributes / personal search on OBF, OPF, OPFF, new config + logos for OPF & OPFF ([#10757](#10757)) ([7e25d9a](7e25d9a)) * make improvements to org table ([#10679](#10679)) ([b0cfea1](b0cfea1)) * Small fixes + improvements ([#10818](#10818)) ([bd91419](bd91419)) ### Bug Fixes * add Moji server IP to rate-limit allow-list ([#10785](#10785)) ([065e0ab](065e0ab)) * add more nutrients to test, to test more things ([#10834](#10834)) ([42b341d](42b341d)) * also check .pot GetText files in addition to .po files ([#10827](#10827)) ([bb87197](bb87197)) * Determine obsolete and deleted from the product revision ([#10791](#10791)) ([508d767](508d767)) * do not localize ecoscore on obf,opf,opff ([#10837](#10837)) ([2f93877](2f93877)) * docs Adding closing ) to generate proper internal link ([#10850](#10850)) ([492d6d9](492d6d9)) * docs Fixed proper denomination of product in query ([#10853](#10853)) ([428dbb3](428dbb3)) * improve OCR JSON generation script ([#10802](#10802)) ([3e8fee7](3e8fee7)) * incorrect self-reference in ingredient.yaml ([#10786](#10786)) ([2757699](2757699)) * indicate some attributes have only mandatory / not_important options ([#10846](#10846)) ([258dc8f](258dc8f)) * invalid type in product_misc.yaml ([#10787](#10787)) ([21920a1](21920a1)) * new mongodb exports for obsolete products collection ([#10794](#10794)) ([c22fc42](c22fc42)) * permissions for check-translations.sh ([#10838](#10838)) ([62e12d6](62e12d6)) * YAML syntax in schema files. ([#10783](#10783)) ([959c74c](959c74c)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Test deployments (with the production databases):
https://world.new.openproductsfacts.org
https://world.new.openpetfoodfacts.org