Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
71fe7e9
chore: create the root package
varl Mar 6, 2020
2794aa3
Merge commit '6ce814f9e1bfa9f63a951bb5d976c366fb88e0b0' as 'packages/…
varl Mar 6, 2020
6ce814f
Squashed 'packages/core/' content from commit 18a7713
varl Mar 6, 2020
455abca
Merge commit '944f591cc48c4279574fe8604f69c12fcc6221cf' as 'packages/…
varl Mar 6, 2020
944f591
Squashed 'packages/widgets/' content from commit 70b0228
varl Mar 6, 2020
9e071d7
chore: merge in refactor work from separate branch
varl Mar 6, 2020
b6276f9
chore: add jest config back
varl Mar 6, 2020
d9fb428
ci(actions): update test scripts and netlify
varl Mar 6, 2020
86565e4
refactor(icons): extract @dhis2/ui-icons
varl Mar 6, 2020
9b61adc
chore: update deps
varl Mar 6, 2020
56bce6f
chore: add watch to icons
varl Mar 6, 2020
e3ac9c4
refactor(togglefield): colocate related code
varl Mar 6, 2020
5183e44
refactor(textareafield): colocate code and stories
varl Mar 6, 2020
7ceddf0
refactor(ui): list breaking changes
varl Mar 6, 2020
35e361e
refactor(input): colocate code and stories
varl Mar 6, 2020
4283a1f
refactor(inputfield): colocate code and stories
varl Mar 6, 2020
d35e9a2
refactor(legend): colocate code and stories
varl Mar 6, 2020
045c4c7
refactor(menuitem): colocate code and stories
varl Mar 6, 2020
9635f0b
refactor(modal): colocate code and stories
varl Mar 6, 2020
1469333
refactor(menu): colocate coe and stories
varl Mar 6, 2020
0153fbe
refactor(menulist): colocate code and stories
varl Mar 6, 2020
c00f65f
refactor(modalactions): colocate code and stories
varl Mar 6, 2020
d7f5390
refactor(modalcontent): colocate code and stories
varl Mar 6, 2020
060e78e
refactor(modaltitle): colocate code and stories
varl Mar 6, 2020
2f89f0a
refactor(cssreset): colocate code and stories
varl Mar 6, 2020
f80d12c
refactor(cssvariables): colocate code and stories
varl Mar 6, 2020
9e4c460
test(modalcontent): repair broken import in e2e
varl Mar 6, 2020
4c78d30
refactor(fileinputfieldwithlist): colocate code and stories
varl Mar 6, 2020
a5225ba
refactor(fileinputfield): colocate code and stories
varl Mar 6, 2020
12c901d
refactor(filelist): colocate code and stories
varl Mar 6, 2020
ae67e84
refactor(fileinput): colocate code and stories
varl Mar 6, 2020
52abe28
refactor(filelistitem): colocate code and stories
varl Mar 6, 2020
6ebed0b
refactor(filelistplaceholder): colocate code and stories
varl Mar 6, 2020
8d64dc0
refactor(multiselect): colocate code and stories
varl Mar 6, 2020
c2b5823
refactor(layercontext): use standard layout
varl Mar 6, 2020
2af3da0
refactor(dropmenu): use standard layout
varl Mar 6, 2020
28dd44c
refactor(multiselectoption): move to standard structure
varl Mar 6, 2020
5bac38c
refactor(multiselectfield): colocate code and stories
varl Mar 6, 2020
57fa827
refactor(node): colocate code and stories
varl Mar 6, 2020
741ed76
refactor(popper): colocate code and stories
varl Mar 6, 2020
2e379c9
refactor(screencover): colocate code and stories
varl Mar 6, 2020
3b6eb21
refactor(select): move to standard structure
varl Mar 6, 2020
0d32f35
refactor(switchfield): colocate code and stories
varl Mar 6, 2020
f229f74
refactor(tabbar): colocate code and stories
varl Mar 6, 2020
ed3de38
refactor(tab): colocate code and stories
varl Mar 6, 2020
337d15e
refactor(singleselect): colocate code and stories
varl Mar 6, 2020
e2c756a
chore: fix imports
varl Mar 6, 2020
e298073
refactor(singleselectfield): colocate code and stories
varl Mar 6, 2020
4179300
refactor(singleselectoption): move to common structure
varl Mar 6, 2020
7f3bb74
refactor(stackedtable): colocate code and stories
varl Mar 6, 2020
92d5823
refactor(table): colocate code and stories
varl Mar 6, 2020
140230c
refactor(stackedtable): use common strucure
varl Mar 6, 2020
36131f7
refactor: colocate table components
varl Mar 6, 2020
726b607
chore: remove comment
varl Mar 6, 2020
db55448
refactor(togglegroupfield): migrate to ui-widgets
varl Mar 9, 2020
a86680a
Squashed 'packages/core/' changes from 18a77139..803aa7f6
varl Mar 9, 2020
ba4e57c
merge: commit 'a86680a4275476bc22c5cdb6610dda388fc08b28' into monorepo
varl Mar 9, 2020
82294cd
refactor(popover): colocate code and stories
varl Mar 9, 2020
7140d07
Squashed 'packages/core/' changes from 803aa7f6..f06e9934
varl Mar 9, 2020
84c8f02
merge: commit '7140d073c3bfec7d2cb6f9d0133207701053a011' into monorepo
varl Mar 9, 2020
d979d96
refactor(checkboxfield): move to ui-widgets
varl Mar 9, 2020
6059625
refactor(fileinputfield): move to ui-widgets
varl Mar 9, 2020
a512f00
refactor(fileinputfieldwithlist): move to ui-widgets
varl Mar 9, 2020
50d9009
refactor(inputfield): move to ui-widgets
varl Mar 9, 2020
1dadf93
test(e2e): repair tests after merge
varl Mar 9, 2020
c3d42ad
refactor(multiselectfield): move to ui-widgets
varl Mar 9, 2020
e09c70c
refactor(singleselectfield): move to ui-widgets
varl Mar 9, 2020
5653131
test(e2e): fix imports for cypress tests
varl Mar 9, 2020
2baa52a
refactor(switchfield): move to ui-widgets
varl Mar 9, 2020
7793fe6
refactor(togglefield): remove component in favor of explicity
varl Mar 9, 2020
3ef63da
refactor(textareafield): move to ui-widgets
varl Mar 9, 2020
1385dfb
test: repair e2e tests
varl Mar 9, 2020
fc63d99
refactor(headerbar): colocate code and stories
varl Mar 9, 2020
1c50f51
refactor(organisationunittree): colocate code and stories
varl Mar 9, 2020
1bb0f9d
feat(constants): move and expose the common proptypes
varl Mar 10, 2020
c52de77
refactor(core): remove common prop types in favor of sharedPropTypes
varl Mar 11, 2020
9847199
ci(actions): update workflows
varl Mar 12, 2020
9e5d3bc
Squashed 'packages/core/' changes from f06e9934..a0b7802e
varl Mar 12, 2020
c986319
merge: update core
varl Mar 12, 2020
03af225
Squashed 'packages/widgets/' changes from 70b0228a..66818df2
varl Mar 12, 2020
d839cdc
merge(widgets): update from upstream
varl Mar 12, 2020
dbfe03c
Squashed 'packages/forms/' content from commit a93e35b0
varl Mar 12, 2020
ce6999e
merge(forms): add ui-forms from upstream
varl Mar 12, 2020
af49144
feat(forms): integrate @dhis2/ui-forms
varl Mar 12, 2020
c15bfb8
docs(storybook): sort stories
varl Mar 12, 2020
06896ea
refactor(forms): add suffix 'Control'
varl Mar 12, 2020
88a3782
feat(ui): expose @dhis2/ui-forms through metapackage
varl Mar 12, 2020
957aa6a
ci(actions): update templates
varl Mar 12, 2020
1758ca2
test(forms): update import paths
varl Mar 12, 2020
9fea12b
ci(cypress): make cypress runs more efficient
varl Mar 19, 2020
a185072
ci(cypress): update project id
varl Mar 19, 2020
c938b58
test(cypress): repair e2e tests for forms
varl Mar 19, 2020
92d900d
ci(actions): rename workflows
varl Mar 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
> 0.5%
last 2 versions
Firefox ESR
ie 11
not dead
25 changes: 25 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 1

