central-develop into 0.17.x #5595

benjaoming · 2019-07-15T16:04:57Z

Summary

These changes are necessary to align the current central server with the current KA Lite release. Some changes to the control_panel app are necessary to keep data export working for many of the larger deployments. More specifically, they have to generate CSV exports in an async environment, which will be done following a change to the central server itself to just use this upcoming 0.17.6.dev release.

This PR flags a few problematic changes that we need to fix for things to work in both the distributed and the central server environments

TODO

If not all TODOs are marked, this PR is considered WIP (work in progress)

Has documentation been written/updated?
Have you written release notes for the upcoming release?

Reviewer guidance

I would definitely not mind a quick look from @jamalex and @rtibbles if you happen to have time.

Issues addressed

…while doing playlist exercies

Student should be redirected to login page if he/she gets looged out while doing playlist exercies

…xam_results Added student_testing/data/407.json

…c_width Increased the height of exercise name column in exam reports

Added Exam Prep Playlists

Added Unit Variable to ExerciseLog Export

…cise error

…orts Added Student Mastery/Class Mastery CoachReports

Massage the Popen arguments into windows form

0.15.x into central-develop

0.15.x to central-develop

…-central-develop Update central-develop to 0.16.x

Pin npm versions

… exports.

…p-org-id Add options object to reference org_id from to ZoneSelectView in data…

…quality#5165

Final 0.16.3 - Fixes learningequality#5087 related to certain Linux kernel version labels - Few docs changes

benjaoming

Adding some notes on whether things should really go in.

benjaoming · 2019-07-15T16:05:35Z

kalite/coachreports/static/css/coachreports/exercise_mastery_view.css

+
+#exercise-mastery {
+    font-size: 10px
+}


This might be a feature lost from 0.16.x - or it might be unwanted in 0.17?

benjaoming · 2019-07-15T16:05:56Z

kalite/coachreports/static/js/coachreports/exercise_mastery_view.js

+            window.location.href = setGetParam(window.location.href, "playlist", selKeys);
+        }
+    });
+});


This might be a feature lost from 0.16.x - or it might be unwanted in 0.17?

The two exercise_master_view changes are from: #3033

@aronasorman noted:

We can revisit the PRs merged into nalanda by looking at the nalanda-bugfixes milestone, and then porting whatever PRs are relevant to the develop branch.

The CSS lives here:

https://github.com/learningequality/ka-lite/blob/master/kalite/coachreports/static/css/coachreports/tabular_view.less

I've searched the codebase for occurrences of "exercise_mastery_view", and as there are none, I will assume that the JS file is unused.

benjaoming · 2019-07-15T16:08:53Z

kalite/control_panel/api_resources.py

+            # As we can't predict the current unit on the central server, its better to have the value as 0.
+            # We can't predict the current unit because in some database we have unit_point_reset gift card for unit 101 whereas the current unit is also 101.
+            # So we can't find current_unit by saying that the first unit that doesn't have the unit_point_reset gift card is current_unit.
+


I don't understand what all this is. Never heard about the "gift card" part nor the purchased_at__gte in the query further up? We don't have a model StoreTransactionLog anywhere, so I think all of this should go.

StoreTransactionLog is a model from kalite.store which is an application we removed.

benjaoming · 2019-07-15T16:09:33Z

kalite/distributed/static/js/distributed/bundle_modules/base.js

@@ -14,6 +14,9 @@ require("browsernizr/test/canvas");
 require("browsernizr/test/touchevents");
 var Modernizr = require("browsernizr");

+// Expose this as a global object for use in central server inline JS.
+global.getCookie = require("utils/get_cookie");
+


This needs to be configurable and only switched on in the central server.

Okay, this might actually be harmless to the rest of the KA Lite application, wouldn't you think so @rtibbles ?

benjaoming · 2019-07-15T16:10:55Z

kalite/packages/bundled/fle_utils/django_utils/command.py

+    # kalitectl.py wil look for centralserver.settings instead of
+    # kalite.settings.
+    new_env = os.environ.copy()
+    new_env["DJANGO_SETTINGS_MODULE"] = kwargs.get("settings") or "kalite.settings"


This should ideally be configurable and only switched on in the central server. The whole function is only used in a test, though, centralserver/central/tests/utils/distributed_server_factory.py.

