Fix/UI authenticated user explore course

.github/pull_request_template.md

@@ -1,20 +1,3 @@
-<!--
-
-🌰🌰
-🌰🌰🌰🌰         🌰 Note: the Nutmeg master branch has been created.  Please consider whether your change
-    🌰🌰🌰🌰     should also be applied to Nutmeg. If so, make another pull request against the
-🌰🌰🌰🌰         open-release/nutmeg.master branch, or ping @nedbat for help or questions.
-🌰🌰
-
-Please give your pull request a short but descriptive title.
-Use conventional commits to separate and summarize commits logically:
-https://open-edx-proposals.readthedocs.io/en/latest/oep-0051-bp-conventional-commits.html
-
-Use this template as a guide. Omit sections that don't apply. You may link to information rather than copy it.
-More details about the template are at https://github.com/openedx/open-edx-proposals/pull/180
-(link will be updated when that document merges)
--->
-
 ## Description
 
 Describe what this pull request changes, and why. Include implications for people using this change.

.github/workflows/deploy-to-ec2-staging.yml

@@ -0,0 +1,54 @@
+name: Deploy-OpenEdx-to-Staging
+on:
+  workflow_dispatch
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send noti begining...
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          fields: workflow,job,message,commit,repo,ref,author,took
+          custom_payload: |
+            {
+              username: 'github-action',
+              icon_emoji: ':octocat:',
+              attachments: [{
+                color: 'good',
+                text: `${process.env.AS_AUTHOR.split(/[<@]/)[1]} start deploying Openedx "${process.env.AS_MESSAGE}" in ${process.env.AS_REF.replace('refs/heads/', '')}`,
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}    
+      - name: Deploy docker image to EC2
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.STAG_IP }}
+          username: openedx
+          key: ${{ secrets.STAG_KEY }}
+          port: 22
+          command_timeout: 100m
+          script: |
+            export PATH='/home/openedx/.local/bin:/home/openedx/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin'
+            docker ps
+            docker images
+            tutor images build openedx --no-cache
+            echo -e "y\n\n\n\n\n\ny" | tutor local launch
+      - name: Send noti
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          fields: workflow,job,message,commit,repo,ref,author,took
+          custom_payload: |
+            {
+              username: 'github-action',
+              icon_emoji: ':octocat:',
+              attachments: [{
+                color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+                text: `${process.env.AS_AUTHOR.split(/[<@]/)[1]} Deploy Openedx "${process.env.AS_MESSAGE}" in ${process.env.AS_REF.replace('refs/heads/', '')} ${'${{ job.status }}' === 'success' ? 'succeeded' : '${{ job.status }}' === 'failure' ? 'failed' : '${{ job.status }}'} in ${process.env.AS_TOOK}`,
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: always() # Pick up events even if the job fails or is canceled. 

.github/workflows/deploy-to-ec2.yml

@@ -0,0 +1,53 @@
+name: Deploy to AWS
+on:
+  push:
+    branches:
+      - "dev"
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send noti begining...
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          fields: workflow,job,message,commit,repo,ref,author,took
+          custom_payload: |
+            {
+              username: 'github-action',
+              icon_emoji: ':octocat:',
+              attachments: [{
+                color: 'good',
+                text: `${process.env.AS_AUTHOR.split(/[<@]/)[1]} start deploying Openedx "${process.env.AS_MESSAGE}" in ${process.env.AS_REF.replace('refs/heads/', '')}`,
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}    
+      - name: Deploy docker image to EC2
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.DEV_IP }}
+          username: ${{ secrets.DEV_USERNAME }}
+          key: ${{ secrets.DEV_KEY }}
+          port: 22
+          command_timeout: 100m
+          script: |
+            tutor images build openedx --no-cache
+            echo -e "y\n\n\n\n\n\ny" | tutor local launch
+      - name: Send noti
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          fields: workflow,job,message,commit,repo,ref,author,took
+          custom_payload: |
+            {
+              username: 'github-action',
+              icon_emoji: ':octocat:',
+              attachments: [{
+                color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+                text: `${process.env.AS_AUTHOR.split(/[<@]/)[1]} Deploy Openedx "${process.env.AS_MESSAGE}" in ${process.env.AS_REF.replace('refs/heads/', '')} ${'${{ job.status }}' === 'success' ? 'succeeded' : '${{ job.status }}' === 'failure' ? 'failed' : '${{ job.status }}'} in ${process.env.AS_TOOK}`,
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: always() # Pick up events even if the job fails or is canceled.            

.github/workflows/unit-tests-gh-hosted.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   run-test:
-    if: github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private'
+    if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true))
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -31,7 +31,7 @@ jobs:
             "cms-2",
             "common-1",
             "common-2",
-            "common-3",
+            "xmodule-1"
         ]
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
@@ -75,7 +75,7 @@ jobs:
         uses: ./.github/actions/unit-tests
 
   collect-and-verify:
-    if: github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private'
+    if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true))
     runs-on: ubuntu-20.04
     strategy:
       matrix:

.github/workflows/unit-tests.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   run-tests:
     name: python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
-    if: github.repository == 'openedx/edx-platform' || github.repository == 'edx/edx-platform-private'
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     strategy:
       matrix:
@@ -80,7 +80,7 @@ jobs:
   # https://github.com/orgs/community/discussions/33579
   success:
     name: Tests successful
-    if: always()
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     needs:
       - run-tests
     runs-on: ubuntu-latest

.github/workflows/verify-gha-unit-tests-count.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   collect-and-verify:
-    if: github.repository == 'openedx/edx-platform' || github.repository == 'edx/edx-platform-private'
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     steps:
       - name: sync directory owner

.tx/config

@@ -67,3 +67,14 @@ source_file = conf/locale/en/LC_MESSAGES/wiki.po
 source_lang = en
 type        = PO
 
+[o:open-edx:p:open-edx-releases:r:release-olive]
+file_filter = conf/locale/<lang>/LC_MESSAGES/django.po
+source_file = conf/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO
+
+[o:open-edx:p:open-edx-releases:r:release-olive-js]
+file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
+source_file = conf/locale/en/LC_MESSAGES/djangojs.po
+source_lang = en
+type = PO

cms/djangoapps/contentstore/courseware_index.py

@@ -49,7 +49,7 @@ def indexing_is_enabled():
     """
     Checks to see if the indexing feature is enabled
     """
-    return settings.FEATURES.get('ENABLE_COURSEWARE_INDEX', False)
+    return settings.FEATURES.get('ENABLE_COURSEWARE_INDEX', True)
 
 
 class SearchIndexingError(Exception):

cms/djangoapps/contentstore/migrations/0009_unit_time_course.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.10 on 2023-18-10 11:09
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contentstore', '0008_cleanstalecertificateavailabilitydatesconfig'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CourseUnitTime',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('block_id' , models.CharField(max_length=255)),
+                ('course_id', models.CharField(max_length=255)),
+                ('display_name', models.CharField(max_length=255)),
+                ('total' , models.IntegerField(default=0))
+            ],
+        )
+    ]
+
+
+
+
+
+
+
+
+

