Search recs unstable merger

.github/workflows/community-contribution-labeling.yml

@@ -0,0 +1,12 @@
+name: Community Contribution Label
+
+on:
+  issues:
+    types: [assigned, unassigned]
+
+jobs:
+  call-label-action:
+    uses: learningequality/.github/.github/workflows/community-contribution-label.yml@main
+    secrets:
+        LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+        LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}

.github/workflows/notify_team_new_comment.yml

@@ -6,30 +6,6 @@ on:
 
 jobs:
   contributor_issue_comment:
-    name: Contributor issue comment
-
-    if: >-
-      ${{
-        !github.event.issue.pull_request &&
-        github.event.comment.author_association != 'MEMBER' &&
-        github.event.comment.author_association != 'OWNER'
-      }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Escape title double quotes
-        id: escape_title
-        env:
-          ISSUE_TITLE: ${{ github.event.issue.title }}
-        run: echo "ISSUE_TITLE=${ISSUE_TITLE//\"/\\\"}" >> "$GITHUB_OUTPUT"
-
-      - name: Send message to Slack channel
-        env:
-            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-            SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-        uses: slackapi/slack-github-action@v1.27.0
-        with:
-          payload: |
-            {
-              "text": "*[Studio] New comment on issue: <${{ github.event.issue.html_url }}#issuecomment-${{ github.event.comment.id }}|${{ steps.escape_title.outputs.ISSUE_TITLE }} by ${{ github.event.comment.user.login }}>*"
-            }
+    uses: learningequality/.github/.github/workflows/notify_team_new_comment.yml@main
+    secrets:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/pythontest.yml

@@ -32,10 +32,7 @@ jobs:
       # Label used to access the service container
       postgres:
         # Docker Hub image
-        image: ghcr.io/learningequality/postgres:${{ github.base_ref || github.ref_name }}
-        credentials:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+        image: postgres:16
         # Provide the password for postgres
         env:
           POSTGRES_USER: learningequality
@@ -68,11 +65,10 @@ jobs:
     - name: Set up minio
       run: |
         docker run -d -p 9000:9000 --name minio \
-                    -e "MINIO_ACCESS_KEY=development" \
-                    -e "MINIO_SECRET_KEY=development" \
-                    -v /tmp/minio_data:/data \
-                    -v /tmp/minio_config:/root/.minio \
-                    minio/minio server /data
+                    -e "MINIO_ROOT_USER=development" \
+                    -e "MINIO_ROOT_PASSWORD=development" \
+                    -e "MINIO_DEFAULT_BUCKETS=content:public" \
+                    bitnami/minio:2024.5.28
     - name: Set up Python 3.10
       uses: actions/setup-python@v5
       with:

.github/workflows/unassign-inactive.yaml

@@ -0,0 +1,15 @@
+name: "Unassign Inactive Contributors"
+run-name: Unassign Inactive Contributors
+
+on:
+  schedule:
+    - cron: "1 0 * * 1" # Every Monday at 00:01 UTC
+  workflow_dispatch:
+
+jobs:
+  unassign-inactive:
+    uses: learningequality/.github/.github/workflows/unassign-inactive-issues.yaml@main
+    secrets:
+      LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+      LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}
+      SLACK_COMMUNITY_NOTIFICATIONS_WEBHOOK_URL: ${{ secrets.SLACK_COMMUNITY_NOTIFICATIONS_WEBHOOK_URL }}

.github/workflows/update-pr-spreadsheet.yml

@@ -1,11 +1,7 @@
 name: Update community pull requests spreadsheet
 on:
   pull_request_target:
-    types: [opened, reopened, edited, closed, synchronize, assigned, unassigned, review_requested, review_request_removed]
-  pull_request_review:
-    types: [submitted, edited, dismissed]
-  issue_comment:
-    types: [created, edited, deleted]
+    types: [assigned,unassigned,opened,closed,reopened]
 
 jobs:
   call-update-spreadsheet:

.gitignore

@@ -27,8 +27,8 @@ var/
 .vscode/
 
 # IntelliJ IDE, except project config