Since all this code is used from the central server's test suite, I'm moving it there.

benjaoming · 2019-07-15T16:11:45Z

kalite/packages/bundled/securesync/devices/api_views.py

-            msg = "\n\n".join([request.body, client_device._hashable_representation(), str(client_device.validate()), client_device.signed_by_id, client_device.id, str(request)])
+            import inspect
+            d = client_device
+            msg = "\n\n".join([str(msg) for msg in [request.body, d._hashable_representation(), d.__dict__, d.__class__, inspect.getfile(d.__class__), local_version, d.description, d.signed_by_id, d.id, request]])


This looks like debugging noise?

Reverting back to the former debug email.

benjaoming · 2019-07-17T10:40:26Z

kalite/packages/bundled/securesync/management/commands/register.py

@@ -61,7 +61,7 @@ def handle(self, *args, **options):
        csrftoken = s.cookies['csrftoken_central']
        login_data = dict(username=options["username"], password=options["password"], csrfmiddlewaretoken=csrftoken, next='/')
        r = s.post(login_url, data=login_data, headers={"Referer": login_url})
-        assert r.status_code == 200, "Error logging into central server: " + r.content
+        assert r.status_code == 200 and "Incorrect user" not in r.content, "Error logging into central server: " + r.content


The change looks like a desired precision from the commit msg: 34a27be

benjaoming · 2019-09-02T16:10:56Z

kalite/packages/bundled/securesync/api_client.py

+        else:
+            parsed_url = urllib2.urlparse.urlparse(host)
+            self.url = "%s://%s" % (self.parsed_url.scheme, self.parsed_url.netloc)
+


I'm not sure why the latter used to call urllib2.urlparse.urlparse, it seems that somehow it checks if the host is a valid URL with a scheme even though the kwarg was called host.. I don't quite grasp this. The central-develop branch had this, which would cause a regression on 0.17.x:

def __init__(self, host=None, require_trusted=True, verbose=True): self.url = host or settings.CENTRAL_SERVER_URL self.parsed_url = urllib2.urlparse.urlparse(self.url)

benjaoming · 2019-09-03T23:17:21Z

Having tested this to the point of registration and by introspecting settings, it seems that the securesync client connects correctly. I had another issues fixed in #5597 - but this should be fine.

anuragkanungo and others added 30 commits February 4, 2015 12:08

Student should be redirected to login page if he/she gets looged out …

95ae21e

…while doing playlist exercies

Merge pull request learningequality#2939 from anuragkanungo/nalanda-rct3

0615773

Student should be redirected to login page if he/she gets looged out while doing playlist exercies

Added Unit Variable to ExerciseLog Export

3daac46

Updated code for unit variable in exercise log

30758b4

Increased height of exercise name column in exam reports

5d6a29d

Added Exam Prep Playlists

6d7e510

Added student_testing/data/407.json

0cef1b9

Added 15Nov2014 RCT condition check for unit variable

6c70ea7

Merge pull request learningequality#3016 from anuragkanungo/smps_4b_e…

8fea95e

…xam_results Added student_testing/data/407.json

Merge pull request learningequality#3011 from anuragkanungo/exam_topi…

318a01a

…c_width Increased the height of exercise name column in exam reports

Merge pull request learningequality#3012 from anuragkanungo/playlist

bf146dc

Added Exam Prep Playlists

Added Student Mastery/Class Mastery CoachReports

c6402d3

RCT Unit Variable comment

c1abb70

Removed Unit Selection Box and Added Class Level Mastery

5105876

correct unit for those we are sure else unit 0

6e6c0f0

Added comment why to keep unit variable as 0 for some cases

26592ee

Merge pull request learningequality#2958 from anuragkanungo/nalanda-rct3

61fb56b

Added Unit Variable to ExerciseLog Export

Code cleanup and renamed report view to exercise_mastery_view

5286833

On Facility Switch remove playlist values from url, to avoid get exer…

af8d016

…cise error

Fixed minor bugs related to division by zero and exercise selection

350a7f5

Moved jquery.js required for dyna-tree persistance to static-libraries

1c582c2

Refactoring and percentage in float

66a0248

removed extra comma, tests was failing

c106ca1

Merge pull request learningequality#3033 from anuragkanungo/coach_rep…

