-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into merge-master-to-alpha
- Loading branch information
Showing
26 changed files
with
7,695 additions
and
5,216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1054,32 +1054,32 @@ | |
| integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== | ||
|
|
||
| "@dhis2/app-runtime@file:../../runtime": | ||
| version "3.10.4-alpha.1" | ||
| version "3.10.6" | ||
| dependencies: | ||
| "@dhis2/app-service-alerts" "3.10.4-alpha.1" | ||
| "@dhis2/app-service-config" "3.10.4-alpha.1" | ||
| "@dhis2/app-service-data" "3.10.4-alpha.1" | ||
| "@dhis2/app-service-offline" "3.10.4-alpha.1" | ||
| "@dhis2/app-service-plugin" "3.10.4-alpha.1" | ||
| "@dhis2/app-service-alerts" "3.10.6" | ||
| "@dhis2/app-service-config" "3.10.6" | ||
| "@dhis2/app-service-data" "3.10.6" | ||
| "@dhis2/app-service-offline" "3.10.6" | ||
| "@dhis2/app-service-plugin" "3.10.6" | ||
|
|
||
| "@dhis2/[email protected].4-alpha.1", "@dhis2/app-service-alerts@file:../../services/alerts": | ||
| version "3.10.4-alpha.1" | ||
| "@dhis2/[email protected].6", "@dhis2/app-service-alerts@file:../../services/alerts": | ||
| version "3.10.6" | ||
|
|
||
| "@dhis2/[email protected].4-alpha.1", "@dhis2/app-service-config@file:../../services/config": | ||
| version "3.10.4-alpha.1" | ||
| "@dhis2/[email protected].6", "@dhis2/app-service-config@file:../../services/config": | ||
| version "3.10.6" | ||
|
|
||
| "@dhis2/[email protected].4-alpha.1", "@dhis2/app-service-data@file:../../services/data": | ||
| version "3.10.4-alpha.1" | ||
| "@dhis2/[email protected].6", "@dhis2/app-service-data@file:../../services/data": | ||
| version "3.10.6" | ||
| dependencies: | ||
| react-query "^3.13.11" | ||
|
|
||
| "@dhis2/[email protected].4-alpha.1", "@dhis2/app-service-offline@file:../../services/offline": | ||
| version "3.10.4-alpha.1" | ||
| "@dhis2/[email protected].6", "@dhis2/app-service-offline@file:../../services/offline": | ||
| version "3.10.6" | ||
| dependencies: | ||
| lodash "^4.17.21" | ||
|
|
||
| "@dhis2/[email protected].4-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin": | ||
| version "3.10.4-alpha.1" | ||
| "@dhis2/[email protected].6", "@dhis2/app-service-plugin@file:../../services/plugin": | ||
| version "3.10.6" | ||
| dependencies: | ||
| post-robot "^10.0.46" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| ### Description | ||
|
|
||
| A playground for exploring the DHIS2 API and debugging Data Engine queries and mutations | ||
|
|
||
| #### How to publish | ||
|
|
||
| Since this lives in the repository with the app-runtime library, releasing new versions of this app should be done in a special way to avoid affecting the library's versions: | ||
|
|
||
| 1. Add any new changes with `chore` commits (not `fix` or `feat`) | ||
| 2. Make sure the supported DHIS2 versions are correct in `d2.config.js` | ||
| 3. Manually update the app version in `package.json` -- **Don't use `yarn version`** because we don't want to a create a git tag for this repo | ||
| 4. Add a `chore` commit for the version bump in `package.json` (make sure this will get its own commit on `master` and doesn't get squashed with others) | ||
| 5. Build the app with `yarn build` | ||
| 6. Publish the new version to the App Hub | ||
| 1. Either on the command line using [`yarn d2-app-scripts publish`](https://developers.dhis2.org/docs/app-platform/scripts/publish/) with an API key you generated on the App Hub | ||
| 2. Or by using the "New version" GUI on the App Hub by going to "Your Apps" => "Data Query Playground" => "New Version". This requires access to the DHIS2 organization |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,22 @@ | ||
| import { json } from '@codemirror/lang-json' | ||
| import { githubLight } from '@uiw/codemirror-theme-github' | ||
| import { monokai } from '@uiw/codemirror-theme-monokai' | ||
| import CodeMirror from '@uiw/react-codemirror' | ||
| import PropTypes from 'prop-types' | ||
| import React from 'react' | ||
| import AceEditor from 'react-ace' | ||
| import styles from './Editor.module.css' | ||
|
|
||
| import 'brace/mode/json' | ||
| import 'brace/theme/monokai' | ||
| import 'brace/theme/github' | ||
| import './Editor.css' | ||
|
|
||
| export const Editor = (props) => ( | ||
| <AceEditor | ||
| fontSize={14} | ||
| mode="json" | ||
| theme="github" | ||
| editorProps={{ $blockScrolling: true }} | ||
| showPrintMargin={false} | ||
| export const Editor = ({ theme, ...editorProps }) => ( | ||
| <CodeMirror | ||
| className={styles.editor} | ||
| extensions={[json()]} | ||
| theme={theme === 'light' ? githubLight : monokai} | ||
| basicSetup={{ tabSize: 4 }} | ||
| width="100%" | ||
| height="100%" | ||
| {...props} | ||
| {...editorProps} | ||
| /> | ||
| ) | ||
| Editor.propTypes = { | ||
| theme: PropTypes.oneOf(['light', 'dark']), | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| .editor { | ||
| height: 100%; | ||
| font-size: 13px; | ||
| } | ||
|
|
||
| /* Need this selector to override the blanket rule `* { font-family: Roboto; }` */ | ||
| .editor * { | ||
| font-family: inherit; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.