Merge branch 'release/26.12.0'

Author: adlius

CHANGELOG

@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.12.0 (2026-06-23)
+====================
+
+- ES2 Consolidation
+
 26.11.0 (2026-06-10)
 ====================
 

admin/base/utils.py

@@ -1,7 +1,7 @@
 """
 Utility functions and classes
 """
-from osf.models import Subject, NodeLicense, Brand
+from osf.models import Subject, NodeLicense, Brand, CedarMetadataTemplate
 
 from django.core.exceptions import ValidationError, PermissionDenied
 from django.urls import reverse
@@ -116,6 +116,11 @@ def get_brand_choices():
     brands = Brand.objects.all()
     return [no_default] + [(brand.id, brand.name) for brand in brands]
 
+def get_cedar_template_choices():
+    no_default = ('', '---------')
+    templates = CedarMetadataTemplate.objects.filter(active=True)
+    return [no_default] + [(t.id, t.schema_name) for t in templates]
+
 def get_toplevel_subjects():
     return Subject.objects.filter(parent__isnull=True, provider___id='osf').values_list('id', 'text')
 

admin/cedar/forms.py

@@ -1,7 +1,8 @@
-from django.forms import ModelForm, CharField, JSONField
+from django.forms import ModelForm, CharField, JSONField, BooleanField
 
 from osf.models import CedarMetadataTemplate
 
