Skip to content

Commit d60b50a

Browse files
committed
Merge branch 'poc-microfrontends' of github.com:ItsMurumba/openhim-console into CU-86c0fbyja_Transaction_Feedback
2 parents f7b083b + f3bcdf5 commit d60b50a

File tree

278 files changed

+19392
-8148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+19392
-8148
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
shell: bash
3636
- name: Run script file
3737
env:
38-
HOST: ${{ secrets.HOST }}
38+
HOST: ${{ secrets.HOST }}
3939
working-directory: ./packaging/import-maps-server
4040
run: |
4141
chmod +x ./build.sh

.github/workflows/tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Push OpenHIM Console Docker Image On Tag
22

33
on:
44
push:
5-
tags: ["*"]
5+
tags: ['*']
66

77
workflow_dispatch:
88

.prettierrc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
semi: false
22
singleQuote: true
33
bracketSpacing: false
4-
trailingComma: "none"
5-
arrowParens: "avoid"
4+
trailingComma: 'none'
5+
arrowParens: 'avoid'

CHANGELOG.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
# Changelog
22

3-
## *v1.13.2 / 2019-09-16*
3+
## _v1.13.2 / 2019-09-16_
44

5-
* Fixed user and channel permissions issue
5+
- Fixed user and channel permissions issue
66

7-
## *v1.13.1 / 2019-09-05*
7+
## _v1.13.1 / 2019-09-05_
88

9-
* Update Dependencies
9+
- Update Dependencies
1010

11-
## *v1.13.0 / 2019-02-04*
11+
## _v1.13.0 / 2019-02-04_
1212

1313
## Final release
1414

15-
## *v1.13.0-rc.2 / 2019-02-01*
15+
## _v1.13.0-rc.2 / 2019-02-01_
1616

1717
## Release candidate with bug fix and new script
1818

1919
### Bug Fix
2020

21-
* Fixed role deselection on edit client modal
21+
- Fixed role deselection on edit client modal
2222

2323
### New Script
2424

25-
* Build CentOS RPM package via docker
25+
- Build CentOS RPM package via docker
2626

2727
---
2828

29-
## *v1.13.0-rc.1 / 2019-01-22*
29+
## _v1.13.0-rc.1 / 2019-01-22_
3030

3131
## Release candidate with various bug fixes / code refactoring and dependency upgrades
3232

3333
### Bug Fixes
3434

35-
* Remove width limit on multi-select that caused truncated inputs
36-
* Fixed tool-tips with HTML elements that weren't being rendered on hover
37-
* Update webpack to hot reload when changes are made to the scripts
38-
* Fix graph missing labels by disabling additional minification
39-
* Fix show reruns button in transactions
40-
* Fix the redirect to rerun transactions from the popover
35+
- Remove width limit on multi-select that caused truncated inputs
36+
- Fixed tool-tips with HTML elements that weren't being rendered on hover
37+
- Update webpack to hot reload when changes are made to the scripts
38+
- Fix graph missing labels by disabling additional minification
39+
- Fix show reruns button in transactions
40+
- Fix the redirect to rerun transactions from the popover
4141

4242
### Code Cleanup
4343

44-
* Fix broken Channel test
45-
* Update tests for dependency upgrades
46-
* Remove console logs
47-
* Fix channel success message wording
44+
- Fix broken Channel test
45+
- Update tests for dependency upgrades
46+
- Remove console logs
47+
- Fix channel success message wording
4848

4949
### Updates/Upgrades
5050

51-
* Update dependency minor versions and patches for security updates
52-
* Upgrade dependency major versions where possible
51+
- Update dependency minor versions and patches for security updates
52+
- Upgrade dependency major versions where possible
5353

5454
### Internal Refactoring
5555

56-
* Separate out basicInfo, routes, dataControl, alerts, requestMatching and userAccess controllers from the channelsModal controller into their own files
56+
- Separate out basicInfo, routes, dataControl, alerts, requestMatching and userAccess controllers from the channelsModal controller into their own files
5757

5858
### Enhancements
5959

60-
* Add icon to transaction log to indicate that a transaction is a rerun
61-
* Travis CI runs console against Node Carbon, Dubnium and latest with code coverage
62-
* Travis CI build status is posted to Jembi slack channel
60+
- Add icon to transaction log to indicate that a transaction is a rerun
61+
- Travis CI runs console against Node Carbon, Dubnium and latest with code coverage
62+
- Travis CI build status is posted to Jembi slack channel
6363