update_configs:
- package_manager: 'javascript'
directory: '/'
update_schedule: 'daily'
version_requirement_updates: 'increase_versions'
target_branch: 'master'
ignored_updates:
# ui-core supports 16.8 of react, so ignore all updates
- match:
dependency_name: 'react'
version_requirement: '>=16.9.x'
- match:
dependency_name: 'react-dom'
version_requirement: '>=16.9.x'

automerged_updates:
- match:
dependency_name: '@dhis2/*'
dependency_type: 'all'
update_type: 'semver:minor'
- match:
dependency_type: 'all'
update_type: 'security:patch'
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# For more information about the properties used in
# this file, please see the EditorConfig documentation:
# https://editorconfig.org/

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/src/locales/*
**/cypress/assets
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const { config } = require('@dhis2/cli-style')

module.exports = {
extends: [config.eslintReact],
}
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# match all files, request review from
* @dhis2/team-apps
4 changes: 4 additions & 0 deletions .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
titleOnly: false
commitsOnly: false
titleAndCommits: true
allowMergeCommits: false
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_extends: .github
39 changes: 39 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# For more options:
# https://github.com/cypress-io/github-action

name: 'dhis2: test (cypress)'

on:
push:
branches:
- master
pull_request:

env:
SERVER_START_CMD: 'yarn cy:server'
SERVER_URL: 'http://localhost:5000'
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