+
 class CedarMetadataTemplateForm(ModelForm):
     schema_name = CharField(
         disabled=True,
@@ -18,7 +19,8 @@ class CedarMetadataTemplateForm(ModelForm):
     template = JSONField(
         disabled=True
     )
+    is_for_collections = BooleanField(label='For collections only:', required=False)
 
     class Meta:
         model = CedarMetadataTemplate
-        fields = ['schema_name', 'cedar_id', 'template_version', 'template', 'active']
+        fields = ['schema_name', 'cedar_id', 'template_version', 'template', 'is_for_collections', 'active', 'should_index_for_search']

admin/collection_providers/forms.py

@@ -4,7 +4,7 @@
 
 from framework.utils import sanitize_html
 from osf.models import CollectionProvider
-from admin.base.utils import get_nodelicense_choices, get_defaultlicense_choices, validate_slug
+from admin.base.utils import get_nodelicense_choices, get_defaultlicense_choices, validate_slug, get_cedar_template_choices
 
 
 class CollectionProviderForm(forms.ModelForm):
@@ -37,9 +37,11 @@ class Meta:
     def __init__(self, *args, **kwargs):
         nodelicense_choices = get_nodelicense_choices()
         defaultlicense_choices = get_defaultlicense_choices()
+        cedar_template_choices = get_cedar_template_choices()
         super().__init__(*args, **kwargs)
         self.fields['licenses_acceptable'].choices = nodelicense_choices
         self.fields['default_license'].choices = defaultlicense_choices
+        self.fields['required_metadata_template'].choices = cedar_template_choices
 
     def clean_description(self, *args, **kwargs):
         if not self.data.get('description'):

admin/collection_providers/views.py

@@ -132,127 +132,78 @@ def get_context_data(self, *args, **kwargs):
         licenses_html += '</ul>'
         collection_provider_attributes['licenses_acceptable'] = licenses_html
 
-        primary_collection = collection_provider.primary_collection
-        # compile html list of collected_type_choices
-        collected_type_choices_html = '<ul>'
-        for choice in primary_collection.collected_type_choices:
-            collected_type_choices_html += f'<li>{choice}</li>'
-        collected_type_choices_html += '</ul>'
-        kwargs['collected_type_choices'] = collected_type_choices_html
-
-        # compile html list of status_choices
-        status_choices_html = '<ul>'
-        for choice in primary_collection.status_choices:
-            status_choices_html += f'<li>{choice}</li>'
-        status_choices_html += '</ul>'
-        kwargs['status_choices'] = status_choices_html
-
-        # compile html list of volume_choices
-        volume_choices_html = '<ul>'
-        for choice in primary_collection.volume_choices:
-            volume_choices_html += f'<li>{choice}</li>'
-        volume_choices_html += '</ul>'
-        kwargs['volume_choices'] = volume_choices_html
-
-        # compile html list of issue_choices
-        issue_choices_html = '<ul>'
-        for choice in primary_collection.issue_choices:
-            issue_choices_html += f'<li>{choice}</li>'
-        issue_choices_html += '</ul>'
-        kwargs['issue_choices'] = issue_choices_html
-
-        # compile html list of program_area_choices
-        program_area_choices_html = '<ul>'
-        for choice in primary_collection.program_area_choices:
-            program_area_choices_html += f'<li>{choice}</li>'
-        program_area_choices_html += '</ul>'
-        kwargs['program_area_choices'] = program_area_choices_html
-
-        # compile html list of school_type_choices
-        school_type_choices_html = '<ul>{choices}</ul>'.format(choices=''.join(
-            f'<li>{choice}</li>' for choice in primary_collection.school_type_choices
-        ))
-        kwargs['school_type_choices'] = school_type_choices_html
-
-        # compile html list of study_design_choices
-        study_design_choices_html = '<ul>{choices}</ul>'.format(choices=''.join(
-            f'<li>{choice}</li>' for choice in primary_collection.study_design_choices
-        ))
-        kwargs['study_design_choices'] = study_design_choices_html
-
-        disease_choices_html = '<ul>{choices}</ul>'.format(choices=''.join(
-            f'<li>{choice}</li>' for choice in primary_collection.disease_choices
-        ))
-        kwargs['disease_choices'] = disease_choices_html
-
-        data_type_choices_html = '<ul>{choices}</ul>'.format(choices=''.join(
-            f'<li>{choice}</li>' for choice in primary_collection.data_type_choices
-        ))
-        kwargs['data_type_choices'] = data_type_choices_html
-
-        grade_levels_choices_html = '<ul>{choices}</ul>'.format(choices=''.join(
-            f'<li>{choice}</li>' for choice in primary_collection.grade_levels_choices
-        ))
-        kwargs['grade_levels_choices'] = grade_levels_choices_html
-
-        # get a dict of model fields so that we can set the initial value for the update form
         fields = model_to_dict(collection_provider)
-        fields['collected_type_choices'] = json.dumps(primary_collection.collected_type_choices)
-        fields['status_choices'] = json.dumps(primary_collection.status_choices)
-        fields['volume_choices'] = json.dumps(primary_collection.volume_choices)
-        fields['issue_choices'] = json.dumps(primary_collection.issue_choices)
-        fields['program_area_choices'] = json.dumps(primary_collection.program_area_choices)
 
-        fields = model_to_dict(collection_provider)
-
-        fields['school_type_choices'] = json.dumps(primary_collection.school_type_choices)
-        fields['study_design_choices'] = json.dumps(primary_collection.study_design_choices)
-        fields['data_type_choices'] = json.dumps(primary_collection.data_type_choices)
-        fields['disease_choices'] = json.dumps(primary_collection.disease_choices)
-        fields['grade_levels_choices'] = json.dumps(primary_collection.grade_levels_choices)
-
-        # compile html list of collected_type_choices
         if collection_provider.primary_collection:
+            primary_collection = collection_provider.primary_collection
+
+            # compile html list of collected_type_choices
             collected_type_choices_html = '<ul>'
-            for choice in collection_provider.primary_collection.collected_type_choices:
+            for choice in primary_collection.collected_type_choices:
                 collected_type_choices_html += f'<li>{choice}</li>'
             collected_type_choices_html += '</ul>'
             kwargs['collected_type_choices'] = collected_type_choices_html
 
             # compile html list of status_choices
             status_choices_html = '<ul>'
-            for choice in collection_provider.primary_collection.status_choices:
+            for choice in primary_collection.status_choices:
                 status_choices_html += f'<li>{choice}</li>'
             status_choices_html += '</ul>'
             kwargs['status_choices'] = status_choices_html
 
             # compile html list of volume_choices
             volume_choices_html = '<ul>'
-            for choice in collection_provider.primary_collection.volume_choices:
+            for choice in primary_collection.volume_choices:
                 volume_choices_html += f'<li>{choice}</li>'
             volume_choices_html += '</ul>'
             kwargs['volume_choices'] = volume_choices_html
 
             # compile html list of issue_choices
             issue_choices_html = '<ul>'
-            for choice in collection_provider.primary_collection.issue_choices:
+            for choice in primary_collection.issue_choices:
                 issue_choices_html += f'<li>{choice}</li>'
             issue_choices_html += '</ul>'
             kwargs['issue_choices'] = issue_choices_html
 
             # compile html list of program_area_choices
             program_area_choices_html = '<ul>'
-            for choice in collection_provider.primary_collection.program_area_choices:
+            for choice in primary_collection.program_area_choices:
                 program_area_choices_html += f'<li>{choice}</li>'
             program_area_choices_html += '</ul>'
             kwargs['program_area_choices'] = program_area_choices_html
 
-            # get a dict of model fields so that we can set the initial value for the update form
-            fields['collected_type_choices'] = json.dumps(collection_provider.primary_collection.collected_type_choices)
-            fields['status_choices'] = json.dumps(collection_provider.primary_collection.status_choices)
-            fields['volume_choices'] = json.dumps(collection_provider.primary_collection.volume_choices)
-            fields['issue_choices'] = json.dumps(collection_provider.primary_collection.issue_choices)
-            fields['program_area_choices'] = json.dumps(collection_provider.primary_collection.program_area_choices)
+            # compile html list of school_type_choices
+            kwargs['school_type_choices'] = '<ul>{choices}</ul>'.format(choices=''.join(
+                f'<li>{choice}</li>' for choice in primary_collection.school_type_choices
+            ))
+
+            # compile html list of study_design_choices
+            kwargs['study_design_choices'] = '<ul>{choices}</ul>'.format(choices=''.join(
+                f'<li>{choice}</li>' for choice in primary_collection.study_design_choices
+            ))
+
+            kwargs['disease_choices'] = '<ul>{choices}</ul>'.format(choices=''.join(
+                f'<li>{choice}</li>' for choice in primary_collection.disease_choices
+            ))
+
+            kwargs['data_type_choices'] = '<ul>{choices}</ul>'.format(choices=''.join(
+                f'<li>{choice}</li>' for choice in primary_collection.data_type_choices
+            ))
+
+            kwargs['grade_levels_choices'] = '<ul>{choices}</ul>'.format(choices=''.join(
+                f'<li>{choice}</li>' for choice in primary_collection.grade_levels_choices
+            ))
+
+            fields['collected_type_choices'] = json.dumps(primary_collection.collected_type_choices)
+            fields['status_choices'] = json.dumps(primary_collection.status_choices)
+            fields['volume_choices'] = json.dumps(primary_collection.volume_choices)
+            fields['issue_choices'] = json.dumps(primary_collection.issue_choices)
+            fields['program_area_choices'] = json.dumps(primary_collection.program_area_choices)
+            fields['school_type_choices'] = json.dumps(primary_collection.school_type_choices)
+            fields['study_design_choices'] = json.dumps(primary_collection.study_design_choices)
+            fields['data_type_choices'] = json.dumps(primary_collection.data_type_choices)
+            fields['disease_choices'] = json.dumps(primary_collection.disease_choices)
+            fields['grade_levels_choices'] = json.dumps(primary_collection.grade_levels_choices)
 
         kwargs['form'] = CollectionProviderForm(initial=fields)
 
@@ -272,7 +223,7 @@ def form_valid(self, form):
         if self.object.primary_collection:
             for choices_name in ['collected_type', 'status', 'issue', 'volume', 'program_area', 'school_type', 'study_design', 'data_type', 'disease', 'grade_levels']:
                 _process_collection_choices(self.object, choices_name, form)
-        self.object.primary_collection.save()
+            self.object.primary_collection.save()
         return super().form_valid(form)
 
     def form_invalid(self, form):

admin/preprint_providers/forms.py

@@ -8,7 +8,8 @@
     Subject
 )
 from admin.base.utils import (get_subject_rules, get_toplevel_subjects,
-    get_nodelicense_choices, get_defaultlicense_choices, validate_slug)
+    get_nodelicense_choices, get_defaultlicense_choices, validate_slug,
+    get_cedar_template_choices)
 
 
 class PreprintProviderForm(forms.ModelForm):
