Skip to content

Commit

Permalink
Merge pull request #3101 from beyondessential/release-2021-34
Browse files Browse the repository at this point in the history
Release v2021-34 (Due 27/08/2021)
  • Loading branch information
IgorNadj authored Aug 27, 2021
2 parents f5ca3f4 + 17e4646 commit 7841cb2
Show file tree
Hide file tree
Showing 546 changed files with 11,008 additions and 3,330 deletions.
38 changes: 19 additions & 19 deletions full-testable-package.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,48 @@ COPY .babelrc-ts.js ./
RUN mkdir ./scripts
COPY scripts/. ./scripts

## copy just the root of each package so it is ready for yarn install, without adding the src
## directories, so that code changes don't invalidate the container cache before we've yarn installed
## copy *just the package.json* of each package so it is ready for yarn install, without adding the
## src directories, so that code changes don't invalidate the container cache before we've run yarn
RUN mkdir -p ./packages/access-policy
COPY packages/access-policy/. ./packages/access-policy
COPY packages/access-policy/package.json ./packages/access-policy
RUN mkdir -p ./packages/admin-panel
COPY packages/admin-panel/package.json ./packages/admin-panel
RUN mkdir -p ./packages/admin-panel-server
COPY packages/admin-panel-server/package.json ./packages/admin-panel-server
RUN mkdir -p ./packages/aggregator
COPY packages/aggregator/package.json ./packages/aggregator
RUN mkdir -p ./packages/auth
COPY packages/auth/. ./packages/auth
COPY packages/auth/package.json ./packages/auth
RUN mkdir -p ./packages/data-api
COPY packages/data-api/package.json ./packages/data-api
RUN mkdir -p ./packages/data-broker
COPY packages/data-broker/package.json ./packages/data-broker
RUN mkdir -p ./packages/database
COPY packages/database/package.json ./packages/database
RUN mkdir -p ./packages/devops
COPY packages/devops/package.json ./packages/devops
RUN mkdir -p ./packages/dhis-api
COPY packages/dhis-api/package.json ./packages/dhis-api
RUN mkdir -p ./packages/entity-server
COPY packages/entity-server/package.json ./packages/entity-server
RUN mkdir -p ./packages/expression-parser
COPY packages/expression-parser/package.json ./packages/expression-parser
RUN mkdir -p ./packages/indicators
COPY packages/indicators/package.json ./packages/indicators
RUN mkdir -p ./packages/kobo-api
COPY packages/kobo-api/package.json ./packages/kobo-api
RUN mkdir -p ./packages/entity-server
COPY packages/entity-server/package.json ./packages/entity-server
RUN mkdir -p ./packages/lesmis
COPY packages/lesmis/package.json ./packages/lesmis
RUN mkdir -p ./packages/lesmis-server
COPY packages/lesmis-server/package.json ./packages/lesmis-server
RUN mkdir -p ./packages/meditrak-server
COPY packages/meditrak-server/package.json ./packages/meditrak-server
RUN mkdir -p ./packages/psss
COPY packages/psss/package.json ./packages/psss
RUN mkdir -p ./packages/psss-server
COPY packages/psss-server/package.json ./packages/psss-server
RUN mkdir -p ./packages/report-server
COPY packages/report-server/package.json ./packages/report-server
RUN mkdir -p ./packages/server-boilerplate
COPY packages/server-boilerplate/package.json ./packages/server-boilerplate
RUN mkdir -p ./packages/expression-parser
COPY packages/expression-parser/package.json ./packages/expression-parser
RUN mkdir -p ./packages/ui-components
COPY packages/ui-components/package.json ./packages/ui-components
RUN mkdir -p ./packages/utils
Expand All @@ -78,21 +82,17 @@ COPY tsconfig-js.json ./
COPY packages/access-policy/. ./packages/access-policy
COPY packages/aggregator/. ./packages/aggregator
COPY packages/auth/. ./packages/auth
COPY packages/database/. ./packages/database
COPY packages/data-api/. ./packages/data-api
COPY packages/data-broker/. ./packages/data-broker
COPY packages/database/. ./packages/database
COPY packages/devops/. ./packages/devops
COPY packages/dhis-api/. ./packages/dhis-api
COPY packages/indicators/. ./packages/indicators
COPY packages/kobo-api/. ./packages/kobo-api
COPY packages/psss-server/. ./packages/psss-server
COPY packages/report-server/. ./packages/report-server
COPY packages/server-boilerplate/. ./packages/server-boilerplate
COPY packages/expression-parser/. ./packages/expression-parser
COPY packages/ui-components/. ./packages/ui-components
COPY packages/indicators/. ./packages/indicators
COPY packages/utils/. ./packages/utils
COPY packages/ui-components/. ./packages/ui-components
COPY packages/weather-api/. ./packages/weather-api
COPY packages/web-frontend/. ./packages/web-frontend
COPY packages/server-boilerplate/. ./packages/server-boilerplate
COPY packages/kobo-api/. ./packages/kobo-api

## build internal dependencies
RUN yarn build-internal-dependencies
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"@types/lodash.keyby": "^4.6.6",
"@types/lodash.pick": "^4.4.0",
"@types/mathjs": "^6.0.5",
"@types/multer": "^1.4.7",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"babel-plugin-istanbul": "^6.0.0",
Expand Down
84 changes: 1 addition & 83 deletions packages/admin-panel-server/.gitignore
Original file line number Diff line number Diff line change
@@ -1,83 +1 @@
dist
package.zip
.local-chromium
local-chromium.tar.gz
aws-access-keys.js

