Skip to content

Commit

Permalink
fix: remove broadcast from socketio.emit (#1202)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jczhong84
jczhong84 authored Mar 21, 2023
1 parent 2bb8873 commit cf96f9a
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 27 deletions.
9 changes: 0 additions & 9 deletions querybook/server/datasources/datadoc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,15 +465,13 @@ def add_datadoc_editor(
(originator, doc_id, uid, None),
namespace="/datadoc",
room=doc_id,
broadcast=True,
)

socketio.emit(
"data_doc_editor",
(originator, doc_id, uid, editor_dict),
namespace="/datadoc",
room=doc_id,
broadcast=True,
)
logic.update_es_data_doc_by_id(doc_id)
send_add_datadoc_editor_email(doc_id, uid, read, write)
Expand Down Expand Up @@ -501,7 +499,6 @@ def add_datadoc_access_request(doc_id, originator=None):
(originator, doc_id, uid, access_request_dict),
namespace="/datadoc",
room=doc_id,
broadcast=True,
)
send_datadoc_access_request_notification(doc_id=doc_id, uid=uid)
return access_request_dict
Expand All @@ -516,7 +513,6 @@ def remove_datadoc_access_request(doc_id, uid, originator=None):
(originator, doc_id, uid, None),
namespace="/datadoc",
room=doc_id,
broadcast=True,
)


Expand Down Expand Up @@ -597,7 +593,6 @@ def update_datadoc_editor(
),
namespace="/datadoc",
room=editor_dict["data_doc_id"],
broadcast=True,
)
return editor_dict

Expand All @@ -620,7 +615,6 @@ def delete_datadoc_editor(
(originator, editor_dict["data_doc_id"], editor_dict["uid"], None),
namespace="/datadoc",
room=editor_dict["data_doc_id"],
broadcast=True,
)


Expand Down Expand Up @@ -663,7 +657,6 @@ def update_datadoc_owner(doc_id, next_owner_id, originator=None):
(originator, doc_id, current_user.id, current_owner_editor_dict),
namespace="/datadoc",
room=doc_id,
broadcast=True,
)
socketio.emit(
"data_doc_editor",
Expand All @@ -675,7 +668,6 @@ def update_datadoc_owner(doc_id, next_owner_id, originator=None):
),
namespace="/datadoc",
room=next_owner_editor_dict["data_doc_id"],
broadcast=True,
)
socketio.emit(
"data_doc_updated",
Expand All @@ -685,7 +677,6 @@ def update_datadoc_owner(doc_id, next_owner_id, originator=None):
),
namespace="/datadoc",
room=next_owner_editor_dict["data_doc_id"],
broadcast=True,
)
logic.update_es_data_doc_by_id(doc_id)
# Update queries in elasticsearch to reflect new permissions
Expand Down
1 change: 0 additions & 1 deletion querybook/server/datasources/query_execution.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def create_query_execution(query, engine_id, data_cell_id=None, originator=None)
),
namespace="/datadoc",
room=data_doc.id,
broadcast=True,
)

return query_execution_dict
Expand Down
5 changes: 0 additions & 5 deletions querybook/server/datasources_socketio/datadoc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ def send_data_doc_session_info(data_doc_id, room, redis_conn=None):
{"users": user_dict, "cursors": cursor_dict},
namespace=DATA_DOC_NAMESPACE,
room=room,
broadcast=True,
)


Expand Down Expand Up @@ -110,7 +109,6 @@ def update_user_list(data_doc_id, add=False, redis_conn=None):
(add, request.sid, current_user.id),
namespace=DATA_DOC_NAMESPACE,
room=data_doc_id,
broadcast=True,
)


Expand Down Expand Up @@ -186,7 +184,6 @@ def fetch_data_doc_editors(doc_id):
"data_doc_editors",
(request.sid, editor_dicts),
namespace=DATA_DOC_NAMESPACE,
broadcast=False,
room=request.sid,
)
send_data_doc_session_info(doc_id, room=request.sid)
Expand All @@ -208,7 +205,6 @@ def fetch_data_doc_access_requests(doc_id):
"data_doc_access_requests",
(request.sid, access_request_dicts),
namespace=DATA_DOC_NAMESPACE,
broadcast=False,
room=request.sid,
)
send_data_doc_session_info(doc_id, room=request.sid)
Expand Down Expand Up @@ -264,5 +260,4 @@ def move_data_doc_cursor(data_doc_id, data_cell_id=None):
),
namespace=DATA_DOC_NAMESPACE,
room=data_doc_id,
broadcast=True,
)
1 change: 0 additions & 1 deletion querybook/server/datasources_socketio/helper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ def handler(*args, **kwargs):
"error",
str(e),
namespace=namespace,
broadcast=False,
room=flask.request.sid,
)

Expand Down
9 changes: 0 additions & 9 deletions querybook/server/logic/datadoc_collab.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def update_datadoc(doc_id, fields, sid="", session=None):
),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=True,
)

return doc_dict
Expand Down Expand Up @@ -67,7 +66,6 @@ def insert_data_cell(
),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=True,
)

return data_cell_dict
Expand All @@ -93,7 +91,6 @@ def move_data_cell(doc_id, from_index, to_index, sid="", session=None):
),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=True,
)

# Should we return data instead?
Expand Down Expand Up @@ -146,7 +143,6 @@ def paste_data_cell(
),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=True,
)
else:
socketio.emit(
Expand All @@ -158,7 +154,6 @@ def paste_data_cell(
),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=True,
)
socketio.emit(
"data_cell_deleted",
Expand All @@ -168,7 +163,6 @@ def paste_data_cell(
),
namespace=DATA_DOC_NAMESPACE,
room=old_data_doc.id,
broadcast=True,
)
else: # Copy
new_cell_dict = insert_data_cell(
Expand All @@ -189,7 +183,6 @@ def paste_data_cell(
(sid),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=False,
)


Expand All @@ -209,7 +202,6 @@ def update_data_cell(cell_id, fields, sid="", session=None):
(sid, data_cell_dict),
namespace=DATA_DOC_NAMESPACE,
room=data_doc.id,
broadcast=True,
)

return data_cell_dict
Expand All @@ -231,7 +223,6 @@ def delete_data_cell(doc_id, cell_id, sid="", session=None):
),
namespace=DATA_DOC_NAMESPACE,
room=doc_id,
broadcast=True,
)

return True
1 change: 0 additions & 1 deletion querybook/server/tasks/run_datadoc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ def _start_query_execution_task(
),
namespace="/datadoc",
room=data_doc_id,
broadcast=True,
)
return query_execution.id

Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ greenlet==1.1.2
alembic==1.8.1

gevent-websocket==0.10.1
flask-socketio==5.3.1
flask-socketio==5.3.3

# Query templating
Jinja2==3.1.2 # From Flask
Expand Down

0 comments on commit cf96f9a

Please sign in to comment.