') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Retain channel list type between browsing/reviewing/searching in import modal by jayoshih · Pull Request #2527 · learningequality/studio · GitHub
Skip to content

Retain channel list type between browsing/reviewing/searching in import modal - #2527

Merged
jayoshih merged 7 commits into
learningequality:developfrom
jayoshih:import
Nov 20, 2020
Merged

Retain channel list type between browsing/reviewing/searching in import modal#2527
jayoshih merged 7 commits into
learningequality:developfrom
jayoshih:import

Conversation

@jayoshih

@jayoshihjayoshih commented Nov 6, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Issue Addressed

Fixes#2506
Fixes#2512
Fixes#2507
Fixes#2577

Steps to Test

Browse resources -> Browse channels

  • Open the import modal
  • Select a channel list type
  • Browse through a channel's resources
  • Click the "Channels" link in the breadcrumb to go back to the default browse view
  • Verify that the channel list type filter matches your selection still

Browse -> Search

  • Open the import modal
  • Select a channel list type
  • Search for a keyword
  • Verify that the channel list type filter matches your selection still

Search-> Browse

  • Open the import modal
  • Search for a keyword
  • Select a channel list type
  • Go back to browsing mode
  • Verify that the channel list type filter matches your selection still

Review -> Browse

  • Open the import modal
  • Select a channel list type
  • Select an item under browsing mode
  • Click review
  • Go back
  • Verify that the channel list type filter matches your selection still

Review -> Search

  • Open the import modal
  • Search for a keyword
  • Select a channel list type
  • Select an item from the search results list
  • Click review
  • Go back
  • Verify that the channel list type filter matches your selection still

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?

@jayoshih
jayoshih requested a review from MisRobNovember 6, 2020 21:15
@codecov

codecovBot commented Nov 6, 2020•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #2527 (ae8ce05) into develop (9696292) will increase coverage by 0.11%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## develop #2527 +/- ##
===========================================
+ Coverage 84.54% 84.65% +0.11% 
===========================================
Files 296 296 Lines 14759 15011 +252 ===========================================
+ Hits 12478 12708 +230 - Misses 2281 2303 +22
Impacted FilesCoverage Δ
...tentcuration/tests/viewsets/test_assessmentitem.py88.20% <0.00%> (-3.91%)⬇️
contentcuration/contentcuration/views/settings.py72.89% <0.00%> (+0.08%)⬆️
...ntcuration/contentcuration/viewsets/contentnode.py83.85% <0.00%> (+0.30%)⬆️
...contentcuration/tests/viewsets/test_contentnode.py83.37% <0.00%> (+0.38%)⬆️
...ontentcuration/contentcuration/viewsets/channel.py71.14% <0.00%> (+0.45%)⬆️
...curation/contentcuration/viewsets/sync/endpoint.py90.55% <0.00%> (+0.78%)⬆️
...uration/contentcuration/viewsets/assessmentitem.py100.00% <0.00%> (+9.33%)⬆️

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 9696292...ae8ce05. Read the comment docs.

MisRob
MisRob requested changes Nov 10, 2020
View reviewed changes

@MisRobMisRob 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.

Thank you, @jayoshih. Also thanks for the testing instructions. In terms of persisting filters, everything works as expected. There are some redundant navigation errors:

Recording:
Peek 2020-11-10 07-32

Errors
Selection_008

Selection_009

@MisRob
MisRob self-requested a review November 19, 2020 18:13
MisRob
MisRob approved these changes Nov 19, 2020
View reviewed changes

@MisRobMisRob 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.

@jayoshih Thank you. I've checked the updated code, and the changes look good. Even though I can see that the code was there before the PR, I added a question to catching NavigationDuplicated error because it might be related.

Comment threadcontentcuration/contentcuration/frontend/shared/mixins.js
},
})
.catch(error => {
if (error && error.name != 'NavigationDuplicated') {

@MisRobMisRobNov 19, 2020

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.

Is there a reason to ignore NavigationDuplicated errors?

@jayoshihjayoshihNov 20, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

They might have been happening frequently, although I don't remember when this was added in

@jayoshih
jayoshih merged commit f295165 into learningequality:developNov 20, 2020
@jredrejojredrejo mentioned this pull request Nov 23, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MisRobMisRobMisRob approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

2 participants

@jayoshih@MisRob