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

charts on fhir update to angular 17 #252

Merged
merged 22 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
88b4217
Updated the angular version to 17
shubhamparikh927 Jun 13, 2024
60faa7b
fixed the showcase build issue
shubhamparikh927 Jun 13, 2024
59a9abf
RT-1025: Updated all the components to standalone component
shubhamparikh927 Jun 14, 2024
29daa52
Updated the npmscope in packge.json
shubhamparikh927 Jun 14, 2024
78ef969
Updated the unit test cases for documentation app
shubhamparikh927 Jun 14, 2024
5122cb9
RT-1025: updated the ngdoc version to 17
shubhamparikh927 Jun 17, 2024
9997710
Updated the deafult font css
shubhamparikh927 Jun 17, 2024
dc6476d
Resolve the css issue
shubhamparikh927 Jun 17, 2024
ae12319
added the missing import
shubhamparikh927 Jun 17, 2024
64292da
Updated the material-icons import in documentation
shubhamparikh927 Jun 17, 2024
c197071
Updated the material-icons import in documentation
shubhamparikh927 Jun 17, 2024
2c183e6
Updated the code to use the built-in fullscreen mode for chart layout…
shubhamparikh927 Jun 18, 2024
e90bdca
Updated the project.json to add style path to material-icon
shubhamparikh927 Jun 18, 2024
1f33d46
Reverted last changes
shubhamparikh927 Jun 18, 2024
2e745e4
Removed the vulnerabilities
shubhamparikh927 Jun 18, 2024
97c992c
Updated the style for documentation app
shubhamparikh927 Jun 19, 2024
54b2af3
Removed the styles from project.json for default.scss
shubhamparikh927 Jun 19, 2024
78db534
Merge branch 'main' of https://github.com/elimuinformatics/charts-on-…
shubhamparikh927 Jun 20, 2024
781f007
Resolved the comments on the PR
shubhamparikh927 Jun 20, 2024
47d4920
Updated the charts-on-fhir version to 3.5.0
shubhamparikh927 Jun 20, 2024
c71e1e7
Resolve the comments on the PR
shubhamparikh927 Jun 21, 2024
7071926
Merge branch 'main' of https://github.com/elimuinformatics/charts-on-…
shubhamparikh927 Jun 24, 2024
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
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ node_modules
.ng-doc
**/synthea-utils/**/*.json
**/mock-fhir-server/**/*.json

/.nx/cache
12 changes: 6 additions & 6 deletions apps/cardio-patient/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "cardio-patient",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/cardio-patient/src",
"prefix": "app",
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/cardio-patient/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -76,13 +76,13 @@
"executor": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "cardio-patient:build:production"
"buildTarget": "cardio-patient:build:production"
},
"development": {
"browserTarget": "cardio-patient:build:development"
"buildTarget": "cardio-patient:build:development"
},
"logica-open": {
"browserTarget": "cardio-patient:build:development,logica-open"
"buildTarget": "cardio-patient:build:development,logica-open"
}
},
"defaultConfiguration": "logica-open"
Expand All @@ -96,7 +96,7 @@
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "cardio-patient:build"
"buildTarget": "cardio-patient:build"
}
},
"test": {
Expand Down
12 changes: 6 additions & 6 deletions apps/cardio/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "cardio",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/cardio/src",
"prefix": "app",
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/cardio/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -76,13 +76,13 @@
"executor": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "cardio:build:production"
"buildTarget": "cardio:build:production"
},
"development": {
"browserTarget": "cardio:build:development"
"buildTarget": "cardio:build:development"
},
"logica-open": {
"browserTarget": "cardio:build:development,logica-open"
"buildTarget": "cardio:build:development,logica-open"
}
},
"defaultConfiguration": "logica-open"
Expand All @@ -96,7 +96,7 @@
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "cardio:build"
"buildTarget": "cardio:build"
}
},
"test": {
Expand Down
6 changes: 3 additions & 3 deletions apps/documentation/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "documentation",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/documentation/src",
"prefix": "app",
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/documentation/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@ng-doc/builder:browser",
Expand Down Expand Up @@ -84,7 +84,7 @@
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "documentation:build"
"buildTarget": "documentation:build"
}
},
"test": {
Expand Down
14 changes: 7 additions & 7 deletions apps/showcase/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "showcase",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/showcase/src",
"prefix": "app",
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/showcase/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -84,16 +84,16 @@
"executor": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "showcase:build:production"
"buildTarget": "showcase:build:production"
},
"development": {
"browserTarget": "showcase:build:development"
"buildTarget": "showcase:build:development"
},
"logica-open": {
"browserTarget": "showcase:build:development,logica-open"
"buildTarget": "showcase:build:development,logica-open"
},
"mock": {
"browserTarget": "showcase:build:development,mock"
"buildTarget": "showcase:build:development,mock"
}
},
"defaultConfiguration": "logica-open"
Expand All @@ -107,7 +107,7 @@
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "showcase:build"
"buildTarget": "showcase:build"
}
},
"test": {
Expand Down
23 changes: 23 additions & 0 deletions libs/ngx-charts-on-fhir/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"extends": ["@nrwl/nx/eslint"],
"rules": {
"overrides": [
{
"files": ["{package,project}.json"],
"parser": "jsonc-eslint-parser",
"rules": {
"@nrwl/nx/dependency-checks": [
"error",
{
"buildTargets": ["build"],
"checkMissingDependencies": true,
"checkObsoleteDependencies": true,
"checkVersionMismatches": true,
"ignoredDependencies": []
}
]
}
}
]
}
}
3 changes: 1 addition & 2 deletions libs/ngx-charts-on-fhir/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"build": {
"executor": "@nx/angular:package",
"options": {
"project": "libs/ngx-charts-on-fhir/ng-package.json",
"updateBuildableProjectDepsInPackageJson": true
semicolin marked this conversation as resolved.
Show resolved Hide resolved
"project": "libs/ngx-charts-on-fhir/ng-package.json"
},
"configurations": {
"production": {
Expand Down
22 changes: 7 additions & 15 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
{
"npmScope": "elimuinformatics",
semicolin marked this conversation as resolved.
Show resolved Hide resolved
"affected": {
"defaultBase": "main"
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "test"]
}
}
},
"namedInputs": {
"sharedGlobals": [],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
Expand All @@ -19,10 +7,14 @@
"targetDefaults": {
"build": {
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
"inputs": ["production", "^production"],
"cache": true
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/karma.conf.js"]
"inputs": ["default", "^production", "{workspaceRoot}/karma.conf.js"],
"cache": true
}
}
},
"useInferencePlugins": true,
"defaultBase": "main"
}
Loading
Loading