alex-poor commented on code in PR #40679:
URL: https://github.com/apache/superset/pull/40679#discussion_r3800071831
##########
superset-frontend/src/pages/DashboardList/index.tsx:
##########
@@ -391,28 +395,32 @@ function DashboardList(props: DashboardListProps) {
row: {
original: {
url,
- dashboard_title: dashboardTitle,
+ dashboard_title: canonicalTitle,
+ localized_title: localizedTitle,
certified_by: certifiedBy,
certification_details: certificationDetails,
description,
},
},
- }: any) => (
- <FlexRowContainer>
- <Link to={url} title={dashboardTitle}>
- {certifiedBy && (
- <>
- <CertifiedBadge
- certifiedBy={certifiedBy}
- details={certificationDetails}
- />{' '}
- </>
- )}
- {dashboardTitle}
- </Link>
- {description && <InfoTooltip tooltip={description} />}
- </FlexRowContainer>
- ),
+ }: any) => {
+ const dashboardTitle = localizedTitle ?? canonicalTitle;
Review Comment:
Fixed in aff0206 — `handleDashboardEdit` refetches the dashboard but spread
the stale row and never overwrote `localized_title`, so a rename left the
previous title's translation on screen until reload. It now takes the server's
recomputed `localized_title` from that response. The chart list had the same
defect by a different route — `handleChartUpdated` merges the edit response,
which carries the canonical name only — so `localized_name` is now dropped when
`slice_name` changes, falling back to the new canonical name.
##########
examples/asset_metadata_translation/hook.py:
##########
@@ -0,0 +1,110 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Reference translation hooks backed by the ``AssetTranslation`` table.
+
+NOT part of Superset core -- see this directory's README. Assign
+``translation_hook`` to ``TRANSLATION_HOOK`` in ``superset_config.py``, or
+``translation_batch_hook`` to ``TRANSLATION_BATCH_HOOK`` to resolve a whole
+collection in a single query (preferred for a table-backed store).
+"""
+
+from __future__ import annotations
+
+import logging
+from collections.abc import Sequence
+
+logger = logging.getLogger(__name__)
+
+
+def translation_hook(
+ default_text: str,
+ locale: str,
+ **kwargs: object,
+) -> str | None:
+ """Look up a stored translation for the active locale.
+
+ Matches on the source text plus the ``model_name``/``field_name`` context
+ Superset passes, so the same string can be translated differently per
field.
+ Returns ``None`` when there is no match (Superset falls back to the
canonical
+ text). Any failure is swallowed so rendering never breaks on a lookup
error.
+ """
+ # Local imports: these are only importable inside the running app context.
+ from superset import db
+
+ from .model import AssetTranslation
+
+ try:
+ row = (
+ db.session.query(AssetTranslation.translated_text)
+ .filter(
+ AssetTranslation.language_code == locale,
+ AssetTranslation.default_text == default_text,
+ AssetTranslation.model_name == kwargs.get("model_name", ""),
+ AssetTranslation.field_name == kwargs.get("field_name", ""),
+ )
+ .first()
+ )
+ except Exception: # pylint: disable=broad-except
+ logger.exception("asset translation lookup failed for %r",
default_text)
+ return None
+
+ return row[0] if row else None
+
+
+def translation_batch_hook(
+ default_texts: Sequence[str],
+ locale: str,
+ **kwargs: object,
+) -> dict[str, str]:
+ """Look up many stored translations in one query.
+
+ The batch counterpart to :func:`translation_hook`: Superset passes every
+ string it is about to render for one context -- all of a dashboard's chart
+ names, say -- so a table-backed store answers with a single ``IN`` query
+ instead of one per string. Strings with no stored translation are simply
+ absent from the result; Superset falls back to the canonical text.
+ """
+ # Local imports: these are only importable inside the running app context.
+ from superset import db
+
+ from .model import AssetTranslation
+
+ if not default_texts:
+ return {}
+
+ try:
+ rows = (
+ db.session.query(
+ AssetTranslation.default_text,
+ AssetTranslation.translated_text,
+ )
+ .filter(
+ AssetTranslation.language_code == locale,
+ AssetTranslation.default_text.in_(default_texts),
+ AssetTranslation.model_name == kwargs.get("model_name", ""),
+ AssetTranslation.field_name == kwargs.get("field_name", ""),
+ )
+ .all()
+ )
+ except Exception: # pylint: disable=broad-except
+ logger.exception(
+ "asset translation batch lookup failed for %d strings",
+ len(default_texts),
+ )
+ return {}
+
+ return dict(rows)
Review Comment:
Addressed in aff0206, though not for the stated reason. `dict(rows)` builds
from an iterable of key/value pairs, and a two-column SQLAlchemy 2 `Row` is
tuple-like, so it does not raise `TypeError` — the `dict(row)` single-row form
is the one that needs `row._mapping`. That said, the mapping is clearer built
from named columns, so it now reads `{row.default_text: row.translated_text for
row in rows}`. As background, this line was `dict(rows)` because ruff's C416
flags the anonymous two-variable comprehension; naming the columns satisfies
both.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
