Develop 202605a

addons/metadata/README.md

@@ -34,6 +34,88 @@ USE_DATASET_IMPORTING = True
 
 The "Import Dataset" button is displayed in a toolbar of a file browser if `USE_DATASET_IMPORTING` is true and users can import datasets from external sources.
 
+## Schema UI Hints (`ui` property)
+
+Metadata schemas (e.g. `e-rad-metadata-1.json`) define both data structure and form rendering. To keep rendering concerns separate from data structure, each question may carry an optional `ui` property — a single JSON object that holds all UI-specific hints.
+
+### Design rationale
+
+Schema properties flow through two distinct paths:
+
+1. **File metadata path** — The schema JSON is stored in `RegistrationSchema.schema` (a JSONField) and served as-is to the browser. The frontend JS (`metadata-fields.js`) reads `question.ui.*` directly. Any new key added to `ui` is automatically available without backend changes.
+
+2. **Project metadata path** — The migration `map_schemas_to_schemablocks` decomposes each question into `RegistrationSchemaBlock` rows. Each column on that model requires a DB migration, a serializer update, and a corresponding Ember model attribute. Adding a single column touches Python models, migrations, API serializers, and Ember types.
+
+By consolidating all UI hints into a single `ui` JSONField column on `RegistrationSchemaBlock`, the project metadata path gains the same extensibility as the file metadata path: new hints can be added to the `ui` object without further migrations or model changes.
+
+### Structure
+
+Simple ja/en pair:
+
+```json
+{ "qid": "grdm-file:title-ja",
+  "ui": {
+    "group": { "id": "title", "title": "データの名称|Title", "tags": ["共通|Common", "リポジトリ|Repository"],
+               "help": "...", "info": "管理対象データの特徴を示す名称を入力。|..." },
+    "sub_label": "（日本語）|(Japanese)",
+    "item": { "placeholder": "研究データ管理に関する意識調査" }
+  } }
+
+{ "qid": "grdm-file:title-en",
+  "ui": { "group": "title", "sub_label": "（English）|(English)" } }
+```
+
+Nested group (ja/en pair inside a category):
+
+```json
+{ "qid": "grdm-file:data-policy-free",
+  "ui": { "group": { "id": "data-policy", "title": "管理対象データの利活用・提供方針|...", "bar": true,
+                      "tags": ["共通|Common"], "info": "ライセンス情報を記載。|..." } } }
+
+{ "qid": "grdm-file:data-policy-license",
+  "ui": { "group": "data-policy" } }
+
+{ "qid": "grdm-file:data-policy-cite-ja",
+  "ui": {
+    "group": { "id": "data-policy-cite", "parent": "data-policy", "title": "引用方法等|..." },
+    "sub_label": "（日本語）|(Japanese)"
+  } }
+
+{ "qid": "grdm-file:data-policy-cite-en",
+  "ui": { "group": "data-policy-cite", "sub_label": "（English）|(English)" } }
+```
+
+The `ui` object has three scopes:
+
+**Page scope** (`page.ui`) — page-level decoration:
+
+- **`header`** — Introductory HTML text displayed above all questions on the page (e.g. format notes, tag legend).
+
+**Group scope** (`ui.group`) — section heading and grouping:
+
+- **`id`** — Group identifier. The first question in a group carries the full definition (object); subsequent questions reference the group by `id` string only (e.g. `"group": "title"`).
+- **`parent`** — Parent group reference. A string ID when the parent is already defined by an earlier question. An object (`{ "id": "...", "title": "...", ... }`) to simultaneously define the parent group — useful when no earlier question belongs directly to the parent.
+- **`title`** — Section heading text.
+- **`help`** — Help text (supports HTML) displayed under the section heading.
+- **`bar`** — If `true`, draw a continuous vertical bar on the left side of group members (for semantic category groups).
+- **`tags`** — Badge labels for the section (e.g. `["共通|Common"]`, `["共通|Common", "リポジトリ|Repository"]`). Pipe-delimited for localization.
+- **`info`** — Detailed explanation shown in a popover when the ⓘ mark next to the group heading is clicked.
+
+**Item scope** (`ui.item`) — individual input field:
+
+- **`placeholder`** — Placeholder text for the input field.
+- **`width`** — Abstract width category (e.g. `"narrow"`, `"half"`).
+- **`widget`** — Override the default widget (e.g. `"radio"` instead of pulldown for `singleselect`).
+- **`enabled_if`** — Conditional disabled display. An object with a `disabled` key whose value is either `true` (unconditionally disabled) or a condition object (e.g. `{ "disabled": { "grdm-file:file-type": "dataset" } }`). When the question's `enabled_if` is false and the `disabled` condition is met, the field is shown greyed out instead of hidden.
+- **`info`** — Detailed explanation shown in a popover when the ⓘ mark next to the field label is clicked. For grouped fields, prefer `ui.group.info` over `ui.item.info`.
+- **`tags`** — Badge labels for standalone fields (fields not belonging to a group). Pipe-delimited for localization.
+
+**Top-level** (`ui.*`):
+
+- **`sub_label`** — Label within a group (e.g. "（日本語）|(Japanese)" / "（English）|(English)" for ja/en pairs).
+
+This list is not exhaustive; new keys can be added as needed without schema migration.
+
 ## Suggestion Policies (ERAD/KAKEN)
 
 This addon provides researcher/project suggestions sourced from ERAD and KAKEN. Ordering and deduplication follow simple, explicit policies so results are predictable and easy to reason about.

