Skip to content

Dev #134

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.

Sign up for GitHub

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

Merged
smalho01 merged 29 commits into from
Jun 16, 2025
Merged

Dev #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ecf961c
update vite to 5.4.19
plarocque4 May 16, 2025
6dc313d
fix prettier issue
plarocque4 May 16, 2025
3715d7b
Merge pull request #127 from mcode/vite-update
plarocque4 May 16, 2025
bdd92e1
vite updates
smalho01 May 20, 2025
2cdb825
single quote
smalho01 May 20, 2025
5acffc6
run prettier
smalho01 May 20, 2025
4c3614b
Merge branch 'dev' into vite-config-updates
smalho01 May 20, 2025
e718f13
Merge pull request #128 from mcode/vite-config-updates
plarocque4 May 20, 2025
43553d5
update turalio to active package ndc code
smalho01 Jun 10, 2025
72e7b82
map ndc to rxnorm
smalho01 Jun 12, 2025
a059d52
prettier
smalho01 Jun 12, 2025
8b54c04
Merge pull request #129 from mcode/turalio-code-update
smalho01 Jun 12, 2025
e46db2a
Bump the npm_and_yarn group across 2 directories with 9 updates
dependabot[bot] Jun 12, 2025
614d9f9
update pims to work with auth number to case number migration
smalho01 Jun 13, 2025
c0df031
Merge branch 'dev' into authNumber->caseNumber
smalho01 Jun 13, 2025
259bfe4
Merge branch 'dev' into ndc-rxnorm-mapping
plarocque4 Jun 13, 2025
6f7a2a4
merge with dev
plarocque4 Jun 13, 2025
0719c50
Merge pull request #131 from mcode/dependabot/npm_and_yarn/backend/np…
plarocque4 Jun 13, 2025
8e02d16
filter case number from pims
smalho01 Jun 13, 2025
eaa3176
Merge branch 'dev' into authNumber->caseNumber
smalho01 Jun 13, 2025
5374baf
run prettier
smalho01 Jun 13, 2025
942e1f2
update ci/cd
smalho01 Jun 13, 2025
6150f15
update ci/cd
smalho01 Jun 13, 2025
0842215
remove all instances of auth number
smalho01 Jun 13, 2025
0160eeb
run prettier
smalho01 Jun 13, 2025
cab52f2
Merge pull request #133 from mcode/auth-case-number
plarocque4 Jun 13, 2025
4a58825
Merge branch 'dev' into ndc-rxnorm-mapping
plarocque4 Jun 13, 2025
a185987
Merge pull request #130 from mcode/ndc-rxnorm-mapping
plarocque4 Jun 13, 2025
e58fed6
update vite config
smalho01 Jun 16, 2025
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
9 changes: 5 additions & 4 deletions .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ Please include a summary of the changes and the related issue/task. Please also
Please include the Jira Ticket Number and Link for this issue/task.

## Checklist before requesting a review

- [ ] I have performed a self-review of my code
- [ ] Ensure the target / base branch for any feature PR is set to `dev` not main (the only exception to this is releases from `dev` and hotfix branches)

## Checklist for conducting a review
- [ ] Review the code changes and make sure they all make sense and are necessary.
- [ ] Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to.

## Workflow
- [ ] Review the code changes and make sure they all make sense and are necessary.
- [ ] Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to.

Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.
## Workflow

Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.
92 changes: 47 additions & 45 deletions .github/workflows/ci-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,79 @@

jobs:
lint_frontend:
defaults:
defaults:
run:
working-directory: frontend
name: Check tsc, lint, and prettier on front end
name: Check tsc, lint, and prettier on front end
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '21.x'
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
CI: true
lint_backend:
defaults:
- uses: actions/checkout@v4
with:
clean: true
- uses: actions/setup-node@v1
with:
node-version: "21.x"
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
Comment on lines +7 to +22

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}

Copilot Autofix

AI 6 months ago

To fix the issue, we will add a permissions block at the root of the workflow file. This block will define the minimal permissions required for the workflow to function. Since the workflow primarily involves linting, testing, and installing dependencies, it only needs contents: read permissions. This ensures that the GITHUB_TOKEN has the least privilege necessary to perform these tasks.

The permissions block will be added immediately after the name and on keys in the workflow file.

Suggested changeset 1
.github/workflows/ci-workflow.yml

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -3,2 +3,4 @@
 on: [push, pull_request]
+permissions:
+  contents: read
 
EOF
@@ -3,2 +3,4 @@
on: [push, pull_request]
permissions:
contents: read

