Skip to content

Commit

Permalink
NXDRIVE-2912: Display Drive notification for document review --21/05 -02
Browse files Browse the repository at this point in the history
  • Loading branch information
gitofanindya committed May 21, 2024
1 parent 075e130 commit 192baf8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 32 deletions.
35 changes: 7 additions & 28 deletions nxdrive/gui/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,24 +243,14 @@ def get_completed_sessions_count(self, uid: str, /) -> int:
)
return 0

@pyqtSlot(str, result=int)
def tasks_remaining(self, uid: str, /) -> int:
"""Return pending tasks count for Drive notification."""
engine = self._get_engine(uid)
if engine:
tasks = self.application.fetch_pending_tasks(engine)
return len(tasks)
log.info("Engine not available")
return 0

@pyqtSlot(str, str, result=str)
def get_text(self, details, ret) -> str:
def get_text(self, details, ret, /) -> str:
details = details.replace("'", '"')
details = json.loads(details)
return details[ret]

@pyqtSlot(str, result=bool)
def text_red(self, text) -> bool:
def text_red(self, text, /) -> bool:
return "ago" in text

@pyqtSlot(str)
Expand Down Expand Up @@ -1201,12 +1191,13 @@ def open_remote_document(
log.exception("Remote document cannot be opened")

@pyqtSlot(str, str, str)
def display_pending_task(self, uid: str, remote_ref: str, /) -> None:
log.info(f"Should open remote document ({remote_ref!r})")
def display_pending_task(
self, uid: str, remote_ref: str, remote_path: str, /
) -> None:
log.info(f"Should open remote document ({remote_path!r})")
try:
if engine := self._manager.engines.get(uid):
url = engine.get_task_url(remote_ref)
log.info(f">>>> doc url: {url}")
engine.open_remote(url=url)
except Exception as exec:
log.exception(f"Remote task cannot be opened: {exec}")
Expand All @@ -1217,20 +1208,8 @@ def get_remote_document_url(self, uid: str, remote_ref: str, /) -> str:
engine = self._get_engine(uid)
return engine.get_metadata_url(remote_ref) if engine else ""

@pyqtSlot(str, result=str)
def get_title(self, engine_uid: str = "", /) -> str:
engine = self._get_engine(engine_uid)
data = self._fetch_tasks(engine)
html = "No Results To Show"
if data:
try:
html = data[0]["variables"]["review_result"]
except IndexError:
log.info("No Pending Tasks Present")
return html

@pyqtSlot(str, str)
def on_clicked_open_task(self, engine_uid: str, task_id: str):
def on_clicked_open_task(self, engine_uid: str, task_id: str) -> None:
engine = engine = self._manager.engines.get(engine_uid)
if not engine:
return
Expand Down
2 changes: 1 addition & 1 deletion nxdrive/gui/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ def close_tasks_window(self) -> None:
"""Close the Tasks window."""
self.task_manager_window.close()

def open_task(self, engine: Engine, task_id: str):
def open_task(self, engine: Engine, task_id: str) -> None:
endpoint = "/ui/#!/tasks/"
url = f"{engine.server_url}{endpoint}{task_id}"
webbrowser.open(url)
Expand Down
6 changes: 3 additions & 3 deletions nxdrive/gui/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -858,10 +858,10 @@ def __init__(self, translate: Callable, /, *, parent: QObject = None) -> None:
}
)

def get_model(self):
def get_model(self) -> QStandardItemModel:
return self.taskmodel

def get_self_model(self):
def get_self_model(self) -> QStandardItemModel:
return self.self_taskmodel

model = pyqtProperty(QObject, fget=get_model, constant=True)
Expand Down Expand Up @@ -913,7 +913,7 @@ def loadList(self, tasks_list: list, username: str, /) -> None:
}
self.add_row(data, self.TASK_ROLE, False)

def add_row(self, task, role, self_task):
def add_row(self, task, role, self_task) -> None:
item = QStandardItem()
item.setData(task, role)

Expand Down

0 comments on commit 192baf8

Please sign in to comment.