addons/metadata/packages.py

@@ -1283,11 +1283,26 @@ def to_creators_metadata(users):
     ]
 
 def _to_user_metadata(user):
-    middle_names_en = '' if not user.middle_names else f'{user.middle_names} '
+    affiliation_ja = ''
+    affiliation_en = ''
+    current_jobs = [job for job in user.jobs if job.get('ongoing')]
+    if current_jobs:
+        affiliation_ja = current_jobs[0].get('institution_ja') or ''
+        affiliation_en = current_jobs[0].get('institution') or ''
     return {
         'number': user.erad,
-        'name_ja': f'{user.family_name_ja}{user.middle_names_ja}{user.given_name_ja}',
-        'name_en': f'{user.given_name} {middle_names_en}{user.family_name}',
+        'name-ja': {
+            'last': user.family_name_ja,
+            'middle': user.middle_names_ja,
+            'first': user.given_name_ja,
+        },
+        'name-en': {
+            'last': user.family_name,
+            'middle': user.middle_names,
+            'first': user.given_name,
+        },
+        'affiliation-name-ja': affiliation_ja,
+        'affiliation-name-en': affiliation_en,
     }
 
 def _snake_to_camel(name):

addons/metadata/report_format/report_en.csv.j2

@@ -7,6 +7,6 @@ Funder,Funding stream code in Japan Grant Number,Program name,Japan Grant Number
     {%- else -%}
         {{grdm_file.data_research_field_tooltip_1 | quotecsv}}
     {%- endif -%}