-.idea/*
-!.idea/studio.iml
+.idea/
+/*.iml
 # ignore future updates to run configuration
 .run/devserver.run.xml
 

.pre-commit-config.yaml

@@ -1,17 +1,19 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.1
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
-    -   id: flake8
-        entry: flake8 --ignore E402,W503,W504,E123,E122,E126
     -   id: check-added-large-files
         exclude: '^.+?\.ttf$'
     -   id: debug-statements
     -   id: end-of-file-fixer
         exclude: '^.+?\.json.+?\.yml$'
+-   repo: https://github.com/PyCQA/flake8
+    rev: 7.1.2
+    hooks:
+    -   id: flake8
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.4.0
+    rev: v3.14.0
     hooks:
     -   id: reorder-python-imports
         language_version: python3
@@ -22,4 +24,4 @@ repos:
           description: This hook handles all frontend linting for Kolibri Studio
           entry: yarn run lint-frontend:format
           language: system
-          files: \.(js|vue|scss|less|css)$
+          files: \.(js|vue|scss|css)$

.stylelintrc.js

@@ -8,8 +8,14 @@ module.exports = {
      * Inline comments explain why rule is ignored
      */
     'selector-max-id': null, // This would require a major refactor
-    'at-rule-no-unknown': null, // we're using LESS
-    'scss/at-rule-no-unknown': null, // we're using LESS
-    'csstree/validator': null // this triggers issues with unknown at rules too.
+    'csstree/validator': null, // this triggers issues with unknown at rules too.
+    'selector-pseudo-element-no-unknown': [ 
+     true,
+     {
+         // In Vue 2.6 and later, `::v-deep` is used for deep selectors.  
+         // This rule allows `::v-deep` to prevent linting errors.
+         ignorePseudoElements: ['v-deep'],
+     }
+    ]
   },
 };

CONTRIBUTING.md

@@ -15,7 +15,8 @@
 **👥 How to connect**
 
 - We encourage you to visit [GitHub Discussions](https://github.com/learningequality/studio/discussions) to connect with the Learning Equality team as well as with other contributors.
-- If you'd like to contribute on a regular basis, we are happy to invite you to our open-source community Slack channel. Get in touch with us at info@learningequality.org to receive an invitation.
+- To get access to the GSOC 2025 Slack channel, send us an e-mail at gsoc@learningequality.org.
+- If you'd like to contribute on a regular basis, we are happy to invite you to our open-source community Slack channel. Get in touch with us at contributors@learningequality.org to receive an invitation.
 
 ---
 

Makefile

@@ -38,7 +38,7 @@ migrate:
 # 4) Remove the management command from this `deploy-migrate` recipe
 # 5) Repeat!
 deploy-migrate:
-	echo "Nothing to do here!"
+	python contentcuration/manage.py rectify_incorrect_contentnode_source_fields
 
 contentnodegc:
 	python contentcuration/manage.py garbage_collect

README.md

@@ -30,7 +30,8 @@ If you are looking for help setting up custom content channels, uploading and or
 **👥 How to connect**
 
 - We encourage you to visit [GitHub Discussions](https://github.com/learningequality/studio/discussions) to connect with the Learning Equality team as well as with other contributors.
-- If you'd like to contribute on a regular basis, we are happy to invite you to our open-source community Slack channel. Get in touch with us at info@learningequality.org to receive an invitation.
+- To get access to the GSOC 2025 Slack channel, send us an e-mail at gsoc@learningequality.org.
+- If you'd like to contribute on a regular basis, we are happy to invite you to our open-source community Slack channel. Get in touch with us at contributors@learningequality.org to receive an invitation.
 
 ---
 
@@ -41,3 +42,9 @@ As soon as you open a pull request, it may take us a week or two to review it as
 ---
 
 *Thank you for your interest in contributing! Learning Equality was founded by volunteers dedicated to helping make educational materials more accessible to those in need, and every contribution makes a difference.*
+
+
+## Licensing
+Kolibri Studio is licensed under the MIT license. See [LICENSE](./LICENSE) for more details.
+
+Other tools and libraries used in Kolibri Studio are licensed under their respective licenses, and some are only used during development and are not intended for distribution or use in production environments.

contentcuration/automation/migrations/0001_initial.py

@@ -12,7 +12,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('kolibri_public', '0005_alter_localfile_extension'),
-        ('contentcuration', '0151_embeddings_embeddingscontentnode'),
     ]
 
     operations = [

contentcuration/contentcuration/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa

contentcuration/contentcuration/apps.py

@@ -1,7 +1,4 @@
 from django.apps import AppConfig
-from django.conf import settings
-
-from contentcuration.utils.storage_common import is_gcs_backend
 
 
 class ContentConfig(AppConfig):
@@ -10,7 +7,3 @@ class ContentConfig(AppConfig):
     def ready(self):
         # Import signals
         import contentcuration.signals  # noqa
-
-        if settings.AWS_AUTO_CREATE_BUCKET and not is_gcs_backend():
-            from contentcuration.utils.minio_utils import ensure_storage_bucket_public
-            ensure_storage_bucket_public()

contentcuration/contentcuration/celery.py

@@ -3,9 +3,12 @@
 from django.conf import settings
 
 from contentcuration.utils.celery.app import CeleryApp
+from contentcuration.utils.celery.tasks import CeleryTask
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "contentcuration.settings")
 
-app = CeleryApp("contentcuration")
+# Celery update now requires that we must pass the task_cls to the CeleryApp, instead
+# of setting it as an attribute on our custom Celery class
+app = CeleryApp("contentcuration", task_cls=CeleryTask)
 app.config_from_object(settings.CELERY)

contentcuration/contentcuration/dev_urls.py

@@ -75,9 +75,3 @@ def file_server(request, storage_path=None):
     re_path(r"^api-auth/", include("rest_framework.urls", namespace="rest_framework")),
     re_path(r"^content/(?P<storage_path>.+)$", file_server),
 ]
