Skip to content

Commit 84bb47e

Browse files
boyleconnordependabot[bot]tschaffter
authored
Update Phi-Annotator-App to API version 1.2.0 (#99)
* Update Example Env File * Update `physical-annotator` to `location-annotator` * Update `phi-deidentifier` to `phi-deidentifier-example` * Point phi-deidentifier Image Link to Correct URL * Bump eslint from 7.28.0 to 7.32.0 in /client Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.32.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](eslint/eslint@v7.28.0...v7.32.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump eslint from 7.28.0 to 7.32.0 in /client Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.32.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](eslint/eslint@v7.28.0...v7.32.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * PHYSICAL_ADDRESS -> LOCATION * Regenerate Client from updated API Spec * "Physical Address" -> "Location" in Web Client * "Physical Address" -> "Location" in docker-compose.yml * Bump Web Client Version Number * Copy Just Necessary Files in Dockerfile * Bump @typescript-eslint/eslint-plugin from 4.26.0 to 4.28.5 in /client (#110) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.26.0 to 4.28.5. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.5/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @openapitools/openapi-generator-cli from 2.3.3 to 2.3.9 (#108) Bumps [@openapitools/openapi-generator-cli](https://github.com/OpenAPITools/openapi-generator-cli) from 2.3.3 to 2.3.9. - [Release notes](https://github.com/OpenAPITools/openapi-generator-cli/releases) - [Changelog](https://github.com/OpenAPITools/openapi-generator-cli/blob/master/.releaserc) - [Commits](OpenAPITools/openapi-generator-cli@v2.3.3...v2.3.9) --- updated-dependencies: - dependency-name: "@openapitools/openapi-generator-cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node from 16.2.0-alpine3.12 to 16.6.0-alpine3.12 in /client (#107) Bumps node from 16.2.0-alpine3.12 to 16.6.0-alpine3.12. --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @testing-library/react from 11.2.7 to 12.0.0 in /client (#105) Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.2.7 to 12.0.0. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](testing-library/react-testing-library@v11.2.7...v12.0.0) --- updated-dependencies: - dependency-name: "@testing-library/react" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nginx from 1.21.0-alpine to 1.21.1-alpine in /client (#106) Bumps nginx from 1.21.0-alpine to 1.21.1-alpine. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @typescript-eslint/parser from 4.26.0 to 4.28.5 in /client (#111) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.26.0 to 4.28.5. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.28.5/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Connor Boyle <connor.bo@gmail.com> * Bump web-vitals from 1.1.1 to 2.0.1 in /client (#87) Bumps [web-vitals](https://github.com/GoogleChrome/web-vitals) from 1.1.1 to 2.0.1. - [Release notes](https://github.com/GoogleChrome/web-vitals/releases) - [Changelog](https://github.com/GoogleChrome/web-vitals/blob/main/CHANGELOG.md) - [Commits](GoogleChrome/web-vitals@v1.1.1...v2.0.1) --- updated-dependencies: - dependency-name: web-vitals dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Schaffter <thomas.schaffter@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Schaffter <thomas.schaffter@gmail.com>
1 parent 9194e30 commit 84bb47e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+593
-362
lines changed

‎.env.example‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ PERSON_NAME_ANNOTATOR_PROTOCOL=http://
1212
PERSON_NAME_ANNOTATOR_HOST=localhost
1313
PERSON_NAME_ANNOTATOR_PORT=9001
1414

15-
PHYSICAL_ADDRESS_ANNOTATOR_PROTOCOL=http://
16-
PHYSICAL_ADDRESS_ANNOTATOR_HOST=localhost
17-
PHYSICAL_ADDRESS_ANNOTATOR_PORT=9002
15+
LOCATION_ANNOTATOR_PROTOCOL=http://
16+
LOCATION_ANNOTATOR_HOST=localhost
17+
LOCATION_ANNOTATOR_PORT=9002
18+
19+
CONTACT_ANNOTATOR_PROTOCOL=http://
20+
CONTACT_ANNOTATOR_HOST=localhost
21+
CONTACT_ANNOTATOR_PORT=9003
22+
23+
ID_ANNOTATOR_PROTOCOL=http://
24+
ID_ANNOTATOR_HOST=localhost
25+
ID_ANNOTATOR_PORT=9004

‎client/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# pull official node base image
2-
FROM node:16.2.0-alpine3.12 as build
2+
FROM node:16.6.0-alpine3.12 as build
33
WORKDIR /app
44
ENV PATH /app/node_modules/.bin:$PATH
55
COPY package.json ./
66
COPY package-lock.json ./
77
RUN npm ci --silent
88
RUN npm install react-scripts@3.4.1 -g --silent
9-
COPY . ./
9+
COPY src ./src
10+
COPY public ./public
1011
RUN npm run build
1112

1213
# production environment
13-
FROM nginx:1.21.0-alpine
14+
FROM nginx:1.21.1-alpine
1415
COPY --from=build /app/build /usr/share/nginx/html
1516
COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
1617

‎client/package-lock.json‎

Lines changed: 152 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"@material-ui/data-grid": "^4.0.0-alpha.30",
88
"@material-ui/icons": "^4.11.2",
99
"@testing-library/jest-dom": "^5.13.0",
10-
"@testing-library/react": "^11.2.7",
10+
"@testing-library/react": "^12.0.0",
1111
"@testing-library/user-event": "^13.1.9",
1212
"prop-types": "^15.7.2",
1313
"react": "^17.0.2",
1414
"react-dom": "^17.0.2",
1515
"react-router-dom": "^5.2.0",
1616
"react-scripts": "4.0.3",
1717
"typescript": "^4.3.2",
18-
"web-vitals": "^1.1.1"
18+
"web-vitals": "^2.0.1"
1919
},
2020
"scripts": {
2121
"start": "chmod +x ./env.sh && ./env.sh && cp env-config.js ./public/ && react-scripts start",
@@ -43,9 +43,9 @@
4343
]
4444
},
4545
"devDependencies": {
46-
"@typescript-eslint/eslint-plugin": "^4.26.0",
47-
"@typescript-eslint/parser": "^4.26.0",
48-
"eslint": "^7.28.0",
46+
"@typescript-eslint/eslint-plugin": "^4.28.5",
47+
"@typescript-eslint/parser": "^4.28.5",
48+
"eslint": "^7.32.0",
4949
"eslint-config-google": "^0.14.0",
5050
"eslint-plugin-react": "^7.24.0"
5151
}