-,{{grdm_file.data_type_tooltip_1 | quotecsv}},{{grdm_file.file_size | quotecsv}},{{grdm_file.data_policy_free_tooltip_1 | quotecsv}},{{grdm_file.data_policy_license | quotecsv}},{{grdm_file.data_policy_cite_en | quotecsv}},{{grdm_file.access_rights_tooltip_1 | quotecsv}},{{grdm_file.available_date | quotecsv}},{{grdm_file.repo_information_en | quotecsv}},{{grdm_file.repo_url_doi_link | quotecsv}},{{grdm_file.creators | map(attribute="name_en") | join(";") | quotecsv}},{{grdm_file.creators | map(attribute="number") | join(";") | quotecsv}},{{grdm_file.hosting_inst_en | quotecsv}},{{grdm_file.hosting_inst_id | quotecsv}},{{grdm_file.data_man_name_en | quotecsv}},{{grdm_file.data_man_number | quotecsv}},{{grdm_file.data_man_org_en | quotecsv}},{{grdm_file.data_man_address_en | quotecsv}},{{grdm_file.data_man_tel | quotecsv}},{{grdm_file.data_man_email | quotecsv}},{{grdm_file.remarks_en | quotecsv}}
+,{{grdm_file.data_type_tooltip_1 | quotecsv}},{{grdm_file.file_size | quotecsv}},{{grdm_file.data_policy_free_tooltip_1 | quotecsv}},{{grdm_file.data_policy_license | quotecsv}},{{grdm_file.data_policy_cite_en | quotecsv}},{{grdm_file.access_rights_tooltip_1 | quotecsv}},{{grdm_file.available_date | quotecsv}},{{grdm_file.repo_information_en | quotecsv}},{{grdm_file.repo_url_doi_link | quotecsv}},{{grdm_file.creators | map(attribute="name_en") | map("namestr_en") | select | join(";") | quotecsv}},{{grdm_file.creators | map(attribute="number") | join(";") | quotecsv}},{{grdm_file.hosting_inst_en | quotecsv}},{{grdm_file.hosting_inst_id | quotecsv}},{{grdm_file.data_man_name_en | namestr_en | quotecsv}},{{grdm_file.data_man_number | quotecsv}},{{grdm_file.data_man_org_en | quotecsv}},{{grdm_file.data_man_address_en | quotecsv}},{{grdm_file.data_man_tel | quotecsv}},{{grdm_file.data_man_email | quotecsv}},{{grdm_file.remarks_en | quotecsv}}
 {%- endif -%}
 {% endfor %}

addons/metadata/report_format/report_ja.csv.j2

@@ -7,6 +7,6 @@
     {%- else -%}
         {{grdm_file.data_research_field_tooltip_0 | quotecsv}}
     {%- endif -%}
-,{{grdm_file.data_type_tooltip_0 | quotecsv}},{{grdm_file.file_size | quotecsv}},{{grdm_file.data_policy_free_tooltip_0 | quotecsv}},{{grdm_file.data_policy_license | quotecsv}},{{grdm_file.data_policy_cite_ja | quotecsv}},{{grdm_file.access_rights_tooltip_0 | quotecsv}},{{grdm_file.available_date | quotecsv}},{{grdm_file.repo_information_ja | quotecsv}},{{grdm_file.repo_url_doi_link | quotecsv}},{{grdm_file.creators | map(attribute="name_ja") | join(";") | quotecsv}},{{grdm_file.creators | map(attribute="number") | join(";") | quotecsv}},{{grdm_file.hosting_inst_ja | quotecsv}},{{grdm_file.hosting_inst_id | quotecsv}},{{grdm_file.data_man_name_ja | quotecsv}},{{grdm_file.data_man_number | quotecsv}},{{grdm_file.data_man_org_ja | quotecsv}},{{grdm_file.data_man_address_ja | quotecsv}},{{grdm_file.data_man_tel | quotecsv}},{{grdm_file.data_man_email | quotecsv}},{{grdm_file.remarks_ja | quotecsv}}
+,{{grdm_file.data_type_tooltip_0 | quotecsv}},{{grdm_file.file_size | quotecsv}},{{grdm_file.data_policy_free_tooltip_0 | quotecsv}},{{grdm_file.data_policy_license | quotecsv}},{{grdm_file.data_policy_cite_ja | quotecsv}},{{grdm_file.access_rights_tooltip_0 | quotecsv}},{{grdm_file.available_date | quotecsv}},{{grdm_file.repo_information_ja | quotecsv}},{{grdm_file.repo_url_doi_link | quotecsv}},{{grdm_file.creators | map(attribute="name_ja") | map("namestr_ja") | select | join(";") | quotecsv}},{{grdm_file.creators | map(attribute="number") | join(";") | quotecsv}},{{grdm_file.hosting_inst_ja | quotecsv}},{{grdm_file.hosting_inst_id | quotecsv}},{{grdm_file.data_man_name_ja | namestr_ja | quotecsv}},{{grdm_file.data_man_number | quotecsv}},{{grdm_file.data_man_org_ja | quotecsv}},{{grdm_file.data_man_address_ja | quotecsv}},{{grdm_file.data_man_tel | quotecsv}},{{grdm_file.data_man_email | quotecsv}},{{grdm_file.remarks_ja | quotecsv}}
 {%- endif -%}
 {% endfor %}