cms/djangoapps/contentstore/models.py

@@ -4,7 +4,8 @@
 
 
 from config_models.models import ConfigurationModel
-from django.db.models.fields import IntegerField, TextField
+from django.db.models.fields import IntegerField, TextField,CharField
+from django.db import models
 
 
 class VideoUploadConfig(ConfigurationModel):
@@ -63,3 +64,44 @@ class Meta:
             "`clean_stale_certificate_available_dates` management command.' See the management command for options."
         )
     )
+
+# model course unit time
+
+# class CourseUnitTime (models.Model):
+#     block_id =  CharField(max_length=255)
+#     course_id = CharField(max_length=255)
+#     display_name = CharField(max_length=255)
+#     total = IntegerField(default=0)
+
+#     def __str__(self):
+#         return self.block_id
+
+#     @classmethod
+#     def create_unit_time(self, course_id, block_id, display_name, total ):
+#         return CourseUnitTime.objects.create(course_id=course_id, block_id=block_id, display_name=display_name, total=total)
+
+#     @classmethod
+#     def get_unit_time (self,  block_id) :
+#         try:
+#             return CourseUnitTime.objects.filter( block_id=block_id)[0]
+#         except :
+#             return None
+
+
+#     @classmethod
+#     def set_unit_time (self, block_id, total , course_id, display_name):
+#         try:
+
+#             total_obj = CourseUnitTime.objects.get(block_id=block_id , course_id = course_id)
+#             total_obj.total = total
+#             total_obj.save()
+#         except CourseUnitTime.DoesNotExist:
+#             return CourseUnitTime.objects.create(block_id=block_id, total=total, course_id=course_id, display_name=display_name)
+
+#     @classmethod
+#     def remove_unit_time_seuqe (self, block_id):
+#         try:
+#             return CourseUnitTime.objects.filter(block_id=block_id).delete()
+#         except:
+#             return None
+

cms/djangoapps/contentstore/signals/handlers.py

@@ -145,7 +145,10 @@ def listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=
     if CoursewareSearchIndexer.indexing_is_enabled() and CourseAboutSearchIndexer.indexing_is_enabled():
         update_search_index.delay(course_key_str, datetime.now(UTC).isoformat())
 
-    update_discussions_settings_from_course_task.delay(course_key_str)
+    update_discussions_settings_from_course_task.apply_async(
+        args=[course_key_str],
+        countdown=settings.DISCUSSION_SETTINGS['COURSE_PUBLISH_TASK_DELAY'],
+    )
 
     # Send to a signal for catalog info changes as well, but only once we know the transaction is committed.
     transaction.on_commit(lambda: emit_catalog_info_changed_signal(course_key))