feat(#9327): add new navigation (#9415)

Co-authored-by: Tatiana Lépiz Soto <[email protected]> Co-authored-by: Aniekan Eshiet <[email protected]> Co-authored-by: Ben Kiarie <[email protected]>
medic · Oct 1, 2024 · b21f40e · b21f40e
1 parent a999a3e
commit b21f40e
Show file tree

Hide file tree

Showing 115 changed files with 2,881 additions and 880 deletions.
diff --git a/api/resources/translations/messages-bm.properties b/api/resources/translations/messages-bm.properties
@@ -1098,7 +1098,8 @@ setup.registration.title = Sɛben min bɛ maralikɛ
 setup.skip = Ka tɛmɛ nin yɔrɔ kan
 setup.start = Bara banni
 setup.statistics.description = 
-setup.statistics.title = 
+setup.statistics.title =
+sidebar_menu.title = Tɛmɛnɛ
 simprints.disabled = Simprints ma lasɔrɔ. Medic Mobile ka Android baarakɛminɛ laban dɔ 
 simprints.register = ka tɔgɔ sɛbɛn kɛ nin Simprints ye
 simprints.search = ka ɲinini kɛ nin Simprints ye

diff --git a/api/resources/translations/messages-en.properties b/api/resources/translations/messages-en.properties
@@ -1007,6 +1007,7 @@ permission.description.can_view_uhc_stats = Allowed to view UHC stats in the Con
 permission.description.can_view_message_action = Display a button to send a message to the selected person.
 permission.description.can_view_messages = Allowed to view Messages.
 permission.description.can_view_messages_tab = Display the Messages tab in the app. If not set it a menu item will be shown in the app menu instead.
+permission.description.can_view_old_navigation = Allowed to view old Navigation bar.
 permission.description.can_view_outgoing_messages = Allowed to view the Outgoing Messages screen in the admin app.
 permission.description.can_view_reports = Allowed to view Reports.
 permission.description.can_view_reports_tab = Display the Reports tab in the app. If not set it a menu item will be shown in the app menu instead.
@@ -1164,6 +1165,7 @@ schedule.registration_anc_pnc = Registration Followup
 scheduled = Scheduled timestamp
 scheduled_tasks = Scheduled tasks
 search_bar.filter.label = Filter
+search_bar.sort.label = Sort
 select.mode.count.plural = {{number}} records selected
 select.mode.count.singular = 1 record selected
 select.mode.delete.all = Delete all
@@ -1185,6 +1187,7 @@ settings.restore.description = Import a new JSON file and overwrite the current
 settings.restore.title = Upload application code
 setup.language.outgoing.subtitle = Select the language in which your care coordinators would like to receive automated messages from CHT.
 setup.language.subtitle = Select the default language that website users of CHT will be using. Users can set individual preferences after logging in.
+sidebar_menu.title = Menu
 sms_message.message = Incoming message
 sms_received = SMS message received; it will be reviewed shortly. If you were trying to submit a text form, please enter a correct form code and try again.
 state.cleared = cleared

diff --git a/api/resources/translations/messages-es.properties b/api/resources/translations/messages-es.properties
@@ -1007,6 +1007,7 @@ permission.description.can_view_uhc_stats = Ver las estadísticas de UHC en la s
 permission.description.can_view_message_action = Mostrar el botón para enviar un mensaje a la persona seleccionada.
 permission.description.can_view_messages = Ver Mensajes.
 permission.description.can_view_messages_tab = Mostrar la pestaña de Mensajes en la aplicación. Si no lo configura, se mostrará en el menú de la aplicación.
+permission.description.can_view_old_navigation = Mostrar la barra de navegación antigua.
 permission.description.can_view_outgoing_messages = Ver la página de mensajes salientes en la Gestión de la Aplicación.
 permission.description.can_view_reports = Ver Informes.
 permission.description.can_view_reports_tab = Mostrar la pestaña de Informes en la aplicación. Si no lo configura, se mostrará en el menú de la aplicación.
@@ -1164,6 +1165,7 @@ schedule.registration_anc_pnc = Seguimiento de Registro
 scheduled = Fecha y hora programada
 scheduled_tasks = Tareas programadas
 search_bar.filter.label = Filtros
+search_bar.sort.label = Ordenar
 select.mode.count.plural = {{number}} registros seleccionados
 select.mode.count.singular = 1 registro seleccionado
 select.mode.delete.all = Eliminar todos
@@ -1185,6 +1187,7 @@ settings.restore.description = Importar un nuevo archivo JSON y sobrescribir la
 settings.restore.title = Subir código de la aplicación
 setup.language.outgoing.subtitle = Seleccione el idioma en el que a sus coordinadores les gustaría recibir mensajes automáticos de CHT.
 setup.language.subtitle = Seleccione el idioma predeterminado que utilizarán los usuarios de CHT. Los usuarios pueden establecer preferencias individuales después de iniciar sesión.
+sidebar_menu.title = Menu
 sms_message.message = Mensajes entrantes
 sms_received = Recibímos su mensaje, lo procesaremos pronto. Si intentaba mandar un formulario de texto, favor inténtelo de nuevo con un código de formulario.
 state.cleared = borrado

diff --git a/api/resources/translations/messages-fr.properties b/api/resources/translations/messages-fr.properties
@@ -1007,6 +1007,7 @@ permission.description.can_view_uhc_stats = Autorisé à afficher les statistiqu
 permission.description.can_view_message_action = Afficher un bouton pour envoyer un message à la personne sélectionnée.
 permission.description.can_view_messages = Autorisé à afficher les Messages.
 permission.description.can_view_messages_tab = Affichez l'onglet Messages dans l'application. S'il n'est pas défini, un élément de menu sera affiché dans le menu de l'application à la place.
+permission.description.can_view_old_navigation = Autorisé à afficher l'ancienne Barre de Navigation.
 permission.description.can_view_outgoing_messages = Autorisé à afficher l'écran des messages sortants dans l'application d'administration.
 permission.description.can_view_reports = Autorisé à afficher les rapports.
 permission.description.can_view_reports_tab = Affichez l'onglet Rapports dans l'application. S'il n'est pas défini, un élément de menu sera affiché dans le menu de l'application à la place.
@@ -1164,6 +1165,7 @@ schedule.registration_anc_pnc = Suivi de l'enregistrement
 scheduled = Prévu
 scheduled_tasks = Tâches plannifiées
 search_bar.filter.label = Filtre
+search_bar.sort.label = Trier
 select.mode.count.plural = {{number}} enregistrements sélectionnés
 select.mode.count.singular = 1 enregistrement supprimé
 select.mode.delete.all = Supprimer tout
@@ -1185,6 +1187,7 @@ settings.restore.description = Importer un nouveau fichier JSON et écraser les
 settings.restore.title = Envoyer nouveaux réglages
 setup.language.outgoing.subtitle = Sélectionnez la langue pour les messages qui seront envoyés aux coordonnateurs de soins.
 setup.language.subtitle = Sélectionnez la langue que les utilisateurs de CHT utilisent par défaut. Les utilisateurs peuvent toujours définir leur préférence une fois inscrits.
+sidebar_menu.title = Menu
 sms_message.message = Messages entrants
 sms_received = Merci, votre message a été bien reçu. Si vous étiez en train d'envoyer un rapport réessayez avec le bon code du rapport.
 state.cleared = dégagé

diff --git a/api/resources/translations/messages-hi.properties b/api/resources/translations/messages-hi.properties
@@ -1099,6 +1099,7 @@ setup.skip = स्थापना के गाइड को छोड़ें
 setup.start = अंत
 setup.statistics.description = अज्ञात आंकड़ों को मेडिक मोबाइल पर सबमिट करने दें ? सॉफ्टवेयर को बेहतर बनाने और उसके प्रभाव के बारे में जानने में मदद के लिए आंकड़ों को हर महीने भेजा जायेगा । कोई भी रोगी की गोपनीय जानकारी हमारे साथ साझा नहीं की जाएगी। आप इस गाइड से किसी भी समय इन सेटिंग्स को अपडेट कर सकते हैं।
 setup.statistics.title = प्रभाव के डेटा साझा करे
+sidebar_menu.title = मेनू
 simprints.disabled = इस डिवाइस पर सिमप्रिंट उपलब्ध नहीं है। सिम्पप्रिंट एकीकरण को सक्षम करने के लिए मेडिक मोबाइल एंड्रॉइड ऐप के नये संस्करण का उपयोग करें।\n
 simprints.register = Simprints के साथ रजिस्टर करें
 simprints.search = Simprints के साथ खोजें

diff --git a/api/resources/translations/messages-id.properties b/api/resources/translations/messages-id.properties
@@ -924,6 +924,7 @@ permission.description.can_view_last_visited_date =
 permission.description.can_view_message_action = 
 permission.description.can_view_messages = 
 permission.description.can_view_messages_tab = 
+permission.description.can_view_old_navigation = Tampilkan bilah navigasi lama
 permission.description.can_view_outgoing_messages = 
 permission.description.can_view_reports = 
 permission.description.can_view_reports_tab = 
@@ -1073,6 +1074,7 @@ select.mode.deselect.all = Bersihkan pilihan
 select.mode.select.all = Pilih semua
 select.mode.start = Pilih
 select.mode.stop = Tutup
+search_bar.sort.label = Urutkan
 selection.doc.content.raw = Isi Laporan Mentah
 send\ the\ following\ message\ to\ the = kirim pesan ini kepada
 sent = Waktu Pengiriman
@@ -1102,7 +1104,8 @@ setup.registration.title = Formulir registrasi
 setup.skip = Melewatkan panduan pengaturan
 setup.start = Selesai
 setup.statistics.description = 
-setup.statistics.title = 
+setup.statistics.title =
+sidebar_menu.title = Menu
 simprints.disabled = 
 simprints.register = Daftar dengan Simprints
 simprints.search = Cari dengan Simprints

diff --git a/api/resources/translations/messages-ne.properties b/api/resources/translations/messages-ne.properties
@@ -1008,6 +1008,7 @@ permission.description.can_view_message_action = चयन गरिएको
 permission.description.can_view_messages = सन्देशहरू हेर्न अनुमति दिइएको।
 permission.description.can_view_messages_tab = एपमा सन्देशहरू ट्याब देखाउनुहोस्। यदि सेट गरिएन भने, एप मेनूमा मेनु वस्तु देखाइनेछ।
 permission.description.can_view_outgoing_messages = व्यवस्थापक एपमा बाहिर जान सक्ने सन्देशहरू हेर्न अनुमति दिइएको।
+permission.description.can_view_old_navigation = पुरानो नेभिगेशन बार हेर्न अनुमति दिइयो
 permission.description.can_view_reports = रिपोर्टहरू हेर्न अनुमति दिइएको।
 permission.description.can_view_reports_tab = एपमा रिपोर्टहरू ट्याब देखाउनुहोस्। यदि सेट गरिएन भने, एप मेनूमा मेनु वस्तु देखाइनेछ।
 permission.description.can_view_tasks = कार्यहरू हेर्न अनुमति दिइएको।
@@ -1164,6 +1165,7 @@ schedule.registration_anc_pnc = दर्ता फलोअप
 scheduled = समयतालिका
 scheduled_tasks = कार्यतालिका
 search_bar.filter.label = फिल्टर
+search_bar.sort.label = क्रमबद्ध गर्नुहोस्
 select.mode.count.plural = {{number}} रेकर्ड छानिएका छन्
 select.mode.count.singular = एउटा रेकर्ड छानिएको छ
 select.mode.delete.all = सबै मेटाउनुहोस्
@@ -1185,6 +1187,7 @@ settings.restore.description = नयाँ JOSS फाईल आयात ग
 settings.restore.title = नयाँ सेटिंग्स अपलोड गर्नुहोस्
 setup.language.outgoing.subtitle = मेडिक मोबाइलले पठाउने सन्देशहरुको भाषा छनौट गर्नुहोस्।
 setup.language.subtitle = मेडिक मोबाइल वेब एप्लिकेश का प्रयोगकर्ता हरुले प्रयोग गर्ने भाषा छनौट गर्नुहोस्।
+sidebar_menu.title = मेनु
 sms_message.message = अाएको सन्देश
 sms_received = सन्देश प्राप्त भयो। रिपोर्ट पठाउनुभएको हो भने मिलेन, पुन\: पठाउनुहोला।
 state.cleared = मेटाइएको

diff --git a/api/resources/translations/messages-sw.properties b/api/resources/translations/messages-sw.properties
@@ -203,7 +203,7 @@ Primary\ location = Eneo
 Processed\ number\ of\ total\ records = Kusindika {{number}}/{{total}} recodi
 RC\ Code = Kodi
 Reading\ file = Unasoma faili..
-Registration\ example = Kwa mfano, kusajili "{{name}} utatuma\:
+Registration\ example = Kwa mfano, kusajili "{{name}}" utatuma\:
 Registration\ format = Jiandikishe kwa ajili ya huu mfuatilio wa ujumbe kwa kutuma ujumbe mfupi na muundo ufuatayo\:
 Registrations = Usajili
 Reload = Pakia upya
@@ -935,7 +935,7 @@ messages.schedule.postnatal.day_7_overdue = Je, {{patient_name}} ({{patient_id}}
 messages.schedule.postnatal.week_6 = Tafadhali ona kwamba {{patient_name}} ({{patient_id}}) ametembelea kituo cha afya kwa huduma ya wiki ya 6 baada ya kujifungua. Akihudhuria ziara iyo, tujulishe kwa 'M {{patient_id}}'. Asante\!
 messages.schedule.postnatal.week_6_overdue = Je, {{patient_name}} ({{patient_id}}) alihudhuria ziara ya baada ya kujifungua ya wiki  ya 6? Tujulishe kwa kutuma   'M {{patient_id}}'. Shukrani\!
 messages.schedule.registration.followup_anc = Hujambo {{contact.name}},kumbuka kutuma fomu ya usajili mimba ya {{patient_name}} {{patient_id}} with 'P {{patient_id}} <Weeks since LMP>'. Asante\!
-messages.schedule.registration.followup_anc_pnc = \n {{contact.name}}, Je\! {{patient_name}} {{patient_id}} anahitaji huduma? Tuma fomu aina ya P  {{patient_id}} <Weeks since LMP>' kusajili kama mja mzito, Fomu ya 'D {{patient_id}} <Delivery Code> <Days Since Delivery>'. kumsajili kwa PNC .Asante\!
+messages.schedule.registration.followup_anc_pnc = \n {{contact.name}}, Je\! {{patient_name}} {{patient_id}} anahitaji huduma? Tuma fomu aina ya 'P  {{patient_id}} <Weeks since LMP>' kusajili kama mja mzito, Fomu ya 'D {{patient_id}} <Delivery Code> <Days Since Delivery>'. kumsajili kwa PNC .Asante\!
 messages.sent.by = Imetumwa na {{senderName}}
 messages.unknown.sender = Mtumaji asiyejulikana\n
 messages.v.report_accepted = Asante {{contact.name}},mgonjwa kwa jina {{patient_name}}  ({{patient_id}}) ameshughulikiwa katika kituo cha afya.
@@ -1007,6 +1007,7 @@ permission.description.can_view_uhc_stats = Inaruhusiwa kutazama takwimu za UHC
 permission.description.can_view_message_action = Onyesha kitufe ili kutuma ujumbe kwa mtu aliyechaguliwa.
 permission.description.can_view_messages = Inaruhusiwa kutazama jumbe.
 permission.description.can_view_messages_tab = Onyesha kichupo cha ujumbe kwenye programu. Ikiwa haijawekwa, kipengee cha menyu kitaonyeshwa kwenye menyu ya programu badala yake.
+permission.description.can_view_old_navigation = Inaruhusiwa kutazama Uabiri wa zamani.
 permission.description.can_view_outgoing_messages = Inaruhusiwa kutazama skrini ya ujumbe unaotoka katika programu ya msimamizi.
 permission.description.can_view_reports = Inaruhusiwa kutazama Ripoti.
 permission.description.can_view_reports_tab = Onyesha kichupo cha Ripoti kwenye programu. Ikiwa haijawekwa, kipengee cha menyu kitaonyeshwa kwenye menyu ya programu badala yake.
@@ -1164,6 +1165,7 @@ schedule.registration_anc_pnc = Ufuatiliaji baada ya usajili
 scheduled = muda wa mpangilio
 scheduled_tasks = Kazi iliyopangwa
 search_bar.filter.label = Chuja
+search_bar.sort.label = Panga
 select.mode.count.plural = Rekodi {{number}} zimechaguliwa
 select.mode.count.singular = Rekodi moja imechaguliwa
 select.mode.delete.all = Futa yote
@@ -1185,6 +1187,7 @@ settings.restore.description = Ingiza faili mpya ya JSON na ubadilishe mipangili
 settings.restore.title = Pakia msimbo wa programu
 setup.language.outgoing.subtitle = Chagua lugha itakayotumika kupokea jumbe za moja kwa moja na waratibisha huduma kutoka CHT.
 setup.language.subtitle = Chagua lugha msingi itakayo tumika kataika tuvuti ya CHT. Mtumizi anaweza badili lugha baada ya kujisajili na kuingia kwenye programu.
+sidebar_menu.title = Menyu
 sms_message.message = Ujumbe unaoingia
 sms_received = Ujumbe umepokewa; utasomwa hivi punde. Kama ulikuwa unajaribu kuwasilisha ujumbe wa muundo maalum, tafadhali weka kodi sahihi ya fomu na ujaribu tena.
 state.cleared = yaliyotolewa

diff --git a/config/default/app_settings.json b/config/default/app_settings.json
@@ -280,6 +280,7 @@
     "can_upgrade": [
       "program_officer"
     ],
+    "can_view_old_navigation": [],
     "can_default_facility_filter": [],
     "can_have_multiple_places": [],
     "can_export_devices_details": [

diff --git a/config/demo/app_settings.json b/config/demo/app_settings.json
@@ -275,7 +275,8 @@
     ],
     "can_upgrade": [
       "program_officer"
-    ]
+    ],
+    "can_view_old_navigation": []
   },
   "uhc": {
     "contacts_default_sort": "",

diff --git a/tests/e2e/default-mobile/browser-compatibility/browser-compatibility.wdio-spec.js b/tests/e2e/default-mobile/browser-compatibility/browser-compatibility.wdio-spec.js
@@ -1,26 +1,23 @@
 const commonPage = require('@page-objects/default/common/common.wdio.page');
 const modalPage = require('@page-objects/default/common/modal.wdio.page');
 const loginPage = require('@page-objects/default/login/login.wdio.page');
-const constants = require('@constants');
-const ANDROID_VERSION = '13';
-const SUPPORTED_CHROME_VERSION = '118.0.5993.112';
-const OUTDATED_CHROME_VERSION = '74.0.5993.112';
 
 describe('Browser Compatibility Modal', () => {
-  const newChromeVersion =
-    `Mozilla/5.0 (Linux; Android ${ANDROID_VERSION}; IN2010) AppleWebKit/537.36 (KHTML, like Gecko) ` +
-    `Chrome/${SUPPORTED_CHROME_VERSION} Mobile Safari/537.36`;
-
-  const outdatedChromeVersion =
-    `Mozilla/5.0 (Linux; Android ${ANDROID_VERSION}; IN2010) AppleWebKit/537.36 (KHTML, like Gecko) ` +
-    `Chrome/${OUTDATED_CHROME_VERSION} Mobile Safari/537.36`;
+  const ANDROID_VERSION = '13';
+  const SUPPORTED_CHROME_VERSION = '118.0.5993.112';
+  const OUTDATED_CHROME_VERSION = '74.0.5993.112';
+
+  const EMULATE_DEVICE_SETTINGS = {
+    viewport: {
+      width: 600,
+      height: 960,
+      isMobile: true,
+      hasTouch: true,
+    }
+  };
 
   beforeEach(async () => {
-    await loginPage.login({
-      username: constants.USERNAME,
-      password: constants.PASSWORD,
-      createUser: true,
-    });
+    await loginPage.cookieLogin();
   });
 
   afterEach(async () => {
@@ -29,30 +26,20 @@ describe('Browser Compatibility Modal', () => {
   });
 
   it('should not display the browser compatibility modal for updated Chrome version', async () => {
-    await browser.emulateDevice({
-      viewport: {
-        width: 600,
-        height: 960,
-        isMobile: true,
-        hasTouch: true,
-      },
-      userAgent: newChromeVersion,
-    });
+    EMULATE_DEVICE_SETTINGS.userAgent = `Mozilla/5.0 (Linux; Android ${ANDROID_VERSION}; `+
+      `IN2010) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${SUPPORTED_CHROME_VERSION} Mobile Safari/537.36`;
+
+    await browser.emulateDevice(EMULATE_DEVICE_SETTINGS);
 
     await commonPage.goToBase();
     await modalPage.checkModalHasClosed();
   });
 
   it('should display the browser compatibility modal for outdated Chrome version', async () => {
-    await browser.emulateDevice({
-      viewport: {
-        width: 600,
-        height: 960,
-        isMobile: true,
-        hasTouch: true,
-      },
-      userAgent: outdatedChromeVersion,
-    });
+    EMULATE_DEVICE_SETTINGS.userAgent = `Mozilla/5.0 (Linux; Android ${ANDROID_VERSION}; ` +
+      `IN2010) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${OUTDATED_CHROME_VERSION} Mobile Safari/537.36`;
+
+    await browser.emulateDevice(EMULATE_DEVICE_SETTINGS);
 
     await commonPage.goToBase();
     const modal = await modalPage.getModalDetails();

diff --git a/tests/e2e/default-mobile/content-security-policy.wdio-spec.js b/tests/e2e/default-mobile/content-security-policy.wdio-spec.js
@@ -8,10 +8,6 @@ describe('Content Security Policy', () => {
     await loginPage.cookieLogin();
   });
 
-  after(async () => {
-    await commonPage.logout();
-  });
-
   // If this test fails, you've probably changed the inline telemetry script
   // If the change is intentional, take the hash recommended in this error and replace the telemetry hash in the
   // API helmet configuration