Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
],
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
Expand All @@ -34,18 +32,41 @@
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/no-empty-function": 0,
"@typescript-eslint/no-unused-vars": 0,
"@angular-eslint/template/click-events-have-key-events": 0
"@angular-eslint/template/click-events-have-key-events": 0,
"eqeqeq": 1
}
},
{
"files": [
"*.html"
],
"files": ["*.html"],
"extends": [
"plugin:@angular-eslint/template/recommended",
"plugin:@angular-eslint/template/accessibility"
"plugin:@angular-eslint/template/accessibility",
"plugin:prettier/recommended"
],
"rules": {}
"rules": {
"prettier/prettier": [
"error",
{
"parser": "angular"
}
]
}
},
{
"files": ["*.js", "*.jsx"],
"env": {
"node": true
},
"extends": ["eslint:recommended"],
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module"
},
"rules": {
"no-unused-vars": "warn",
"no-console": "error",
"eqeqeq": ["error", "always"]
}
}
]
}
12 changes: 8 additions & 4 deletions .github/workflows/build-on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ jobs:
Build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- name: Checkout code with submodules
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
submodules: true

Comment on lines +11 to +17
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ› οΈ Refactor suggestion

Update Checkout Action Version
The checkout step is still using actions/checkout@v3. For improved stability and to align with other workflows in the repository, please update this to actions/checkout@v4.

-      - name: Checkout code with submodules
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          submodules: true  
+      - name: Checkout code with submodules
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          submodules: true
πŸ“ Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- name: Checkout code with submodules
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
submodules: true
- name: Checkout code with submodules
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
submodules: true
🧰 Tools
πŸͺ› actionlint (1.7.4)

12-12: the runner of "actions/checkout@v3" action is too old to run on GitHub Actions. update the action's version to fix this issue

(action)

πŸͺ› YAMLlint (1.35.1)

[error] 16-16: trailing spaces

(trailing-spaces)

- name: Update submodules manually (if needed)
run: |
git submodule init
git submodule update --recursive

- name: Setup JDK 17
uses: actions/setup-java@v2
Expand All @@ -30,7 +36,5 @@ jobs:
npm config set legacy-peer-deps true
npm install -g @angular/cli
npm install typescript@5.1.3 --save-dev
npm install ng2-smart-table@1.2.1
npm install node-sass
npm install --force
npm run build
npm run build-ci
10 changes: 4 additions & 6 deletions .github/workflows/package-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4


- name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'


- name: Set up Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -38,14 +38,12 @@ jobs:
npm install -g @angular/cli
npm install -g grunt-cli
npm install typescript@5.1.3 --save-dev
npm install ng2-smart-table@1.2.1
npm install node-sass --force
npm install --force
ng build --configuration production


- name: Upload WAR file as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: HWC-Inventory-UI
path: dist/hwc-inventory-ui/hwc-inventory-ui.war
10 changes: 4 additions & 6 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4


- name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'

- name: Set up Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -35,16 +35,14 @@ jobs:
npm config set legacy-peer-deps true
npm install -g @angular/cli
npm install typescript@5.1.3 --save-dev
npm install ng2-smart-table@1.2.1
npm install node-sass
npm install --force
npm run build

- name: Create WAR file
run: jar -cvf hwc-inventory-ui.war -C dist .

- name: Upload WAR file as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: HWC-Inventory-UI
path: hwc-inventory-ui.war
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ testem.log
Thumbs.db

