vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor!: Remove doc typer code

Browse source 
- This hasn't worked since v13 refactor and no one has noticed.
- Needs better implementation.
This commit is contained in:
Ankush Menat 2023-06-29 12:19:28 +05:30
parent 441495b561
commit 97c1106aca
2 changed files with 8 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/public/js/frappe/views/formview.js
View file

@ -52,11 +52,6 @@ frappe.views.FormFactory = class FormFactory extends frappe.views.Factory {
// set users that currently viewing the form
frappe.ui.form.FormViewers.set_users(data, "viewers");
});
frappe.realtime.on("doc_typers", function (data) {
// set users that currently typing on the form
frappe.ui.form.FormViewers.set_users(data, "typers");
});
}
this.initialized = true;
}

70
socketio.js
View file

@ -114,24 +114,11 @@ io.on("connection", function (socket) {
socket.join(room);
// show who is currently viewing the form
send_users(
{
socket: socket,
doctype: doctype,
docname: docname,
},
"view"
);
// show who is currently typing on the form
send_users(
{
socket: socket,
doctype: doctype,
docname: docname,
},
"type"
);
send_users({
socket: socket,
doctype: doctype,
docname: docname,
});
},
});
});
@ -150,36 +137,6 @@ io.on("connection", function (socket) {
);
});
socket.on("doc_typing", function (doctype, docname) {
// show users that are currently typing on the form
const room = get_typing_room(socket, doctype, docname);
socket.join(room);
send_users(
{
socket: socket,
doctype: doctype,
docname: docname,
},
"type"
);
});
socket.on("doc_typing_stopped", function (doctype, docname) {
// remove this user from the list of users currently typing on the form'
const room = get_typing_room(socket, doctype, docname);
socket.leave(room);
send_users(
{
socket: socket,
doctype: doctype,
docname: docname,
},
"type"
);
});
socket.on("open_in_editor", (data) => {
let s = get_redis_subscriber("redis_queue");
s.publish("open_in_editor", JSON.stringify(data));
@ -206,10 +163,6 @@ function get_open_doc_room(socket, doctype, docname) {
return get_site_name(socket) + ":open_doc:" + doctype + "/" + docname;
}
function get_typing_room(socket, doctype, docname) {
return get_site_name(socket) + ":typing:" + doctype + "/" + docname;
}
function get_user_room(socket, user) {
return get_site_name(socket) + ":user:" + user || socket.user;
}
@ -314,19 +267,14 @@ function can_subscribe_doctype(args) {
});
}
function send_users(args, action) {
function send_users(args) {
if (!(args && args.doctype && args.docname)) {
return;
}
const open_doc_room = get_open_doc_room(args.socket, args.doctype, args.docname);
const room =
action == "view"
? open_doc_room
: get_typing_room(args.socket, args.doctype, args.docname);
const clients = Array.from(io.sockets.adapter.rooms.get(room) || []);
const clients = Array.from(io.sockets.adapter.rooms.get(open_doc_room) || []);
let users = [];
io.sockets.sockets.forEach((sock) => {
@ -335,10 +283,8 @@ function send_users(args, action) {
}
});
const emit_event = action == "view" ? "doc_viewers" : "doc_typers";
// notify
io.to(open_doc_room).emit(emit_event, {
io.to(open_doc_room).emit("doc_viewers", {
doctype: args.doctype,
docname: args.docname,
users: Array.from(new Set(users)),