Skip to content

Commit

Permalink
Merge branch 'master' into fix/enable-user-ou-and-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
janhenrikoverland authored Nov 22, 2024
2 parents aacb0f7 + 90cf3e9 commit d1b679d
Show file tree
Hide file tree
Showing 39 changed files with 7,207 additions and 13,008 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ const { config } = require('@dhis2/cli-style')

module.exports = {
extends: [config.eslintReact],
rules: {
'react/no-unknown-property': ['error', { ignore: ['jsx', 'global'] }],
},
}
17 changes: 14 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
version: 2
updates:
- package-ecosystem: npm
directory: '/'
directory: /
schedule:
interval: weekly
open-pull-requests-limit: 10
target-branch: master
open-pull-requests-limit: 5
versioning-strategy: increase
groups:
security:
applies-to: security-updates
update-types:
- minor
- patch
devDependencies:
applies-to: version-updates
dependency-type: development
update-types:
- minor
- patch
6 changes: 3 additions & 3 deletions .github/workflows/copy-build-to-d2-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{env.GH_TOKEN}}

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '16.x'
node-version: '20.x'

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dhis2-verify-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
lint-pr-title:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: c-hive/gha-yarn-cache@v1
- uses: actions/checkout@v4
- uses: c-hive/gha-yarn-cache@v2
- run: yarn install --frozen-lockfile
- id: commitlint
run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
token: ${{env.GH_TOKEN}}
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Install
run: yarn install --frozen-lockfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20.x

- name: Install
run: yarn install --frozen-lockfile
Expand Down
30 changes: 23 additions & 7 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ const makeBabelConfig = require('@dhis2/cli-app-scripts/config/makeBabelConfig.j

module.exports = {
addons: ['@storybook/preset-create-react-app'],
stories: ['../src/**/*.stories.@(js|mdx)'],
stories: ['../src/**/*.stories.@(js)'],

babel: async (config) => {
// currently styled-jsx is configured the same way for prod and
// dev so it doesn't matter what the mode is here.
Expand All @@ -17,12 +18,27 @@ module.exports = {
// with the storybook babel configuration.
return {
...config,
presets: [...config.presets, ...custom.presets],
plugins: [
...config.plugins,
...custom.plugins,
...custom.env[mode].plugins,
],
presets: custom.presets,
plugins: [...custom.plugins, ...custom.env[mode].plugins].map(
(plugin) => {
if (plugin instanceof Array) {
return [plugin[0], { ...plugin[1], loose: true }]
}

return [plugin, { loose: true }]
}
),
}
},

framework: {
name: '@storybook/react-webpack5',
options: {},
},

docs: {},

typescript: {
reactDocgen: 'react-docgen-typescript',
},
}
6 changes: 0 additions & 6 deletions .storybook/preview-head.html

This file was deleted.

3 changes: 3 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { CssReset } from '@dhis2/ui'
import React from 'react'
const { withJsx } = require('@mihkeleidast/storybook-addon-source')

export const decorators = [
withJsx,
(Story) => (
<div>
<CssReset />
Expand All @@ -22,3 +24,4 @@ export const decorators = [
</div>
),
]
//export const tags = ['autodocs', 'autodocs'];
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## [26.9.2](https://github.com/dhis2/analytics/compare/v26.9.1...v26.9.2) (2024-11-03)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([ce24864](https://github.com/dhis2/analytics/commit/ce248640f88ea49ebe5004d93b7fa2beac8254dc))

## [26.9.1](https://github.com/dhis2/analytics/compare/v26.9.0...v26.9.1) (2024-10-27)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([9a507a2](https://github.com/dhis2/analytics/commit/9a507a2236567597f0cda20e4a0fff9fc1d082f3))

# [26.9.0](https://github.com/dhis2/analytics/compare/v26.8.8...v26.9.0) (2024-10-22)


Expand Down
Loading

0 comments on commit d1b679d

Please sign in to comment.