Bah 2135

.appversion

@@ -0,0 +1 @@
+1.0.0

.eslintrc.js

@@ -24,6 +24,7 @@ module.exports = {
   plugins: ['react'],
   rules: {
     'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
+    'import/no-extraneous-dependencies': ['error', {'devDependencies': ['**/*.test.js', '**/*.test.jsx','**/*.spec.js', '**/*.spec.jsx']}],
     'react/jsx-props-no-spreading': 'off',
     'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
     'import/no-extraneous-dependencies': [

.github/workflows/ci.yml

@@ -7,23 +7,73 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      HELM_CHART_PATH: package/helm/
     steps:
       - uses: actions/checkout@v1
       - name: Set env
-        run: echo "RELEASE_VERSION=$(echo $GITHUB_SHA | head -c7)" >> $GITHUB_ENV
+        run: |
+          APP_VERSION=$(cat .appversion)
+          echo "ARTIFACT_VERSION=$(echo $APP_VERSION-${{github.run_number}})" >> $GITHUB_ENV
       - name: NCG Docker Registry
         env:
           DOCKER_REGISTRY_URL: docker.io
-          NCG_PASSWORD: ${{ secrets.DOCKER_NCG_PASSWORD }}
-          NCG_USERNAME: ${{ secrets.DOCKER_NCG_USERNAME }}
+          NCG_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          NCG_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         run: docker login -u $NCG_USERNAME -p $NCG_PASSWORD $DOCKER_REGISTRY_URL
       - name: Build docker image for NCG
         env:
           CONTAINER_REPO_NAME: hiu-ui
-          NCG_USERNAME: ${{ secrets.DOCKER_NCG_USERNAME }}
-        run: docker build --build-arg BACKEND_BASE_URL=https://ncg-dev.projecteka.in/ --build-arg BASE_NAME=/hiu --build-arg BACKEND_API_PATH=hiu-api --build-arg DICOM_SERVER_PATH=/dicom-web --build-arg VIEWER_PAGE=/viewer/ --build-arg TITLE=NCG -t $NCG_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION .
+          NCG_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: docker build -f package/docker/Dockerfile -t $NCG_USERNAME/$CONTAINER_REPO_NAME:$ARTIFACT_VERSION .
       - name: Push Docker image to NCG Registry
         env:
           CONTAINER_REPO_NAME: hiu-ui
-          NCG_USERNAME: ${{ secrets.DOCKER_NCG_USERNAME }}
-        run: docker push $NCG_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION
+          NCG_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: docker push $NCG_USERNAME/$CONTAINER_REPO_NAME:$ARTIFACT_VERSION
+      - name: Tag Docker Container with latest tag
+        env:
+          CONTAINER_REPO_NAME: hiu-ui
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: docker tag $DOCKER_USERNAME/$CONTAINER_REPO_NAME:$ARTIFACT_VERSION $DOCKER_USERNAME/$CONTAINER_REPO_NAME:latest
+      - name: Push Latest Docker Container to Registry
+        env:
+          CONTAINER_REPO_NAME: hiu-ui
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: docker push $DOCKER_USERNAME/$CONTAINER_REPO_NAME:latest
+      - name: Helm - Update Version and Image Tag
+        run: |
+          yq --inplace '.image.tag = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/values.yaml
+          yq --inplace '.version = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/Chart.yaml
+
+      - name: Helm Lint
+        run: helm lint $HELM_CHART_PATH
+
+      - name: Helm Package
+        run: helm package $HELM_CHART_PATH
+
+      - name: Helm - Checkout Charts Repository
+        uses: actions/checkout@v2
+        with:
+          repository: Bahmniindiadistro/helm-charts
+          ref: gh-pages
+          path: helm-charts
+          persist-credentials: false
+
+      - name: Helm - Copy chart
+        run: mkdir -p helm-charts/hiu-ui/ && cp hiu-ui-${{ env.ARTIFACT_VERSION }}.tgz helm-charts/hiu-ui/
+
+      - name: Helm - reIndex
+        working-directory: helm-charts/
+        run: helm repo index --merge index.yaml --url https://bahmniindiadistro.github.io/helm-charts/  .
+
+      - name: Helm - Publish Chart
+        working-directory: helm-charts/
+        run: |
+          git config user.name ${{ secrets.BAHMNI_USERNAME}}
+          git config user.email ${{ secrets.BAHMNI_EMAIL}}
+          git add .
+          git commit -m "Release of hiu-ui-${{ env.ARTIFACT_VERSION }}"
+          git push 'https://${{ secrets.BAHMNI_USERNAME}}:${{ secrets.BAHMNI_PAT}}@github.com/bahmniindiadistro/helm-charts.git' gh-pages
+
+

.github/workflows/uat.yml

@@ -17,16 +17,16 @@ jobs:
       - name: NHA Docker Registry
         env:
           DOCKER_REGISTRY_URL: docker.io
-          NHA_PASSWORD: ${{ secrets.DOCKER_NHA_PASSWORD }}
-          NHA_USERNAME: ${{ secrets.DOCKER_NHA_USERNAME }}
+          NHA_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          NHA_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         run: docker login -u $NHA_USERNAME -p $NHA_PASSWORD $DOCKER_REGISTRY_URL
       - name: Build docker image for NHA
         env:
           CONTAINER_REPO_NAME: hiu-ui
-          NHA_USERNAME: ${{ secrets.DOCKER_NHA_USERNAME }}
-        run: docker build --build-arg BACKEND_BASE_URL=http://uat.ndhm.gov.in/ --build-arg BASE_NAME=/hiu --build-arg BACKEND_API_PATH=api-hiu --build-arg DICOM_SERVER_PATH=/dicom-web --build-arg VIEWER_PAGE=/viewer/ --build-arg TITLE=NHA -t $NHA_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION .
+          NHA_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: docker build -t $NHA_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION .
       - name: Push Docker image to NHA Registry
         env:
           CONTAINER_REPO_NAME: hiu-ui
-          NHA_USERNAME: ${{ secrets.DOCKER_NHA_USERNAME }}
+          NHA_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         run: docker push $NHA_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2021 Thoughtworks Technologies India Private limited
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,4 +1,24 @@
-## Available Scripts
+This is a forked repo from project-eka, includes few ui-enchancements and session management.
+
+## To run locally:
+
+update src path in index.html as `/bundle.js`
+
+### 1. using docker
+
+To build a image, you can run:
+
+### `docker build -t hiu-ui .`
+
+To run the container, 
+
+you can update docker-compose.development.yml environment variable if needed, you can run:
+
+### `docker-compose -f docker-compose.development.yml up hiu-ui`
+
+Note: BACKEND_BASE_URL, BASE_NAME are mandatory in docker-compose.development.yml
+
+###2. using npm
 
 In the project directory, you can run:
 
@@ -36,20 +56,28 @@ devServer: {
 Launches the test runner in the interactive watch mode.
 
 
-## Plugging in the reference HIU-UI to HIU-Server
+## Plugging in the reference HIU-UI to Local-HIU-Server
 
-create a file ".env" in the root directory. with the following contents
+update src/Config.js. with the following contents
 
 ```
-BACKEND_BASE_URL = 'http://localhost:8003'
-BASE_NAME = '/hiu'
-BACKEND_API_PATH= '/'
-DICOM_VIEWER_PAGE= '/viewer/'
-DICOM_SERVER_PATH= '/dicom-web'
-REACT_APP_SITE_TITLE= 'NCG'
+BACKEND_BASE_URL: 'http://localhost:8003',
+BASE_NAME: '/hiu',
+BACKEND_API_PATH: '/',
+DICOM_VIEWER_PAGE: '/viewer/',
+DICOM_SERVER_PATH: '/dicom-web',
+TITLE: 'NCG'
 ```
 The above should be self explanatory, essentially it says that the HIU-Service is running on http://localhost:8003
 
+Add the following to the Config file for the specific timezone. The following is for IST TimeZone UTC+5:30
+
+```aidl
+TIMEZONE_OFFSET: '+05:30'
+```
+
+Note: If you haven't specify TimeZone, it will be UTC by default
+
 If you are testing with the reference HIU-Service, and thats running locally on a different port, most likely Chrome will not allow you to make Http calls because of CORS restrictions. To do this, there are many ways - for example, use a proxy like HAProxy and put your HIU-UI and HIU-Server behind the proxy and route the calls appropriately. 
 
 For development purpose, you can start chrome with disabled web security. 
@@ -60,4 +88,4 @@ open -na Google\ Chrome --args --disable-web-security --user-data-dir=$HOME/loca
 Note the above will start a new process of Chrome. Use this only for local testing and do not use this for accessing any public websites, and terminate this specific process as soon as you are done. 
 
 
-The latest versions of Safari also allows you disable Cross-Origin Restrictions. Enable the developer menu from Preferences >> Advanced, and select "Disable Cross-Origin Restrictions" from the develop menu. Again be careful of browsing external and public websites, and uncheck the above option "Disable Cross-Orgin .. " as soon as you are done. 
+The latest versions of Safari also allows you disable Cross-Origin Restrictions. Enable the developer menu from Preferences >> Advanced, and select "Disable Cross-Origin Restrictions" from the develop menu. Again be careful of browsing external and public websites, and uncheck the above option "Disable Cross-Orgin .. " as soon as you are done. 

docker-compose.development.yml

@@ -0,0 +1,15 @@
+version: '3'
+services:
+  hiu-ui:
+    image: "hiu-ui:latest"
+    environment:
+        BACKEND_BASE_URL: "<backend base url>"
+        BASE_NAME: '/hiu'
+        BACKEND_API_PATH: "/hiu-api"
+        DICOM_SERVER_PATH: '/'
+        VIEWER_PAGE: "/viewer/"
+        TITLE: 'NCG'
+        TIMEZONE_OFFSET: "+05:30"
+    ports:
+        - "8000:5000"
+

entryPoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+file="/dist/bundle.js"
+set -xe
+: "${BACKEND_BASE_URL?BACKEND_BASE_URL is not defined}"
+: "${BASE_NAME?BASE_NAME is not defined}"
+
+sed -i 's|TITLE:[^,]*|TITLE: '\"$TITLE\"'|g' $file
+sed -i 's|BACKEND_BASE_URL:[^,]*|BACKEND_BASE_URL: '\"$BACKEND_BASE_URL\"'|g' $file
+sed -i 's|BACKEND_API_PATH:[^,]*|BACKEND_API_PATH: '\"$BACKEND_API_PATH\"'|g' $file
+sed -i 's|BASE_NAME:[^,]*|BASE_NAME: '\"$BASE_NAME\"'|g' $file
+sed -i 's|DICOM_VIEWER_PAGE:[^,]*|DICOM_VIEWER_PAGE: '\"$DICOM_VIEWER_PAGE\"'|g' $file
+sed -i 's|DICOM_SERVER_PATH:[^,]*|DICOM_SERVER_PATH: '\"$DICOM_SERVER_PATH\"'|g' $file
+sed -i 's|TIMEZONE_OFFSET:[^,]*|TIMEZONE_OFFSET: '\"$TIMEZONE_OFFSET\"'|g' $file
+
+
+exec "$@"

index.html

@@ -9,6 +9,6 @@
 
   <body>
     <div id="app"></div>
-    <script type="text/javascript" src="/bundle.js"></script>
+    <script type="text/javascript" src="/hiuser/bundle.js"></script>
   </body>
 </html>

index.js

@@ -11,6 +11,7 @@ import { MuiPickersUtilsProvider } from "@material-ui/pickers";
 import { teal } from "@material-ui/core/colors";
 // main app
 import App from "./src/App";
+import Config from "./src/Config";
 
 const theme = createMuiTheme({
   palette: {
@@ -28,7 +29,7 @@ const theme = createMuiTheme({
   }
 });
 
-document.querySelector('title').innerHTML=REACT_APP_SITE_TITLE;
+document.querySelector('title').innerHTML= Config.TITLE;
 
 ReactDOM.render(
   <Provider store={store}>

package.json

@@ -7,7 +7,7 @@
     "test": "jest --passWithNoTests",
     "test:update:snapshot": "npm test -- -u",
     "test:watch": "jest --watch",
-    "build": "rm -rf dist && MODE=PROD webpack --config ./webpack/webpack.prod.config.js",
+    "build": "rm -rf dist && MODE=PROD webpack --config ./webpack/webpack.common.js",
     "dev": "./node_modules/.bin/webpack-dev-server --config ./webpack/webpack.dev.config.js",
     "start": "http-server dist",
     "lint": "eslint src",

package/docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM node:8 as build-deps
+WORKDIR /app
+COPY . ./
+RUN npm install
+RUN npm run build
+
+# stage: 2 ?~@~T the production environment
+FROM node:13.12.0-alpine
+RUN npm install -g serve@13.0.4
+COPY --from=build-deps /app/dist/ dist/
+EXPOSE 5000
+
+COPY entryPoint.sh /
+RUN chmod +x entryPoint.sh
+ENTRYPOINT ["/entryPoint.sh"]
+CMD ["serve", "dist/", "-l",  "5000"]

package/helm/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

package/helm/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v2
+name: hiu-ui
+description: Helm chart for hiu-ui
+type: application
+version: 1.0.0

package/helm/templates/configMap.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Chart.Name }}-config
+data:
+  BACKEND_BASE_URL: "{{ .Values.config.BACKEND_BASE_URL }}"
+  BASE_NAME: "{{ .Values.config.BASE_NAME }}"
+  BACKEND_API_PATH: "{{ .Values.config.BACKEND_API_PATH }}"
+  DICOM_SERVER_PATH: "{{ .Values.config.DICOM_SERVER_PATH }}"
+  VIEWER_PAGE: "{{ .Values.config.VIEWER_PAGE }}"
+  TITLE: "{{ .Values.config.TITLE }}"
+  TIMEZONE_OFFSET: "{{ .Values.config.TIMEZONE_OFFSET }}"