6464
---

README.md

Lines changed: 62 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
This application provides a web application to configure and manage the [OpenHIM-core component](https://github.com/jembi/openhim-core-js). It provides the following features:
66

7-
* Configure and manage OpenHIM channels
8-
* View logged transactions
9-
* Configure clients that can access particular routes
10-
* Monitor the operations of the OpenHIM application
11-
* Managing the security infrastructure
12-
* Importing and exporting OpenHIM server configuration
7+
- Configure and manage OpenHIM channels
8+
- View logged transactions
9+
- Configure clients that can access particular routes
10+
- Monitor the operations of the OpenHIM application
11+
- Managing the security infrastructure
12+
- Importing and exporting OpenHIM server configuration
1313

1414
See the [development road-map](http://openhim.org/docs/introduction/roadmap) for more details on what is to come!
1515

@@ -18,7 +18,9 @@ See documentation and tutorials at [openhim.org](http://openhim.org).
1818
---
1919

2020
## Getting started with the OpenHIM Console
21+
2122
### Tech Used
23+
2224
- Node: v16.20.2
2325
- Lerna (microfrontend)
2426
- Docker
@@ -49,7 +51,7 @@ To run tests:
4951
npm test
5052
```
5153

52-
**Note:** If you are running from a **microfrontend branch**, be sure to change ``environment`` value inside ```packages/legacy-app/app/config/default.json``` to ``development``. This is when you are running the project locally.
54+
**Note:** If you are running from a **microfrontend branch**, be sure to change `environment` value inside `packages/legacy-app/app/config/default.json` to `development`. This is when you are running the project locally.
5355

5456
---
5557

@@ -67,6 +69,7 @@ docker exec -it openhim-console bash
6769
apt-get update && apt-get install vim -y
6870
vi /usr/share/nginx/html/config/default.json
6971
```
72+
7073
Or the sed command can be used
7174

7275
```sh
@@ -76,7 +79,7 @@ Or the sed command can be used
7679

7780
Your file should look something like this:
7881

79-
``` json
82+
```json
8083
{
8184
"protocol": "https", // Change the protocol to 'http' when the OpenHIM core API protocol is 'http'. The default OpenHIM core API protocol is 'https'
8285
"host": "localhost", // change this to the hostname for your OpenHIM-core server (This hostname _MUST_ be publicly accessible)
@@ -90,8 +93,8 @@ Your file should look something like this:
9093

9194
Now, navigate to your web server and you should see the OpenHIM-console load (eg. `http://localhost:9000`) and login. The default username and password are:
9295

93-
* username: `[email protected]`
94-
* password: `openhim-password`
96+
- username: `[email protected]`
97+
- password: `openhim-password`
9598

9699
You will be prompted to change this.
97100

@@ -111,9 +114,9 @@ npm install
111114

112115
change the following property from ./packages/legacy-app/app/config/default.json
113116

114-
``` json
117+
```json
115118
{
116-
"environment": "development"
119+
"environment": "development"
117120
}
118121
```
119122

@@ -155,89 +158,91 @@ Refer to [this blog](https://developers.redhat.com/blog/2014/05/05/running-syste
155158

156159
1. Setup environment
157160

158-
Navigate to the infrastructure folder: `infrastructure/centos`
161+
Navigate to the infrastructure folder: `infrastructure/centos`
159162

160-
Provision VM and automatically build RPM package:
163+
Provision VM and automatically build RPM package:
161164

162-
```bash
163-
vagrant up
164-
```
165+
```bash
166+
vagrant up
167+
```
165168

166-
or without automatic provisioning (useful if you prefer manual control of the process):
169+
or without automatic provisioning (useful if you prefer manual control of the process):
167170

168-
```bash
169-
vagrant up --no-provision
170-
```
171+
```bash
172+
vagrant up --no-provision
173+
```
171174

172175
1. [Optional] The Vagrant file provisions the VM with the latest source code from master and attempts to compile the RPM package for you. However in the event an error occurs, or if you prefer to have manual control over the process, then you'll need to do the following:
173176

174-
* Remote into the VM: `vagrant ssh`
175-
* Download or sync all source code into VM.
176-
* Ensure all dependencies are installed.
177+
- Remote into the VM: `vagrant ssh`
178+
- Download or sync all source code into VM.
179+
- Ensure all dependencies are installed.
177180

178-
```bash
179-
npm i && npm i speculate
180-
```
181+
```bash
182+
npm i && npm i speculate
183+
```
181184

182-
* Run speculate to generate the SPEC files needed to build the RPM package.
185+
- Run speculate to generate the SPEC files needed to build the RPM package.
183186

184-
```bash
185-
npm run spec
186-
```
187+
```bash
188+
npm run spec
189+
```
187190

188-
* Ensure the directory with the source code is linked to the rpmbuild directory - the folder RPMBUILD will use.
191+
- Ensure the directory with the source code is linked to the rpmbuild directory - the folder RPMBUILD will use.
189192

190-
```bash
191-
ln -s ~/openhim-console ~/rpmbuild
192-
```
193+
```bash
194+
ln -s ~/openhim-console ~/rpmbuild
195+
```
193196

194-
* Build RPM package.
197+
- Build RPM package.
195198

196-
```bash
197-
rpmbuild -bb ~/rpmbuild/SPECS/openhim-console.spec
198-
```
199+
```bash
200+
rpmbuild -bb ~/rpmbuild/SPECS/openhim-console.spec
201+
```
199202

200203
1. Install & Test package
201204

202-
```bash
203-
sudo yum install -y ~/rpmbuild/RPMS/x86_64/openhim-console-{current_version}.x86_64.rpm
204-
sudo systemctl start openhim-console
205-
curl http://localhost:9000
206-
```
205+
```bash
206+
sudo yum install -y ~/rpmbuild/RPMS/x86_64/openhim-console-{current_version}.x86_64.rpm
207+
sudo systemctl start openhim-console
208+
curl http://localhost:9000
209+
```
207210

208-
Note: In order for openhim-console to run successfully, you'll need to point it to a valid instance of Openhim-core or install it locally:
211+
Note: In order for openhim-console to run successfully, you'll need to point it to a valid instance of Openhim-core or install it locally:
209212

210213
1. How to check the logs?
211214

212-
```bash
213-
sudo systemctl status openhim-console
214-
sudo tail -f -n 100 /var/log/messages
215-
```
215+
```bash
216+
sudo systemctl status openhim-console
217+
sudo tail -f -n 100 /var/log/messages
218+
```
216219

217220
1. If everything checks out then extract the RPM package by leaving the VM.
218221

219-
Install Vagrant scp [plugin](https://github.com/invernizzi/vagrant-scp):
222+
Install Vagrant scp [plugin](https://github.com/invernizzi/vagrant-scp):
220223

221-
```bash
222-
vagrant plugin install vagrant-scp
223-
```
224+
```bash
225+
vagrant plugin install vagrant-scp
226+
```
224227

225-
Then copy the file from the VM:
228+
Then copy the file from the VM:
226229

227-
```bash
228-
vagrant scp default:/home/vagrant/rpmbuild/RPMS/x86_64/{filename}.rpm .
229-
```
230+
```bash
231+
vagrant scp default:/home/vagrant/rpmbuild/RPMS/x86_64/{filename}.rpm .
232+
```
230233

231234
---
232235

233236
## Access to services in the dev environement
237+
234238
For dev environment you can access the admin console and signin using the following credentials :
235239

236240
- URL : http://localhost:9000/
237241
- username : [email protected]
238242
- password : instant101
239243

240244
---
245+
241246
## Contributing
242247

243248
You may view/add issues here: <https://github.com/jembi/openhim-console/issues>

docker-compose.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
version: '3'
22
services:
33
jembi-mfe-server:
4-
image: jembi/openhim-console-mf:prod
5-
container_name: jembi-mfe-server
6-
ports:
7-
- "80:80"
8-
stdin_open: true
9-
tty: true
10-
restart: always
11-
4+
image: jembi/openhim-console-mf:prod
5+
container_name: jembi-mfe-server
6+
ports:
7+
- '80:80'
8+
stdin_open: true
9+
tty: true
10+
restart: always

0 commit comments

Comments
 (0)