Copilot is powered by AI and may make mistakes. Always verify output.
CI: true
lint_backend:
defaults:
run:
working-directory: backend
name: Check tsc, lint, and prettier on back end
working-directory: backend
name: Check tsc, lint, and prettier on back end
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '21.x'
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
CI: true
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: "21.x"
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
Comment on lines +23 to +38

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}

Copilot Autofix

AI 6 months ago

To fix the issue, we need to add a permissions block to the workflow file. This block should specify the minimal permissions required for the workflow to function correctly. Since the workflow only performs linting, testing, and formatting tasks, it does not require write access to the repository. Therefore, the permissions block should set contents: read at the root level of the workflow to apply to all jobs. This ensures that the GITHUB_TOKEN has only read access to the repository contents.

Suggested changeset 1
.github/workflows/ci-workflow.yml

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -3,2 +3,4 @@
 on: [push, pull_request]
+permissions:
+  contents: read
 
EOF
@@ -3,2 +3,4 @@
on: [push, pull_request]
permissions:
contents: read

Copilot is powered by AI and may make mistakes. Always verify output.
CI: true
test_frontend:
defaults:
defaults:
run:
working-directory: frontend
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [21]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}

Copilot Autofix

AI 6 months ago

To fix the issue, we will add a permissions block at the root of the workflow file. This block will define the minimal permissions required for the workflow. Since the workflow primarily performs linting and testing tasks, it does not require write permissions. We will set contents: read as the permission, which is sufficient for accessing the repository's contents.

The permissions block will be added immediately after the name field at the top of the file. This ensures that the permissions apply to all jobs in the workflow unless overridden by a job-specific permissions block.

Suggested changeset 1
.github/workflows/ci-workflow.yml

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -1,2 +1,4 @@
 name: Lint and Test
+permissions:
+  contents: read
 
EOF
@@ -1,2 +1,4 @@
name: Lint and Test
permissions:
contents: read

Copilot is powered by AI and may make mistakes. Always verify output.

test_backend:
defaults:
defaults:
run:
working-directory: backend
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [21]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true
Comment on lines +63 to +82

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}

Copilot Autofix

AI 6 months ago

To fix the issue, we will add a permissions block to the root of the workflow file. This block will define the minimal permissions required for the workflow to function. Since the workflow primarily involves linting, testing, and installing dependencies, it only needs read access to the repository contents. We will set contents: read as the permission for the entire workflow.

Suggested changeset 1
.github/workflows/ci-workflow.yml

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -4,2 +4,5 @@
 
+permissions:
+  contents: read
+
 jobs:
EOF
@@ -4,2 +4,5 @@

permissions:
contents: read

jobs:
Copilot is powered by AI and may make mistakes. Always verify output.
56 changes: 28 additions & 28 deletions .github/workflows/docker-cd-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@ name: Docker Development Image CD

on:
push:
branches: [ dev ]
branches: [dev]
workflow_dispatch:

jobs:
docker-cd:
docker-cd:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
clean: true

- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false

- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false
- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:experimental
labels: ${{ steps.docker-meta-data.outputs.labels }}
- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:experimental
labels: ${{ steps.docker-meta-data.outputs.labels }}
56 changes: 28 additions & 28 deletions .github/workflows/docker-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@ name: Docker Image CD

on:
push:
branches: [ main ]
branches: [main]
workflow_dispatch:

jobs:
docker-cd:
docker-cd:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
clean: true

- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false

- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false
- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:latest
labels: ${{ steps.docker-meta-data.outputs.labels }}
- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:latest
labels: ${{ steps.docker-meta-data.outputs.labels }}
17 changes: 8 additions & 9 deletions .github/workflows/docker-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@ name: Docker Image CI

on:
pull_request:
branches: [ main, dev ]
branches: [main, dev]
workflow_dispatch:


jobs:
docker-ci:
docker-ci:
runs-on: ubuntu-latest
steps:

- name: Checkout Repository
uses: actions/checkout@v3
with:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
clean: true

- name: Test Server Docker image Builds
run: docker build .
- name: Test Server Docker image Builds
run: docker build .
56 changes: 28 additions & 28 deletions .github/workflows/docker-tag-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@ on:
workflow_dispatch:
push:
tags:
- '*'
- "*"

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
clean: true

- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker-meta-data.outputs.tags }}
labels: ${{ steps.docker-meta-data.outputs.labels }}
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker-meta-data.outputs.tags }}
labels: ${{ steps.docker-meta-data.outputs.labels }}
Loading
Loading