@@ -42,10 +43,12 @@ def __init__(self, *args, **kwargs):
         toplevel_choices = get_toplevel_subjects()
         nodelicense_choices = get_nodelicense_choices()
         defaultlicense_choices = get_defaultlicense_choices()
+        cedar_template_choices = get_cedar_template_choices()
         super().__init__(*args, **kwargs)
         self.fields['toplevel_subjects'].choices = toplevel_choices
         self.fields['licenses_acceptable'].choices = nodelicense_choices
         self.fields['default_license'].choices = defaultlicense_choices
+        self.fields['required_metadata_template'].choices = cedar_template_choices
 
     def clean_subjects_acceptable(self, *args, **kwargs):
         subject_ids = [_f for _f in self.data['subjects_chosen'].split(', ') if _f]

admin/registration_providers/forms.py

@@ -7,6 +7,7 @@
     get_defaultlicense_choices,
     validate_slug,
     get_brand_choices,
+    get_cedar_template_choices,
 )
 
 
@@ -41,10 +42,12 @@ def __init__(self, *args, **kwargs):
         nodelicense_choices = get_nodelicense_choices()
         defaultlicense_choices = get_defaultlicense_choices()
         brand_choices = get_brand_choices()
+        cedar_template_choices = get_cedar_template_choices()
         super().__init__(*args, **kwargs)
         self.fields['licenses_acceptable'].choices = nodelicense_choices
         self.fields['default_license'].choices = defaultlicense_choices
         self.fields['brand'].choices = brand_choices
