From afe8561f70b264b2ed7f0fd93105659264cba858 Mon Sep 17 00:00:00 2001 From: Joseph Amlung Date: Thu, 30 Apr 2026 10:06:13 -0400 Subject: [PATCH 1/3] Fixed text and basic behavior of CascadeSelector component --- package-lock.json | 8 +-- src/components/common/CascadeSelector.jsx | 68 ++++++++++++++--------- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index d66bf175..98cebbb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13408,7 +13408,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, "fast-uri": { @@ -15754,7 +15754,7 @@ "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, "json-stringify-safe": { @@ -16690,7 +16690,7 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, "negotiator": { @@ -22866,7 +22866,7 @@ "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, "through2": { diff --git a/src/components/common/CascadeSelector.jsx b/src/components/common/CascadeSelector.jsx index d907c4ae..1c6d01fb 100644 --- a/src/components/common/CascadeSelector.jsx +++ b/src/components/common/CascadeSelector.jsx @@ -27,7 +27,7 @@ const PRESETS = [ }, { id: 'sourcetoconcepts', - label: 'OpenMRS', + label: 'All Source Concepts & Mappings', params: { method: 'sourcetoconcepts', mapTypes: 'Q-AND-A,CONCEPT-SET', cascadeLevels: '*', returnMapTypes: '*' }, }, { @@ -62,6 +62,7 @@ const CascadeSelector = ({ onChange, conceptUrl, collectionUrl, showPreviewDefau const [transform, setTransform] = React.useState(false) const [customParams, setCustomParams] = React.useState(DEFAULT_CUSTOM_PARAMS) const [showPreview, setShowPreview] = React.useState(showPreviewDefault) + const [showAdvanced, setShowAdvanced] = React.useState(false) const selectedPreset = PRESETS.find(p => p.id === selectedPresetId) const baseParams = selectedPresetId === 'custom' ? customParams : (selectedPreset.params || {}) @@ -85,9 +86,8 @@ const CascadeSelector = ({ onChange, conceptUrl, collectionUrl, showPreviewDefau return ( - {/* Cascade dropdown + Transform checkbox on same row */} - + Cascade diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json index 82dcaf75..1a36f747 100644 --- a/src/i18n/locales/en/translations.json +++ b/src/i18n/locales/en/translations.json @@ -274,7 +274,8 @@ "intensional": "Intensional", "extensional": "Extensional", "cascade": "Cascade", - "unresolved": "Unresolved", + "source_mappings": "Source Mappings", + "all_source_concepts_and_mappings": "All Source Concepts & Mappings", "versioned_repo": "Versioned (Repo)", "versioned_resource": "Versioned (Resource)", "resolved_repo": "Resolved Repo", @@ -324,7 +325,6 @@ "compositional": "Compositional", "version_needed": "Version Needed", "meta": "Meta", - "revision_date": "Revision Date", "short_code": "Short Code", "full_name": "Full Name", "short_name": "Short Name", @@ -550,7 +550,6 @@ "last_name": "Last Name", "company": "Company", "email_address": "Email Address", - "location": "Location", "profile_update_success": "Profile updated successfully", "profile_update_failure": "An error occurred while updating profile.", "copy_api_token": "Copy API token", diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json index cbff07ee..075df0f5 100644 --- a/src/i18n/locales/es/translations.json +++ b/src/i18n/locales/es/translations.json @@ -30,6 +30,8 @@ "select": "Seleccionar", "search": "Buscar", "for": "para", + "none": "Ninguno", + "custom": "Personalizado", "load_more": "Cargar más" }, "errors": { @@ -67,6 +69,14 @@ "mapping": { "mappings": "Mapeos" }, + "reference": { + "cascade": "Cascada", + "source_mappings": "Mapeos de la fuente", + "all_source_concepts_and_mappings": "Todos los conceptos y mapeos de la fuente", + "advanced": "Avanzado", + "hide_advanced": "Ocultar avanzado", + "transform_tooltip": "Convierte la referencia en referencia(s) extensional(es). Las referencias para conceptos o mapeos resueltos se almacenaran como referencias extensionales individuales en lugar de referencia(s) intensional(es)." + }, "repo": { "repos": "Repositorios", "repo": "Repositorio", diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json index 04f8739b..e4b5a350 100644 --- a/src/i18n/locales/zh/translations.json +++ b/src/i18n/locales/zh/translations.json @@ -88,6 +88,7 @@ "target": "目标", "properties": "特性", "custom": "自定义", + "none": "无", "load_more": "加载更多" }, "errors": { @@ -274,7 +275,6 @@ "last_name": "姓氏", "company": "公司", "email_address": "电子邮件地址", - "location": "位置", "profile_update_success": "已成功更新个人资料", "profile_update_failure": "更新个人资料时出现错误。", "copy_api_token": "复制 API 令牌", @@ -288,6 +288,14 @@ "user_has_not_created_public_repos_suffix": "尚未创建任何公开的存储库", "recent_activity": "最近的活动" }, + "reference": { + "cascade": "级联", + "source_mappings": "源映射", + "all_source_concepts_and_mappings": "所有源概念和映射", + "advanced": "高级", + "hide_advanced": "隐藏高级", + "transform_tooltip": "将引用转换为外延引用。已解析概念或映射的引用将作为单独的外延引用存储，而不是作为内涵引用存储。" + }, "search": { "filters": "筛选项", "concepts": "概念",