Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Update the development setup script to reflect our complete validation strategy - #2842

Merged
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete
Jan 21, 2021
Merged

Update the development setup script to reflect our complete validation strategy#2842
rtibbles merged 3 commits into
learningequality:hotfixesfrom
MisRob:devsetup-complete

Conversation

@MisRob

Copy link
Copy Markdown
Member

Steps to Test

  • Clear IndexedDB
  • yarn run devsetup
  • Check that nodes in "Published Channel" editor are marked as complete/incomplete properly ("incomplete" error icon is visible for incomplete ones)

Checklist

  • Is the code clean and well-commented?
  • Has the docs label been added if this introduces a change that needs to be updated in the user docs?
  • Has the CHANGELOG label been added to this pull request? Items with this label will be added to the CHANGELOG at a later time
  • Are there tests for this change?
  • Are all user-facing strings translated properly (if applicable)?
  • Has the notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)?
  • Are all UI components LTR and RTL compliant (if applicable)?
  • Are views organized into pages, components, and layouts directories as described in the docs?
  • Are users' storage used being recalculated properly on any changes to their main tree files?
  • Are there any new ways this uses user data that needs to be factored into our Privacy Policy?
  • Are there any new interactions that need to be added to the QA Sheet?
  • Are there opportunities for using Google Analytics here (if applicable)?
  • If the Pipfile has been changed, is the updated Pipfile.lock file also included in this PR?
  • Are the migrations safe for a large db (if applicable)?

@codecov

codecovBot commented Jan 20, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2842 (673b715) into hotfixes (453d4f1) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## hotfixes #2842 +/- ##
============================================
+ Coverage 84.85% 84.87% +0.02% 
============================================
Files 292 292 Lines 15338 15407 +69 ============================================
+ Hits 13015 13077 +62 - Misses 2323 2330 +7 
Impacted FilesCoverage Δ
...ntcuration/contentcuration/tests/test_asynctask.py93.47% <0.00%> (-6.53%)⬇️
contentcuration/contentcuration/tasks_test.py100.00% <0.00%> (ø)
...ntcuration/contentcuration/utils/celery_signals.py84.61% <0.00%> (+9.10%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 453d4f1...673b715. Read the comment docs.

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce to just the update to the dev setup command, please!

channel1.main_tree.children.first().copy_to(channel4.main_tree)

# Get validation to be reflected in nodes properly
ContentNode.objects.all().update(complete=True)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that I expected to see - the other changes have implications for test behaviour, so I'd rather they were left as is.

@MisRobMisRobJan 21, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining diff is just cleanup of the code I added some time ago and that is now obsolete. I'd prefer not to leave it here as is because it's confusing - it looks like that you can set those values to chosen ones when you actually can't as it will be overridden by newly introduced scripts - generate_tree is called before we start marking nodes as complete/incomplete here.

I am planning to come with a way of how to test complete/incomplete in the next PR I am working on so that we can test self-healing of incorrectly marked nodes.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am planning to come with a way of how to test complete/incomplete in the next PR

It can be done this way at this point:
MisRob@1fddf26

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some of these edits, as some of these utils are used during our tests, so I wanted to make sure the tests were accurately reflecting appropriate values for complete. e.g. ac072ea

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah okay, so the issue is rather db utils parameters, not devsetup data itself. I haven't noticed that we are using utils from somewhere else - will revert that part.

@MisRob
MisRob requested a review from rtibblesJanuary 21, 2021 07:19
@rtibbles
rtibbles merged commit 1f29929 into learningequality:hotfixesJan 21, 2021
@MisRob
MisRob deleted the devsetup-complete branch February 3, 2021 07:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MisRob@rtibbles