8e5e8e5

…orts Added Student Mastery/Class Mastery CoachReports

Fix 3040, Redirect to login page in case of Unauthorized

bc21a36

Used SetGetParam for url

3bffde5

Test for redirect unauthorized playlist view request to login page

5e0b016

Added test for unauthorized request to redirect to login page

d4c91a2

Moved import to top

cfb423d

Added implicit wait for css selector to be found in selenium test

14c8701

rtibbles and others added 14 commits September 24, 2015 16:38

Merge pull request learningequality#4498 from MCGallaspy/central-develop

90d20c6

Massage the Popen arguments into windows form

Merge pull request learningequality#4513 from learningequality/0.15.x

d7cdc84

0.15.x into central-develop

Merge pull request learningequality#4683 from learningequality/0.15.x

dc56afc

0.15.x to central-develop

Merge remote-tracking branch 'origin/0.16.x' into central-develop

c789b22

Merge pull request learningequality#5014 from learningequality/update…

bf2cfa4

…-central-develop Update central-develop to 0.16.x

Merge pull request learningequality#5034 from jamalex/pin_npm_versions

cb25c26

Pin npm versions

Add options object to reference org_id from to ZoneSelectView in data…

45cc3e4

… exports.

Merge pull request learningequality#5095 from rtibbles/central-develo…

a118a2d

…p-org-id Add options object to reference org_id from to ZoneSelectView in data…

Remove .gitmodules file causing RTD to break

bdf518c

Remove unused submodule for RTD to build

635c5ea

Make version visible in docs for installation guide - fixes learninge…

a2b59b0

…quality#5165

Merge tag '0.16.x' into central-develop

3555f82

Final 0.16.3 - Fixes learningequality#5087 related to certain Linux kernel version labels - Few docs changes

Merge remote-tracking branch 'upstream/0.16.x' into central-develop

9272dcf

Merge branch 'central-develop' into central-develop-into-0.17.x

3fccd47

benjaoming commented Jul 15, 2019

View reviewed changes

Benjamin Bach added 4 commits July 15, 2019 18:12

Remove duplicated line

a56efba

Remove unused JS and cherry-picked CSS from learningequality#3033

54bc417

Remove unused .json file from learningequality#3033

650a95d

Remove Nalanda-specific code from learningequality#3033

e554397

benjaoming force-pushed the central-develop-into-0.17.x branch from 748bc61 to e554397 Compare July 16, 2019 14:35

Benjamin Bach added 2 commits July 17, 2019 12:32

call_outside_command_with_output moved to central server

338fc49

Remove debug statement

f2ae87c

benjaoming commented Jul 17, 2019

View reviewed changes

Benjamin Bach added 2 commits September 2, 2019 17:43

Remove unreferenced JS library jquery.cookie.js

5161c9b

Unify approach from 0.17.x and central-develop

bc367a0

benjaoming force-pushed the central-develop-into-0.17.x branch from 0900e60 to bc367a0 Compare September 2, 2019 16:08

benjaoming commented Sep 2, 2019

View reviewed changes

benjaoming merged commit fe802df into learningequality:0.17.x Sep 3, 2019

benjaoming changed the title ~~central-develop into 0.17.x [WIP]~~ central-develop into 0.17.x Sep 3, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

central-develop into 0.17.x #5595

central-develop into 0.17.x #5595

benjaoming commented Jul 15, 2019

benjaoming left a comment

benjaoming Jul 15, 2019

benjaoming Jul 15, 2019

benjaoming Jul 16, 2019

benjaoming Jul 16, 2019

benjaoming Jul 15, 2019

benjaoming Jul 16, 2019

benjaoming Jul 15, 2019

benjaoming Sep 2, 2019

benjaoming Jul 15, 2019

benjaoming Jul 17, 2019

benjaoming Jul 15, 2019

benjaoming Jul 17, 2019

benjaoming Jul 17, 2019

benjaoming Sep 2, 2019

benjaoming commented Sep 3, 2019

central-develop into 0.17.x #5595

central-develop into 0.17.x #5595

Conversation

benjaoming commented Jul 15, 2019

Summary

TODO

Reviewer guidance

Issues addressed

benjaoming left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benjaoming commented Sep 3, 2019