Skip to content

Commit

Permalink
Merge branch 'main' into improve-translations-editing
Browse files Browse the repository at this point in the history
  • Loading branch information
perierc committed Jan 17, 2024
2 parents 5c96e90 + 78fdffc commit ef4d88e
Show file tree
Hide file tree
Showing 22 changed files with 4,876 additions and 1,236 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -55,7 +55,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -68,6 +68,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/container-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ jobs:
cd ${{ matrix.env }}
docker system prune -af
- uses: frankie567/[email protected]
- uses: basos9/[email protected]
if: ${{ always() }}
with:
apiHost: https://grafana.openfoodfacts.org
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ A typescript migration is in progress, and we are also trying to simplify the AP
Please visit the [doc folder](./doc) for more documentation about the Taxonomy Editor.
This documentation tries to follow as much as possible the documentation system from [Diataxis](https://diataxis.fr/).

<img width="500" src="./doc/assets/taxonomy_editor_overview.png">

## User interface

<details><summary><h2> Screenshots </h2></summary>
Expand Down
5 changes: 3 additions & 2 deletions backend/editor/graph_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from .exceptions import TransactionMissingError

log = logging.getLogger(__name__)
DEFAULT_DB = "neo4j"


txn = contextvars.ContextVar("txn")
Expand All @@ -29,7 +30,7 @@ async def TransactionCtx():
"""
global txn, session
try:
async with driver.session() as _session:
async with driver.session(database=DEFAULT_DB) as _session:
txn_manager = await _session.begin_transaction()
async with txn_manager as _txn:
txn.set(_txn)
Expand Down Expand Up @@ -86,5 +87,5 @@ def SyncTransactionCtx():
"""
uri = settings.uri
driver = neo4j.GraphDatabase.driver(uri)
with driver.session() as _session:
with driver.session(database=DEFAULT_DB) as _session:
yield _session
6 changes: 3 additions & 3 deletions backend/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ef4d88e

Please sign in to comment.