Skip to content

Commit

Permalink
Merge branch 'master' into header-bar-for-global-shell
Browse files Browse the repository at this point in the history
  • Loading branch information
KaiVandivier committed Feb 24, 2025
2 parents d1e28f3 + 50db7d2 commit e04d53c
Show file tree
Hide file tree
Showing 242 changed files with 6,982 additions and 2,638 deletions.
2 changes: 0 additions & 2 deletions .github/CODEOWNERS

This file was deleted.

10 changes: 7 additions & 3 deletions .github/workflows/dhis2-deploy-netlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ on:
push:
branches:
- master
paths:
- '_redirects' # only rebuild and deploy when redirects file changes

concurrency:
group: ${{ github.workflow}}-${{ github.ref }}
Expand All @@ -28,10 +30,12 @@ jobs:
with:
node-version: 20.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
# We use Netlify only for deploy previews, production docs are hosted at developers.dhis2.org
# Don't build anything, just copy the _redirects file into the dist directory

- run: yarn build
- run: |
mkdir dist
cp _redirects dist/_redirects
- uses: nwtgck/actions-netlify@v1.1
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dhis2-verify-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 20.x
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
- id: commitlint
Expand All @@ -23,6 +26,9 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v1
with:
node-version: 20.x
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
- id: commitlint
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/generate-and-upload-bom.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: 'This workflow creates bill of material and uploads it to Dependency-Track each night'

on:
schedule:
- cron: '0 0 * * *'

concurrency:
group: ${{ github.workflow}}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash

