From 45ed484c2a3d5f930523a712b9e2e80f7b7e7f4f Mon Sep 17 00:00:00 2001 From: rusikv Date: Wed, 15 May 2024 17:26:36 +0300 Subject: [PATCH] UI: mobile app qr code improvements, cleanup --- .../json/system/widget_bundles/cards.json | 2 +- .../widget_bundles/home_page_widgets.json | 3 +- .../widget_types/home_mobile_app_qr_code.json | 27 ----- .../widget_types/mobile_app_qr_code.json | 4 +- ui-ngx/src/app/core/auth/auth.selectors.ts | 2 +- .../src/app/core/http/mobile-app.service.ts | 12 +-- .../cards/mobile-app-qr-code-widget.models.ts | 17 ++-- .../mobile-app-qrcode-widget.component.html | 6 +- .../mobile-app-qrcode-widget.component.scss | 23 ----- .../lib/mobile-app-qrcode-widget.component.ts | 71 ++++++++------ ...app-qr-code-widget-settings.component.html | 84 +++------------- ...app-qr-code-widget-settings.component.scss | 19 ---- ...e-app-qr-code-widget-settings.component.ts | 32 +----- .../admin/mobile-app-settings.component.html | 12 +-- .../admin/mobile-app-settings.component.scss | 4 - .../admin/mobile-app-settings.component.ts | 6 +- .../home-links/home-links-routing.module.ts | 98 ++++++++++--------- .../app/shared/models/mobile-app.models.ts | 5 +- .../assets/dashboard/sys_admin_home_page.json | 12 ++- .../dashboard/tenant_admin_home_page.json | 13 ++- .../assets/locale/locale.constant-en_US.json | 4 +- ui-ngx/src/form.scss | 6 ++ 22 files changed, 168 insertions(+), 294 deletions(-) delete mode 100644 application/src/main/data/json/system/widget_types/home_mobile_app_qr_code.json delete mode 100644 ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.scss diff --git a/application/src/main/data/json/system/widget_bundles/cards.json b/application/src/main/data/json/system/widget_bundles/cards.json index 5a839d4c82..e0f4f4c615 100644 --- a/application/src/main/data/json/system/widget_bundles/cards.json +++ b/application/src/main/data/json/system/widget_bundles/cards.json @@ -17,7 +17,7 @@ "cards.label_widget", "cards.dashboard_state_widget", "cards.qr_code", - "cards.mobile_app_qr_code", + "mobile_app_qr_code", "cards.attributes_card", "cards.html_card", "cards.html_value_card", diff --git a/application/src/main/data/json/system/widget_bundles/home_page_widgets.json b/application/src/main/data/json/system/widget_bundles/home_page_widgets.json index cb8d0ed915..a30d6ee76f 100644 --- a/application/src/main/data/json/system/widget_bundles/home_page_widgets.json +++ b/application/src/main/data/json/system/widget_bundles/home_page_widgets.json @@ -13,7 +13,6 @@ "home_page_widgets.quick_links", "home_page_widgets.documentation_links", "home_page_widgets.dashboards", - "home_page_widgets.usage_info", - "home_page_widgets.home_page_mobile_app_qr_code" + "home_page_widgets.usage_info" ] } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/home_mobile_app_qr_code.json b/application/src/main/data/json/system/widget_types/home_mobile_app_qr_code.json deleted file mode 100644 index 908533b279..0000000000 --- a/application/src/main/data/json/system/widget_types/home_mobile_app_qr_code.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "fqn": "home_page_widgets.home_page_mobile_app_qr_code", - "name": "Home page mobile app QR code", - "deprecated": false, - "image": "tb-image:bW9iaWxlX2FwcF9xcl9jb2RlX3dpZGdldC5zdmc=:bW9iaWxlX2FwcF9xcl9jb2RlX3dpZGdldC5zdmc=;data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="200" height="160" fill="none"><rect width="200" height="160" fill="#fff" rx="4"/><rect width="199" height="159" x=".5" y=".5" stroke="#000" stroke-opacity=".1" rx="3.5"/><g clip-path="url(#a)"><rect width="137" height="137" x="31.5" y="11.5" fill="#fff" rx="8.2"/><path fill="#fff" d="M168.5 11.5h-137v137h137v-137Z"/><mask id="b" width="124" height="124" x="38" y="18" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M42.7 52.4h-4.3v4.2h4.3v-4.2ZM42.7 60.9h-4.3V65h4.3V61ZM42.7 65.1h-4.3v4.3h4.3V65ZM42.7 94.9h-4.3V99h4.3V95ZM47 56.6h-4.3V61h4.2v-4.3ZM47 82.1h-4.3v4.3h4.2V82ZM47 86.4h-4.3v4.2h4.2v-4.2ZM47 94.9h-4.3V99h4.2V95ZM47 103.4h-4.3v4.2h4.2v-4.2ZM51.2 52.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M51.2 60.9h-4.3V65h4.3V61ZM51.2 73.6h-4.3V78h4.3v-4.3Z"/><path fill="#fff" d="M51.2 77.9h-4.3V82h4.3V78ZM51.2 82.1h-4.3v4.3h4.3V82ZM51.2 90.6h-4.3V95h4.3v-4.3ZM51.2 99.1h-4.3v4.3h4.3V99ZM55.4 52.4h-4.2v4.2h4.2v-4.2ZM55.4 69.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M55.4 86.4h-4.2v4.2h4.2v-4.2ZM55.4 99.1h-4.2v4.3h4.2V99ZM55.4 103.4h-4.2v4.2h4.2v-4.2ZM59.7 65.1h-4.3v4.3h4.3V65ZM59.7 69.4h-4.3v4.2h4.3v-4.2ZM59.7 86.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M59.7 90.6h-4.3V95h4.3v-4.3Z"/><path fill="#fff" d="M59.7 94.9h-4.3V99h4.3V95ZM63.9 52.4h-4.2v4.2h4.2v-4.2ZM63.9 65.1h-4.2v4.3h4.2V65ZM63.9 69.4h-4.2v4.2h4.2v-4.2ZM63.9 86.4h-4.2v4.2h4.2v-4.2ZM63.9 99.1h-4.2v4.3h4.2V99ZM68.1 52.4H64v4.2h4.2v-4.2ZM68.1 60.9H64V65h4.2V61ZM68.1 69.4H64v4.2h4.2v-4.2ZM68.1 77.9H64V82h4.2V78ZM68.1 86.4H64v4.2h4.2v-4.2ZM68.1 94.9H64V99h4.2V95ZM68.1 103.4H64v4.2h4.2v-4.2Z"/><path fill="#fff" d="M72.4 52.4H68v4.2h4.3v-4.2ZM72.4 69.4H68v4.2h4.3v-4.2ZM72.4 77.9H68V82h4.3V78ZM72.4 82.1H68v4.3h4.3V82ZM72.4 86.4H68v4.2h4.3v-4.2Z"/><path fill="#fff" d="M72.4 90.6H68V95h4.3v-4.3ZM72.4 99.1H68v4.3h4.3V99ZM72.4 103.4H68v4.2h4.3v-4.2ZM76.6 22.7h-4.2v4.2h4.2v-4.2ZM76.6 31.2h-4.2v4.2h4.2v-4.2ZM76.6 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M76.6 43.9h-4.2v4.2h4.2V44ZM76.6 48.1h-4.2v4.3h4.2v-4.3ZM76.6 52.4h-4.2v4.2h4.2v-4.2ZM76.6 56.6h-4.2V61h4.2v-4.3Z"/><path fill="#fff" d="M76.6 60.9h-4.2V65h4.2V61ZM76.6 65.1h-4.2v4.3h4.2V65ZM76.6 69.4h-4.2v4.2h4.2v-4.2ZM76.6 94.9h-4.2V99h4.2V95ZM76.6 103.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M76.6 107.6h-4.2v4.3h4.2v-4.3ZM76.6 111.9h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M76.6 116.1h-4.2v4.2h4.2v-4.2ZM76.6 124.6h-4.2v4.2h4.2v-4.2ZM76.6 128.8h-4.2v4.3h4.2v-4.3ZM76.6 137.3h-4.2v4.3h4.2v-4.3ZM80.9 18.4h-4.3v4.3H81v-4.3ZM80.9 27h-4.3v4.2H81v-4.3ZM80.9 31.2h-4.3v4.2H81v-4.2ZM80.9 35.4h-4.3v4.3H81v-4.3ZM80.9 39.7h-4.3v4.2H81v-4.2ZM80.9 48.1h-4.3v4.3H81v-4.3ZM80.9 60.9h-4.3V65H81V61ZM80.9 65.1h-4.3v4.3H81V65ZM80.9 73.6h-4.3V78H81v-4.3ZM80.9 82.1h-4.3v4.3H81V82ZM80.9 94.9h-4.3V99H81V95ZM80.9 99.1h-4.3v4.3H81V99ZM80.9 103.4h-4.3v4.2H81v-4.2ZM80.9 111.9h-4.3v4.2H81v-4.2Z"/><path fill="#fff" d="M80.9 116.1h-4.3v4.2H81v-4.2ZM80.9 124.6h-4.3v4.2H81v-4.2ZM80.9 137.3h-4.3v4.3H81v-4.3ZM85.1 18.4H81v4.3H85v-4.3ZM85.1 31.2H81v4.2H85v-4.2ZM85.1 35.4H81v4.3H85v-4.3ZM85.1 43.9H81v4.2H85V44ZM85.1 56.6H81V61H85v-4.3ZM85.1 73.6H81V78H85v-4.3Z"/><path fill="#fff" d="M85.1 77.9H81V82H85V78ZM85.1 82.1H81v4.3H85V82ZM85.1 86.4H81v4.2H85v-4.2Z"/><path fill="#fff" d="M85.1 90.6H81V95H85v-4.3ZM85.1 99.1H81v4.3H85V99ZM85.1 111.9H81v4.2H85v-4.2Z"/><path fill="#fff" d="M85.1 116.1H81v4.2H85v-4.2ZM85.1 133H81v4.3H85v-4.2ZM89.4 22.7H85v4.2h4.3v-4.2ZM89.4 31.2H85v4.2h4.3v-4.2ZM89.4 35.4H85v4.3h4.3v-4.3ZM89.4 48.1H85v4.3h4.3v-4.3ZM89.4 52.4H85v4.2h4.3v-4.2ZM89.4 56.6H85V61h4.3v-4.3ZM89.4 65.1H85v4.3h4.3V65ZM89.4 103.4H85v4.2h4.3v-4.2Z"/><path fill="#fff" d="M89.4 107.6H85v4.3h4.3v-4.3ZM89.4 111.9H85v4.2h4.3v-4.2ZM89.4 128.8H85v4.3h4.3v-4.3Z"/><path fill="#fff" d="M89.4 133H85v4.3h4.3v-4.2ZM93.6 18.4h-4.2v4.3h4.2v-4.3ZM93.6 22.7h-4.2v4.2h4.2v-4.2ZM93.6 27h-4.2v4.2h4.2v-4.3ZM93.6 31.2h-4.2v4.2h4.2v-4.2ZM93.6 43.9h-4.2v4.2h4.2V44ZM93.6 56.6h-4.2V61h4.2v-4.3ZM93.6 65.1h-4.2v4.3h4.2V65ZM93.6 69.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M93.6 73.6h-4.2V78h4.2v-4.3ZM93.6 82.1h-4.2v4.3h4.2V82ZM93.6 86.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M93.6 90.6h-4.2V95h4.2v-4.3ZM93.6 111.9h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M93.6 116.1h-4.2v4.2h4.2v-4.2ZM97.9 18.4h-4.3v4.3H98v-4.3ZM97.9 22.7h-4.3v4.2H98v-4.2ZM97.9 35.4h-4.3v4.3H98v-4.3ZM97.9 48.1h-4.3v4.3H98v-4.3ZM97.9 52.4h-4.3v4.2H98v-4.2ZM97.9 60.9h-4.3V65H98V61ZM97.9 65.1h-4.3v4.3H98V65ZM97.9 73.6h-4.3V78H98v-4.3ZM97.9 82.1h-4.3v4.3H98V82ZM97.9 86.4h-4.3v4.2H98v-4.2ZM97.9 94.9h-4.3V99H98V95ZM97.9 99.1h-4.3v4.3H98V99ZM97.9 103.4h-4.3v4.2H98v-4.2Z"/><path fill="#fff" d="M97.9 107.6h-4.3v4.3H98v-4.3ZM97.9 116.1h-4.3v4.2H98v-4.2ZM97.9 124.6h-4.3v4.2H98v-4.2ZM97.9 133h-4.3v4.3H98v-4.2ZM102.1 22.7H98v4.2h4.2v-4.2ZM102.1 43.9H98v4.2h4.2V44ZM102.1 52.4H98v4.2h4.2v-4.2ZM102.1 69.4H98v4.2h4.2v-4.2Z"/><path fill="#fff" d="M102.1 73.6H98V78h4.2v-4.3ZM102.1 90.6H98V95h4.2v-4.3Z"/><path fill="#fff" d="M102.1 94.9H98V99h4.2V95ZM102.1 103.4H98v4.2h4.2v-4.2ZM102.1 133H98v4.3h4.2v-4.2ZM102.1 137.3H98v4.3h4.2v-4.3ZM106.4 18.4H102v4.3h4.3v-4.3ZM106.4 22.7H102v4.2h4.3v-4.2ZM106.4 48.1H102v4.3h4.3v-4.3ZM106.4 60.9H102V65h4.3V61ZM106.4 73.6H102V78h4.3v-4.3Z"/><path fill="#fff" d="M106.4 77.9H102V82h4.3V78ZM106.4 82.1H102v4.3h4.3V82ZM106.4 86.4H102v4.2h4.3v-4.2Z"/><path fill="#fff" d="M106.4 90.6H102V95h4.3v-4.3Z"/><path fill="#fff" d="M106.4 94.9H102V99h4.3V95ZM106.4 103.4H102v4.2h4.3v-4.2ZM106.4 116.1H102v4.2h4.3v-4.2ZM106.4 133H102v4.3h4.3v-4.2ZM106.4 137.3H102v4.3h4.3v-4.3ZM110.6 27h-4.2v4.2h4.2v-4.3ZM110.6 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M110.6 43.9h-4.2v4.2h4.2V44ZM110.6 48.1h-4.2v4.3h4.2v-4.3ZM110.6 52.4h-4.2v4.2h4.2v-4.2ZM110.6 56.6h-4.2V61h4.2v-4.3ZM110.6 90.6h-4.2V95h4.2v-4.3ZM110.6 99.1h-4.2v4.3h4.2V99ZM110.6 107.6h-4.2v4.3h4.2v-4.3ZM110.6 116.1h-4.2v4.2h4.2v-4.2ZM110.6 120.3h-4.2v4.3h4.2v-4.3ZM110.6 133h-4.2v4.3h4.2v-4.2ZM110.6 137.3h-4.2v4.3h4.2v-4.3ZM114.9 31.2h-4.3v4.2h4.3v-4.2ZM114.9 48.1h-4.3v4.3h4.3v-4.3ZM114.9 52.4h-4.3v4.2h4.3v-4.2ZM114.9 65.1h-4.3v4.3h4.3V65ZM114.9 73.6h-4.3V78h4.3v-4.3Z"/><path fill="#fff" d="M114.9 77.9h-4.3V82h4.3V78ZM114.9 82.1h-4.3v4.3h4.3V82ZM114.9 86.4h-4.3v4.2h4.3v-4.2ZM114.9 99.1h-4.3v4.3h4.3V99ZM114.9 111.9h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M114.9 116.1h-4.3v4.2h4.3v-4.2ZM114.9 133h-4.3v4.3h4.3v-4.2ZM114.9 137.3h-4.3v4.3h4.3v-4.3ZM119.1 18.4H115v4.3h4.2v-4.3ZM119.1 35.4H115v4.3h4.2v-4.3ZM119.1 39.7H115v4.2h4.2v-4.2Z"/><path fill="#fff" d="M119.1 43.9H115v4.2h4.2V44ZM119.1 65.1H115v4.3h4.2V65ZM119.1 69.4H115v4.2h4.2v-4.2Z"/><path fill="#fff" d="M119.1 73.6H115V78h4.2v-4.3Z"/><path fill="#fff" d="M119.1 77.9H115V82h4.2V78ZM119.1 82.1H115v4.3h4.2V82ZM119.1 86.4H115v4.2h4.2v-4.2ZM119.1 94.9H115V99h4.2V95ZM119.1 103.4H115v4.2h4.2v-4.2Z"/><path fill="#fff" d="M119.1 107.6H115v4.3h4.2v-4.3ZM119.1 116.1H115v4.2h4.2v-4.2ZM119.1 124.6H115v4.2h4.2v-4.2ZM119.1 133H115v4.3h4.2v-4.2ZM119.1 137.3H115v4.3h4.2v-4.3ZM123.4 31.2H119v4.2h4.3v-4.2ZM123.4 35.4H119v4.3h4.3v-4.3ZM123.4 56.6H119V61h4.3v-4.3Z"/><path fill="#fff" d="M123.4 60.9H119V65h4.3V61ZM123.4 90.6H119V95h4.3v-4.3Z"/><path fill="#fff" d="M123.4 94.9H119V99h4.3V95ZM123.4 99.1H119v4.3h4.3V99ZM123.4 120.3H119v4.3h4.3v-4.3Z"/><path fill="#fff" d="M123.4 124.6H119v4.2h4.3v-4.2ZM127.6 18.4h-4.2v4.3h4.2v-4.3ZM127.6 27h-4.2v4.2h4.2v-4.3ZM127.6 31.2h-4.2v4.2h4.2v-4.2ZM127.6 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M127.6 43.9h-4.2v4.2h4.2V44ZM127.6 48.1h-4.2v4.3h4.2v-4.3ZM127.6 56.6h-4.2V61h4.2v-4.3ZM127.6 65.1h-4.2v4.3h4.2V65ZM127.6 69.4h-4.2v4.2h4.2v-4.2ZM127.6 77.9h-4.2V82h4.2V78ZM127.6 82.1h-4.2v4.3h4.2V82ZM127.6 99.1h-4.2v4.3h4.2V99ZM127.6 103.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M127.6 107.6h-4.2v4.3h4.2v-4.3ZM127.6 111.9h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M127.6 116.1h-4.2v4.2h4.2v-4.2ZM127.6 120.3h-4.2v4.3h4.2v-4.3ZM127.6 128.8h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M127.6 133h-4.2v4.3h4.2v-4.2ZM131.9 52.4h-4.3v4.2h4.3v-4.2ZM131.9 65.1h-4.3v4.3h4.3V65ZM131.9 77.9h-4.3V82h4.3V78ZM131.9 86.4h-4.3v4.2h4.3v-4.2ZM131.9 94.9h-4.3V99h4.3V95ZM131.9 103.4h-4.3v4.2h4.3v-4.2ZM131.9 120.3h-4.3v4.3h4.3v-4.3ZM131.9 133h-4.3v4.3h4.3v-4.2ZM131.9 137.3h-4.3v4.3h4.3v-4.3ZM136.1 52.4h-4.2v4.2h4.2v-4.2ZM136.1 56.6h-4.2V61h4.2v-4.3Z"/><path fill="#fff" d="M136.1 60.9h-4.2V65h4.2V61ZM136.1 65.1h-4.2v4.3h4.2V65ZM136.1 69.4h-4.2v4.2h4.2v-4.2ZM136.1 94.9h-4.2V99h4.2V95ZM136.1 103.4h-4.2v4.2h4.2v-4.2ZM136.1 111.9h-4.2v4.2h4.2v-4.2ZM136.1 120.3h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M136.1 124.6h-4.2v4.2h4.2v-4.2ZM136.1 128.8h-4.2v4.3h4.2v-4.3ZM140.3 52.4h-4.2v4.2h4.2v-4.2ZM140.3 56.6h-4.2V61h4.2v-4.3ZM140.3 65.1h-4.2v4.3h4.2V65ZM140.3 73.6h-4.2V78h4.2v-4.3Z"/><path fill="#fff" d="M140.3 77.9h-4.2V82h4.2V78ZM140.3 86.4h-4.2v4.2h4.2v-4.2ZM140.3 94.9h-4.2V99h4.2V95ZM140.3 103.4h-4.2v4.2h4.2v-4.2ZM140.3 120.3h-4.2v4.3h4.2v-4.3ZM140.3 128.8h-4.2v4.3h4.2v-4.3ZM144.6 60.9h-4.3V65h4.3V61Z"/><path fill="#fff" d="M144.6 86.4h-4.3v4.2h4.3v-4.2ZM144.6 103.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M144.6 107.6h-4.3v4.3h4.3v-4.3ZM144.6 111.9h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M144.6 116.1h-4.3v4.2h4.3v-4.2ZM144.6 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M144.6 124.6h-4.3v4.2h4.3v-4.2ZM148.8 52.4h-4.2v4.2h4.2v-4.2ZM148.8 60.9h-4.2V65h4.2V61ZM148.8 73.6h-4.2V78h4.2v-4.3ZM148.8 82.1h-4.2v4.3h4.2V82ZM148.8 86.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M148.8 90.6h-4.2V95h4.2v-4.3ZM148.8 99.1h-4.2v4.3h4.2V99ZM148.8 103.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M148.8 107.6h-4.2v4.3h4.2v-4.3ZM148.8 111.9h-4.2v4.2h4.2v-4.2ZM148.8 120.3h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M148.8 124.6h-4.2v4.2h4.2v-4.2ZM148.8 128.8h-4.2v4.3h4.2v-4.3ZM148.8 137.3h-4.2v4.3h4.2v-4.3ZM153 56.6h-4.2V61h4.3v-4.3Z"/><path fill="#fff" d="M153 60.9h-4.2V65h4.3V61ZM153 65.1h-4.2v4.3h4.3V65ZM153 94.9h-4.2V99h4.3V95ZM153 99.1h-4.2v4.3h4.3V99ZM153 103.4h-4.2v4.2h4.3v-4.2ZM153 120.3h-4.2v4.3h4.3v-4.3Z"/><path fill="#fff" d="M153 124.6h-4.2v4.2h4.3v-4.2ZM153 137.3h-4.2v4.3h4.3v-4.3ZM157.3 52.4h-4.2v4.2h4.2v-4.2ZM157.3 56.6h-4.2V61h4.2v-4.3Z"/><path fill="#fff" d="M157.3 60.9h-4.2V65h4.2V61ZM157.3 65.1h-4.2v4.3h4.2V65ZM157.3 90.6h-4.2V95h4.2v-4.3ZM157.3 116.1h-4.2v4.2h4.2v-4.2ZM157.3 124.6h-4.2v4.2h4.2v-4.2ZM157.3 133h-4.2v4.3h4.2v-4.2Z"/><path fill="#fff" d="M161.6 56.6h-4.3V61h4.3v-4.3Z"/><path fill="#fff" d="M161.6 60.9h-4.3V65h4.3V61ZM161.6 65.1h-4.3v4.3h4.3V65ZM161.6 73.6h-4.3V78h4.3v-4.3ZM161.6 90.6h-4.3V95h4.3v-4.3ZM161.6 103.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M161.6 107.6h-4.3v4.3h4.3v-4.3ZM161.6 111.9h-4.3v4.2h4.3v-4.2ZM161.6 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M161.6 124.6h-4.3v4.2h4.3v-4.2ZM161.6 133h-4.3v4.3h4.3v-4.2Z"/></mask><g mask="url(#b)"><path fill="#000" d="M161.6 18.4H38.4v123.2h123.2V18.4Z"/></g><mask id="c" width="31" height="31" x="38" y="18" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M42.7 18.4h-4.3v4.3h4.3v-4.3ZM42.7 22.7h-4.3v4.2h4.3v-4.2ZM42.7 27h-4.3v4.2h4.3v-4.3ZM42.7 31.2h-4.3v4.2h4.3v-4.2ZM42.7 35.4h-4.3v4.3h4.3v-4.3ZM42.7 39.7h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M42.7 43.9h-4.3v4.2h4.3V44ZM47 18.4h-4.3v4.3h4.2v-4.3ZM47 43.9h-4.3v4.2h4.2V44Z"/><path fill="#fff" d="M51.2 18.4h-4.3v4.3h4.3v-4.3ZM51.2 43.9h-4.3v4.2h4.3V44Z"/><path fill="#fff" d="M55.4 18.4h-4.2v4.3h4.2v-4.3ZM55.4 43.9h-4.2v4.2h4.2V44ZM59.7 18.4h-4.3v4.3h4.3v-4.3ZM59.7 43.9h-4.3v4.2h4.3V44Z"/><path fill="#fff" d="M63.9 18.4h-4.2v4.3h4.2v-4.3ZM63.9 43.9h-4.2v4.2h4.2V44ZM68.1 18.4H64v4.3h4.2v-4.3ZM68.1 22.7H64v4.2h4.2v-4.2ZM68.1 27H64v4.2h4.2v-4.3ZM68.1 31.2H64v4.2h4.2v-4.2ZM68.1 35.4H64v4.3h4.2v-4.3ZM68.1 39.7H64v4.2h4.2v-4.2Z"/><path fill="#fff" d="M68.1 43.9H64v4.2h4.2V44Z"/></mask><g mask="url(#c)"><path fill="#000" d="M68.1 18.4H38.4v29.7h29.7V18.4Z"/></g><mask id="d" width="14" height="14" x="46" y="26" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M51.2 27h-4.3v4.2h4.3v-4.3ZM51.2 31.2h-4.3v4.2h4.3v-4.2ZM51.2 35.4h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M55.4 27h-4.2v4.2h4.2v-4.3ZM55.4 31.2h-4.2v4.2h4.2v-4.2ZM55.4 35.4h-4.2v4.3h4.2v-4.3ZM59.7 27h-4.3v4.2h4.3v-4.3ZM59.7 31.2h-4.3v4.2h4.3v-4.2ZM59.7 35.4h-4.3v4.3h4.3v-4.3Z"/></mask><g mask="url(#d)"><path fill="#000" d="M59.7 27H46.9v12.7h12.8V26.9Z"/></g><mask id="e" width="31" height="31" x="131" y="18" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M136.1 18.4h-4.2v4.3h4.2v-4.3ZM136.1 22.7h-4.2v4.2h4.2v-4.2ZM136.1 27h-4.2v4.2h4.2v-4.3ZM136.1 31.2h-4.2v4.2h4.2v-4.2ZM136.1 35.4h-4.2v4.3h4.2v-4.3ZM136.1 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M136.1 43.9h-4.2v4.2h4.2V44ZM140.3 18.4h-4.2v4.3h4.2v-4.3ZM140.3 43.9h-4.2v4.2h4.2V44Z"/><path fill="#fff" d="M144.6 18.4h-4.3v4.3h4.3v-4.3ZM144.6 43.9h-4.3v4.2h4.3V44ZM148.8 18.4h-4.2v4.3h4.2v-4.3ZM148.8 43.9h-4.2v4.2h4.2V44ZM153 18.4h-4.2v4.3h4.3v-4.3ZM153 43.9h-4.2v4.2h4.3V44ZM157.3 18.4h-4.2v4.3h4.2v-4.3ZM157.3 43.9h-4.2v4.2h4.2V44Z"/><path fill="#fff" d="M161.6 18.4h-4.3v4.3h4.3v-4.3ZM161.6 22.7h-4.3v4.2h4.3v-4.2ZM161.6 27h-4.3v4.2h4.3v-4.3ZM161.6 31.2h-4.3v4.2h4.3v-4.2ZM161.6 35.4h-4.3v4.3h4.3v-4.3ZM161.6 39.7h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M161.6 43.9h-4.3v4.2h4.3V44Z"/></mask><g mask="url(#e)"><path fill="#000" d="M161.6 18.4h-29.7v29.7h29.7V18.4Z"/></g><mask id="f" width="14" height="14" x="140" y="26" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M144.6 27h-4.3v4.2h4.3v-4.3ZM144.6 31.2h-4.3v4.2h4.3v-4.2ZM144.6 35.4h-4.3v4.3h4.3v-4.3ZM148.8 27h-4.2v4.2h4.2v-4.3ZM148.8 31.2h-4.2v4.2h4.2v-4.2ZM148.8 35.4h-4.2v4.3h4.2v-4.3ZM153 27h-4.2v4.2h4.3v-4.3ZM153 31.2h-4.2v4.2h4.3v-4.2ZM153 35.4h-4.2v4.3h4.3v-4.3Z"/></mask><g mask="url(#f)"><path fill="#000" d="M153 27h-12.7v12.7h12.8V26.9Z"/></g><mask id="g" width="31" height="31" x="38" y="111" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M42.7 111.9h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M42.7 116.1h-4.3v4.2h4.3v-4.2ZM42.7 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M42.7 124.6h-4.3v4.2h4.3v-4.2ZM42.7 128.8h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M42.7 133h-4.3v4.3h4.3v-4.2ZM42.7 137.3h-4.3v4.3h4.3v-4.3ZM47 111.9h-4.3v4.2h4.2v-4.2ZM47 137.3h-4.3v4.3h4.2v-4.3Z"/><path fill="#fff" d="M51.2 111.9h-4.3v4.2h4.3v-4.2ZM51.2 137.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M55.4 111.9h-4.2v4.2h4.2v-4.2ZM55.4 137.3h-4.2v4.3h4.2v-4.3ZM59.7 111.9h-4.3v4.2h4.3v-4.2ZM59.7 137.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M63.9 111.9h-4.2v4.2h4.2v-4.2ZM63.9 137.3h-4.2v4.3h4.2v-4.3ZM68.1 111.9H64v4.2h4.2v-4.2Z"/><path fill="#fff" d="M68.1 116.1H64v4.2h4.2v-4.2ZM68.1 120.3H64v4.3h4.2v-4.3Z"/><path fill="#fff" d="M68.1 124.6H64v4.2h4.2v-4.2ZM68.1 128.8H64v4.3h4.2v-4.3Z"/><path fill="#fff" d="M68.1 133H64v4.3h4.2v-4.2ZM68.1 137.3H64v4.3h4.2v-4.3Z"/></mask><g mask="url(#g)"><path fill="#000" d="M68.1 111.9H38.4v29.7h29.7v-29.7Z"/></g><mask id="h" width="14" height="14" x="46" y="120" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M51.2 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M51.2 124.6h-4.3v4.2h4.3v-4.2ZM51.2 128.8h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M55.4 120.3h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M55.4 124.6h-4.2v4.2h4.2v-4.2ZM55.4 128.8h-4.2v4.3h4.2v-4.3ZM59.7 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M59.7 124.6h-4.3v4.2h4.3v-4.2ZM59.7 128.8h-4.3v4.3h4.3v-4.3Z"/></mask><g mask="url(#h)"><path fill="#000" d="M59.7 120.3H46.9v12.8h12.8v-12.8Z"/></g></g><defs><clipPath id="a"><rect width="137" height="137" x="31.5" y="11.5" fill="#fff" rx="8.2"/></clipPath></defs></svg>", - "description": "Enables users to open the ThingsBoard mobile app by scanning a QR code from Home page.", - "descriptor": { - "type": "static", - "sizeX": 6, - "sizeY": 3, - "resources": [], - "templateHtml": "\n", - "templateCss": "", - "controllerScript": "self.onInit = function() {\n}", - "settingsSchema": "", - "dataKeySettingsSchema": "", - "settingsDirective": "", - "defaultConfig": "{\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Home page mobile app QR code\",\"dropShadow\":true}" - }, - "tags": [ - "ios", - "android", - "qr code", - "mobile application", - "home page" - ] -} \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/mobile_app_qr_code.json b/application/src/main/data/json/system/widget_types/mobile_app_qr_code.json index ccb9bea73f..37f7df0ae6 100644 --- a/application/src/main/data/json/system/widget_types/mobile_app_qr_code.json +++ b/application/src/main/data/json/system/widget_types/mobile_app_qr_code.json @@ -1,5 +1,5 @@ { - "fqn": "cards.mobile_app_qr_code", + "fqn": "mobile_app_qr_code", "name": "Mobile app QR code", "deprecated": false, "image": "tb-image:bW9iaWxlX2FwcF9xcl9jb2RlX3dpZGdldC5zdmc=:bW9iaWxlX2FwcF9xcl9jb2RlX3dpZGdldC5zdmc=;data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="200" height="160" fill="none"><rect width="200" height="160" fill="#fff" rx="4"/><rect width="199" height="159" x=".5" y=".5" stroke="#000" stroke-opacity=".1" rx="3.5"/><g clip-path="url(#a)"><rect width="137" height="137" x="31.5" y="11.5" fill="#fff" rx="8.2"/><path fill="#fff" d="M168.5 11.5h-137v137h137v-137Z"/><mask id="b" width="124" height="124" x="38" y="18" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M42.7 52.4h-4.3v4.2h4.3v-4.2ZM42.7 60.9h-4.3V65h4.3V61ZM42.7 65.1h-4.3v4.3h4.3V65ZM42.7 94.9h-4.3V99h4.3V95ZM47 56.6h-4.3V61h4.2v-4.3ZM47 82.1h-4.3v4.3h4.2V82ZM47 86.4h-4.3v4.2h4.2v-4.2ZM47 94.9h-4.3V99h4.2V95ZM47 103.4h-4.3v4.2h4.2v-4.2ZM51.2 52.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M51.2 60.9h-4.3V65h4.3V61ZM51.2 73.6h-4.3V78h4.3v-4.3Z"/><path fill="#fff" d="M51.2 77.9h-4.3V82h4.3V78ZM51.2 82.1h-4.3v4.3h4.3V82ZM51.2 90.6h-4.3V95h4.3v-4.3ZM51.2 99.1h-4.3v4.3h4.3V99ZM55.4 52.4h-4.2v4.2h4.2v-4.2ZM55.4 69.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M55.4 86.4h-4.2v4.2h4.2v-4.2ZM55.4 99.1h-4.2v4.3h4.2V99ZM55.4 103.4h-4.2v4.2h4.2v-4.2ZM59.7 65.1h-4.3v4.3h4.3V65ZM59.7 69.4h-4.3v4.2h4.3v-4.2ZM59.7 86.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M59.7 90.6h-4.3V95h4.3v-4.3Z"/><path fill="#fff" d="M59.7 94.9h-4.3V99h4.3V95ZM63.9 52.4h-4.2v4.2h4.2v-4.2ZM63.9 65.1h-4.2v4.3h4.2V65ZM63.9 69.4h-4.2v4.2h4.2v-4.2ZM63.9 86.4h-4.2v4.2h4.2v-4.2ZM63.9 99.1h-4.2v4.3h4.2V99ZM68.1 52.4H64v4.2h4.2v-4.2ZM68.1 60.9H64V65h4.2V61ZM68.1 69.4H64v4.2h4.2v-4.2ZM68.1 77.9H64V82h4.2V78ZM68.1 86.4H64v4.2h4.2v-4.2ZM68.1 94.9H64V99h4.2V95ZM68.1 103.4H64v4.2h4.2v-4.2Z"/><path fill="#fff" d="M72.4 52.4H68v4.2h4.3v-4.2ZM72.4 69.4H68v4.2h4.3v-4.2ZM72.4 77.9H68V82h4.3V78ZM72.4 82.1H68v4.3h4.3V82ZM72.4 86.4H68v4.2h4.3v-4.2Z"/><path fill="#fff" d="M72.4 90.6H68V95h4.3v-4.3ZM72.4 99.1H68v4.3h4.3V99ZM72.4 103.4H68v4.2h4.3v-4.2ZM76.6 22.7h-4.2v4.2h4.2v-4.2ZM76.6 31.2h-4.2v4.2h4.2v-4.2ZM76.6 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M76.6 43.9h-4.2v4.2h4.2V44ZM76.6 48.1h-4.2v4.3h4.2v-4.3ZM76.6 52.4h-4.2v4.2h4.2v-4.2ZM76.6 56.6h-4.2V61h4.2v-4.3Z"/><path fill="#fff" d="M76.6 60.9h-4.2V65h4.2V61ZM76.6 65.1h-4.2v4.3h4.2V65ZM76.6 69.4h-4.2v4.2h4.2v-4.2ZM76.6 94.9h-4.2V99h4.2V95ZM76.6 103.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M76.6 107.6h-4.2v4.3h4.2v-4.3ZM76.6 111.9h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M76.6 116.1h-4.2v4.2h4.2v-4.2ZM76.6 124.6h-4.2v4.2h4.2v-4.2ZM76.6 128.8h-4.2v4.3h4.2v-4.3ZM76.6 137.3h-4.2v4.3h4.2v-4.3ZM80.9 18.4h-4.3v4.3H81v-4.3ZM80.9 27h-4.3v4.2H81v-4.3ZM80.9 31.2h-4.3v4.2H81v-4.2ZM80.9 35.4h-4.3v4.3H81v-4.3ZM80.9 39.7h-4.3v4.2H81v-4.2ZM80.9 48.1h-4.3v4.3H81v-4.3ZM80.9 60.9h-4.3V65H81V61ZM80.9 65.1h-4.3v4.3H81V65ZM80.9 73.6h-4.3V78H81v-4.3ZM80.9 82.1h-4.3v4.3H81V82ZM80.9 94.9h-4.3V99H81V95ZM80.9 99.1h-4.3v4.3H81V99ZM80.9 103.4h-4.3v4.2H81v-4.2ZM80.9 111.9h-4.3v4.2H81v-4.2Z"/><path fill="#fff" d="M80.9 116.1h-4.3v4.2H81v-4.2ZM80.9 124.6h-4.3v4.2H81v-4.2ZM80.9 137.3h-4.3v4.3H81v-4.3ZM85.1 18.4H81v4.3H85v-4.3ZM85.1 31.2H81v4.2H85v-4.2ZM85.1 35.4H81v4.3H85v-4.3ZM85.1 43.9H81v4.2H85V44ZM85.1 56.6H81V61H85v-4.3ZM85.1 73.6H81V78H85v-4.3Z"/><path fill="#fff" d="M85.1 77.9H81V82H85V78ZM85.1 82.1H81v4.3H85V82ZM85.1 86.4H81v4.2H85v-4.2Z"/><path fill="#fff" d="M85.1 90.6H81V95H85v-4.3ZM85.1 99.1H81v4.3H85V99ZM85.1 111.9H81v4.2H85v-4.2Z"/><path fill="#fff" d="M85.1 116.1H81v4.2H85v-4.2ZM85.1 133H81v4.3H85v-4.2ZM89.4 22.7H85v4.2h4.3v-4.2ZM89.4 31.2H85v4.2h4.3v-4.2ZM89.4 35.4H85v4.3h4.3v-4.3ZM89.4 48.1H85v4.3h4.3v-4.3ZM89.4 52.4H85v4.2h4.3v-4.2ZM89.4 56.6H85V61h4.3v-4.3ZM89.4 65.1H85v4.3h4.3V65ZM89.4 103.4H85v4.2h4.3v-4.2Z"/><path fill="#fff" d="M89.4 107.6H85v4.3h4.3v-4.3ZM89.4 111.9H85v4.2h4.3v-4.2ZM89.4 128.8H85v4.3h4.3v-4.3Z"/><path fill="#fff" d="M89.4 133H85v4.3h4.3v-4.2ZM93.6 18.4h-4.2v4.3h4.2v-4.3ZM93.6 22.7h-4.2v4.2h4.2v-4.2ZM93.6 27h-4.2v4.2h4.2v-4.3ZM93.6 31.2h-4.2v4.2h4.2v-4.2ZM93.6 43.9h-4.2v4.2h4.2V44ZM93.6 56.6h-4.2V61h4.2v-4.3ZM93.6 65.1h-4.2v4.3h4.2V65ZM93.6 69.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M93.6 73.6h-4.2V78h4.2v-4.3ZM93.6 82.1h-4.2v4.3h4.2V82ZM93.6 86.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M93.6 90.6h-4.2V95h4.2v-4.3ZM93.6 111.9h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M93.6 116.1h-4.2v4.2h4.2v-4.2ZM97.9 18.4h-4.3v4.3H98v-4.3ZM97.9 22.7h-4.3v4.2H98v-4.2ZM97.9 35.4h-4.3v4.3H98v-4.3ZM97.9 48.1h-4.3v4.3H98v-4.3ZM97.9 52.4h-4.3v4.2H98v-4.2ZM97.9 60.9h-4.3V65H98V61ZM97.9 65.1h-4.3v4.3H98V65ZM97.9 73.6h-4.3V78H98v-4.3ZM97.9 82.1h-4.3v4.3H98V82ZM97.9 86.4h-4.3v4.2H98v-4.2ZM97.9 94.9h-4.3V99H98V95ZM97.9 99.1h-4.3v4.3H98V99ZM97.9 103.4h-4.3v4.2H98v-4.2Z"/><path fill="#fff" d="M97.9 107.6h-4.3v4.3H98v-4.3ZM97.9 116.1h-4.3v4.2H98v-4.2ZM97.9 124.6h-4.3v4.2H98v-4.2ZM97.9 133h-4.3v4.3H98v-4.2ZM102.1 22.7H98v4.2h4.2v-4.2ZM102.1 43.9H98v4.2h4.2V44ZM102.1 52.4H98v4.2h4.2v-4.2ZM102.1 69.4H98v4.2h4.2v-4.2Z"/><path fill="#fff" d="M102.1 73.6H98V78h4.2v-4.3ZM102.1 90.6H98V95h4.2v-4.3Z"/><path fill="#fff" d="M102.1 94.9H98V99h4.2V95ZM102.1 103.4H98v4.2h4.2v-4.2ZM102.1 133H98v4.3h4.2v-4.2ZM102.1 137.3H98v4.3h4.2v-4.3ZM106.4 18.4H102v4.3h4.3v-4.3ZM106.4 22.7H102v4.2h4.3v-4.2ZM106.4 48.1H102v4.3h4.3v-4.3ZM106.4 60.9H102V65h4.3V61ZM106.4 73.6H102V78h4.3v-4.3Z"/><path fill="#fff" d="M106.4 77.9H102V82h4.3V78ZM106.4 82.1H102v4.3h4.3V82ZM106.4 86.4H102v4.2h4.3v-4.2Z"/><path fill="#fff" d="M106.4 90.6H102V95h4.3v-4.3Z"/><path fill="#fff" d="M106.4 94.9H102V99h4.3V95ZM106.4 103.4H102v4.2h4.3v-4.2ZM106.4 116.1H102v4.2h4.3v-4.2ZM106.4 133H102v4.3h4.3v-4.2ZM106.4 137.3H102v4.3h4.3v-4.3ZM110.6 27h-4.2v4.2h4.2v-4.3ZM110.6 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M110.6 43.9h-4.2v4.2h4.2V44ZM110.6 48.1h-4.2v4.3h4.2v-4.3ZM110.6 52.4h-4.2v4.2h4.2v-4.2ZM110.6 56.6h-4.2V61h4.2v-4.3ZM110.6 90.6h-4.2V95h4.2v-4.3ZM110.6 99.1h-4.2v4.3h4.2V99ZM110.6 107.6h-4.2v4.3h4.2v-4.3ZM110.6 116.1h-4.2v4.2h4.2v-4.2ZM110.6 120.3h-4.2v4.3h4.2v-4.3ZM110.6 133h-4.2v4.3h4.2v-4.2ZM110.6 137.3h-4.2v4.3h4.2v-4.3ZM114.9 31.2h-4.3v4.2h4.3v-4.2ZM114.9 48.1h-4.3v4.3h4.3v-4.3ZM114.9 52.4h-4.3v4.2h4.3v-4.2ZM114.9 65.1h-4.3v4.3h4.3V65ZM114.9 73.6h-4.3V78h4.3v-4.3Z"/><path fill="#fff" d="M114.9 77.9h-4.3V82h4.3V78ZM114.9 82.1h-4.3v4.3h4.3V82ZM114.9 86.4h-4.3v4.2h4.3v-4.2ZM114.9 99.1h-4.3v4.3h4.3V99ZM114.9 111.9h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M114.9 116.1h-4.3v4.2h4.3v-4.2ZM114.9 133h-4.3v4.3h4.3v-4.2ZM114.9 137.3h-4.3v4.3h4.3v-4.3ZM119.1 18.4H115v4.3h4.2v-4.3ZM119.1 35.4H115v4.3h4.2v-4.3ZM119.1 39.7H115v4.2h4.2v-4.2Z"/><path fill="#fff" d="M119.1 43.9H115v4.2h4.2V44ZM119.1 65.1H115v4.3h4.2V65ZM119.1 69.4H115v4.2h4.2v-4.2Z"/><path fill="#fff" d="M119.1 73.6H115V78h4.2v-4.3Z"/><path fill="#fff" d="M119.1 77.9H115V82h4.2V78ZM119.1 82.1H115v4.3h4.2V82ZM119.1 86.4H115v4.2h4.2v-4.2ZM119.1 94.9H115V99h4.2V95ZM119.1 103.4H115v4.2h4.2v-4.2Z"/><path fill="#fff" d="M119.1 107.6H115v4.3h4.2v-4.3ZM119.1 116.1H115v4.2h4.2v-4.2ZM119.1 124.6H115v4.2h4.2v-4.2ZM119.1 133H115v4.3h4.2v-4.2ZM119.1 137.3H115v4.3h4.2v-4.3ZM123.4 31.2H119v4.2h4.3v-4.2ZM123.4 35.4H119v4.3h4.3v-4.3ZM123.4 56.6H119V61h4.3v-4.3Z"/><path fill="#fff" d="M123.4 60.9H119V65h4.3V61ZM123.4 90.6H119V95h4.3v-4.3Z"/><path fill="#fff" d="M123.4 94.9H119V99h4.3V95ZM123.4 99.1H119v4.3h4.3V99ZM123.4 120.3H119v4.3h4.3v-4.3Z"/><path fill="#fff" d="M123.4 124.6H119v4.2h4.3v-4.2ZM127.6 18.4h-4.2v4.3h4.2v-4.3ZM127.6 27h-4.2v4.2h4.2v-4.3ZM127.6 31.2h-4.2v4.2h4.2v-4.2ZM127.6 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M127.6 43.9h-4.2v4.2h4.2V44ZM127.6 48.1h-4.2v4.3h4.2v-4.3ZM127.6 56.6h-4.2V61h4.2v-4.3ZM127.6 65.1h-4.2v4.3h4.2V65ZM127.6 69.4h-4.2v4.2h4.2v-4.2ZM127.6 77.9h-4.2V82h4.2V78ZM127.6 82.1h-4.2v4.3h4.2V82ZM127.6 99.1h-4.2v4.3h4.2V99ZM127.6 103.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M127.6 107.6h-4.2v4.3h4.2v-4.3ZM127.6 111.9h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M127.6 116.1h-4.2v4.2h4.2v-4.2ZM127.6 120.3h-4.2v4.3h4.2v-4.3ZM127.6 128.8h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M127.6 133h-4.2v4.3h4.2v-4.2ZM131.9 52.4h-4.3v4.2h4.3v-4.2ZM131.9 65.1h-4.3v4.3h4.3V65ZM131.9 77.9h-4.3V82h4.3V78ZM131.9 86.4h-4.3v4.2h4.3v-4.2ZM131.9 94.9h-4.3V99h4.3V95ZM131.9 103.4h-4.3v4.2h4.3v-4.2ZM131.9 120.3h-4.3v4.3h4.3v-4.3ZM131.9 133h-4.3v4.3h4.3v-4.2ZM131.9 137.3h-4.3v4.3h4.3v-4.3ZM136.1 52.4h-4.2v4.2h4.2v-4.2ZM136.1 56.6h-4.2V61h4.2v-4.3Z"/><path fill="#fff" d="M136.1 60.9h-4.2V65h4.2V61ZM136.1 65.1h-4.2v4.3h4.2V65ZM136.1 69.4h-4.2v4.2h4.2v-4.2ZM136.1 94.9h-4.2V99h4.2V95ZM136.1 103.4h-4.2v4.2h4.2v-4.2ZM136.1 111.9h-4.2v4.2h4.2v-4.2ZM136.1 120.3h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M136.1 124.6h-4.2v4.2h4.2v-4.2ZM136.1 128.8h-4.2v4.3h4.2v-4.3ZM140.3 52.4h-4.2v4.2h4.2v-4.2ZM140.3 56.6h-4.2V61h4.2v-4.3ZM140.3 65.1h-4.2v4.3h4.2V65ZM140.3 73.6h-4.2V78h4.2v-4.3Z"/><path fill="#fff" d="M140.3 77.9h-4.2V82h4.2V78ZM140.3 86.4h-4.2v4.2h4.2v-4.2ZM140.3 94.9h-4.2V99h4.2V95ZM140.3 103.4h-4.2v4.2h4.2v-4.2ZM140.3 120.3h-4.2v4.3h4.2v-4.3ZM140.3 128.8h-4.2v4.3h4.2v-4.3ZM144.6 60.9h-4.3V65h4.3V61Z"/><path fill="#fff" d="M144.6 86.4h-4.3v4.2h4.3v-4.2ZM144.6 103.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M144.6 107.6h-4.3v4.3h4.3v-4.3ZM144.6 111.9h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M144.6 116.1h-4.3v4.2h4.3v-4.2ZM144.6 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M144.6 124.6h-4.3v4.2h4.3v-4.2ZM148.8 52.4h-4.2v4.2h4.2v-4.2ZM148.8 60.9h-4.2V65h4.2V61ZM148.8 73.6h-4.2V78h4.2v-4.3ZM148.8 82.1h-4.2v4.3h4.2V82ZM148.8 86.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M148.8 90.6h-4.2V95h4.2v-4.3ZM148.8 99.1h-4.2v4.3h4.2V99ZM148.8 103.4h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M148.8 107.6h-4.2v4.3h4.2v-4.3ZM148.8 111.9h-4.2v4.2h4.2v-4.2ZM148.8 120.3h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M148.8 124.6h-4.2v4.2h4.2v-4.2ZM148.8 128.8h-4.2v4.3h4.2v-4.3ZM148.8 137.3h-4.2v4.3h4.2v-4.3ZM153 56.6h-4.2V61h4.3v-4.3Z"/><path fill="#fff" d="M153 60.9h-4.2V65h4.3V61ZM153 65.1h-4.2v4.3h4.3V65ZM153 94.9h-4.2V99h4.3V95ZM153 99.1h-4.2v4.3h4.3V99ZM153 103.4h-4.2v4.2h4.3v-4.2ZM153 120.3h-4.2v4.3h4.3v-4.3Z"/><path fill="#fff" d="M153 124.6h-4.2v4.2h4.3v-4.2ZM153 137.3h-4.2v4.3h4.3v-4.3ZM157.3 52.4h-4.2v4.2h4.2v-4.2ZM157.3 56.6h-4.2V61h4.2v-4.3Z"/><path fill="#fff" d="M157.3 60.9h-4.2V65h4.2V61ZM157.3 65.1h-4.2v4.3h4.2V65ZM157.3 90.6h-4.2V95h4.2v-4.3ZM157.3 116.1h-4.2v4.2h4.2v-4.2ZM157.3 124.6h-4.2v4.2h4.2v-4.2ZM157.3 133h-4.2v4.3h4.2v-4.2Z"/><path fill="#fff" d="M161.6 56.6h-4.3V61h4.3v-4.3Z"/><path fill="#fff" d="M161.6 60.9h-4.3V65h4.3V61ZM161.6 65.1h-4.3v4.3h4.3V65ZM161.6 73.6h-4.3V78h4.3v-4.3ZM161.6 90.6h-4.3V95h4.3v-4.3ZM161.6 103.4h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M161.6 107.6h-4.3v4.3h4.3v-4.3ZM161.6 111.9h-4.3v4.2h4.3v-4.2ZM161.6 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M161.6 124.6h-4.3v4.2h4.3v-4.2ZM161.6 133h-4.3v4.3h4.3v-4.2Z"/></mask><g mask="url(#b)"><path fill="#000" d="M161.6 18.4H38.4v123.2h123.2V18.4Z"/></g><mask id="c" width="31" height="31" x="38" y="18" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M42.7 18.4h-4.3v4.3h4.3v-4.3ZM42.7 22.7h-4.3v4.2h4.3v-4.2ZM42.7 27h-4.3v4.2h4.3v-4.3ZM42.7 31.2h-4.3v4.2h4.3v-4.2ZM42.7 35.4h-4.3v4.3h4.3v-4.3ZM42.7 39.7h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M42.7 43.9h-4.3v4.2h4.3V44ZM47 18.4h-4.3v4.3h4.2v-4.3ZM47 43.9h-4.3v4.2h4.2V44Z"/><path fill="#fff" d="M51.2 18.4h-4.3v4.3h4.3v-4.3ZM51.2 43.9h-4.3v4.2h4.3V44Z"/><path fill="#fff" d="M55.4 18.4h-4.2v4.3h4.2v-4.3ZM55.4 43.9h-4.2v4.2h4.2V44ZM59.7 18.4h-4.3v4.3h4.3v-4.3ZM59.7 43.9h-4.3v4.2h4.3V44Z"/><path fill="#fff" d="M63.9 18.4h-4.2v4.3h4.2v-4.3ZM63.9 43.9h-4.2v4.2h4.2V44ZM68.1 18.4H64v4.3h4.2v-4.3ZM68.1 22.7H64v4.2h4.2v-4.2ZM68.1 27H64v4.2h4.2v-4.3ZM68.1 31.2H64v4.2h4.2v-4.2ZM68.1 35.4H64v4.3h4.2v-4.3ZM68.1 39.7H64v4.2h4.2v-4.2Z"/><path fill="#fff" d="M68.1 43.9H64v4.2h4.2V44Z"/></mask><g mask="url(#c)"><path fill="#000" d="M68.1 18.4H38.4v29.7h29.7V18.4Z"/></g><mask id="d" width="14" height="14" x="46" y="26" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M51.2 27h-4.3v4.2h4.3v-4.3ZM51.2 31.2h-4.3v4.2h4.3v-4.2ZM51.2 35.4h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M55.4 27h-4.2v4.2h4.2v-4.3ZM55.4 31.2h-4.2v4.2h4.2v-4.2ZM55.4 35.4h-4.2v4.3h4.2v-4.3ZM59.7 27h-4.3v4.2h4.3v-4.3ZM59.7 31.2h-4.3v4.2h4.3v-4.2ZM59.7 35.4h-4.3v4.3h4.3v-4.3Z"/></mask><g mask="url(#d)"><path fill="#000" d="M59.7 27H46.9v12.7h12.8V26.9Z"/></g><mask id="e" width="31" height="31" x="131" y="18" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M136.1 18.4h-4.2v4.3h4.2v-4.3ZM136.1 22.7h-4.2v4.2h4.2v-4.2ZM136.1 27h-4.2v4.2h4.2v-4.3ZM136.1 31.2h-4.2v4.2h4.2v-4.2ZM136.1 35.4h-4.2v4.3h4.2v-4.3ZM136.1 39.7h-4.2v4.2h4.2v-4.2Z"/><path fill="#fff" d="M136.1 43.9h-4.2v4.2h4.2V44ZM140.3 18.4h-4.2v4.3h4.2v-4.3ZM140.3 43.9h-4.2v4.2h4.2V44Z"/><path fill="#fff" d="M144.6 18.4h-4.3v4.3h4.3v-4.3ZM144.6 43.9h-4.3v4.2h4.3V44ZM148.8 18.4h-4.2v4.3h4.2v-4.3ZM148.8 43.9h-4.2v4.2h4.2V44ZM153 18.4h-4.2v4.3h4.3v-4.3ZM153 43.9h-4.2v4.2h4.3V44ZM157.3 18.4h-4.2v4.3h4.2v-4.3ZM157.3 43.9h-4.2v4.2h4.2V44Z"/><path fill="#fff" d="M161.6 18.4h-4.3v4.3h4.3v-4.3ZM161.6 22.7h-4.3v4.2h4.3v-4.2ZM161.6 27h-4.3v4.2h4.3v-4.3ZM161.6 31.2h-4.3v4.2h4.3v-4.2ZM161.6 35.4h-4.3v4.3h4.3v-4.3ZM161.6 39.7h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M161.6 43.9h-4.3v4.2h4.3V44Z"/></mask><g mask="url(#e)"><path fill="#000" d="M161.6 18.4h-29.7v29.7h29.7V18.4Z"/></g><mask id="f" width="14" height="14" x="140" y="26" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M144.6 27h-4.3v4.2h4.3v-4.3ZM144.6 31.2h-4.3v4.2h4.3v-4.2ZM144.6 35.4h-4.3v4.3h4.3v-4.3ZM148.8 27h-4.2v4.2h4.2v-4.3ZM148.8 31.2h-4.2v4.2h4.2v-4.2ZM148.8 35.4h-4.2v4.3h4.2v-4.3ZM153 27h-4.2v4.2h4.3v-4.3ZM153 31.2h-4.2v4.2h4.3v-4.2ZM153 35.4h-4.2v4.3h4.3v-4.3Z"/></mask><g mask="url(#f)"><path fill="#000" d="M153 27h-12.7v12.7h12.8V26.9Z"/></g><mask id="g" width="31" height="31" x="38" y="111" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M42.7 111.9h-4.3v4.2h4.3v-4.2Z"/><path fill="#fff" d="M42.7 116.1h-4.3v4.2h4.3v-4.2ZM42.7 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M42.7 124.6h-4.3v4.2h4.3v-4.2ZM42.7 128.8h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M42.7 133h-4.3v4.3h4.3v-4.2ZM42.7 137.3h-4.3v4.3h4.3v-4.3ZM47 111.9h-4.3v4.2h4.2v-4.2ZM47 137.3h-4.3v4.3h4.2v-4.3Z"/><path fill="#fff" d="M51.2 111.9h-4.3v4.2h4.3v-4.2ZM51.2 137.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M55.4 111.9h-4.2v4.2h4.2v-4.2ZM55.4 137.3h-4.2v4.3h4.2v-4.3ZM59.7 111.9h-4.3v4.2h4.3v-4.2ZM59.7 137.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M63.9 111.9h-4.2v4.2h4.2v-4.2ZM63.9 137.3h-4.2v4.3h4.2v-4.3ZM68.1 111.9H64v4.2h4.2v-4.2Z"/><path fill="#fff" d="M68.1 116.1H64v4.2h4.2v-4.2ZM68.1 120.3H64v4.3h4.2v-4.3Z"/><path fill="#fff" d="M68.1 124.6H64v4.2h4.2v-4.2ZM68.1 128.8H64v4.3h4.2v-4.3Z"/><path fill="#fff" d="M68.1 133H64v4.3h4.2v-4.2ZM68.1 137.3H64v4.3h4.2v-4.3Z"/></mask><g mask="url(#g)"><path fill="#000" d="M68.1 111.9H38.4v29.7h29.7v-29.7Z"/></g><mask id="h" width="14" height="14" x="46" y="120" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M51.2 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M51.2 124.6h-4.3v4.2h4.3v-4.2ZM51.2 128.8h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M55.4 120.3h-4.2v4.3h4.2v-4.3Z"/><path fill="#fff" d="M55.4 124.6h-4.2v4.2h4.2v-4.2ZM55.4 128.8h-4.2v4.3h4.2v-4.3ZM59.7 120.3h-4.3v4.3h4.3v-4.3Z"/><path fill="#fff" d="M59.7 124.6h-4.3v4.2h4.3v-4.2ZM59.7 128.8h-4.3v4.3h4.3v-4.3Z"/></mask><g mask="url(#h)"><path fill="#000" d="M59.7 120.3H46.9v12.8h12.8v-12.8Z"/></g></g><defs><clipPath id="a"><rect width="137" height="137" x="31.5" y="11.5" fill="#fff" rx="8.2"/></clipPath></defs></svg>", @@ -15,7 +15,7 @@ "settingsSchema": "", "dataKeySettingsSchema": "", "settingsDirective": "tb-mobile-app-qr-code-widget-settings", - "defaultConfig": "{\n \"showTitle\": true,\n \"backgroundColor\": \"rgb(255, 255, 255)\",\n \"color\": \"rgba(0, 0, 0, 0.87)\",\n \"padding\": \"8px\",\n \"settings\": {\n \"useDefaultApp\": true,\n \"androidConfig\": {\n \"enabled\": true,\n \"appPackage\": \"\",\n \"sha256CertFingerprints\": \"\"\n },\n \"iosConfig\": {\n \"enabled\": true,\n \"appId\": \"\"\n },\n \"qrCodeConfig\": {\n \"badgeEnabled\": true,\n \"badgeStyle\": \"ORIGINAL\",\n \"badgePosition\": \"RIGHT\",\n \"qrCodeLabelEnabled\": true,\n \"qrCodeLabel\": \"Scan to connect or download mobile app\"\n }\n },\n \"title\": \"Mobile app QR code\",\n \"dropShadow\": true,\n \"enableFullscreen\": false,\n \"widgetStyle\": {},\n \"widgetCss\": \"\",\n \"pageSize\": 1024,\n \"noDataDisplayMessage\": \"\",\n \"showTitleIcon\": false,\n \"titleTooltip\": \"\",\n \"titleStyle\": {\n \"fontSize\": \"16px\",\n \"fontWeight\": 400\n }\n}" + "defaultConfig": "{\n \"showTitle\": true,\n \"backgroundColor\": \"rgb(255, 255, 255)\",\n \"color\": \"rgba(0, 0, 0, 0.87)\",\n \"padding\": \"8px\",\n \"settings\": {\n \"useSystemSettings\": true,\n \"androidConfig\": {\n \"enabled\": true\n },\n \"iosConfig\": {\n \"enabled\": true\n },\n \"qrCodeConfig\": {\n \"badgeEnabled\": true,\n \"badgeStyle\": \"ORIGINAL\",\n \"badgePosition\": \"RIGHT\",\n \"qrCodeLabelEnabled\": true,\n \"qrCodeLabel\": \"Scan to connect or download mobile app\"\n }\n },\n \"title\": \"Mobile app QR code\",\n \"dropShadow\": true,\n \"enableFullscreen\": false,\n \"widgetStyle\": {},\n \"widgetCss\": \"\",\n \"pageSize\": 1024,\n \"noDataDisplayMessage\": \"\",\n \"showTitleIcon\": false,\n \"titleTooltip\": \"\",\n \"titleStyle\": {\n \"fontSize\": \"16px\",\n \"fontWeight\": 400\n }\n}\n" }, "tags": [ "ios", diff --git a/ui-ngx/src/app/core/auth/auth.selectors.ts b/ui-ngx/src/app/core/auth/auth.selectors.ts index 0a97ef5665..2d84955936 100644 --- a/ui-ngx/src/app/core/auth/auth.selectors.ts +++ b/ui-ngx/src/app/core/auth/auth.selectors.ts @@ -83,7 +83,7 @@ export const selectMobileQrEnabled = createSelector( (state: AuthState) => state.mobileQrEnabled ); -export const selectPersistDeviceStateToTelemetryAndMobileQrEnabled = createSelector( +export const selectHomeDashboardParams = createSelector( selectPersistDeviceStateToTelemetry, selectMobileQrEnabled, (persistDeviceStateToTelemetry, mobileQrEnabled) => ({persistDeviceStateToTelemetry, mobileQrEnabled}) diff --git a/ui-ngx/src/app/core/http/mobile-app.service.ts b/ui-ngx/src/app/core/http/mobile-app.service.ts index bb4dc6c863..7b108e487c 100644 --- a/ui-ngx/src/app/core/http/mobile-app.service.ts +++ b/ui-ngx/src/app/core/http/mobile-app.service.ts @@ -18,7 +18,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-utils'; import { Observable } from 'rxjs'; -import { MobileAppQRCodeSettings } from '@shared/models/mobile-app.models'; +import { MobileAppSettings } from '@shared/models/mobile-app.models'; @Injectable({ providedIn: 'root' @@ -30,15 +30,15 @@ export class MobileAppService { ) { } - public getMobileAppSettings(config?: RequestConfig): Observable { - return this.http.get(`/api/mobile/app/settings`, defaultHttpOptionsFromConfig(config)); + public getMobileAppSettings(config?: RequestConfig): Observable { + return this.http.get(`/api/mobile/app/settings`, defaultHttpOptionsFromConfig(config)); } - public saveMobileAppSettings(mobileAppSettings: MobileAppQRCodeSettings, config?: RequestConfig): Observable { - return this.http.post(`/api/mobile/app/settings`, mobileAppSettings, defaultHttpOptionsFromConfig(config)); + public saveMobileAppSettings(mobileAppSettings: MobileAppSettings, config?: RequestConfig): Observable { + return this.http.post(`/api/mobile/app/settings`, mobileAppSettings, defaultHttpOptionsFromConfig(config)); } - public getMobileAppDeepLink( config?: RequestConfig): Observable { + public getMobileAppDeepLink(config?: RequestConfig): Observable { return this.http.get(`/api/mobile/deepLink`, defaultHttpOptionsFromConfig(config)); } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/mobile-app-qr-code-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/mobile-app-qr-code-widget.models.ts index 4027e0445b..1b280d68c1 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/mobile-app-qr-code-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/mobile-app-qr-code-widget.models.ts @@ -22,23 +22,20 @@ import { QRCodeConfig } from '@shared/models/mobile-app.models'; -export type MobileAppQrCodeWidgetSettings = { - useDefaultApp: boolean; - androidConfig: AndroidConfig; - iosConfig: IosConfig; +export interface MobileAppQrCodeWidgetSettings { + useSystemSettings: boolean; + androidConfig: Pick; + iosConfig: Pick; qrCodeConfig: Omit; } export const mobileAppQrCodeWidgetDefaultSettings: MobileAppQrCodeWidgetSettings = { - useDefaultApp: true, + useSystemSettings: true, androidConfig: { - enabled: true, - appPackage: '', - sha256CertFingerprints: '' + enabled: true }, iosConfig: { - enabled: true, - appId: '' + enabled: true }, qrCodeConfig: { badgeEnabled: true, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.html index 35092807dc..2c2623cc0c 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.html @@ -15,16 +15,12 @@ limitations under the License. --> -
admin.mobile-app.connect-mobile-app
- -
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.scss index d00baa119e..ddb8870d42 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.scss @@ -23,24 +23,6 @@ background-color: transparent; } -.tb-title { - padding-bottom: 12px; - align-self: start; - font-weight: 600; - font-size: 20px; - line-height: 24px; - letter-spacing: 0.1px; - color: rgba(0, 0, 0, 0.76); - - @media #{$mat-md-lg} { - padding-bottom: 0; - font-weight: 500; - font-size: 14px; - line-height: 20px; - letter-spacing: 0.25px; - } -} - .tb-qrcode-label { font-size: 14px; color: rgba(0, 0, 0, 0.54); @@ -56,8 +38,3 @@ border-radius: 6px; } -.tb-badge-container { - @media #{$mat-md} { - display: none; - } -} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.ts index 5085d43aec..0f450d47f7 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/mobile-app-qrcode-widget.component.ts @@ -14,97 +14,108 @@ /// limitations under the License. /// -import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { PageComponent } from '@shared/components/page.component'; import { AppState } from '@core/core.state'; import { Store } from '@ngrx/store'; -import { BadgePosition, BadgeStyle, badgeStyleURLMap, MobileAppQRCodeSettings } from '@shared/models/mobile-app.models'; +import { BadgePosition, BadgeStyle, badgeStyleURLMap, MobileAppSettings } from '@shared/models/mobile-app.models'; import { MobileAppService } from '@core/http/mobile-app.service'; import { WidgetContext } from '@home/models/widget-component.models'; import { UtilsService } from '@core/services/utils.service'; -import { interval, mergeMap, Observable, Subject, takeUntil } from 'rxjs'; +import { Subject } from 'rxjs'; import { MINUTE } from '@shared/models/time/time.models'; -import { coerceBoolean } from '@shared/decorators/coercion'; import { MobileAppQrCodeWidgetSettings } from '@home/components/widget/lib/cards/mobile-app-qr-code-widget.models'; +import { isDefinedAndNotNull } from '@core/utils'; +import { ResizeObserver } from '@juggle/resize-observer'; @Component({ selector: 'tb-mobile-app-qrcode-widget', templateUrl: './mobile-app-qrcode-widget.component.html', styleUrls: ['./mobile-app-qrcode-widget.component.scss'] }) -export class MobileAppQrcodeWidgetComponent extends PageComponent implements OnInit, AfterViewInit, OnDestroy { +export class MobileAppQrcodeWidgetComponent extends PageComponent implements OnInit, OnDestroy { @Input() ctx: WidgetContext; @Input() - @coerceBoolean() - previewMode: boolean; - - @Input() - set mobileAppSettings(settings: MobileAppQRCodeSettings | MobileAppQrCodeWidgetSettings) { + set mobileAppSettings(settings: MobileAppSettings | MobileAppQrCodeWidgetSettings) { if (settings) { this.mobileAppSettingsValue = settings; } }; - get mobileAppSettings() { + get mobileAppSettings(): MobileAppSettings | MobileAppQrCodeWidgetSettings { return this.mobileAppSettingsValue; } - @ViewChild('canvas', {static: false}) canvasRef: ElementRef; + @ViewChild('canvas', {static: true}) canvasRef: ElementRef; private readonly destroy$ = new Subject(); + private widgetResize$: ResizeObserver; badgeStyle = BadgeStyle; badgePosition = BadgePosition; badgeStyleURLMap = badgeStyleURLMap; + showBadgeContainer = true; - private mobileAppSettingsValue: MobileAppQRCodeSettings | MobileAppQrCodeWidgetSettings; + private mobileAppSettingsValue: MobileAppSettings | MobileAppQrCodeWidgetSettings; private deepLinkTTL: number; + private deepLinkTTLTimeoutID: NodeJS.Timeout; constructor(protected store: Store, protected cd: ChangeDetectorRef, private mobileAppService: MobileAppService, - private utilsService: UtilsService) { + private utilsService: UtilsService, + private elementRef: ElementRef) { super(store); } ngOnInit(): void { - if (!this.previewMode) { - if (this.ctx) { + if (!this.mobileAppSettings) { + if (isDefinedAndNotNull(this.ctx.settings.useSystemSettings) && !this.ctx.settings.useSystemSettings) { this.mobileAppSettings = this.ctx.settings; } else { this.mobileAppService.getMobileAppSettings().subscribe((settings => { this.mobileAppSettings = settings; - this.cd.detectChanges(); + this.cd.markForCheck(); })); } } - } - - ngAfterViewInit(): void { - this.getMobileAppDeepLink().subscribe(link => { - this.deepLinkTTL = Number(this.utilsService.getQueryParam('ttl', link)) * MINUTE; - this.updateQRCode(link); - interval(this.deepLinkTTL).pipe( - takeUntil(this.destroy$), - mergeMap(() => this.getMobileAppDeepLink()) - ).subscribe(link => this.updateQRCode(link)); + this.initMobileAppQRCode(); + this.widgetResize$ = new ResizeObserver(() => { + const showHideBadgeContainer = this.elementRef.nativeElement.offsetWidth > 250; + if (showHideBadgeContainer !== this.showBadgeContainer) { + this.showBadgeContainer = showHideBadgeContainer; + this.cd.markForCheck(); + } }); + this.widgetResize$.observe(this.elementRef.nativeElement); } ngOnDestroy() { + if (this.widgetResize$) { + this.widgetResize$.disconnect(); + } super.ngOnDestroy(); this.destroy$.next(); this.destroy$.complete(); + clearTimeout(this.deepLinkTTLTimeoutID); } - getMobileAppDeepLink(): Observable { - return this.mobileAppService.getMobileAppDeepLink(); + private initMobileAppQRCode() { + if (this.deepLinkTTLTimeoutID) { + clearTimeout(this.deepLinkTTLTimeoutID); + this.deepLinkTTLTimeoutID = null; + } + this.mobileAppService.getMobileAppDeepLink().subscribe(link => { + this.deepLinkTTL = Number(this.utilsService.getQueryParam('ttl', link)) * MINUTE; + this.updateQRCode(link); + this.deepLinkTTLTimeoutID = setTimeout(() => this.initMobileAppQRCode(), this.deepLinkTTL); + }); } - updateQRCode(link: string) { + private updateQRCode(link: string) { import('qrcode').then((QRCode) => { QRCode.toCanvas(this.canvasRef.nativeElement, link, { width: 100 }); }); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.html index d474714216..4d930347c8 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.html @@ -15,88 +15,36 @@ limitations under the License. --> -
-
-
-
admin.mobile-app.applications
- - {{ 'admin.mobile-app.default' | translate }} - {{ 'admin.mobile-app.custom' | translate }} - +
+
+
+ + {{ 'admin.mobile-app.use-system-settings' | translate }} +
-
+
+
+
admin.mobile-app.applications
+
- + {{ 'admin.mobile-app.android' | translate }}
-
-
-
{{ 'admin.mobile-app.app-package-name' | translate }}
- - - - warning - - -
-
-
-
-
{{ 'admin.mobile-app.sha256-certificate-fingerprints' | translate }}
- - - - warning - - -
-
- + {{ 'admin.mobile-app.ios' | translate }}
-
-
-
{{ 'admin.mobile-app.app-id' | translate }}
- - - - warning - - -
-
-
+
+
admin.mobile-app.appearance
- {{ 'admin.mobile-app.badges' | translate }} @@ -118,7 +66,7 @@
- + {{ 'admin.mobile-app.label' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.scss deleted file mode 100644 index d0a2c9ac16..0000000000 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.scss +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright © 2016-2024 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -.tb-fixed-width { - min-width: 230px; -} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.ts index 664dbe3327..bcb70518f5 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/mobile-app-qr-code-widget-settings.component.ts @@ -25,7 +25,7 @@ import { mobileAppQrCodeWidgetDefaultSettings } from '@home/components/widget/li @Component({ selector: 'tb-mobile-app-qr-code-widget-settings', templateUrl: './mobile-app-qr-code-widget-settings.component.html', - styleUrls: ['/mobile-app-qr-code-widget-settings.component.scss', './../widget-settings.scss'] + styleUrls: ['./../widget-settings.scss'] }) export class MobileAppQrCodeWidgetSettingsComponent extends WidgetSettingsComponent { @@ -49,15 +49,12 @@ export class MobileAppQrCodeWidgetSettingsComponent extends WidgetSettingsCompon protected onSettingsSet(settings: WidgetSettings) { this.mobileAppQRCodeWidgetSettingsForm = this.fb.group({ - useDefaultApp: [settings.useDefaultApp], + useSystemSettings: [settings.useSystemSettings], androidConfig: this.fb.group({ enabled: [settings.androidConfig.enabled], - appPackage: [settings.androidConfig.appPackage, [Validators.required]], - sha256CertFingerprints: [settings.androidConfig.sha256CertFingerprints, [Validators.required]] }), iosConfig: this.fb.group({ enabled: [settings.iosConfig.enabled], - appId: [settings.iosConfig.appId, [Validators.required]] }), qrCodeConfig: this.fb.group({ badgeEnabled: [settings.qrCodeConfig.badgeEnabled], @@ -70,35 +67,16 @@ export class MobileAppQrCodeWidgetSettingsComponent extends WidgetSettingsCompon } protected validatorTriggers(): string[] { - return ['useDefaultApp', 'androidConfig.enabled', 'iosConfig.enabled', 'qrCodeConfig.badgeEnabled', 'qrCodeConfig.qrCodeLabelEnabled']; + return ['useSystemSettings', 'androidConfig.enabled', 'iosConfig.enabled', 'qrCodeConfig.badgeEnabled', 'qrCodeConfig.qrCodeLabelEnabled']; } protected updateValidators(emitEvent: boolean) { - const useDefaultApp = this.mobileAppQRCodeWidgetSettingsForm.get('useDefaultApp').value; + const useSystemSettings = this.mobileAppQRCodeWidgetSettingsForm.get('useSystemSettings').value; const androidEnabled = this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.enabled').value; const iosEnabled = this.mobileAppQRCodeWidgetSettingsForm.get('iosConfig.enabled').value; const badgeEnabled = this.mobileAppQRCodeWidgetSettingsForm.get('qrCodeConfig.badgeEnabled').value; const qrCodeLabelEnabled = this.mobileAppQRCodeWidgetSettingsForm.get('qrCodeConfig.qrCodeLabelEnabled').value; - if (useDefaultApp) { - this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.appPackage').disable({emitEvent: false}); - this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.sha256CertFingerprints').disable({emitEvent: false}); - this.mobileAppQRCodeWidgetSettingsForm.get('iosConfig.appId').disable({emitEvent: false}); - } else { - if (androidEnabled) { - this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.appPackage').enable({emitEvent: false}); - this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.sha256CertFingerprints').enable({emitEvent: false}); - } else { - this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.appPackage').disable({emitEvent: false}); - this.mobileAppQRCodeWidgetSettingsForm.get('androidConfig.sha256CertFingerprints').disable({emitEvent: false}); - } - if (iosEnabled) { - this.mobileAppQRCodeWidgetSettingsForm.get('iosConfig.appId').enable({emitEvent: false}); - } else { - this.mobileAppQRCodeWidgetSettingsForm.get('iosConfig.appId').disable({emitEvent: false}); - } - } - if (!androidEnabled && !iosEnabled) { this.mobileAppQRCodeWidgetSettingsForm.get('qrCodeConfig.badgeEnabled').disable({emitEvent: false}); this.mobileAppQRCodeWidgetSettingsForm.get('qrCodeConfig.badgeStyle').disable({emitEvent: false}); @@ -116,7 +94,7 @@ export class MobileAppQrCodeWidgetSettingsComponent extends WidgetSettingsCompon } } - if (qrCodeLabelEnabled) { + if (qrCodeLabelEnabled && !useSystemSettings) { this.mobileAppQRCodeWidgetSettingsForm.get('qrCodeConfig.qrCodeLabel').enable({emitEvent: false}); } else { this.mobileAppQRCodeWidgetSettingsForm.get('qrCodeConfig.qrCodeLabel').disable({emitEvent: false}); diff --git a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.html index 88c6c287d5..0d5de08de0 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.html @@ -43,7 +43,7 @@
-
{{ 'admin.mobile-app.app-package-name' | translate }}
+
{{ 'admin.mobile-app.app-package-name' | translate }}
-
{{ 'admin.mobile-app.sha256-certificate-fingerprints' | translate }}
+
{{ 'admin.mobile-app.sha256-certificate-fingerprints' | translate }}
-
{{ 'admin.mobile-app.app-id' | translate }}
+
{{ 'admin.mobile-app.app-id' | translate }}
- {{ 'admin.mobile-app.badges' | translate }} @@ -135,7 +135,7 @@
- + {{ 'admin.mobile-app.label' | translate }} @@ -154,7 +154,7 @@
admin.mobile-app.preview
-
diff --git a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.scss b/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.scss index 5f04c04e8f..40bffb8ca6 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.scss +++ b/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.scss @@ -14,10 +14,6 @@ * limitations under the License. */ -.tb-fixed-width { - min-width: 230px; -} - .tb-qrcode-preview { background-color: rgba(0, 0, 0, 0.04); box-shadow: none; diff --git a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts index 96e8e89e6a..0423ce989f 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/mobile-app-settings.component.ts @@ -27,7 +27,7 @@ import { badgePositionTranslationsMap, BadgeStyle, badgeStyleTranslationsMap, - MobileAppQRCodeSettings + MobileAppSettings } from '@shared/models/mobile-app.models'; @Component({ @@ -39,7 +39,7 @@ export class MobileAppSettingsComponent extends PageComponent implements HasConf mobileAppSettingsForm: FormGroup; - mobileAppSettings: MobileAppQRCodeSettings; + mobileAppSettings: MobileAppSettings; private readonly destroy$ = new Subject(); @@ -133,7 +133,7 @@ export class MobileAppSettingsComponent extends PageComponent implements HasConf }); } - private processMobileAppSettings(mobileAppSettings: MobileAppQRCodeSettings): void { + private processMobileAppSettings(mobileAppSettings: MobileAppSettings): void { this.mobileAppSettings = {...mobileAppSettings}; this.mobileAppSettingsForm.reset(this.mobileAppSettings); } diff --git a/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts b/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts index 9c6adf91ca..b141600732 100644 --- a/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/home-links/home-links-routing.module.ts @@ -27,8 +27,9 @@ import { AppState } from '@core/core.state'; import { map } from 'rxjs/operators'; import { getCurrentAuthUser, + selectHomeDashboardParams, selectMobileQrEnabled, - selectPersistDeviceStateToTelemetryAndMobileQrEnabled + selectPersistDeviceStateToTelemetry } from '@core/auth/auth.selectors'; import { EntityKeyType } from '@shared/models/query/query.models'; import { ResourcesService } from '@core/services/resources.service'; @@ -37,9 +38,42 @@ const sysAdminHomePageJson = '/assets/dashboard/sys_admin_home_page.json'; const tenantAdminHomePageJson = '/assets/dashboard/tenant_admin_home_page.json'; const customerUserHomePageJson = '/assets/dashboard/customer_user_home_page.json'; -const updateDeviceActivityKeyFilterIfNeeded = (store: Store, - dashboard$: Observable): Observable => - store.pipe(select(selectPersistDeviceStateToTelemetryAndMobileQrEnabled)).pipe( +const getHomeDashboard = (store: Store, resourcesService: ResourcesService) => { + const authority = getCurrentAuthUser(store).authority; + switch (authority) { + case Authority.SYS_ADMIN: + return applySystemParametersToHomeDashboard(store, resourcesService.loadJsonResource(sysAdminHomePageJson), authority); + case Authority.TENANT_ADMIN: + return applySystemParametersToHomeDashboard(store, resourcesService.loadJsonResource(tenantAdminHomePageJson), authority); + case Authority.CUSTOMER_USER: + return applySystemParametersToHomeDashboard(store, resourcesService.loadJsonResource(customerUserHomePageJson), authority); + default: + return of(null); + } +}; + +const applySystemParametersToHomeDashboard = (store: Store, + dashboard$: Observable, + authority: Authority): Observable => { + let selectParams$: Observable<{persistDeviceStateToTelemetry?: boolean, mobileQrEnabled?: boolean}>; + switch (authority) { + case Authority.SYS_ADMIN: + selectParams$ = store.pipe( + select(selectMobileQrEnabled), + map(mobileQrEnabled => ({mobileQrEnabled})) + ); + break; + case Authority.TENANT_ADMIN: + selectParams$ = store.pipe(select(selectHomeDashboardParams)); + break; + case Authority.CUSTOMER_USER: + selectParams$ = store.pipe( + select(selectPersistDeviceStateToTelemetry), + map(persistDeviceStateToTelemetry => ({persistDeviceStateToTelemetry})) + ); + break; + } + return selectParams$.pipe( mergeMap((params) => dashboard$.pipe( map((dashboard) => { if (params.persistDeviceStateToTelemetry) { @@ -49,31 +83,21 @@ const updateDeviceActivityKeyFilterIfNeeded = (store: Store, } } } - return params.mobileQrEnabled ? toggleMobileQRCodeDisplay(dashboard) : dashboard; + if (params.mobileQrEnabled) { + for (const widgetId of Object.keys(dashboard.configuration.widgets)) { + if (dashboard.configuration.widgets[widgetId].config.title === 'Select show mobile QR code') { + dashboard.configuration.widgets[widgetId].config.settings.markdownTextFunction = + (dashboard.configuration.widgets[widgetId].config.settings.markdownTextFunction as string) + .replace('\'${mobileQrEnabled}\'', String(true)); + } + } + } + dashboard.hideDashboardToolbar = true; + return dashboard; }) )) ); - -const toggleMobileQRCodeDisplayIfNeeded = (store: Store, - dashboard$: Observable): Observable => - store.pipe(select(selectMobileQrEnabled)).pipe( - mergeMap((mobileQrEnabled) => dashboard$.pipe( - map((dashboard) => { - return mobileQrEnabled ? toggleMobileQRCodeDisplay(dashboard) : dashboard; - }) - )) - ); - -const toggleMobileQRCodeDisplay = (dashboard: HomeDashboard) => { - for (const widgetId of Object.keys(dashboard.configuration.widgets)) { - if (dashboard.configuration.widgets[widgetId].config.title === 'Select show mobile QR code') { - dashboard.configuration.widgets[widgetId].config.settings.markdownTextFunction = - (dashboard.configuration.widgets[widgetId].config.settings.markdownTextFunction as string) - .replace('\'${mobileQrEnabled}\'', String(true)); - } - } - return dashboard; -} +}; export const homeDashboardResolver: ResolveFn = ( route: ActivatedRouteSnapshot, @@ -85,27 +109,7 @@ export const homeDashboardResolver: ResolveFn = ( dashboardService.getHomeDashboard().pipe( mergeMap((dashboard) => { if (!dashboard) { - let dashboard$: Observable; - const authority = getCurrentAuthUser(store).authority; - switch (authority) { - case Authority.SYS_ADMIN: - dashboard$ = toggleMobileQRCodeDisplayIfNeeded(store, resourcesService.loadJsonResource(sysAdminHomePageJson)); - break; - case Authority.TENANT_ADMIN: - dashboard$ = updateDeviceActivityKeyFilterIfNeeded(store, resourcesService.loadJsonResource(tenantAdminHomePageJson)); - break; - case Authority.CUSTOMER_USER: - dashboard$ = updateDeviceActivityKeyFilterIfNeeded(store, resourcesService.loadJsonResource(customerUserHomePageJson)); - break; - } - if (dashboard$) { - return dashboard$.pipe( - map((homeDashboard) => { - homeDashboard.hideDashboardToolbar = true; - return homeDashboard; - }) - ); - } + return getHomeDashboard(store, resourcesService); } return of(dashboard); }) diff --git a/ui-ngx/src/app/shared/models/mobile-app.models.ts b/ui-ngx/src/app/shared/models/mobile-app.models.ts index 02139bd913..262cc34f9e 100644 --- a/ui-ngx/src/app/shared/models/mobile-app.models.ts +++ b/ui-ngx/src/app/shared/models/mobile-app.models.ts @@ -14,10 +14,9 @@ /// limitations under the License. /// -import { TenantId } from '@shared/models/id/tenant-id'; +import { HasTenantId } from '@shared/models/entity.models'; -export interface MobileAppQRCodeSettings { - tenantId: TenantId; +export interface MobileAppSettings extends HasTenantId { useDefaultApp: boolean; androidConfig: AndroidConfig; iosConfig: IosConfig; diff --git a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json index 4984de6e29..24bac97279 100644 --- a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json +++ b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json @@ -2634,22 +2634,24 @@ "typeFullFqn": "system.home_page_widgets.getting_started" }, "53d5f2dd-d432-5362-745f-63bf4487dc96": { - "typeFullFqn": "system.home_page_widgets.home_page_mobile_app_qr_code", + "typeFullFqn": "system.mobile_app_qr_code", "type": "static", "sizeX": 6, "sizeY": 3, "config": { - "showTitle": false, + "showTitle": true, "backgroundColor": "rgb(255, 255, 255)", "color": "rgba(0, 0, 0, 0.87)", "padding": "8px", "settings": {}, - "title": "Mobile app QR code", + "title": "{i18n:admin.mobile-app.connect-mobile-app}", "dropShadow": false, "enableFullscreen": false, "widgetStyle": {}, - "widgetCss": "", - "noDataDisplayMessage": "" + "widgetCss": ".tb-widget-container > .tb-widget > .tb-widget-header > .tb-widget-title {\n padding: 0;\n}\n\n.tb-widget-container > .tb-widget > .tb-widget-header > .tb-widget-title > .title-row > .title {\n padding-bottom: 12px;\n font-weight: 600;\n font-size: 20px;\n line-height: 24px;\n letter-spacing: 0.1px;\n color: rgba(0, 0, 0, 0.76);\n}\n\n@media screen and (min-width: 960px) and (max-width: 1819px) {\n .tb-widget-container > .tb-widget > .tb-widget-header > .tb-widget-title > .title-row > .title {\n padding-bottom: 0;\n font-weight: 500;\n font-size: 14px;\n line-height: 20px;\n letter-spacing: 0.25px;\n }\n}\n", + "showTitleIcon": false, + "titleTooltip": "", + "titleStyle": null }, "row": 0, "col": 0, diff --git a/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json b/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json index 6c1bed741e..40792caf09 100644 --- a/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json +++ b/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json @@ -1177,19 +1177,24 @@ "typeFullFqn": "system.home_page_widgets.getting_started" }, "8c5207d8-7103-4dc2-db48-d61c0c8c61fd": { - "typeFullFqn": "system.home_page_widgets.home_page_mobile_app_qr_code", + "typeFullFqn": "system.mobile_app_qr_code", "type": "static", "sizeX": 6, "sizeY": 3, "config": { - "showTitle": false, + "showTitle": true, "backgroundColor": "rgb(255, 255, 255)", "color": "rgba(0, 0, 0, 0.87)", "padding": "8px", "settings": {}, - "title": "Mobile app QR code", + "title": "{i18n:admin.mobile-app.connect-mobile-app}", "dropShadow": false, - "enableFullscreen": false + "enableFullscreen": false, + "widgetStyle": {}, + "widgetCss": ".tb-widget-container > .tb-widget > .tb-widget-header > .tb-widget-title {\n padding: 0;\n}\n\n.tb-widget-container > .tb-widget > .tb-widget-header > .tb-widget-title > .title-row > .title {\n padding-bottom: 12px;\n font-weight: 600;\n font-size: 20px;\n line-height: 24px;\n letter-spacing: 0.1px;\n color: rgba(0, 0, 0, 0.76);\n}\n\n@media screen and (min-width: 960px) and (max-width: 1819px) {\n .tb-widget-container > .tb-widget > .tb-widget-header > .tb-widget-title > .title-row > .title {\n padding-bottom: 0;\n font-weight: 500;\n font-size: 14px;\n line-height: 20px;\n letter-spacing: 0.25px;\n }\n}\n", + "showTitleIcon": false, + "titleTooltip": "", + "titleStyle": null }, "row": 0, "col": 0, diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index d79b468a8e..c2fb5e2a1c 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -433,6 +433,7 @@ "ios": "iOS", "app-id": "App ID", "app-id-required": "App ID is required", + "appearance": "Appearance", "appearance-on-home-page": "Appearance on Home page", "enabled": "Enabled", "disabled": "Disabled", @@ -445,7 +446,8 @@ "left": "Left", "set": "Set", "preview": "Preview", - "connect-mobile-app": "Connect mobile app" + "connect-mobile-app": "Connect mobile app", + "use-system-settings": "Use system settings" }, "2fa": { "2fa": "Two-factor authentication", diff --git a/ui-ngx/src/form.scss b/ui-ngx/src/form.scss index df9211720c..f38d459b97 100644 --- a/ui-ngx/src/form.scss +++ b/ui-ngx/src/form.scss @@ -234,6 +234,12 @@ } .fixed-title-width { min-width: 200px; + + &-230 { + min-width: 230px; + } + } + [class^="fixed-title-width"] { @media #{$mat-xs} { min-width: fit-content; }