-
-if getattr(settings, "DEBUG_PANEL_ACTIVE", False):
-
-    import debug_toolbar
-
-    urlpatterns = [re_path(r"^__debug__/", include(debug_toolbar.urls))] + urlpatterns

contentcuration/contentcuration/frontend/accounts/pages/Create.vue

@@ -562,13 +562,13 @@
 </script>
 
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 
   .v-text-field {
     margin-top: 8px !important;
   }
 
-  .policy-checkbox /deep/ .v-input__slot {
+  .policy-checkbox ::v-deep .v-input__slot {
     margin-bottom: 4px !important;
 
     label {
@@ -593,11 +593,11 @@
   .span-spacing {
     display: flex;
     margin-left: 40px;
-  }
 
-  .span-spacing span {
-    margin-left: 2px;
-    font-size: 16px;
+    span {
+      margin-left: 2px;
+      font-size: 16px;
+    }
   }
 
   .span-spacing-email {

contentcuration/contentcuration/frontend/accounts/pages/Main.vue

@@ -206,20 +206,24 @@
 </script>
 
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 
   .main {
     overflow: auto;
     /* stylelint-disable-next-line custom-property-pattern */
     background-color: var(--v-backgroundColor-base);
   }
 
-  .links span:not(:last-child)::after {
-    margin: 0 8px 0 12px;
-    font-size: 14pt;
-    color: var(--v-grey-base);
-    vertical-align: middle;
-    content: '•';
+  .links {
+    span {
+      &:not(:last-child)::after {
+        margin: 0 8px 0 12px;
+        font-size: 14pt;
+        color: var(--v-grey-base);
+        vertical-align: middle;
+        content: '•';
+      }
+    }
   }
 
   .w-100 {

contentcuration/contentcuration/frontend/accounts/pages/activateAccount/RequestNewActivationLink.vue

@@ -68,7 +68,7 @@
 
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 
   .w-100 {
     width: 100%;

contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue

@@ -69,7 +69,7 @@
 
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 
   .w-100 {
     width: 100%;