Skip to content

Reinstates move as an async task#2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jayoshih merged 4 commits into from
Jan 13, 2021
+60 −6
Merged

Reinstates move as an async task #2741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cf0dcb
Reinstate moving as async task.
rtibbles Jan 12, 2021
1a3d9e8
Automatically cleanup finished move tasks.
rtibbles Jan 12, 2021
9944aef
Add error logging.
rtibbles Jan 12, 2021
ef92fd2
Raise non-deadlock errors.
rtibbles Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions contentcuration/contentcuration/frontend/shared/data/resources.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
},
});

function deleteMoveTasks(change) {

@aronasormanaronasormanJan 12, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?

@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.

if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
if (change.obj.task_type === 'move-nodes') {
Task.delete(change.key);
}
}
}

export const Task = new Resource({
tableName: TABLE_NAMES.TASK,
urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
applyChanges(changes);
}
}
deleteMoveTasks(change);
},
[CHANGE_TYPES.UPDATED]: function(change) {
if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
applyChanges(changes);
}
}
deleteMoveTasks(change);
},
},
});
36 changes: 36 additions & 0 deletions contentcuration/contentcuration/tasks.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
self,
user_id,
channel_id,
target_id,
node_id,
position="last-child",
):
node = ContentNode.objects.get(id=node_id)
target = ContentNode.objects.get(id=target_id)

moved = False
attempts = 0
try:
while not moved and attempts < 10:
try:
node.move_to(
target,
position,
)
moved = True
except OperationalError as e:
if "deadlock detected" in e.args[0]:
pass
else:
raise
except Exception as e:
report_exception(e)

return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.


@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
"duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
"move-nodes": {"task": move_nodes_task, "progress_tracking": False},
"export-channel": {"task": export_channel_task, "progress_tracking": True},
"sync-channel": {"task": sync_channel_task, "progress_tracking": True},
"get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down
20 changes: 14 additions & 6 deletions contentcuration/contentcuration/viewsets/contentnode.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

try:
target, position = self.validate_targeting_args(target, position)
try:
contentnode.move_to(target, position)
except ValueError:
raise ValidationError(
"Invalid position argument specified: {}".format(position)
)

channel_id = target.channel_id

task_args = {
"user_id": self.request.user.id,
"channel_id": channel_id,
"node_id": contentnode.id,
"target_id": target.id,
"position": position,
}

task, task_info = create_async_task(
"move-nodes", self.request.user, **task_args
)
Comment thread
kollivier marked this conversation as resolved.

return (
None,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Reinstates move as an async task by rtibbles · Pull Request #2741 · learningequality/studio · GitHub
Skip to content
Reinstates move as an async task#2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', '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('^' + ".*" + '
Reinstates move as an async task by rtibbles · Pull Request #2741 · learningequality/studio · GitHub
Skip to content
Reinstates move as an async task#2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down

, '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" + '
Reinstates move as an async task by rtibbles · Pull Request #2741 · learningequality/studio · GitHub
Skip to content
Reinstates move as an async task#2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down

, '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('^' + ".*" + '
Reinstates move as an async task by rtibbles · Pull Request #2741 · learningequality/studio · GitHub
Skip to content
Reinstates move as an async task#2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down

, '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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Reinstates move as an async task by rtibbles · Pull Request #2741 · learningequality/studio · GitHub
Skip to content
Reinstates move as an async task#2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jayoshih
merged 4 commits into

from

Jan 13, 2021

+60

−6

 Merged


Reinstates move as an async task
#2741
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
1cf0dcb

Reinstate moving as async task.


rtibbles Jan 12, 2021
1a3d9e8

Automatically cleanup finished move tasks.


rtibbles Jan 12, 2021
9944aef

Add error logging.


rtibbles Jan 12, 2021
ef92fd2

Raise non-deadlock errors.


rtibbles Jan 12, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 10 additions & 0 deletions
contentcuration/contentcuration/frontend/shared/data/resources.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1455,6 +1455,14 @@ export const Clipboard = new Resource({
 },
});

