Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…

…t/DHIS2-18250-breadcrumb-navigation-bar # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/Pages/MainPage/MainPage.component.js
dhis2 · Oct 29, 2024 · 3fa656d · 3fa656d
2 parents dc7ce47 + ef57abf
commit 3fa656d
Show file tree

Hide file tree

Showing 80 changed files with 756 additions and 1,067 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,53 @@
+## [101.14.4](https://github.com/dhis2/capture-app/compare/v101.14.3...v101.14.4) (2024-10-29)
+
+
+### Bug Fixes
+
+* [DHIS2-18228] Image Deleted on Update ([#3857](https://github.com/dhis2/capture-app/issues/3857)) ([4656864](https://github.com/dhis2/capture-app/commit/46568640482a3d6a610533573b1132c160329296))
+
+## [101.14.3](https://github.com/dhis2/capture-app/compare/v101.14.2...v101.14.3) (2024-10-29)
+
+
+### Bug Fixes
+
+* [DHIS2-17843] Disable delete enrollment button when user does not have authority ([#3859](https://github.com/dhis2/capture-app/issues/3859)) ([edee6d3](https://github.com/dhis2/capture-app/commit/edee6d350fb2672a3470ef4c282460b34fa726eb))
+
+## [101.14.2](https://github.com/dhis2/capture-app/compare/v101.14.1...v101.14.2) (2024-10-27)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([57a7b83](https://github.com/dhis2/capture-app/commit/57a7b8300c841d043da84735ed32dfce0b64e25b))
+
+## [101.14.1](https://github.com/dhis2/capture-app/compare/v101.14.0...v101.14.1) (2024-10-22)
+
+
+### Bug Fixes
+
+* [DHIS2-16010] app crashes on invalid programid ([#3765](https://github.com/dhis2/capture-app/issues/3765)) ([9133a63](https://github.com/dhis2/capture-app/commit/9133a63e138517c633a192b5d51f39a43c57e327))
+
+# [101.14.0](https://github.com/dhis2/capture-app/compare/v101.13.0...v101.14.0) (2024-10-21)
+
+
+### Features
+
+* [DHIS2-17792] Org unit context in forms ([#3828](https://github.com/dhis2/capture-app/issues/3828)) ([c8ccf63](https://github.com/dhis2/capture-app/commit/c8ccf63e0cde97a190cec6248dc25a4a4d747646))
+
+# [101.13.0](https://github.com/dhis2/capture-app/compare/v101.12.2...v101.13.0) (2024-10-21)
+
+
+### Features
+
+* [DHIS2-16992] Fixed size for changelog modal and columns ([#3834](https://github.com/dhis2/capture-app/issues/3834)) ([3b021cf](https://github.com/dhis2/capture-app/commit/3b021cf5569338db5038d8ed231a810a0fa909f3))
+* [DHIS2-17991] Show orgUnit selector in Enter details now ([#3824](https://github.com/dhis2/capture-app/issues/3824)) ([bf2f1ca](https://github.com/dhis2/capture-app/commit/bf2f1cabebe4ddf100cb8054be0a4af2fbec3965))
+
+## [101.12.2](https://github.com/dhis2/capture-app/compare/v101.12.1...v101.12.2) (2024-10-20)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([9bf7696](https://github.com/dhis2/capture-app/commit/9bf7696de59baf42dd8f8ee1869f4696f83c007a))
+
 ## [101.12.1](https://github.com/dhis2/capture-app/compare/v101.12.0...v101.12.1) (2024-10-16)
 
 

diff --git a/cypress/e2e/ScopeSelector/ScopeSelector.feature b/cypress/e2e/ScopeSelector/ScopeSelector.feature
@@ -28,8 +28,6 @@ Feature: User uses the ScopeSelector to navigate
     When you select both org unit and program Malaria case registration
     Then you should see the table
 
-  # DHIS2-16010 - App crashes on invalid program id
-  @skip
   Scenario: Main page > Url with invalid program id
     Given you land on a main page with an invalid program id
     Then you should see error message

diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js
@@ -66,7 +66,7 @@ Then('the user sees the enrollment organisation unit', () => {
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-icon-orgunit"]').should('exist');
         cy.get('[data-test="widget-enrollment-orgunit"]')
-            .contains('Started at: Ngelehun CHC')
+            .contains('Started at:Ngelehun CHC')
             .should('exist');
     });
 });
@@ -77,7 +77,7 @@ Then('the user sees the owner organisation unit', () => {
             'exist',
         );
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains('Owned by: Ngelehun CHC')
+            .contains('Owned by:Ngelehun CHC')
             .should('exist');
     });
 });
@@ -232,7 +232,7 @@ Then(/^the user successfully transfers the enrollment/, () => {
 
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains('Owned by: Njandama MCHP')
+            .contains('Owned by:Njandama MCHP')
             .should('exist');
     });
 });
@@ -246,7 +246,7 @@ Then(/^the user types in (.*)/, (orgunit) => {
 Given(/^the enrollment owner organisation unit is (.*)/, (orgunit) => {
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains(`Owned by: ${orgunit}`)
+            .contains(`Owned by:${orgunit}`)
             .should('exist');
     });
 });

diff --git a/docs/developer/configure-a-capture-plugin.mdx b/docs/developer/configure-a-capture-plugin.mdx
@@ -1,5 +1,4 @@
 import Logo from './resources/tracker-plugin-configurator-logo.png'
-import TPCFormFieldDemoImg from './resources/tpc-form-field-demo.png'
 
 # Configuration
 
@@ -11,7 +10,7 @@ This application is called __Tracker Plugin Configurator__ and is available in t
 
 The app is also installable from the App Management app in your DHIS2 instance.
 
-<img src={Logo} alt="Tracker Plugin Configurator" style={{ width: '10%' }} />
+<img src={Logo} alt="Tracker Plugin Configurator" style={{ width: '65px' }} />
 
 ### How to use the Tracker Plugin Configurator
 
@@ -25,5 +24,5 @@ The app is also installable from the App Management app in your DHIS2 instance.
 
 <br />
 
-<img src={TPCFormFieldDemoImg} alt="Form Field Plugin" />
+![Form field plugin](resources/tpc-form-field-demo.png)
 
diff --git a/docs/developer/develop-a-capture-plugin.md b/docs/developer/develop-a-capture-plugin.md
@@ -5,7 +5,7 @@ description: Learn how to develop a plugin for the DHIS2 Capture app.
 id: develop-a-capture-plugin
 ---
 
-To develop your own capture plugin, you need to follow these steps:
+Developing a capture plugin is almost the same as developing a regular DHIS2 custom app. However, there are some differences in how you structure your plugin and how you configure it to work with the DHIS2 Capture app. These are outlined in the few steps below.
 
 ## Step 1: Create a new DHIS2 custom app
 
@@ -52,6 +52,6 @@ To build your plugin, you can use the provided build script from `d2-app-scripts
 Run `yarn build` or (`d2-app-scripts build`) to build a production version of your plugin.
 
 After building your plugin, you can deploy it to your DHIS2 instance.
-You can do this by uploading the ZIP file to the _App management_ app in your DHIS2 instance, or publishing it to the app hub.
+You can do this by uploading the ZIP file to the _App management_ app in your DHIS2 instance, or publishing it to the App Hub.
 
-See [Configuring a Capture plugin](/docs/capture-plugins/developer/configure-a-capture-plugin) for more information on how to configure your plugin in the DHIS2 Capture app.
+See [Configuring a Capture plugin](configure-a-capture-plugin) for more information on how to configure your plugin in the DHIS2 Capture app.
diff --git a/docs/developer/enrollment-plugins/manual-setup.mdx b/docs/developer/enrollment-plugins/manual-setup.mdx
@@ -19,7 +19,7 @@ When booting the capture application, we will look in the dataStore for these ke
 We assume that you will already have these three keys under the `capture` namespace in the datastore. If you do not have them, please create them before proceeding.
 
 | Page                  | Key                         |
-|-----------------------|-----------------------------|
+| --------------------- | --------------------------- |
 | Enrollment Dashboard  | `enrollmentOverviewLayout`  |
 | Enrollment Add Event  | `enrollmentEventNewLayout`  |
 | Enrollment Edit Event | `enrollmentEventEditLayout` |
@@ -37,10 +37,8 @@ You can also have different layouts for the three different enrollment pages.
         label={'Enrollment Dashboard'}
         default
     >
-        <CodeBlock
-            language={'json'}
-        >
-            {`{
+```json
+{
     "IpHINAT79UW": {
         "title": "Child Programme dashboard",
         "leftColumn": [
@@ -94,17 +92,15 @@ You can also have different layouts for the three different enrollment pages.
             }
         ]
     }
-}`}
-        </CodeBlock>
+}
+```
     </TabItem>
     <TabItem
         value={'ENROLLMENT_EVENT_NEW'}
         label={'Add Event'}
     >
-        <CodeBlock
-            language={'json'}
-        >
-            {`{
+```json
+{
     "IpHINAT79UW": {
         "title": "Child Programme: Add Event",
         "leftColumn": [
@@ -150,17 +146,15 @@ You can also have different layouts for the three different enrollment pages.
             }
         ]
     }
-}`}
-        </CodeBlock>
+}
+```
     </TabItem>
     <TabItem
         value={'ENROLLMENT_EVENT_EDIT'}
         label={'Edit Event'}
     >
-        <CodeBlock
-            language={'json'}
-        >
-            {`{
+```json
+{
     "IpHINAT79UW": {
         "title": "Child Programme: Edit Event",
         "leftColumn": [
@@ -215,7 +209,7 @@ You can also have different layouts for the three different enrollment pages.
         ]
     }
 }`}
-        </CodeBlock>
+```
     </TabItem>
 </Tabs>
 
@@ -268,11 +262,8 @@ You can also extend the configurations to render your own custom plugins. You ca
 
 You would place this inside either the `leftColumn` or `rightColumn` array.
 
-<CodeBlock
-    language={'json'}
-    title={'capture/enrollmentEventEditLayout'}
->
-{`"leftColumn": [
+```json title="capture/enrollmentEventEditLayout"
+"leftColumn": [
     {
         "type": "component",
         "name": "EditEventWorkspace"
@@ -284,6 +275,5 @@ You would place this inside either the `leftColumn` or `rightColumn` array.
     }
     // highlight-end
 ],
-`}
-</CodeBlock>
+```
 
diff --git a/docs/developer/form-field-plugins/developer-details.md b/docs/developer/form-field-plugins/developer-details.md
@@ -4,11 +4,9 @@ sidebar_label: Developer details
 id: developer-details
 ---
 
-Here are some details for developers who want to develop a form field plugin for the DHIS2 Capture app.
-
 A form field plugin runs in a sandboxed environment, meaning it can only read and write data that it's been configured to have access to.
-If the plugin is given access to a field, we provide any relevant values, metadata, and rules engine output for that field.
-We also provide some context about the application state, mainly if the plugin is in view or edit mode, or if the form has been attempted submitted.
+If the plugin is given access to a field, all relevant values, metadata, and rules engine output for that field is provided.
+Also the context about the application state is provided, mainly if the plugin is in view or edit mode, or if the form has been attempted to be submitted.
 
 If a plugin tries to update a field that it has not been given access to, an appropriate error message will be displayed in the console.
 

diff --git a/docs/developer/getting-started.md b/docs/developer/getting-started.md
@@ -6,6 +6,10 @@ The plugin framework is currently an experimental feature and is subject to chan
 We are working on improving both the technology and the way you use it. We will provide more documentation and examples as we progress.
 :::
 
+:::info Supported versions
+The plugin framework is supported in **DHIS2 version 40.5 and later**.
+:::
+
 ## What are plugins?
 Plugins are a way to extend the functionality of our core applications within the DHIS2 ecosystem.
 These plugins will act and feel like native widgets / components, and allow you to write custom code that will be injected into the core applications,

diff --git a/i18n/cs.po b/i18n/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Jiří Podhorecký <[email protected]>, 2024\n"
 "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
@@ -625,53 +625,6 @@ msgstr "Oznámení"
 msgid "Close the notice"
 msgstr "Zavřít oznámení"
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr "Použít nový ovládací panel zápisu pro {{programName}}"
-
-msgid "Opt in for {{programName}}"
-msgstr "Přihlásit se do {{programName}}"
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-"Kliknutím na přihlášení níže začnete používat nový ovládací panel registrace"
-" v aplikaci Capture pro tento program Tracker. V současné době existuje "
-"určitá funkce z aplikace Tracker Capture, která ještě nebyla přidána, včetně"
-" funkcí vztahů a doporučení. Práce na zahrnutí této funkce sledování do "
-"Capture pokračují a budou přidány v nadcházejících vydáních aplikace."
-
-msgid ""
-"The core team appreciates any feedback on this new functionality which is "
-"currently being beta tested, please report any issues and feedback in the "
-"DHIS2 JIRA project."
-msgstr ""
-"Základní tým oceňuje jakoukoli zpětnou vazbu k této nové funkcionalitě, "
-"která je v současné době beta testována, nahlaste prosím jakékoli problémy a"
-" zpětnou vazbu v projektu DHIS2 JIRA."
-
-msgid ""
-"Click the button below to opt-in to the new enrollment dashboard "
-"functionality in the Capture app (beta) for this Tracker program for all "
-"users."
-msgstr ""
-"Kliknutím na tlačítko níže se přihlásíte k nové funkci ovládacího panelu "
-"registrace v aplikaci Capture (beta) pro tento program Tracker pro všechny "
-"uživatele."
-
-msgid "Yes, opt in"
-msgstr "Ano, přihlásit se"
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr "Přestat používat nový ovládací panel zápisu pro {{programName}}"
-
-msgid "Opt out for {{programName}}"
-msgstr "Odhlásit se z {{programName}}"
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr "Zápis s ID \"{{enrollmentId}}\" neexistuje"
 
@@ -766,9 +719,6 @@ msgstr "Zobrazit pracovní seznam v tomto programu."
 msgid "Page is missing required values from URL"
 msgstr "Na stránce chybí požadované hodnoty z adresy URL"
 
-msgid "Program is not valid"
-msgstr "Program není platný"
-
 msgid "Org unit is not valid with current program"
 msgstr "Organizační jednotka není platná pro aktuální program"
 
@@ -1285,6 +1235,12 @@ msgstr "Widget pro zápis nelze načíst. Prosím zkuste to znovu později"
 msgid "Follow-up"
 msgstr "Následovat"
 
+msgid "Started at{{escape}}"
+msgstr ""
+
+msgid "Owned by{{escape}}"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "Zrušeno"
 
@@ -1489,13 +1445,6 @@ msgstr "{{ linkableStageLabel }} nemá žádné propojitelné události"
 msgid "Ambiguous relationships, contact system administrator"
 msgstr "Nejednoznačné vztahy, kontaktujte správce systému"
 
-msgid ""
-"Enter {{linkableStageLabel}} details in the next step after completing this "
-"{{currentStageLabel}}."
-msgstr ""
-"V dalším kroku po vyplnění této stránky {{currentStageLabel}} zadejte údaje "
-"{{linkableStageLabel}}."
-
 msgid "Enter details now"
 msgstr "Zadejte nyní podrobnosti"
 
@@ -1580,6 +1529,9 @@ msgstr "Seznam změn"
 msgid "No changes to display"
 msgstr ""
 
+msgid "Updated"
+msgstr "Aktualizováno"
+
 msgid "Created"
 msgstr "Vytvořeno"
 
@@ -1598,6 +1550,9 @@ msgstr "Datová položka"
 msgid "Change"
 msgstr ""
 
+msgid "Value"
+msgstr ""
+
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""