Skip to content

Commit

Permalink
working added storybook support.
Browse files Browse the repository at this point in the history
Forced Webpack v5.74.0 version due to Storybook webpack incompatibilities.

storybookjs/storybook#16977 (comment)
nrwl/nx#8538 (comment)
  • Loading branch information
AnalogJ committed Apr 29, 2023
1 parent 467d5f9 commit ba9b80a
Show file tree
Hide file tree
Showing 4 changed files with 5,108 additions and 124 deletions.
38 changes: 35 additions & 3 deletions frontend/angular.json
Expand Up @@ -23,7 +23,10 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"allowedCommonJsDependencies": ["chart.js", "highlight.js"],
"allowedCommonJsDependencies": [
"chart.js",
"highlight.js"
],
"aot": true,
"assets": [
"src/favicon.ico",
Expand Down Expand Up @@ -124,7 +127,6 @@
}
]
}

}
},
"serve": {
Expand Down Expand Up @@ -192,11 +194,41 @@
"devServerTarget": "fastenhealth:serve:prod"
}
}
},
"storybook": {
"builder": "@storybook/angular:start-storybook",
"options": {
"configDir": ".storybook",
"browserTarget": "fastenhealth:build",
"compodoc": true,
"compodocArgs": [
"-e",
"json",
"-d",
"."
],
"port": 6006
}
},
"build-storybook": {
"builder": "@storybook/angular:build-storybook",
"options": {
"configDir": ".storybook",
"browserTarget": "fastenhealth:build",
"compodoc": true,
"compodocArgs": [
"-e",
"json",
"-d",
"."
],
"outputDir": "storybook-static"
}
}
}
}
},
"cli": {
"analytics": false
}
}
}
17 changes: 16 additions & 1 deletion frontend/package.json
Expand Up @@ -9,7 +9,9 @@
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"dist": "ng build --watch --output-path=../dist"
"dist": "ng build --watch --output-path=../dist",
"storybook": "ng run fastenhealth:storybook",
"build-storybook": "ng run fastenhealth:build-storybook"
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -58,6 +60,13 @@
"@angular/cli": "^14.1.3",
"@angular/compiler-cli": "^14.1.3",
"@angular/language-service": "^14.1.3",
"@compodoc/compodoc": "^1.1.19",
"@storybook/addon-essentials": "^7.0.7",
"@storybook/addon-interactions": "^7.0.7",
"@storybook/addon-links": "^7.0.7",
"@storybook/angular": "^7.0.7",
"@storybook/blocks": "^7.0.7",
"@storybook/testing-library": "^0.0.14-next.2",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "^5.1.2",
Expand All @@ -70,8 +79,14 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~7.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.0.7",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.6.4"
},
"resolutions": {
"webpack": "5.74.0"
}
}
Expand Up @@ -12,6 +12,7 @@ import {DiagnosticReportModel} from '../../../lib/models/resources/diagnostic-re
import {FastenDisplayModel} from '../../../lib/models/fasten/fasten-display-model';
import * as _ from "lodash";
import {ConditionModel} from '../../../lib/models/resources/condition-model';
import {CodingModel} from '../../../lib/models/datatypes/coding-model';

@Component({
selector: 'app-report-medical-history-condition',
Expand Down Expand Up @@ -99,7 +100,7 @@ export class ReportMedicalHistoryConditionComponent implements OnInit {

let telecomEmails =_.find(practitionerModel.telecom, {"system": "email"})
let email = _.get(telecomEmails, '[0].value')
let qualification = _.find(practitionerModel.qualification, {"system": "http://nucc.org/provider-taxonomy"})
let qualification = _.find(practitionerModel.qualification, {"system": "http://nucc.org/provider-taxonomy"}) as CodingModel

involvedInCareMap[id] = _.mergeWith(
{},
Expand Down

0 comments on commit ba9b80a

Please sign in to comment.