+        self.fields['required_metadata_template'].choices = cedar_template_choices
         if kwargs.get('initial', None) and kwargs.get('initial').get('_id', None):
             provider = RegistrationProvider.load(kwargs.get('initial').get('_id'))
             self.fields['default_schema'].choices = provider.schemas.filter(visible=True, active=True).values_list('id', 'name')

admin/templates/cedar/list.html

@@ -14,6 +14,7 @@ <h2>List of Cedar Metadata Templates</h2>
             <th>Name</th>
             <th>Version</th>
             <th>Active</th>
+            <th>For Collections only</th>
         </tr>
     </thead>
     <tbody>
@@ -33,6 +34,9 @@ <h2>List of Cedar Metadata Templates</h2>
             <td>
                 {{ template.active }}
             </td>
+            <td>
+                {{ template.is_for_collections }}
+            </td>
         </tr>
     {% endfor %}
     </tbody>

api/cedar_metadata_records/serializers.py

@@ -11,7 +11,8 @@
 from api.cedar_metadata_records.utils import can_create_record
 
 from osf.exceptions import ValidationError
-from osf.models import CedarMetadataRecord, CedarMetadataTemplate, Guid
+from osf.models import CedarMetadataRecord, CedarMetadataTemplate, CollectionSubmission, Guid
+from osf.utils.workflows import CollectionSubmissionStates
 
 logger = logging.getLogger(__name__)
 
@@ -115,13 +116,32 @@ def create(self, validated_data):
             raise PermissionDenied
         if not template.is_active():
             raise NotFound
-        record = CedarMetadataRecord(guid=guid, template=template, metadata=metadata, is_published=is_published)
-        try:
-            record.save()
-        except ValidationError as e:
-            raise InvalidModelValueError(detail=e.messages[0])
-        except IntegrityError:
-            raise JSONAPIException(detail=f'Cedar metadata record already exists: guid=[{guid._id}], template=[{template._id}]')
+        has_active_collection_submission = CollectionSubmission.objects.filter(
+            guid=guid,
+            collection__provider__required_metadata_template=template,
+            machine_state__in=[CollectionSubmissionStates.PENDING.value, CollectionSubmissionStates.ACCEPTED.value],
+        ).exists()
+        if template.is_for_collections and not has_active_collection_submission:
+            record, _ = CedarMetadataRecord.objects.get_or_create(
+                guid=guid,
+                template=template,
+                defaults={'metadata': metadata, 'is_published': is_published},
+            )
+            if record.metadata != metadata or record.is_published != is_published:
+                record.metadata = metadata
+                record.is_published = is_published
+                try:
+                    record.save()
+                except ValidationError as e:
+                    raise InvalidModelValueError(detail=e.messages[0])
+        else:
+            record = CedarMetadataRecord(guid=guid, template=template, metadata=metadata, is_published=is_published)
+            try:
+                record.save()
+            except ValidationError as e:
+                raise InvalidModelValueError(detail=e.messages[0])
+            except IntegrityError:
+                raise JSONAPIException(detail=f'Cedar metadata record already exists: guid=[{guid._id}], template=[{template._id}]')
         return record
 
     def update(self, instance, validated_data):

api/cedar_metadata_templates/serializers.py

@@ -9,14 +9,15 @@ class CedarMetadataTemplateSerializer(JSONAPISerializer):
     class Meta:
         type_ = 'cedar-metadata-templates'
 
-    filterable_fields = frozenset(['schema_name', 'cedar_id', 'active'])
+    filterable_fields = frozenset(['schema_name', 'cedar_id', 'active', 'is_for_collections'])
 
     id = ser.CharField(source='_id', read_only=True)
     schema_name = ser.CharField(read_only=True)
     cedar_id = ser.CharField(read_only=True)
     template = ser.DictField(read_only=True)
     active = ser.BooleanField(read_only=True)
     template_version = ser.IntegerField(read_only=True)
+    is_for_collections = ser.BooleanField(read_only=True)
 
     links = LinksField({'self': 'get_absolute_url'})