jobs:
create-bom:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Generate BOMs
run: |
npm install -g @cyclonedx/cdxgen
cdxgen -o sbom.json
- name: Upload SBOM to DependencyTrack
env:
DEPENDENCY_TRACK_API: 'https://dt.security.dhis2.org/api/v1/bom'
run: |
curl -X POST "$DEPENDENCY_TRACK_API" \
--fail-with-body \
-H "Content-Type: multipart/form-data" \
-H "X-Api-Key: ${{ secrets.DEPENDENCYTRACK_APIKEY }}" \
-F "project=53c6ea2f-413f-45b9-a360-e366f917277d" \
-F "bom=@sbom.json"
292 changes: 291 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# default code owner for repo
* @dhis2/platform-frontend
* @dhis2/team-extensibility
5 changes: 5 additions & 0 deletions _redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Redirect legacy ui.dhis2.nu netlify site to the developer portal
/demo https://developers.dhis2.org/demo
/components/* https://developers.dhis2.org/docs/ui/components/:splat
/recipes/* https://developers.dhis2.org/docs/ui/recipes/:splat
/* https://developers.dhis2.org/design-system/:splat
6 changes: 3 additions & 3 deletions collections/forms/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { FileInputFieldFF } from '@dhis2/ui'
|showValidStatus|boolean||||
|valid|boolean||||
|validationText|string||||
|value|arrayOf(instanceOf(File)) │ ''||||
|value|`arrayOf(instanceOf(File)) │ ''`||||

### InputFieldFF

Expand Down Expand Up @@ -118,7 +118,7 @@ import { MultiSelectFieldFF } from '@dhis2/ui'
|meta|custom|||`meta` props provided by Final Form `Field`|
|error|boolean||||
|loading|boolean||||
|options|arrayOf({<br/> "label": "string",<br/> "value": "string"<br/>})|`[]`|||
|options|`arrayOf({<br/> "label": "string",<br/> "value": "string"<br/>})`|``[]``|||
|showLoadingStatus|boolean||||
|showValidStatus|boolean||||
|valid|boolean||||
Expand Down Expand Up @@ -169,7 +169,7 @@ import { SingleSelectFieldFF } from '@dhis2/ui'
|---|---|---|---|---|
|input|custom|||`input` props received from Final Form `Field`|
|meta|custom|||`meta` props received from Final Form `Field`|
|options|arrayOf({<br/> "label": "string",<br/> "value": "string"<br/>})||*||
|options|`arrayOf({<br/> "label": "string",<br/> "value": "string"<br/>})`||*||
|error|boolean||||
|loading|boolean||||
|showLoadingStatus|boolean||||
Expand Down
4 changes: 2 additions & 2 deletions collections/forms/i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-09-09T12:09:30.724Z\n"
"PO-Revision-Date: 2024-09-09T12:09:30.724Z\n"
"POT-Creation-Date: 2024-11-29T06:54:11.622Z\n"
"PO-Revision-Date: 2024-11-29T06:54:11.622Z\n"

msgid "Upload file"
msgstr "Upload file"
Expand Down
20 changes: 12 additions & 8 deletions collections/forms/i18n/fr.po
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
#
# Translators:
# phil_dhis2, 2021
# Philip Larsen Donnelly, 2021
# Viktor Varland <viktor@dhis2.org>, 2021
# Bram Piot <bram.piot@gmail.com>, 2021
# Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2021
# Yao Selom SAKA (HISP WCA) <ysaka@hispwca.org>, 2022
# Yayra Gomado <ygomado@hispwca.org>, 2025
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2022-02-11T13:37:19.312Z\n"
"POT-Creation-Date: 2024-11-29T06:54:11.622Z\n"
"PO-Revision-Date: 2021-06-24 12:50+0000\n"
"Last-Translator: Yao Selom SAKA (HISP WCA) <ysaka@hispwca.org>, 2022\n"
"Language-Team: French (https://www.transifex.com/hisp-uio/teams/100509/fr/)\n"
"Last-Translator: Yayra Gomado <ygomado@hispwca.org>, 2025\n"
"Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -49,7 +50,7 @@ msgid "Please enter a number with a maximum of {{upperBound}}"
msgstr ""

msgid "Please enter at least {{lowerBound}} characters"
msgstr ""
msgstr "Veuillez saisir au moins {{lowerBound}} caractères"

msgid "Please enter a number of at least {{lowerBound}}"
msgstr ""
Expand Down Expand Up @@ -83,9 +84,6 @@ msgstr "Le mot de passe doit contenir au moins un chiffre"
msgid "Password should have at least one special character"
msgstr "Le mot de passe doit avoir au moins un caractère spécial"

msgid "Please provide a username between 4 and 255 characters"
msgstr ""

msgid "Please provide a valid email address"
msgstr "Veuillez saisir une adresse email valide"

Expand All @@ -106,3 +104,9 @@ msgstr ""

msgid "Please provide a valid url"
msgstr "Veuillez saisir un lien URL valide"

msgctxt " - or @"
msgid ""
"Please provide a username between 4 and 255 characters long and possibly "
"separated by . "
msgstr ""
107 changes: 107 additions & 0 deletions collections/forms/i18n/hi_IN.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
#
# Translators:
# Siddharth Agarwal, 2025
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-11-29T06:54:11.622Z\n"
"PO-Revision-Date: 2021-06-24 12:50+0000\n"
"Last-Translator: Siddharth Agarwal, 2025\n"
"Language-Team: Hindi (India) (https://app.transifex.com/hisp-uio/teams/100509/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hi_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "Upload file"
msgstr ""

msgid "Upload files"
msgstr ""

msgid "Remove"
msgstr "हटाएं"

msgid "Please provide an alpha-numeric value"
msgstr ""

msgid "Please provide a boolean value"
msgstr ""

msgid "Please enter between {{lowerBound}} and {{upperBound}} characters"
msgstr ""

msgid ""
"Please make sure the value of this input matches the value in "
"\"{{otherField}}\"."
msgstr ""

msgid "Please enter a maximum of {{upperBound}} characters"
msgstr ""

msgid "Please enter a number with a maximum of {{upperBound}}"
msgstr ""

msgid "Please enter at least {{lowerBound}} characters"
msgstr ""

msgid "Please enter a number of at least {{lowerBound}}"
msgstr ""

msgid "Number cannot be less than {{lowerBound}} or more than {{upperBound}}"
msgstr ""

msgid ""
"Please make sure the value of this input matches the pattern "
"{{patternString}}."
msgstr ""

msgid "Password should be a string"
msgstr ""

msgid "Password should be at least 8 characters long"
msgstr ""

msgid "Password should be no longer than 34 characters"
msgstr ""

msgid "Password should contain at least one lowercase letter"
msgstr ""

msgid "Password should contain at least one UPPERCASE letter"
msgstr ""

msgid "Password should contain at least one number"
msgstr ""

msgid "Password should have at least one special character"
msgstr ""

msgid "Please provide a valid email address"
msgstr ""

msgid "Please provide a value"
msgstr ""

msgid "Please provide a round number without decimals"
msgstr ""

msgid "Please provide a valid international phone number."
msgstr ""

msgid "Please provide a number"
msgstr ""

msgid "Please provide a string"
msgstr ""

msgid "Please provide a valid url"
msgstr ""

msgctxt " - or @"
msgid ""
"Please provide a username between 4 and 255 characters long and possibly "
"separated by . "
msgstr ""
19 changes: 11 additions & 8 deletions collections/forms/i18n/nb.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#
# Translators:
# Karoline Tufte Lien <karoline@dhis2.org>, 2021
# Caroline Hesthagen Holen <caroline@devotta.no>, 2021
# Karoline Tufte Lien <karoline@dhis2.org>, 2025
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2022-02-11T13:37:19.312Z\n"
"POT-Creation-Date: 2024-11-29T06:54:11.622Z\n"
"PO-Revision-Date: 2021-06-24 12:50+0000\n"
"Last-Translator: Caroline Hesthagen Holen <caroline@devotta.no>, 2021\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/hisp-uio/teams/100509/nb/)\n"
"Last-Translator: Karoline Tufte Lien <karoline@dhis2.org>, 2025\n"
"Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -46,7 +46,7 @@ msgid "Please enter a number with a maximum of {{upperBound}}"
msgstr ""

msgid "Please enter at least {{lowerBound}} characters"
msgstr ""
msgstr "Skriv inn minst {{lowerBound}} tegn"

msgid "Please enter a number of at least {{lowerBound}}"
msgstr ""
Expand Down Expand Up @@ -80,9 +80,6 @@ msgstr "Passord må inneholde minst et siffer"
msgid "Password should have at least one special character"
msgstr "Passordet skal ha minst ett spesialtegn"

msgid "Please provide a username between 4 and 255 characters"
msgstr ""

msgid "Please provide a valid email address"
msgstr "Vennligst fyll ut en gyldig e-postadresse"

Expand All @@ -103,3 +100,9 @@ msgstr ""

msgid "Please provide a valid url"
msgstr "Oppgi en gyldig url"

msgctxt " - or @"
msgid ""
"Please provide a username between 4 and 255 characters long and possibly "
"separated by . "
msgstr ""
Loading

0 comments on commit e04d53c

Please sign in to comment.