Skip to content

Commit b601386

Browse files
committed
UI: file_actions: dev [ci skip]
Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
1 parent ca65cc1 commit b601386

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

nc_py_api/ex_app/ui/top_menu.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@ def display_name(self) -> str:
3131
return self._raw_data["display_name"]
3232

3333
@property
34-
def icon_url(self) -> str:
34+
def icon(self) -> str:
3535
"""Relative to the ExApp url with icon or empty value to use the default one icon."""
36-
return self._raw_data["icon_url"] if self._raw_data["icon_url"] else ""
36+
return self._raw_data["icon"] if self._raw_data["icon"] else ""
3737

3838
@property
3939
def admin_required(self) -> bool:
4040
"""Flag that determines whether the entry menu is displayed only for administrators."""
41+
print(self._raw_data["admin_required"])
4142
return bool(self._raw_data["admin_required"])
4243

4344
def __repr__(self):
@@ -52,19 +53,19 @@ class _UiTopMenuAPI:
5253
def __init__(self, session: NcSessionApp):
5354
self._session = session
5455

55-
def register(self, name: str, display_name: str, icon_url: str = "", admin_required=False) -> None:
56+
def register(self, name: str, display_name: str, icon: str = "", admin_required=False) -> None:
5657
"""Registers or edit the App entry in Top Meny.
5758
5859
:param name: Unique name for the menu entry.
5960
:param display_name: Display name of the menu entry.
60-
:param icon_url: Optional, url relative to the ExApp, like: "img/icon.svg"
61+
:param icon: Optional, url relative to the ExApp, like: "img/icon.svg"
6162
:param admin_required: Boolean value indicating should be Entry visible to all or only to admins.
6263
"""
6364
require_capabilities("app_api", self._session.capabilities)
6465
params = {
6566
"name": name,
6667
"displayName": display_name,
67-
"iconUrl": icon_url,
68+
"icon": icon,
6869
"adminRequired": int(admin_required),
6970
}
7071
self._session.ocs(method="POST", path=f"{self._session.ae_url}/{self._ep_suffix}", json=params)

tests/actual_tests/appcfg_prefs_ex_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_appcfg_sensitive(nc_app):
122122
assert appcfg.get_value("test_key") == "123"
123123
assert appcfg.get_values(["test_key"])[0].value == "123"
124124
appcfg.delete("test_key")
125-
# next code tests `sensitive` value from the `AppEcosystem`
125+
# next code tests `sensitive` value from the `AppAPI`
126126
params = {"configKey": "test_key", "configValue": "123"}
127127
result = nc_app._session.ocs(method="POST", path=f"{nc_app._session.ae_url}/{appcfg._url_suffix}", json=params)
128128
assert not result["sensitive"] # by default if sensitive value is unspecified it is False

tests/actual_tests/ui_top_menu_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def test_register_ui_top_menu(nc_app):
88
result = nc_app.ui.top_menu.get_entry("test_name")
99
assert result.name == "test_name"
1010
assert result.display_name == "Disp name"
11-
assert result.icon_url == ""
11+
assert result.icon == ""
1212
assert result.admin_required is False
1313
nc_app.ui.top_menu.unregister(result.name)
1414
assert nc_app.ui.top_menu.get_entry("test_name") is None
@@ -19,13 +19,13 @@ def test_register_ui_top_menu(nc_app):
1919
result = nc_app.ui.top_menu.get_entry("test_name")
2020
assert result.name == "test_name"
2121
assert result.display_name == "display"
22-
assert result.icon_url == "img/test.svg"
22+
assert result.icon == "img/test.svg"
2323
assert result.admin_required is True
2424
nc_app.ui.top_menu.register("test_name", "Display name", "", admin_required=False)
2525
result = nc_app.ui.top_menu.get_entry("test_name")
2626
assert result.name == "test_name"
2727
assert result.display_name == "Display name"
28-
assert result.icon_url == ""
28+
assert result.icon == ""
2929
assert result.admin_required is False
3030
nc_app.ui.top_menu.unregister(result.name)
3131
assert nc_app.ui.top_menu.get_entry("test_name") is None

0 commit comments

Comments
 (0)