function deleteMoveTasks(change) {
@aronasormanaronasormanJan 12, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Hmm i'm not familiar with this system, but does this basically ensure we delete any move tasks once theyre done in some form?
@rtibblesrtibblesJan 12, 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.

Yeah, pretty much - we are using the tasks as a messenger format pretty much to revert the move if it fails, but after that we can just auto delete it.
 if (change.obj.status === 'SUCCESS' || change.obj.status === 'FAILED') {
 if (change.obj.task_type === 'move-nodes') {
 Task.delete(change.key);
 }
 }
}

export const Task = new Resource({
 tableName: TABLE_NAMES.TASK,
 urlName: 'task',
Expand All@@ -1467,6 +1475,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 [CHANGE_TYPES.UPDATED]: function(change) {
 if (change.mods.status === 'SUCCESS') {
Expand All@@ -1475,6 +1484,7 @@ export const Task = new Resource({
 applyChanges(changes);
 }
 }
 deleteMoveTasks(change);
 },
 },
});

36 changes: 36 additions & 0 deletions
contentcuration/contentcuration/tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
from django.core.cache import cache
from django.core.mail import EmailMessage
from django.db import IntegrityError
from django.db.utils import OperationalError
from django.template.loader import render_to_string
from django.utils import translation
from django.utils.translation import ugettext as _
Expand All@@ -22,6 +23,7 @@
from contentcuration.utils.csv_writer import write_user_csv
from contentcuration.utils.nodes import generate_diff
from contentcuration.utils.publish import publish_channel
from contentcuration.utils.sentry import report_exception
from contentcuration.utils.sync import sync_channel
from contentcuration.utils.user import CACHE_USER_STORAGE_KEY
from contentcuration.viewsets.sync.constants import CHANNEL
Expand DownExpand Up@@ -56,6 +58,39 @@
# runs the management command 'exportchannel' async through celery


@task(bind=True, name="move_nodes_task")
def move_nodes_task(
 self,
 user_id,
 channel_id,
 target_id,
 node_id,
 position="last-child",
):
 node = ContentNode.objects.get(id=node_id)
 target = ContentNode.objects.get(id=target_id)

 moved = False
 attempts = 0
 try:
 while not moved and attempts < 10:
 try:
 node.move_to(
 target,
 position,
 )
 moved = True
 except OperationalError as e:
 if "deadlock detected" in e.args[0]:
 pass
 else:
 raise
 except Exception as e:
 report_exception(e)

 return {"changes": [generate_update_event(node.pk, CONTENTNODE, {"parent": node.parent_id})]}
Comment thread
kollivier marked this conversation as resolved.



@task(bind=True, name="duplicate_nodes_task")
def duplicate_nodes_task(
 self,
Expand DownExpand Up@@ -212,6 +247,7 @@ def calculate_user_storage_task(user_id):

type_mapping = {
 "duplicate-nodes": {"task": duplicate_nodes_task, "progress_tracking": True},
 "move-nodes": {"task": move_nodes_task, "progress_tracking": False},
 "export-channel": {"task": export_channel_task, "progress_tracking": True},
 "sync-channel": {"task": sync_channel_task, "progress_tracking": True},
 "get-node-diff": {"task": generatenodediff_task, "progress_tracking": False},
Expand Down

20 changes: 14 additions & 6 deletions
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -676,12 +676,20 @@ def move(self, pk, target=None, position=None):

 try:
 target, position = self.validate_targeting_args(target, position)
 try:
 contentnode.move_to(target, position)
 except ValueError:
 raise ValidationError(
 "Invalid position argument specified: {}".format(position)
 )

 channel_id = target.channel_id

 task_args = {
 "user_id": self.request.user.id,
 "channel_id": channel_id,
 "node_id": contentnode.id,
 "target_id": target.id,
 "position": position,
 }

 task, task_info = create_async_task(
 "move-nodes", self.request.user, **task_args
 )
Comment thread
kollivier marked this conversation as resolved.


 return (
 None,
Expand Down