From 60b94c04c5416a77a6296be59df7a733da5e2240 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Mon, 13 Nov 2023 20:28:12 -0500 Subject: [PATCH 01/89] course discovery --- lms/djangoapps/courseware/views/views.py | 14 +++++++------- lms/envs/devstack.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py index 79d2976d2c97..0ece88777360 100644 --- a/lms/djangoapps/courseware/views/views.py +++ b/lms/djangoapps/courseware/views/views.py @@ -276,14 +276,14 @@ def courses(request): """ courses_list = [] course_discovery_meanings = getattr(settings, 'COURSE_DISCOVERY_MEANINGS', {}) - if not settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'): - courses_list = get_courses(request.user) + # if not settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'): + courses_list = get_courses(request.user) - if configuration_helpers.get_value("ENABLE_COURSE_SORTING_BY_START_DATE", - settings.FEATURES["ENABLE_COURSE_SORTING_BY_START_DATE"]): - courses_list = sort_by_start_date(courses_list) - else: - courses_list = sort_by_announcement(courses_list) + if configuration_helpers.get_value("ENABLE_COURSE_SORTING_BY_START_DATE", + settings.FEATURES["ENABLE_COURSE_SORTING_BY_START_DATE"]): + courses_list = sort_by_start_date(courses_list) + else: + courses_list = sort_by_announcement(courses_list) # Add marketable programs to the context. programs_list = get_programs_with_type(request.site, include_hidden=False) diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index c2454ee71fc2..e342dac0af0b 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -36,7 +36,7 @@ # When the celery task is run eagerly, it is executed locally while sharing the # thread and its request cache with the active Django Request. In that case, # do not clear the cache. -CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION = False +CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION = True HTTPS = 'off' LMS_ROOT_URL = f'http://{LMS_BASE}' @@ -198,7 +198,7 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing 'language': LANGUAGE_MAP, } -FEATURES['ENABLE_COURSE_DISCOVERY'] = False +FEATURES['ENABLE_COURSE_DISCOVERY'] = True # Setting for overriding default filtering facets for Course discovery # COURSE_DISCOVERY_FILTERS = ["org", "language", "modes"] FEATURES['COURSES_ARE_BROWSEABLE'] = True From 42d65a00d35d2128a5e709d9b09cc476eccf165a Mon Sep 17 00:00:00 2001 From: qtw97 Date: Tue, 14 Nov 2023 15:34:13 -0500 Subject: [PATCH 02/89] Update courses.html --- lms/templates/courseware/courses.html | 185 +++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 1 deletion(-) diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index db303073676d..d127457527c8 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -35,7 +35,7 @@
% if course_discovery_enabled: - +
+
+
- +
+
+
+ - +
+
- -
- +
@@ -91,6 +94,13 @@ font-family: 'Inter', sans-serif; } + .magnifier-input{ + display: flex; + flex-direction: row; + align-items: stretch; + + } + .wrapper-search-context { display: flex; flex-direction: column; @@ -154,7 +164,7 @@ .search-container { box-sizing: border-box; display: flex; - flex-direction: column; + flex-direction: row; align-items: flex-start; padding: 12px 18px; gap: 10px; From c6bff93011d5d3adc3263a2524184a4d4c07ae88 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Tue, 14 Nov 2023 19:19:44 -0500 Subject: [PATCH 07/89] Update courses.html --- lms/templates/courseware/courses.html | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index f5c3ec500960..e2d4778d6a96 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -35,7 +35,7 @@
% if course_discovery_enabled: - +
@@ -60,15 +60,16 @@
+ Search Icon + - Search Icon
- + ${_('Loading')}
@@ -77,9 +78,21 @@
+ + +
+ Sort by: + +
+ + + +
From 7f15b952fee9eb38158a12e175aa348ef9585cf1 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Fri, 24 Nov 2023 20:23:41 -0500 Subject: [PATCH 74/89] Update courses.html --- lms/templates/courseware/courses.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index b1fb0af6165e..032821a39ded 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -52,7 +52,7 @@
- span class="filter-text">Filter + Filter
3
From 5039388cfd27f7a0a2c0e50a530223e44bfd1481 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Fri, 24 Nov 2023 20:24:15 -0500 Subject: [PATCH 75/89] Update courses.html --- lms/templates/courseware/courses.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 032821a39ded..8b9544d7d060 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -104,10 +104,6 @@ - - - From 9ec41f2d15b858ae72d68c910b33aa4db66b1236 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Sat, 25 Nov 2023 19:02:26 -0500 Subject: [PATCH 83/89] Revert "Update bok_choy_docker.yml" This reverts commit 961db1bf04513064f018db8931a8422ac5a2c74b. --- lms/envs/bok_choy_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/envs/bok_choy_docker.yml b/lms/envs/bok_choy_docker.yml index 31f6fcfcda79..5431910e05c0 100644 --- a/lms/envs/bok_choy_docker.yml +++ b/lms/envs/bok_choy_docker.yml @@ -78,9 +78,9 @@ EVENT_TRACKING_BACKENDS: host: [edx.devstack.mongo] port: 27017 FEATURES: {ALLOW_AUTOMATED_SIGNUPS: true, AUTOMATIC_AUTH_FOR_TESTING: true, - AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING: true, CERTIFICATES_HTML_VIEW: true,ENABLE_FILTER: true, ENABLE_SORTBY: false, + AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING: true, CERTIFICATES_HTML_VIEW: true, CERTIFICATES_INSTRUCTOR_GENERATION: true, CUSTOM_COURSES_EDX: true, - ENABLE_COURSE_DISCOVERY: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_GRADE_DOWNLOADS: true, + ENABLE_COURSE_DISCOVERY: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_GRADE_DOWNLOADS: true, ENABLE_SPECIAL_EXAMS: true, ENABLE_THIRD_PARTY_AUTH: true, ENABLE_VERIFIED_CERTIFICATES: true, EXPOSE_CACHE_PROGRAMS_ENDPOINT: true, MODE_CREATION_FOR_TESTING: true, PREVIEW_LMS_BASE: 'preview.localhost:8003', RESTRICT_AUTOMATIC_AUTH: false, SHOW_HEADER_LANGUAGE_SELECTOR: true} From 290d8c7e59d2f68d9a2354ee69cd06f9498b15fd Mon Sep 17 00:00:00 2001 From: qtw97 Date: Sat, 25 Nov 2023 19:02:33 -0500 Subject: [PATCH 84/89] Revert "Update bok_choy.yml" This reverts commit b5f61d370a5cfa2af91ea1abd62f7b6afcff0813. --- lms/envs/bok_choy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/lms/envs/bok_choy.yml b/lms/envs/bok_choy.yml index 45ab7779a1ac..53675e6e5626 100644 --- a/lms/envs/bok_choy.yml +++ b/lms/envs/bok_choy.yml @@ -115,8 +115,6 @@ FEATURES: CERTIFICATES_INSTRUCTOR_GENERATION: true CUSTOM_COURSES_EDX: true, ENABLE_COURSE_DISCOVERY: true - ENABLE_FILTER: true - ENABLE_SORTBY: false ENABLE_DISCUSSION_SERVICE: true ENABLE_GRADE_DOWNLOADS: true ENABLE_SPECIAL_EXAMS: true From af930ec50dff300139b65f7b41c1db8d0f2eaf43 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Sat, 25 Nov 2023 19:09:40 -0500 Subject: [PATCH 85/89] Revert "Create 0012_auto_20231118_2333.py" This reverts commit 9f8eef1dbb9019a0287e52747bfe5c4797c517e5. --- .../migrations/0012_auto_20231118_2333.py | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 common/djangoapps/third_party_auth/migrations/0012_auto_20231118_2333.py diff --git a/common/djangoapps/third_party_auth/migrations/0012_auto_20231118_2333.py b/common/djangoapps/third_party_auth/migrations/0012_auto_20231118_2333.py deleted file mode 100644 index 6a17b65c6996..000000000000 --- a/common/djangoapps/third_party_auth/migrations/0012_auto_20231118_2333.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 3.2.20 on 2023-11-18 23:33 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('sites', '0002_alter_domain_unique'), - ('third_party_auth', '0011_applemigrationuseridinfo'), - ] - - operations = [ - migrations.AlterField( - model_name='ltiproviderconfig', - name='site', - field=models.ForeignKey(default=2, help_text='The Site that this provider configuration belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='ltiproviderconfigs', to='sites.site'), - ), - migrations.AlterField( - model_name='oauth2providerconfig', - name='site', - field=models.ForeignKey(default=2, help_text='The Site that this provider configuration belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='oauth2providerconfigs', to='sites.site'), - ), - migrations.AlterField( - model_name='samlconfiguration', - name='site', - field=models.ForeignKey(default=2, help_text='The Site that this SAML configuration belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='samlconfigurations', to='sites.site'), - ), - migrations.AlterField( - model_name='samlproviderconfig', - name='site', - field=models.ForeignKey(default=2, help_text='The Site that this provider configuration belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='samlproviderconfigs', to='sites.site'), - ), - ] From 3cc2deb0bc293a8b00fa06eb71eaf6e2080c24e0 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Sat, 25 Nov 2023 19:14:04 -0500 Subject: [PATCH 86/89] Update discovery_factory.js --- lms/static/js/discovery/discovery_factory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/js/discovery/discovery_factory.js b/lms/static/js/discovery/discovery_factory.js index 754ec8d582b6..662db9c8e1b9 100644 --- a/lms/static/js/discovery/discovery_factory.js +++ b/lms/static/js/discovery/discovery_factory.js @@ -55,7 +55,7 @@ dispatcher.listenTo(search, 'search', function(query, total) { if (total > 0) { - form.showFoundMessage(total, query); + form.showFoundMessage(total); if (query) { filters.add( {type: 'search_query', query: query, name: quote(query)}, From b1e5d966d423fc67c7668c3efacc0ed0c4fe1cc4 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Sat, 25 Nov 2023 19:14:07 -0500 Subject: [PATCH 87/89] Update search_form.js --- lms/static/js/discovery/views/search_form.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lms/static/js/discovery/views/search_form.js b/lms/static/js/discovery/views/search_form.js index 69890c1404a6..cbfc7414870b 100644 --- a/lms/static/js/discovery/views/search_form.js +++ b/lms/static/js/discovery/views/search_form.js @@ -18,8 +18,6 @@ submitForm: function(event) { event.preventDefault(); - var query = this.$searchField.val(); - $('#search-query-display').text('Search Query: ' + query); this.doSearch(); }, From 3df44104ae14ab5368d0bcc5c4b956e6d47f7659 Mon Sep 17 00:00:00 2001 From: qtw97 Date: Mon, 27 Nov 2023 16:55:27 -0500 Subject: [PATCH 88/89] Update courses.html --- lms/templates/courseware/courses.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 6a1606bcc8d9..efb892584cb6 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -303,11 +303,24 @@ align-items: center; /* Vertically align the items in center */ } - .courses{ + .courses-list { display: flex; flex-wrap: wrap; - gap: 27px; - width: 312px; + justify-content:flex-start; + } + + .courses-listing-item { + flex: 0 1 25%; /* flex-grow: 0, flex-shrink: 1, flex-basis: 25% */ + box-sizing: border-box; /* Includes padding and border in the element's total width */ + /* Add margin or padding as needed, keeping in mind the total width */ + } + + + .find-courses .courses-container .courses:not(.no-course-discovery), .university-profile .courses-container .courses:not(.no-course-discovery) { + float: left; + display: block; + margin-right: 2.35765%; + width: 100%; } From c23c4f0036ba7baf98fd1f8587e42dbad14fadef Mon Sep 17 00:00:00 2001 From: qtw97 Date: Mon, 27 Nov 2023 17:35:49 -0500 Subject: [PATCH 89/89] Update search_form.js --- lms/static/js/discovery/views/search_form.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/static/js/discovery/views/search_form.js b/lms/static/js/discovery/views/search_form.js index cbfc7414870b..e242904b49fd 100644 --- a/lms/static/js/discovery/views/search_form.js +++ b/lms/static/js/discovery/views/search_form.js @@ -42,7 +42,6 @@ this.$loadingIndicator.addClass('hidden'); }, - showFoundMessage: function(count) { var msg = ngettext( 'Viewing %s course',