addons/metadata/routes.py

@@ -61,6 +61,8 @@
         Rule([
             '/project/<pid>/{}/file_metadata/suggestions/files/<path:filepath>'.format(SHORT_NAME),
             '/project/<pid>/node/<nid>/{}/file_metadata/suggestions/files/<path:filepath>'.format(SHORT_NAME),
+            '/project/<pid>/{}/suggestions'.format(SHORT_NAME),
+            '/project/<pid>/node/<nid>/{}/suggestions'.format(SHORT_NAME),
         ], 'get', views.metadata_file_metadata_suggestions, json_renderer),
         Rule([
             '/{}/packages/projects/'.format(SHORT_NAME),

addons/metadata/static/files.js

@@ -13,6 +13,7 @@ const _ = rdmGettext._;
 const ImportDatasetButton = require('./metadataImportDatasetButton.js');
 
 const QuestionPage = require('./metadata-fields.js').QuestionPage;
+const getLocalizedText = require('./util.js').getLocalizedText;
 const WaterButlerCache = require('./wbcache.js').WaterButlerCache;
 const registrations = require('./registration.js');
 const RegistrationSchemas = registrations.RegistrationSchemas;
@@ -293,9 +294,7 @@ function MetadataButtons() {
     );
     self.lastFields = self.lastQuestionPage.fields;
     container.empty();
-    self.lastFields.forEach(function(field) {
-      container.append(field.element);
-    });
+    container.append(self.lastQuestionPage.container);
     self.lastQuestionPage.validateAll();
   }
 
@@ -334,8 +333,9 @@ function MetadataButtons() {
   }
 
   self.createSchemaSelector = function(targetItem) {
-    const label = $('<label></label>').text(_('Metadata Schema:'));
-    const schema = $('<select></select>');
+    const label = $('<label></label>').text(_('Schema:'))
+      .css({ 'margin-right': '8px', 'margin-bottom': 0, 'white-space': 'nowrap', 'min-width': '8em', 'text-align': 'right' });
+    const schema = $('<select></select>').addClass('form-control');
     const activeSchemas = (self.registrationSchemas.schemas || [])
       .filter(function(s) {
         return s.attributes.active;
@@ -346,7 +346,7 @@ function MetadataButtons() {
     activeSchemas.forEach(function(s) {
       schema.append($('<option></option>')
         .attr('value', s.id)
-        .text(s.attributes.name));
+        .text(getLocalizedText(s.attributes.schema.ui && s.attributes.schema.ui.label) || s.attributes.name));
     });
     var currentSchemaId = null;
     const activeSchemaIds = activeSchemas.map(function(s) {
@@ -363,6 +363,7 @@ function MetadataButtons() {
       schema.val(currentSchemaId);
     }
     const group = $('<div></div>').addClass('form-group')
+      .css({ 'margin-bottom': 0, display: 'flex', 'align-items': 'center' })
       .append(label)
       .append(schema);
     return {
@@ -521,10 +522,12 @@ function MetadataButtons() {
         self.findSchemaById(self.currentSchemaId),
         filepath,
         item,
-        {}
+        { variantContainer: variantSlot }
       );
     });
-    dialog.toolbar.append(selector.group);
+    var variantSlot = $('<div>');
+    var selectorColumn = $('<div>').append(selector.group).append(variantSlot);
+    dialog.toolbar.append(selectorColumn);
     if ((context.projectMetadata || {}).editable && !extraMetadata) {
       const pasteButton = $('<button></button>')
         .addClass('btn btn-default')
@@ -534,9 +537,7 @@ function MetadataButtons() {
         .append(_('Paste from Clipboard'))
         .attr('type', 'button')
         .on('click', self.pasteFromClipboard);
-      dialog.toolbar.append($('<div></div>')
-        .css('display', 'flex')
-        .append(pasteButton));
+      dialog.toolbar.append(pasteButton);
     }
     if (dialog.customHandler) {
       dialog.customHandler.empty();
@@ -566,7 +567,7 @@ function MetadataButtons() {
       self.findSchemaById(self.currentSchemaId),
       filepath,
       item,
-      {}
+      { variantContainer: variantSlot }
     );
     dialog.container.append(fieldContainer);
     dialog.dialog.one('shown.bs.modal', function() {
@@ -656,11 +657,13 @@ function MetadataButtons() {
         self.findSchemaById(self.currentSchemaId),
         filepaths,
         items,
-        Object.assign({multiple: true}, computeValuesForMultipleEdit(self.currentSchemaId))
+        Object.assign({multiple: true, variantContainer: variantSlot}, computeValuesForMultipleEdit(self.currentSchemaId))
       );
     });
     dialog.toolbar.empty();
-    dialog.toolbar.append(selector.group);
+    var variantSlot = $('<div>');
+    var selectorColumn = $('<div>').append(selector.group).append(variantSlot);
+    dialog.toolbar.append(selectorColumn);
 
     // container
     dialog.container.empty();
@@ -671,7 +674,7 @@ function MetadataButtons() {
       self.findSchemaById(self.currentSchemaId),
       filepaths,
       items,
-      Object.assign({multiple: true}, computeValuesForMultipleEdit(self.currentSchemaId))
+      Object.assign({multiple: true, variantContainer: variantSlot}, computeValuesForMultipleEdit(self.currentSchemaId))
     );
     dialog.container.append(fieldContainer);
     dialog.dialog.one('shown.bs.modal', function() {
@@ -1131,9 +1134,7 @@ function MetadataButtons() {
     );
     self.lastFields = self.lastQuestionPage.fields;
     container.empty();
-    self.lastFields.forEach(function(field) {
-      container.append(field.element);
-    });
+    container.append(self.lastQuestionPage.container);
     self.lastQuestionPage.validateAll();
     const message = $('<div></div>');
     if (self.lastQuestionPage.hasValidationError) {
@@ -2208,7 +2209,10 @@ function MetadataButtons() {
     copyToClipboard.on('click', function(event) {
       self.copyToClipboard(event, copyStatus);
     });
-    const toolbar = $('<div></div>');
+    const toolbar = $('<div></div>')
+      .css('display', 'flex')
+      .css('align-items', 'flex-end')
+      .css('margin-bottom', '10px');
     const customHandler = $('<span></span>');
     const container = $('<ul></ul>').css('padding', '0 20px');
     var notice = $('<span></span>');
@@ -2232,6 +2236,8 @@ function MetadataButtons() {
                 .append($('<div class="col-sm-12 metadata-scroll-area"></div>')
                   .css('overflow-y', 'scroll')
                   .css('height', '66vh')
+                  .css('background-color', '#fff')
+                  .css('padding-top', '12px')
                   .append(container))))
             .append($('<div class="modal-footer"></div>')
               .css('display', 'flex')
@@ -2274,7 +2280,10 @@ function MetadataButtons() {
           $(dialog).modal('hide');
       });
     });
-    const toolbar = $('<div></div>');
+    const toolbar = $('<div></div>')
+      .css('display', 'flex')
+      .css('align-items', 'flex-end')
+      .css('margin-bottom', '10px');
     const container = $('<ul></ul>').css('padding', '0 20px');
     dialog
       .append($('<div class="modal-dialog modal-lg"></div>')
@@ -2289,6 +2298,8 @@ function MetadataButtons() {
                 .append($('<div class="col-sm-12 metadata-scroll-area"></div>')
                   .css('overflow-y', 'scroll')
                   .css('height', '70vh')
+                  .css('background-color', '#fff')
+                  .css('padding-top', '12px')
                   .append(container))))
             .append($('<div class="modal-footer"></div>')
               .css('display', 'flex')