diff --git a/pmp-revamp-ui/public/i18n/ara.json b/pmp-revamp-ui/public/i18n/ara.json index 07d3375c..49ac5a50 100644 --- a/pmp-revamp-ui/public/i18n/ara.json +++ b/pmp-revamp-ui/public/i18n/ara.json @@ -455,7 +455,8 @@ "unexpectedError": "لقد واجهنا خطأ غير متوقع. يرجى المحاولة مرة أخرى.", "searchDeviceId": "البحث عن معرف الجهاز", "selectDeviceId": "حدد معرف الجهاز", - "linkedDevicesList": "قائمة الأجهزة المرتبطة" + "linkedDevicesList": "قائمة الأجهزة المرتبطة", + "backToSbi": "العودة إلى قائمة SBI" }, "deactivateDevicePopup": { "headerMsg": "هل تريد إلغاء تنشيط الجهاز", diff --git a/pmp-revamp-ui/public/i18n/eng.json b/pmp-revamp-ui/public/i18n/eng.json index 0f9254d7..fc33ccd6 100644 --- a/pmp-revamp-ui/public/i18n/eng.json +++ b/pmp-revamp-ui/public/i18n/eng.json @@ -450,7 +450,8 @@ "unexpectedError": "We have encountered with an unexpected error. Please try again.", "searchDeviceId": "Search Device ID", "selectDeviceId": "Select Device ID", - "linkedDevicesList": "List of Linked Devices" + "linkedDevicesList": "List of Linked Devices", + "backToSbi": "Back to List of SBI" }, "deactivateDevicePopup": { "headerMsg": "Do you want to deactivate Device ", diff --git a/pmp-revamp-ui/public/i18n/fra.json b/pmp-revamp-ui/public/i18n/fra.json index c7b51034..334f5395 100644 --- a/pmp-revamp-ui/public/i18n/fra.json +++ b/pmp-revamp-ui/public/i18n/fra.json @@ -455,7 +455,8 @@ "unexpectedError": "Nous avons rencontré une erreur inattendue. Veuillez réessayer.", "searchDeviceId": "Rechercher l'ID de l'appareil", "selectDeviceId": "Sélectionner l'ID de l'appareil", - "linkedDevicesList": "Liste des appareils liés" + "linkedDevicesList": "Liste des appareils liés", + "backToSbi": "Retour à la liste des SBI" }, "deactivateDevicePopup": { "headerMsg": "Voulez-vous désactiver l'appareil ", diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js index 382aa463..b81a28a5 100644 --- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js +++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js @@ -21,7 +21,7 @@ import viewIcon from "../../../svg/view_icon.svg"; import DeactivatePopup from '../../common/DeactivatePopup.js'; import Pagination from '../../common/Pagination.js'; -function AdminDevicesList({ title, isLinkedDevicesList }) { +function AdminDevicesList({ title, subTitle, isLinkedDevicesList }) { const location = useLocation(); const navigate = useNavigate(''); const { t } = useTranslation(); @@ -291,11 +291,6 @@ function AdminDevicesList({ title, isLinkedDevicesList }) { title={title} backLink='/partnermanagement' /> - {isLinkedDevicesList && ( - - )}
{expandFilter && ( diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AllDevicesList.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AllDevicesList.js index 5802429d..9144a993 100644 --- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AllDevicesList.js +++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AllDevicesList.js @@ -5,6 +5,7 @@ function AllDevicesList () { return ( ); diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/LinkedDevicesList.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/LinkedDevicesList.js index 2c241f7b..d30336bf 100644 --- a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/LinkedDevicesList.js +++ b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/LinkedDevicesList.js @@ -4,7 +4,8 @@ function LinkedDevicesList () { return ( ); diff --git a/pmp-revamp-ui/src/pages/common/FilterButtons.js b/pmp-revamp-ui/src/pages/common/FilterButtons.js index 05278078..303b86ae 100644 --- a/pmp-revamp-ui/src/pages/common/FilterButtons.js +++ b/pmp-revamp-ui/src/pages/common/FilterButtons.js @@ -1,15 +1,24 @@ import { useTranslation } from 'react-i18next'; import { getUserProfile } from '../../services/UserProfileService'; import { isLangRTL, onPressEnterKey } from '../../utils/AppUtils'; +import backArrow from '../../svg/back_arrow.svg'; -function FilterButtons({ titleId, listTitle, dataListLength, filter, onResetFilter, setFilter }) { +function FilterButtons({ titleId, listTitle, dataListLength, filter, onResetFilter, setFilter, goBack, backArrowTitle, addBackArrow }) { const { t } = useTranslation(); const isLoginLanguageRTL = isLangRTL(getUserProfile().langCode); return ( -
-
- {t(listTitle) + ' (' + dataListLength + ")"} +
+
+ {addBackArrow && ( +
+ +

{t(backArrowTitle)}

+
+ )} +

{t(listTitle) + ' (' + dataListLength + ")"}

{filter &&