‎client/src/.openapi-generator/FILES‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ models/TextDateAnnotation.ts
2020
models/TextDateAnnotationAllOf.ts
2121
models/TextIdAnnotation.ts
2222
models/TextIdAnnotationAllOf.ts
23+
models/TextLocationAnnotation.ts
24+
models/TextLocationAnnotationAllOf.ts
2325
models/TextPersonNameAnnotation.ts
24-
models/TextPhysicalAddressAnnotation.ts
25-
models/TextPhysicalAddressAnnotationAllOf.ts
2626
models/Tool.ts
2727
models/ToolDependencies.ts
28+
models/ToolType.ts
2829
models/index.ts
2930
runtime.ts

‎client/src/.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.1
1+
5.2.0

‎client/src/apis/DeidentifiedNoteApi.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/* eslint-disable */
33
/**
44
* NLP Sandbox PHI Deidentifier API
5-
* # Introduction This NLP tool takes as input a clinical note and returned a de-identified version of the note. This design of this API is a work in progress. # Examples - [NLP Sandbox PHI Deidentifier](https://github.com/nlpsandbox/phi-deidentifier)
5+
* # Introduction This NLP tool takes as input a clinical note and returned a de-identified version of the note. This design of this API is a work in progress. # Examples - [NLP Sandbox PHI Deidentifier Example](https://github.com/nlpsandbox/phi-deidentifier-example)
66
*
7-
* The version of the OpenAPI document: 1.1.2
7+
* The version of the OpenAPI document: 1.2.0
88
* Contact: team@nlpsandbox.io
99
*
1010
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

‎client/src/apis/HealthCheckApi.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/* eslint-disable */
33
/**
44
* NLP Sandbox PHI Deidentifier API
5-
* # Introduction This NLP tool takes as input a clinical note and returned a de-identified version of the note. This design of this API is a work in progress. # Examples - [NLP Sandbox PHI Deidentifier](https://github.com/nlpsandbox/phi-deidentifier)
5+
* # Introduction This NLP tool takes as input a clinical note and returned a de-identified version of the note. This design of this API is a work in progress. # Examples - [NLP Sandbox PHI Deidentifier Example](https://github.com/nlpsandbox/phi-deidentifier-example)
66
*
7-
* The version of the OpenAPI document: 1.1.2
7+
* The version of the OpenAPI document: 1.2.0
88
* Contact: team@nlpsandbox.io
99
*
1010
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

‎client/src/apis/ToolApi.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/* eslint-disable */
33
/**
44
* NLP Sandbox PHI Deidentifier API
5-
* # Introduction This NLP tool takes as input a clinical note and returned a de-identified version of the note. This design of this API is a work in progress. # Examples - [NLP Sandbox PHI Deidentifier](https://github.com/nlpsandbox/phi-deidentifier)
5+
* # Introduction This NLP tool takes as input a clinical note and returned a de-identified version of the note. This design of this API is a work in progress. # Examples - [NLP Sandbox PHI Deidentifier Example](https://github.com/nlpsandbox/phi-deidentifier-example)
66
*
7-
* The version of the OpenAPI document: 1.1.2
7+
* The version of the OpenAPI document: 1.2.0
88
* Contact: team@nlpsandbox.io
99
*
1010
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

‎client/src/components/AnnotationView.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import PropTypes from 'prop-types';
77
function AnnotationView(props) {
88
const types = [
99
{type: 'text_date', name: 'Date', key: 'textDateAnnotations'},
10-
{type: 'text_physical_address', name: 'Physical Address', key:
11-
'textPhysicalAddressAnnotations'},
10+
{type: 'text_location', name: 'Location', key: 'textLocationAnnotations'},
1211
{type: 'text_person_name', name: 'Person Name', key:
1312
'textPersonNameAnnotations'},
1413
{type: 'text_contact', name: 'Contact Info', key: 'textContactAnnotations'},

0 commit comments

Comments
 (0)