From 3d27d5f7559640d9a1de1bf52958466e72746bd5 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 25 Jul 2023 10:50:56 +0530 Subject: [PATCH 1/5] fix: upcoming evals query --- lms/www/classes/progress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/www/classes/progress.py b/lms/www/classes/progress.py index eef9cbee..d273162c 100644 --- a/lms/www/classes/progress.py +++ b/lms/www/classes/progress.py @@ -36,7 +36,7 @@ def get_context(context): context.assessments = get_assessments(class_name, context.student.name) upcoming_evals = frappe.get_all( - "LMS certificate Request", + "LMS Certificate Request", { "member": context.student.name, "course": ["in", context.courses], From 1862d726ad183b153a50fb8a07ef26e49938e5be Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 25 Jul 2023 17:15:56 +0530 Subject: [PATCH 2/5] fix: telemetry --- lms/public/js/common_functions.js | 9 --------- lms/public/js/website.bundle.js | 1 + lms/templates/lms_base.html | 11 ++++++++++- lms/www/batch/edit.html | 6 ------ lms/www/classes/class.html | 5 ----- lms/www/classes/index.html | 6 ------ 6 files changed, 11 insertions(+), 27 deletions(-) diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js index 62ad81f3..2eeb43ae 100644 --- a/lms/public/js/common_functions.js +++ b/lms/public/js/common_functions.js @@ -1,7 +1,6 @@ frappe.ready(() => { setup_file_size(); pin_header(); - setup_router(); $(".join-batch").click((e) => { join_course(e); @@ -43,14 +42,6 @@ frappe.ready(() => { }); }); -const setup_router = () => { - frappe.router = { - slug(name) { - return name.toLowerCase().replace(/ /g, "-"); - }, - }; -}; - const pin_header = () => { const el = document.querySelector(".sticky"); if (el) { diff --git a/lms/public/js/website.bundle.js b/lms/public/js/website.bundle.js index 7d1dfd83..f24ab539 100644 --- a/lms/public/js/website.bundle.js +++ b/lms/public/js/website.bundle.js @@ -1,3 +1,4 @@ import "./profile.js"; import "./common_functions.js"; import "../../../../frappe/frappe/public/js/frappe/ui/chart.js"; +import "../../../../frappe/frappe/public/js/frappe/event_emitter.js"; diff --git a/lms/templates/lms_base.html b/lms/templates/lms_base.html index 73728239..311053d0 100644 --- a/lms/templates/lms_base.html +++ b/lms/templates/lms_base.html @@ -18,5 +18,14 @@ Object.assign(frappe.boot, telemetry_boot_info) {% endif %} - {{ include_script("telemetry.bundle.js") }} + + {{ include_script("telemetry.bundle.js") }} + {%- endblock -%} \ No newline at end of file diff --git a/lms/www/batch/edit.html b/lms/www/batch/edit.html index 44454396..6fa88e22 100644 --- a/lms/www/batch/edit.html +++ b/lms/www/batch/edit.html @@ -115,12 +115,6 @@ "can_select": ["LMS Quiz"], "can_read": ["LMS Quiz"] }; - - frappe.router = { - slug (name) { - return name.toLowerCase().replace(/ /g, "-"); - } - } {% endif %} {{ include_script('controls.bundle.js') }} diff --git a/lms/www/classes/class.html b/lms/www/classes/class.html index c81d56a1..fd264025 100644 --- a/lms/www/classes/class.html +++ b/lms/www/classes/class.html @@ -462,11 +462,6 @@ frappe.boot.single_types = [] - frappe.router = { - slug (name) { - return name.toLowerCase().replace(/ /g, "-"); - } - } let class_info = {{ class_info | json }}; {% endif %} diff --git a/lms/www/classes/index.html b/lms/www/classes/index.html index fed9ac46..081c8b09 100644 --- a/lms/www/classes/index.html +++ b/lms/www/classes/index.html @@ -157,12 +157,6 @@ "can_select": ["LMS Category"], "can_read": ["LMS Category"] }; - - frappe.router = { - slug (name) { - return name.toLowerCase().replace(/ /g, "-"); - } - } let class_info = null; {% endif %} From d4dcfcdbc66b09678dcb15292479b4abf0da6d47 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 25 Jul 2023 18:06:25 +0530 Subject: [PATCH 3/5] chore: remove dev dependencies --- package.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/package.json b/package.json index 7f3e41ff..efae27f8 100644 --- a/package.json +++ b/package.json @@ -14,17 +14,5 @@ "bugs": { "url": "https://github.com/frappe/lms/issues" }, - "homepage": "https://github.com/frappe/lms#readme", - "devDependencies": { - "cypress": "^10" - }, - "dependencies": { - "@4tw/cypress-drag-drop": "^2", - "@cypress/code-coverage": "^3", - "@editorjs/header": "^2.7.0", - "@editorjs/list": "^1.8.0", - "@testing-library/cypress": "^8", - "@testing-library/dom": "8.17.1", - "cypress-real-events": "^1.7.6" - } + "homepage": "https://github.com/frappe/lms#readme" } From 2412ef0260bd2e4b7b804c5a81a27d0c0618975a Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 25 Jul 2023 18:48:31 +0530 Subject: [PATCH 4/5] fix: dependencies --- package.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index efae27f8..021b0ad1 100644 --- a/package.json +++ b/package.json @@ -14,5 +14,14 @@ "bugs": { "url": "https://github.com/frappe/lms/issues" }, - "homepage": "https://github.com/frappe/lms#readme" + "homepage": "https://github.com/frappe/lms#readme", + "dependencies": { + "@4tw/cypress-drag-drop": "^2", + "@cypress/code-coverage": "^3", + "@editorjs/header": "^2.7.0", + "@editorjs/list": "^1.8.0", + "@testing-library/cypress": "^8", + "@testing-library/dom": "8.17.1", + "cypress-real-events": "^1.7.6" + } } From 3c374f48b39bda1169f4691d97bcae07d7527abf Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 25 Jul 2023 19:20:55 +0530 Subject: [PATCH 5/5] ci: manually installing cypress --- .github/workflows/ui-tests.yml | 5 +++++ package.json | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index d59e5acc..b9aa4614 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -100,6 +100,11 @@ jobs: bench --site lms.test execute frappe.utils.install.complete_setup_wizard bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user + - name: cypress pre-requisites + run: | + cd ~/frappe-bench/apps/lms + yarn add cypress@^10 --no-lockfile + - name: UI Tests run: cd ~/frappe-bench/ && bench --site lms.test run-ui-tests lms --headless env: diff --git a/package.json b/package.json index 021b0ad1..efae27f8 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,5 @@ "bugs": { "url": "https://github.com/frappe/lms/issues" }, - "homepage": "https://github.com/frappe/lms#readme", - "dependencies": { - "@4tw/cypress-drag-drop": "^2", - "@cypress/code-coverage": "^3", - "@editorjs/header": "^2.7.0", - "@editorjs/list": "^1.8.0", - "@testing-library/cypress": "^8", - "@testing-library/dom": "8.17.1", - "cypress-real-events": "^1.7.6" - } + "homepage": "https://github.com/frappe/lms#readme" }