Merge remote-tracking branch 'origin/main' into mobile-ui

.gitignore

@@ -19,14 +19,15 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 .vscode
-.idea/
+.idea
 
 # Copied docs
 docs/cli/cli
 docs/app-platform
 docs/cli/cypress
 docs/app-runtime
 docs/cli/style
+docs/capture-plugins
 
 mobile/mobile-ui
 

blog/2019-12-12-ui-core-4.md

@@ -1,8 +1,7 @@
 ---
 slug: 2019/12/ui-core-4
 title: UI-core 4 release
-# author: [ismay, joe]
-author_title: DHIS2 Core Team
+authors: core
 tags: [libraries, ui-core]
 ---
 

blog/2020-05-28-ui-5-release.md

@@ -1,8 +1,8 @@
 ---
 slug: 2020/05/ui-5-release
 title: UI 5 release
-# author: ['martin', 'jan-gerke', 'jennifer', 'hendrik', 'ismay']
-author_title: DHIS2 Core Team
+# author: ['martin', 'jan-gerke', 'jennifer', 'hendrik']
+authors: core
 # author_image_url: https://avatars1.githubusercontent.com/u/17883920?s=460&v=4
 tags: [libraries, ui-core, ui-widgets, ui-forms, ui]
 ---

blog/2022-07-27-app-platform-v10.md

@@ -1,7 +1,7 @@
 ---
 slug: 2022/07/app-platform-v10
 title: App-platform v10
-authors: ismay
+authors: core
 tags: [app platform, developer tools, webapp, announcement]
 ---
 

blog/authors.yml

@@ -1,42 +1,48 @@
 austin:
     name: Austin McGee
+    title: DHIS2 Core Team
     url: https://github.com/amcgee
     image_url: https://github.com/amcgee.png
 
 jennifer:
     name: Jennifer Arnesen
+    title: DHIS2 Core Team
     url: https://github.com/jenniferarnesen
     image_url: https://github.com/jenniferarnesen.png
 
 joe:
     name: Joe Cooper
+    title: DHIS2 Core Team
     url: https://github.com/cooper-joe
     image_url: https://github.com/cooper-joe.png
 
 varl:
     name: Viktor Varland
+    title: DHIS2 Core Team
     url: https://github.com/varl
     image_url: https://github.com/varl.png
 
 claudemamo:
     name: Claude Mamo
+    title: DHIS2 Core Team
     url: https://github.com/cjmamo
     image_url: https://github.com/cjmamo.png
 
-ismay:
-    name: Ismay Wolff
-    url: https://github.com/ismay
-    image_url: https://github.com/ismay.png
-
 kai:
     name: Kai Vandivier
+    title: DHIS2 Core Team
     url: https://github.com/KaiVandivier
     image_url: https://github.com/KaiVandivier.png
 rene:
     name: Rene Pot
+    title: DHIS2 Core Team
     url: https://github.com/Topener
     image_url: https://github.com/Topener.png
 birk:
     name: Birk Johansson
+    title: DHIS2 Core Team
     url: https://github.com/Birkbjo
     image_url: https://github.com/Birkbjo.png
+core:
+    name: DHIS2 Core Team
+    image_url: https://github.com/dhis2.png

docs-migrate.js

@@ -1,4 +1,5 @@
 const { execSync } = require('child_process')
+const path = require('path')
 const fs = require('fs-extra')
 
 const migrateDocs = ({
@@ -8,8 +9,11 @@ const migrateDocs = ({
     targetDir,
     extraFiles = [],
     postDownloadActions = [],
+    ignoreDirs = [],
 }) => {
     try {
+        // reset the working directory between each migration
+        process.chdir(__dirname)
         // Remove any previous copy
         fs.removeSync(tempDir)
 
@@ -38,7 +42,14 @@ const migrateDocs = ({
 
         // Copy the directory to another place and create missing directories
         console.log(`copy files to ${targetDir}`)
-        fs.copySync(`${tempDir}/docs`, targetDir, { recursive: true })
+        fs.copySync(`${tempDir}/docs`, targetDir, {
+            recursive: true,
+            filter: (src) => !ignoreDirs.some(dir => src
+                .includes(path
+                    .join(tempDir, 'docs', dir)
+                ),
+            ),
+        })
 
         // Copy extra files
         extraFiles.forEach((file) => {
@@ -128,9 +139,17 @@ migrateDocs({
     ],
 })
 
+migrateDocs({
+    repo: 'https://github.com/dhis2/capture-app.git',
+    tempDir: '.capture-repo-temp',
+    targetDir: './docs/capture-plugins',
+    ignoreDirs: ['user']
+})
+
 migrateDocs({
     repo: 'https://github.com/dhis2/dhis2-mobile-ui.git',
     tempDir: '.mui-repo-temp',
     targetDir: './mobile/mobile-ui',
     branch: 'develop'
 })
+

docusaurus.config.js

@@ -228,6 +228,7 @@ module.exports = {
             'data-project-color': '#393D4D',
             'data-project-logo': '/img/logo.png',
             'data-modal-title': 'DHIS2 Developers AI',
+            'data-user-analytics-fingerprint-enabled': 'true',
             'data-modal-disclaimer':
                 'Answers are AI generated based on the DHIS2 Documentation. Be aware it might not be 100% accurate or up-to-date, check the sources to know for sure.',
             async: true,

sidebars.js

@@ -58,7 +58,7 @@ module.exports = {
         {
             label: 'Web App Development',
             type: 'category',
-            collapsed: false,
+            collapsed: true,
             collapsible: true,
             items: [
                 {
@@ -192,6 +192,7 @@ module.exports = {
                                         'app-runtime/advanced/offline/useOnlineStatus',
                                     ],
                                 },
+                                'app-runtime/advanced/CustomDataProvider',
                                 'app-runtime/advanced/services',
                                 'app-runtime/advanced/DataEngine',
                                 'app-runtime/advanced/DataEngineLinks',
@@ -302,6 +303,29 @@ module.exports = {
                 },
             ],
         },
+        {
+            label: 'Capture Plugins',
+            type: 'category',
+            collapsed: true,
+            collapsible: true,
+            items: [
+                'capture-plugins/developer/getting-started',
+                'capture-plugins/developer/develop-a-capture-plugin',
+                'capture-plugins/developer/configure-a-capture-plugin',
+                {
+                    'Form Field Plugin': [
+                        'capture-plugins/developer/form-field-plugins/introduction',
+                        'capture-plugins/developer/form-field-plugins/developer-details',
+                        'capture-plugins/developer/form-field-plugins/manual-setup',
+                    ],
+                    'Enrollment Plugin': [
+                        'capture-plugins/developer/enrollment-plugins/introduction',
+                        'capture-plugins/developer/enrollment-plugins/developer-details',
+                        'capture-plugins/developer/enrollment-plugins/manual-setup',
+                    ]
+                }
+            ]
+        },
         {
             CLI: [
                 'cli/readme',