jobs:
e2e:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
strategy:
matrix:
containers: [1, 2, 3]
steps:
- name: Checkout
uses: actions/checkout@v1

- name: Tests
uses: cypress-io/github-action@v1
with:
record: true
parallel: true
start: ${{ env.SERVER_START_CMD }}
wait-on: ${{ env.SERVER_URL }}
wait-on-timeout: 60
group: 'e2e'
env:
CI: true
STORYBOOK_TESTING: true
21 changes: 21 additions & 0 deletions .github/workflows/node-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'dhis2: lint (node)'

on: push

jobs:
check:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12.x

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

- name: Run linters
run: yarn lint
env:
CI: true
50 changes: 50 additions & 0 deletions .github/workflows/node-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: 'dhis2: publish (node)'

on:
push:
branches:
# match branches in:
# https://github.com/semantic-release/semantic-release/blob/master/docs/usage/configuration.md#branches
- master
- next
- next-major
- alpha
- beta
- '[0-9]+.x'
- '[0-9]+.x.x'
- '[0-9]+.[0-9]+.x'

env:
GIT_AUTHOR_NAME: '@dhis2-bot'
GIT_AUTHOR_EMAIL: 'apps@dhis2.org'
GIT_COMMITTER_NAME: '@dhis2-bot'
GIT_COMMITTER_EMAIL: 'apps@dhis2.org'
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
GH_TOKEN: ${{secrets.GH_TOKEN}}

jobs:
publish:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12.x

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

- name: Build
run: yarn build

- name: Test
run: yarn test

- name: Lint
run: yarn lint

- name: Publish to NPM
run: npx @dhis2/cli-utils release --publish npm
env:
CI: true
24 changes: 24 additions & 0 deletions .github/workflows/node-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 'dhis2: test (node)'

on: push

jobs:
unit:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12.x

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

- name: Build
run: yarn build

- name: Test
run: yarn test
env:
CI: true
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

.yarn
.yarnrc

# Editor settings
/.vscode

# dependencies
node_modules/

# testing
/coverage

# production
build/
dist/

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json
bundle.stats.json

# cypress
cypress/screenshots
cypress/videos
cypress.env.json

# d2
.d2/
locales/
15 changes: 15 additions & 0 deletions .huskyrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const { config } = require('@dhis2/cli-style')
const husky = require(config.husky)

const tasks = arr => arr.join(' && ')

module.exports = {
hooks: {
...husky.hooks,
'pre-commit': tasks([
'd2-style js check --staged',
'd2-style text check --staged',
]),
'pre-push': 'yarn test',
},
}
5 changes: 5 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const { config } = require('@dhis2/cli-style')

module.exports = {
...require(config.prettier),
}
10 changes: 10 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[main]
host = https://www.transifex.com
lang_map = fa_AF: prs

[app-ui-widgets.en-pot]
file_filter = packages/widgets/i18n/<lang>.po
minimum_perc = 0
source_file = packages/widgets/i18n/en.pot
source_lang = en
type = PO
29 changes: 29 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2018, DHIS 2
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading