Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev merge #807

Closed
wants to merge 52 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
364329f
Dev --> Master for HCM v1.4 (#751)
kanishq-egov May 29, 2024
8822717
Campaign merged (#738)
jagankumar-egov May 29, 2024
b98dd54
Delete .vscode directory (#754)
jagankumar-egov May 29, 2024
41a7328
Delete edcr/service/egov/egov-edcr-extract/src/test/resources directo…
jagankumar-egov May 30, 2024
b7a63ee
Health Campaign Service - Build Config update for master build using …
kanishq-egov May 30, 2024
e8d6558
HLM Individual search failed on userid based search fixed (#758)
kanishq-egov May 30, 2024
3c88770
Fixes of admin console v0.1 (#759)
jagankumar-egov May 30, 2024
a4c94e3
Admin console, user password logic updated (#760)
jagankumar-egov May 31, 2024
17be18f
flyway base image updated
kavi-egov Jun 3, 2024
564c7d8
HLM Health-HRMS bug fix, user was set to null in hrms update as the t…
kanishq-egov Jun 4, 2024
6553166
reverted product changes and removed duplicate attendance code (#768)
kavi-egov Jun 7, 2024
90caabe
flyway version update
kavi-egov Jun 7, 2024
ab9c7bc
updated psql version for core services and facility
kavi-egov Jun 8, 2024
b2deb8f
flyway update
kavi-egov Jun 8, 2024
1355a91
HLM throwing custom exception when boundary service call throw an err…
kanishq-egov Jun 14, 2024
3d000ed
HLM-6185: Added null check for the project task resources list (#767)
kanishq-egov Jun 14, 2024
e9c0367
HLM-6196: Search failing, updated GenericQueryBuilder.java, added cha…
kanishq-egov Jun 17, 2024
bbdfa8e
Hlm 6196 hrms employee search by names fix (#785)
kanishq-egov Jun 19, 2024
3e8a3ec
microplan-ui (#782)
siddhant-nawale-egov Jun 20, 2024
6caaf27
Admin console Improved performance, sheets freezed, implemented cachi…
jagankumar-egov Jun 20, 2024
44f7540
HLM-6196: updated @component in validators for client reference id va…
kanishq-egov Jun 20, 2024
0a71b1e
Update core-services/egov-hrms/src/main/java/org/egov/hrms/web/valida…
kavi-egov Jun 20, 2024
60353d5
updated changelog for HCM v1.4 release
kanishq-egov Jun 20, 2024
88cc79e
updated changelog for HCM v1.4 release
kanishq-egov Jun 20, 2024
0cb84c3
Update health-services/product/CHANGELOG.md
kavi-egov Jun 20, 2024
9bca481
Update health-services/libraries/health-services-models/src/main/java…
kavi-egov Jun 20, 2024
f9e5187
HLM added error stack strace whenever custom exception is thrown whil…
kanishq-egov Jun 20, 2024
5f9dbe4
Merge branch 'master-flyway-imageupdate' of https://github.com/egover…
kanishq-egov Jun 20, 2024
00a7acc
Master flyway imageupdate (#794)
kanishq-egov Jun 20, 2024
5389381
Adding plan-service folder for master merge (#783)
Priyanka-eGov Jun 24, 2024
1dca6ee
Microplan UI (#793)
siddhant-nawale-egov Jun 24, 2024
ee169be
HLM-6303: fixed search for zero search object parameters case (#799)
kanishq-egov Jun 27, 2024
37ec1da
merging master to master-flyway-imageupdate (#800)
kanishq-egov Jun 27, 2024
c720e8d
Adding resource-estimation-service folder for master merge (#784)
Priyanka-eGov Jun 27, 2024
9374c37
commit changelog,localsetup,readme (#797)
devdatta-egov Jun 27, 2024
90dd4d2
Resource service read me from master (#801)
devdatta-egov Jun 27, 2024
50a6c17
removing location accuracy maximum
vishal-egov Aug 28, 2023
9e487b3
Added changes from commit 6ea1b424cb0ac161707a2721e308100ae5f8837f
kanishq-egov Jun 28, 2024
5212a47
Added changes from commit f16f84e0be73f2ae2f918302671ffe7c844261a3
kanishq-egov Jun 28, 2024
fc30b4f
HLM-6289: updated changes from impel for stock and referral minus dow…
kanishq-egov Jul 1, 2024
69cc444
[hlm-4053] client ref id unique key error changes and search fix
vishal-egov Oct 9, 2023
d4ba451
HLM-6289: updated the code for search in cache fix
kanishq-egov Jul 1, 2024
a8ab007
[hlm-4053] search fix for facility, household. Fixed individual iden…
vishal-egov Oct 9, 2023
d15246c
beneficiary sick and absent in task validation
bhanuprakash-egov Jun 19, 2024
009c012
HLM-6289: Reset transformer to match base branch master
kanishq-egov Jul 1, 2024
61029c2
HLM-6289: Reset transformer to match base branch master 2
kanishq-egov Jul 1, 2024
705ff42
HLM-6289: Reset dashboard-analytics and pgr-services to match base br…
kanishq-egov Jul 1, 2024
159d908
HLM-6289: findInCache fix for individual repository, project benefici…
kanishq-egov Jul 1, 2024
80de4b8
HLM-6289: updated individual repository
kanishq-egov Jul 1, 2024
afda6a0
Merge branch 'master-flyway-imageupdate' into master-impel-changes
kanishq-egov Jul 2, 2024
2eee190
Merge pull request #802 from egovernments/master-impel-changes
kanishq-egov Jul 2, 2024
c57a65d
Merge branch 'master-flyway-imageupdate' into dev
kanishq-egov Jul 2, 2024
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
  •  
  •  
  •  
64 changes: 64 additions & 0 deletions .github/workflows/buildWorkbenchUI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Digit Admin Console Build workflow
on:
push:
branches:
- campaign
paths:
- 'micro-ui/web/micro-ui-internals/**'
pull_request:
branches:
- campaign
workflow_dispatch:
jobs:
docker_image-build:
outputs:
run_job_digit_ui: ${{ steps.check_files.outputs.run_job_digit_ui }}
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
fetch-depth: 2
- name: Setup Docker
uses: docker/setup-buildx-action@v1
- name: check modified files
id: check_files
run: |
echo "=============== list modified files ==============="
git diff --name-only HEAD^ HEAD

echo "========== check paths of modified files =========="
git diff --name-only HEAD^ HEAD > files.txt
run_job_digit_ui=false
while IFS= read -r file
do
if [[ $file == micro-ui/* ]]; then
echo "This modified file is under the 'digit_ui' folder."
run_job_digit_ui=true
fi
done < files.txt

# Set the output based on whether the job should run
echo "::set-output name=run_job_digit_ui::$run_job_digit_ui"
echo "ACTION_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
echo "COMMIT_ID=${GITHUB_SHA: -8}" >> $GITHUB_ENV # Extract last 8 characters of SHA
echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV




- name: Login to egovio docker Container Registry
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
# Authenticate with Docker Hub
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

- name: Build and Push Docker image for digit-ui
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
run: |
docker build -t workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} -f web/workbench/Dockerfile .
docker tag workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker push egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
working-directory: micro-ui
25 changes: 25 additions & 0 deletions .github/workflows/publishAllPackages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Node.js Publish UI Packages

on:
push:
branches: [ 'develop','campaign' ]
paths:
- 'micro-ui/web/micro-ui-internals/**'

pull_request:
branches:
- 'dev-hcm'
# Push events to branches matching refs/heads/mona/octocat

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- run: cd micro-ui/web/micro-ui-internals/ && bash ./publish-develop.sh
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
20 changes: 20 additions & 0 deletions .github/workflows/publishAllPackagesRelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Node.js Publish UI Packages

on:
push:
branches: [ 'master' ]
paths:
- 'micro-ui/web/micro-ui-internals/**'

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
registry-url: https://registry.npmjs.org/
- run: cd micro-ui/web/micro-ui-internals/ && bash ./publish.sh
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
77 changes: 77 additions & 0 deletions .github/workflows/publishProjectFactory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: project factory service docker Image CI

on:
push:
branches: [ "campaign" ]
paths:
- 'utilities/project-factory/**'
pull_request:
branches: [ "campaign" ]

jobs:

build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Fetch all history for tags and branches

- name: Set up environment variables
id: env
run: |
echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
echo "ACTION_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
echo "COMMIT_ID=${GITHUB_SHA: -8}" >> $GITHUB_ENV # Extract last 8 characters of SHA

- name: Build the service Docker image
id: docker_build
working-directory: ./utilities/project-factory
run: |
IMAGE_TAG=egovio/project-factory:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker build . \
--file Dockerfile \
--tag $IMAGE_TAG
echo "::set-output name=image_name::$IMAGE_TAG"


- name: Build the db migration Docker image
id: docker_db_build
working-directory: ./utilities/project-factory/migration
run: |
IMAGE_TAG=egovio/project-factory-db:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker build . \
--file Dockerfile \
--tag $IMAGE_TAG
echo "::set-output name=db_image_name::$IMAGE_TAG"


- name: Login to Docker Hub and Push Docker Image
working-directory: ./utilities/project-factory
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
IMAGE_NAME: ${{ steps.docker_build.outputs.image_name }}
run: |
# Authenticate with Docker Hub
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

# Push the image to Docker Hub
docker push $IMAGE_NAME
echo "Docker image pushed: $IMAGE_NAME"

- name: Login to Docker Hub and Push DB Migration Docker Image
working-directory: ./utilities/project-factory/migration
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DB_IMAGE_NAME: ${{ steps.docker_db_build.outputs.db_image_name }}
run: |
# Authenticate with Docker Hub
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

# Push the image to Docker Hub
docker push $DB_IMAGE_NAME
echo "Docker image pushed: $DB_IMAGE_NAME"
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.DS_Store
frontend/micro-ui-internals/node_modules/*
.idea
index.lock
/health-services/stock/stock.iml
Expand Down Expand Up @@ -83,4 +82,7 @@ Thumbs.db

# Ignore system-specific files
.DS_Store
Thumbs.db
Thumbs.db

utilities/project-factory/node_modules/*
frontend/micro-ui/web/micro-ui-internals/node_modules/*
46 changes: 43 additions & 3 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ config:
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/project/src/main/resources/db"
image-name: "health-project-db"
- name: "builds/health-campaign-services/health-services/project-java-17"
build:
- work-dir: "health-services/project"
image-name: "project"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/project/src/main/resources/db"
image-name: "project-db"
- name: "builds/health-campaign-services/health-services/referralmanagement-java-17"
build:
- work-dir: "health-services/referralmanagement"
Expand All @@ -85,6 +92,13 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "health-services/individual/src/main/resources/db"
image-name: "individual-db"
- name: "builds/health-campaign-services/health-services/individual-java-17"
build:
- work-dir: "health-services/individual"
image-name: "individual"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/individual/src/main/resources/db"
image-name: "individual-db"
- name: "builds/health-campaign-services/health-services/health-individual"
build:
- work-dir: "health-services/individual"
Expand Down Expand Up @@ -222,6 +236,13 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/egov-hrms/src/main/resources/db"
image-name: "egov-hrms-db"
- name: "builds/health-campaign-services/core-services/egov-hrms-java-17"
build:
- work-dir: "core-services/egov-hrms"
image-name: "egov-hrms"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "core-services/egov-hrms/src/main/resources/db"
image-name: "egov-hrms-db"
- name: "builds/health-campaign-services/health-services/plan-service"
build:
- work-dir: "health-services/plan-service"
Expand All @@ -233,10 +254,29 @@ config:
build:
- work-dir: "health-services/resource-estimation-service"
image-name: "resource-estimation-service"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/resource-estimation-service/src/main/resources/db"
image-name: "resource-estimation-service-db"
dockerfile: "build/17/maven/Dockerfile"
- name: "builds/health-campaign-services/analytics/auth-proxy"
build:
- work-dir: "analytics/auth-proxy"
image-name: "auth-proxy"

# frontend
- name: builds/health-campaign-services/frontend/workbench-ui
build:
- work-dir: frontend/micro-ui/
dockerfile: frontend/micro-ui/web/workbench/Dockerfile
image-name: workbench-ui

- name: builds/health-campaign-services/frontend/microplan-ui
build:
- work-dir: frontend/micro-ui/
dockerfile: frontend/micro-ui/web/microplan/Dockerfile
image-name: microplan-ui

#Utilities
- name: "builds/health-campaign-services/health-services/project-factory"
build:
- work-dir: "health-services/project-factory"
image-name: "project-factory"
- work-dir: "health-services/project-factory/migration"
image-name: "project-factory-db"
Loading
Loading