Fix/issue45758

modules/weko-itemtypes-ui/weko_itemtypes_ui/admin.py

@@ -704,14 +704,15 @@ def mapping_register(self):
         item_type = ItemTypes.get_by_id(data.get('item_type_id'))
         meta_system = item_type.render.get('meta_system')
         mapping_type = data.get('mapping_type')
+        data_mapping = data.get('mapping')
         lst_duplicate = check_duplicate_mapping(
-            data.get('mapping'), meta_system, item_type, mapping_type)
+            data_mapping, meta_system, item_type, mapping_type)
         if len(lst_duplicate) > 0:
             return jsonify(duplicate=True, err_items=lst_duplicate,
                            msg=_('Duplicate mapping as below:'))
         try:
             Mapping.create(item_type_id=data.get('item_type_id'),
-                           mapping=data.get('mapping'))
+                           mapping=data_mapping)
             db.session.commit()
         except BaseException:
             db.session.rollback()

modules/weko-itemtypes-ui/weko_itemtypes_ui/static/js/weko_itemtypes_ui/create_itemtype.js

@@ -1397,15 +1397,17 @@ $(document).ready(function () {
           // Get item id of sub-property is language.
           data.key_subproperty_languague.forEach(function (itemkey) {
             let listSubItem = itemkey.split(".");
-            var temp_prop = properties_obj[data.meta_list[listSubItem[0]].input_type.substr(4)].schema.properties;
-            for (var idx = 1; idx < listSubItem.length; idx++) {
-              let _item = temp_prop[listSubItem[idx]]
-              if (_item && _item.items) {
-                temp_prop = _item.items.properties;
-              } else if (_item && _item.properties) {
-                temp_prop = _item.properties;
-              } else if (_item && idx === listSubItem.length - 1) {
-                _item['isSubLanguage'] = true;
+            if (listSubItem && listSubItem.length > 0 && listSubItem[0] in data.meta_list) {
+              var temp_prop = properties_obj[data.meta_list[listSubItem[0]].input_type.substr(4)].schema.properties;
+              for (var idx = 1; idx < listSubItem.length; idx++) {
+                let _item = temp_prop[listSubItem[idx]]
+                if (_item && _item.items) {
+                  temp_prop = _item.items.properties;
+                } else if (_item && _item.properties) {
+                  temp_prop = _item.properties;
+                } else if (_item && idx === listSubItem.length - 1) {
+                  _item['isSubLanguage'] = true;
+                }
               }
             }
           });

modules/weko-itemtypes-ui/weko_itemtypes_ui/utils.py

@@ -300,8 +300,21 @@ def process_overlap():
 
     lst_temporary = {}
     meta_list = item_type.render.get('meta_list')
-    for item_key, item_value in data_mapping.items():
-        lst_temporary[item_key] = get_all_mapping(item_value, mapping_type)
+    table_row = item_type.render.get('table_row')
+    properties = item_type.schema.get('properties')
+    table_row += [
+        'pubdate',
+        'system_file',
+        'system_identifier_doi',
+        'system_identifier_hdl',
+        'system_identifier_uri'
+    ]
+
+    for item_key, item_value in deepcopy(data_mapping).items():
+        if item_key in table_row:
+            lst_temporary[item_key] = get_all_mapping(item_value, mapping_type)
+        else:
+            data_mapping.pop(item_key)
     lst_mapping_detail = []
     for k, v in lst_temporary.items():
         lst_mapping_detail.append({k: v})
@@ -322,14 +335,13 @@ def process_overlap():
             lst_overlap = list(
                 set(lst_values_src).intersection(lst_values_des))
             if lst_overlap:
-                properties = item_type.schema.get('properties')
                 if item_src_key in properties:
-                    item_src_name = item_type.schema.get('properties').get(
+                    item_src_name = properties.get(
                         item_src_key).get('title')
                 else:
                     continue
                 if item_des_key in properties:
-                    item_des_name = item_type.schema.get('properties').get(
+                    item_des_name = properties.get(
                         item_des_key).get('title')
                 else:
                     continue

modules/weko-schema-ui/weko_schema_ui/schema.py

@@ -1054,7 +1054,7 @@ def replace_nameIdentifierScheme_for_jpcoar_v2(atr_vm_item):
                         item_type = ItemType.query.filter_by(id=self._item_type_id).one_or_none()
                         # current_app.logger.error(item_type.schema["properties"][key_item_parent])
                         atr_name = ""
-                        if "title" in item_type.schema["properties"][key_item_parent]:
+                        if "title" in item_type.schema.get("properties", {}).get(key_item_parent, {}):
                             atr_name = item_type.schema["properties"][key_item_parent]["title"]
                         vlst_child = get_mapping_value(mpdic, {},
                                                            key_item_parent,