src/environments/environment.ts
src/environments/environment.ci.ts
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Common-UI"]
path = Common-UI
url = https://github.com/PSMRI/Common-UI.git
url = https://github.com/PSMRI/Common-UI
2 changes: 1 addition & 1 deletion Common-UI
Submodule Common-UI updated 79 files
+128 βˆ’0 CODE_OF_CONDUCT.md
+674 βˆ’0 LICENSE
+16 βˆ’4 README.md
+93 βˆ’0 src/registrar/abha-components/abha-consent-form/abha-consent-form.component.css
+73 βˆ’0 src/registrar/abha-components/abha-consent-form/abha-consent-form.component.html
+21 βˆ’0 src/registrar/abha-components/abha-consent-form/abha-consent-form.component.spec.ts
+82 βˆ’0 src/registrar/abha-components/abha-consent-form/abha-consent-form.component.ts
+0 βˆ’0 src/registrar/abha-components/abha-enter-mobile-otp-component/abha-enter-mobile-otp-component.component.css
+35 βˆ’0 src/registrar/abha-components/abha-enter-mobile-otp-component/abha-enter-mobile-otp-component.component.html
+21 βˆ’0 ...registrar/abha-components/abha-enter-mobile-otp-component/abha-enter-mobile-otp-component.component.spec.ts
+111 βˆ’0 src/registrar/abha-components/abha-enter-mobile-otp-component/abha-enter-mobile-otp-component.component.ts
+0 βˆ’15 src/registrar/abha-components/abha-enter-otp-component/abha-enter-otp-component.component.css
+90 βˆ’0 src/registrar/abha-components/abha-enter-otp-component/abha-enter-otp-component.component.html
+21 βˆ’0 src/registrar/abha-components/abha-enter-otp-component/abha-enter-otp-component.component.spec.ts
+299 βˆ’0 src/registrar/abha-components/abha-enter-otp-component/abha-enter-otp-component.component.ts
+15 βˆ’33 ...registrar/abha-components/abha-generation-success-component/abha-generation-success-component.component.css
+102 βˆ’0 ...egistrar/abha-components/abha-generation-success-component/abha-generation-success-component.component.html
+21 βˆ’0 ...strar/abha-components/abha-generation-success-component/abha-generation-success-component.component.spec.ts
+125 βˆ’0 src/registrar/abha-components/abha-generation-success-component/abha-generation-success-component.component.ts
+0 βˆ’0 src/registrar/abha-components/abha-mobile-component/abha-mobile-component.component.css
+48 βˆ’0 src/registrar/abha-components/abha-mobile-component/abha-mobile-component.component.html
+21 βˆ’0 src/registrar/abha-components/abha-mobile-component/abha-mobile-component.component.spec.ts
+125 βˆ’0 src/registrar/abha-components/abha-mobile-component/abha-mobile-component.component.ts
+107 βˆ’0 src/registrar/abha-components/abha-verify-success-component/abha-verify-success-component.component.css
+60 βˆ’0 src/registrar/abha-components/abha-verify-success-component/abha-verify-success-component.component.html
+21 βˆ’0 src/registrar/abha-components/abha-verify-success-component/abha-verify-success-component.component.spec.ts
+80 βˆ’0 src/registrar/abha-components/abha-verify-success-component/abha-verify-success-component.component.ts
+0 βˆ’0 src/registrar/abha-components/biometric-authentication/biometric-authentication.component.css
+0 βˆ’10 src/registrar/abha-components/biometric-authentication/biometric-authentication.component.html
+0 βˆ’0 src/registrar/abha-components/biometric-authentication/biometric-authentication.component.spec.ts
+82 βˆ’0 src/registrar/abha-components/biometric-authentication/biometric-authentication.component.ts
+96 βˆ’0 src/registrar/abha-components/display-abha-card/display-abha-card.component.css
+21 βˆ’0 src/registrar/abha-components/display-abha-card/display-abha-card.component.html
+21 βˆ’0 src/registrar/abha-components/display-abha-card/display-abha-card.component.spec.ts
+89 βˆ’0 src/registrar/abha-components/display-abha-card/display-abha-card.component.ts
+21 βˆ’4 src/registrar/abha-components/download-search-abha/download-search-abha.component.css
+113 βˆ’0 src/registrar/abha-components/download-search-abha/download-search-abha.component.html
+21 βˆ’0 src/registrar/abha-components/download-search-abha/download-search-abha.component.spec.ts
+298 βˆ’0 src/registrar/abha-components/download-search-abha/download-search-abha.component.ts
+167 βˆ’0 src/registrar/abha-components/generate-abha-component/generate-abha-component.component.css
+61 βˆ’0 src/registrar/abha-components/generate-abha-component/generate-abha-component.component.html
+4 βˆ’7 src/registrar/abha-components/generate-abha-component/generate-abha-component.component.spec.ts
+160 βˆ’0 src/registrar/abha-components/generate-abha-component/generate-abha-component.component.ts
+0 βˆ’0 src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.css
+0 βˆ’0 src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html
+0 βˆ’0 src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.spec.ts
+14 βˆ’107 src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.ts
+0 βˆ’238 src/registrar/biometric-authentication/biometric-authentication.component.ts
+0 βˆ’34 src/registrar/generate-abha-component/auth-method.html
+0 βˆ’61 src/registrar/generate-abha-component/generate-abha-component.component.html
+0 βˆ’166 src/registrar/generate-abha-component/generate-abha-component.component.ts
+0 βˆ’99 src/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.html
+0 βˆ’45 src/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.spec.ts
+0 βˆ’228 src/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.ts
+0 βˆ’141 src/registrar/health-id-otp-generation/health-id-otp-generation.component.html
+0 βˆ’45 src/registrar/health-id-otp-generation/health-id-otp-generation.component.spec.ts
+0 βˆ’639 src/registrar/health-id-otp-generation/health-id-otp-generation.component.ts
+0 βˆ’75 src/registrar/health-id-otp-generation/health-id-otp-succespopup.html
+0 βˆ’153 src/registrar/health-id-validatepopup/health-id-validatepopup.component.html
+0 βˆ’21 src/registrar/health-id-validatepopup/health-id-validatepopup.component.spec.ts
+0 βˆ’534 src/registrar/health-id-validatepopup/health-id-validatepopup.component.ts
+19 βˆ’20 src/registrar/registration.module.ts
+3 βˆ’4 src/registrar/registration/abha-information/abha-information.component.html
+59 βˆ’33 src/registrar/registration/abha-information/abha-information.component.ts
+47 βˆ’1 src/registrar/registration/location-information/location-information.component.ts
+3 βˆ’0 src/registrar/registration/other-information/other-information.component.ts
+3 βˆ’0 src/registrar/registration/personal-information/personal-information.component.ts
+1 βˆ’1 src/registrar/registration/registration.component.html
+137 βˆ’73 src/registrar/registration/registration.component.ts
+1 βˆ’1 src/registrar/search/search.component.ts
+2 βˆ’1 src/registrar/services/rddevice.service.ts
+46 βˆ’0 src/registrar/services/registrar.service.ts
+0 βˆ’103 src/registrar/set-password-for-abha/set-password-for-abha.component.html
+0 βˆ’45 src/registrar/set-password-for-abha/set-password-for-abha.component.spec.ts
+0 βˆ’143 src/registrar/set-password-for-abha/set-password-for-abha.component.ts
+0 βˆ’45 src/registrar/view-health-id-card/view-health-id-card.component.css
+0 βˆ’35 src/registrar/view-health-id-card/view-health-id-card.component.html
+0 βˆ’45 src/registrar/view-health-id-card/view-health-id-card.component.spec.ts
+0 βˆ’144 src/registrar/view-health-id-card/view-health-id-card.component.ts
11 changes: 8 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,20 @@
}
],
"outputHashing": "all",
"optimization": true
"optimization": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
"sourceMap": true
},
"ci": {
"budgets": [
Expand Down
Loading