Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
710 changes: 355 additions & 355 deletions .yarn/releases/yarn-4.9.2.cjs → .yarn/releases/yarn-4.10.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.9.2.cjs
yarnPath: .yarn/releases/yarn-4.10.3.cjs

# https://github.com/vitejs/vite-plugin-react-swc/issues/74#issuecomment-1520484130
# https://github.com/swc-project/swc/issues/5616#issuecomment-1265639797
Expand Down
15 changes: 15 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
Release Notes
=============

Version 0.45.9
--------------

- adding ecosystems subtopic (#2602)
- chore(deps): update dependency ruff to v0.14.1 (#2607)
- chore(deps): update yarn to v4.10.3 (#2609)
- chore(deps): update node.js to v22.20.0 (#2608)
- fix(deps): update dependency @faker-js/faker to v10 (#2470)
- [pre-commit.ci] pre-commit autoupdate (#2315)
- Organization landing route (#2588)
- Video section text change (#2601)
- fix(deps): update dependency django to v4.2.25 [security] (#2561)
- MIT CLimate Portal ETL (#2589)
- fix(deps): update dependency django-oauth-toolkit to v3 (#1816)

Version 0.45.8 (Released October 16, 2025)
--------------

Expand Down
2 changes: 1 addition & 1 deletion articles/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def to_internal_value(self, data):
return clean_html(data)


class ArticleSerializer(serializers.ModelSerializer):
class RichTextArticleSerializer(serializers.ModelSerializer):
"""
Serializer for LearningResourceInstructor model
"""
Expand Down
4 changes: 2 additions & 2 deletions articles/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from rest_framework.permissions import IsAdminUser

from articles.models import Article
from articles.serializers import ArticleSerializer
from articles.serializers import RichTextArticleSerializer
from main.constants import VALID_HTTP_METHODS
from main.utils import cache_page_for_all_users, clear_search_cache

Expand Down Expand Up @@ -34,7 +34,7 @@ class ArticleViewSet(viewsets.ModelViewSet):
Viewset for Article viewing and editing.
"""

serializer_class = ArticleSerializer
serializer_class = RichTextArticleSerializer
queryset = Article.objects.all()
pagination_class = DefaultPagination

Expand Down
17 changes: 17 additions & 0 deletions data_fixtures/fixtures/offered_by.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,23 @@
"updated_on": "2023-08-08T14:27:25.128989+00:00"
}
},
{
"model": "learning_resources.LearningResourceOfferor",
"fields": {
"name": "MIT Climate Portal",
"code": "climate",
"professional": false,
"offerings": ["Learning Materials"],
"audience": ["Everyone"],
"formats": ["Online", "Downloadable"],
"fee": ["Free"],
"certifications": ["No Certificates"],
"content_types": ["Academic"],
"more_information": "https://climate.mit.edu",
"created_on": "2023-08-08T14:27:25.128989+00:00",
"updated_on": "2023-08-08T14:27:25.128989+00:00"
}
},
{
"model": "learning_resources.LearningResourceOfferor",
"fields": {
Expand Down
44 changes: 44 additions & 0 deletions data_fixtures/migrations/0018_add_mit_climate_platform.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Generated manually


from django.db import migrations


def remove_climate_platform(apps, schema_editor):
"""
Remove canvas platform
"""

LearningResourcePlatform = apps.get_model(
"learning_resources", "LearningResourcePlatform"
)
LearningResourcePlatform.objects.filter(code="climate").delete()


def add_climate_platform(apps, schema_editor):
LearningResourcePlatform = apps.get_model(
"learning_resources", "LearningResourcePlatform"
)

LearningResourcePlatform.objects.update_or_create(
code="climate",
defaults={
"name": "MIT Climate",
"is_edx": False,
"has_content_files": False,
"url": "https://climate.mit.edu/",
},
)


class Migration(migrations.Migration):
dependencies = [
(
"data_fixtures",
"0017_update_edx_content_urls",
),
]

operations = [
migrations.RunPython(add_climate_platform, remove_climate_platform),
]
45 changes: 45 additions & 0 deletions data_fixtures/migrations/0019_add_mit_climate_offerer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Generated by Django 4.2.24 on 2025-10-07 17:07

from django.db import migrations


def remove_climate_offeror(apps, schema_editor):
"""
Remove canvas platform
"""

LearningResourceOfferor = apps.get_model(
"learning_resources", "LearningResourceOfferor"
)
LearningResourceOfferor.objects.filter(code="climate").delete()


def add_climate_offeror(apps, schema_editor):
LearningResourceOfferor = apps.get_model(
"learning_resources", "LearningResourceOfferor"
)

LearningResourceOfferor.objects.update_or_create(
code="climate",
defaults={
"name": "MIT Climate Portal",
"professional": False,
"offerings": ["Learning Materials"],
"audience": ["Everyone"],
"formats": ["Online", "Downloadable"],
"fee": ["Free"],
"certifications": ["No Certificates"],
"content_types": ["Academic"],
"more_information": "https://climate.mit.edu",
},
)


class Migration(migrations.Migration):
dependencies = [
("data_fixtures", "0018_add_mit_climate_platform"),
]

operations = [
migrations.RunPython(add_climate_offeror, remove_climate_offeror),
]
33 changes: 33 additions & 0 deletions data_fixtures/migrations/0020_add_climate_ecosystems_topic.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 4.2.24 on 2025-10-07 17:07

from django.db import migrations

from data_fixtures.utils import upsert_topic_data_file


def remove_climate_offeror(apps, schema_editor):
"""
Remove canvas platform
"""

LearningResourceTopic = apps.get_model(
"learning_resources", "LearningResourceTopic"
)
LearningResourceTopic.objects.filter(
name="Ecosystems", parent__name="Energy, Climate & Sustainability"
).delete()


def add_climate_offeror(apps, schema_editor):
# read in updated yaml file and upsert ecosystems subtopic
upsert_topic_data_file()


class Migration(migrations.Migration):
dependencies = [
("data_fixtures", "0019_add_mit_climate_offerer"),
]

operations = [
migrations.RunPython(add_climate_offeror, remove_climate_offeror),
]
2 changes: 1 addition & 1 deletion docker-compose.apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
profiles:
- frontend
working_dir: /src
image: node:22.17
image: node:22.20
entrypoint: ["/bin/sh", "-c"]
command:
- |
Expand Down
1 change: 1 addition & 0 deletions frontends/api/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const config: Config.InitialOptions = {
...baseConfig.setupFilesAfterEnv,
"./test-utils/setupJest.ts",
],
transformIgnorePatterns: ["node_modules/(?!@faker-js).+"],
}

export default config
2 changes: 1 addition & 1 deletion frontends/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"react": "^19"
},
"devDependencies": {
"@faker-js/faker": "^9.9.0",
"@faker-js/faker": "^10.0.0",
"@testing-library/react": "^16.3.0",
"enforce-unique": "^1.3.0",
"jest": "^29.7.0",
Expand Down
Loading
Loading