### https://raw.github.com/github/gitignore/49d13cdba39774f7fa224ef13f4a1153200e2710/Global/macOS.gitignore

*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### https://raw.github.com/github/gitignore/49d13cdba39774f7fa224ef13f4a1153200e2710/Node.gitignore

# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity
uploads/*
178 changes: 178 additions & 0 deletions packages/admin-panel-server/examples.http
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
@baseUrl = http://localhost:8070/v1
# Uncomment below to fetch against the dev server, rather than localhost
# @baseUrl = https://dev-admin-api.tupaia.org/v1
@contentType = application/json
# In order to setup authorization, please set 'email' and 'password' in your restClient environement variables
# see: https://marketplace.visualstudio.com/items?itemName=humao.rest-client#environment-variables
@authorization = Basic {{email}}:{{password}}

### Login
POST {{baseUrl}}/login HTTP/1.1
content-type: {{contentType}}

{
"emailAddress": "{{email}}",
"password": "{{password}}"
}

### Fetch Dashboard Preview Data
POST {{baseUrl}}/fetchReportPreviewData?entityCode=TO
content-type: {{contentType}}
Authorization: {{authorization}}

{
"previewConfig": {
"data": {
"dataElements": [
"BCD46",
"BCD47",
"BCD48",
"BCD48a",
"BCD48b",
"BCD49",
"BCD50",
"BCD50",
"BCD51",
"BCD52",
"BCD53",
"BCD54",
"BCD55"
],
"aggregations": ["MOST_RECENT"],
"transform": [
"keyValueByDataElementName",
{
"transform": "select",
"'Doctors'": "$row.BCD46",
"'Midwives'": "$row.BCD47",
"'Nurses'": "sum([$row.BCD48, $row.BCD48a, $row.BCD48b])",
"'Aides'": "$row.BCD49",
"'Others'": "sum([$row.BCD50, $row.BCD51, $row.BCD52, $row.BCD53, $row.BCD54, $row.BCD55])",
"...": ["period", "organisationUnit"]
},
{
"transform": "aggregate",
"organisationUnit": "group",
"period": "group",
"Doctors": "sum",
"Midwives": "sum",
"Nurses": "sum",
"Aides": "sum",
"Others": "sum"
}
]
}
}
}

### Export dashboard visualisation
POST {{baseUrl}}/export/dashboardVisualisation
content-type: {{contentType}}
Authorization: {{authorization}}

{
"visualisation": {
"code": "test_viz_12",
"name": "Test visualisation",
"permissionGroup": "Public",
"data": {
"dataElements": [
"BCD46",
"BCD47",
"BCD48",
"BCD48a",
"BCD48b",
"BCD49",
"BCD50",
"BCD50",
"BCD51",
"BCD52",
"BCD53",
"BCD54",
"BCD55"
],
"aggregations": ["MOST_RECENT"],
"transform": [
"keyValueByDataElementName",
{
"transform": "select",
"'Doctors'": "$row.BCD46",
"'Midwives'": "$row.BCD47",
"'Nurses'": "sum([$row.BCD48, $row.BCD48a, $row.BCD48b])",
"'Aides'": "$row.BCD49",
"'Others'": "sum([$row.BCD50, $row.BCD51, $row.BCD52, $row.BCD53, $row.BCD54, $row.BCD55])",
"...": ["period", "organisationUnit"]
},
{
"transform": "aggregate",
"organisationUnit": "group",
"period": "group",
"Doctors": "sum",
"Midwives": "sum",
"Nurses": "sum",
"Aides": "sum",
"Others": "sum"
}
]
},
"presentation": {
"type": "chart"
}
}
}

### Save dashboard visualisation (report + dashboard_item)
POST {{baseUrl}}/saveDashboardVisualisation
content-type: {{contentType}}
Authorization: {{authorization}}

{
"visualisation": {
"code": "test_viz_12",
"name": "Test visualisation",
"permissionGroup": "Public",
"data": {
"dataElements": [
"BCD46",
"BCD47",
"BCD48",
"BCD48a",
"BCD48b",
"BCD49",
"BCD50",
"BCD50",
"BCD51",
"BCD52",
"BCD53",
"BCD54",
"BCD55"
],
"aggregations": ["MOST_RECENT"],
"transform": [
"keyValueByDataElementName",
{
"transform": "select",
"'Doctors'": "$row.BCD46",
"'Midwives'": "$row.BCD47",
"'Nurses'": "sum([$row.BCD48, $row.BCD48a, $row.BCD48b])",
"'Aides'": "$row.BCD49",
"'Others'": "sum([$row.BCD50, $row.BCD51, $row.BCD52, $row.BCD53, $row.BCD54, $row.BCD55])",
"...": ["period", "organisationUnit"]
},
{
"transform": "aggregate",
"organisationUnit": "group",
"period": "group",
"Doctors": "sum",
"Midwives": "sum",
"Nurses": "sum",
"Aides": "sum",
"Others": "sum"
}
]
},
"presentation": {
"type": "chart"
}
}
}
4 changes: 4 additions & 0 deletions packages/admin-panel-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,14 @@
"@tupaia/utils": "1.0.0",
"api-error-handler": "^1.0.0",
"body-parser": "^1.18.3",
"camelcase-keys": "^7.0.0",
"case": "^1.6.3",
"client-sessions": "^0.8.0",
"cors": "^2.8.5",
"express": "^4.16.2",
"http-proxy-middleware": "^2.0.1",
"lodash": "^4.17.4",
"multer": "^1.4.3",
"winston": "^3.2.1"
}
}
Loading

0 comments on commit 7841cb2

Please sign in to comment.