Skip to content
Open
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
70 changes: 35 additions & 35 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,42 @@ updates:
- package-ecosystem: "docker"
directory: "/operations"
schedule:
interval: "weekly"
interval: "monthly"
day: "sunday"
time: "05:00"
timezone: "US/Eastern"
- package-ecosystem: "docker"
directory: "/prime-router"
schedule:
interval: "weekly"
interval: "monthly"
day: "sunday"
time: "05:00"
timezone: "US/Eastern"
- package-ecosystem: "docker"
directory: "/.environment/docker/docker-compose"
schedule:
interval: "weekly"
interval: "monthly"
day: "sunday"
time: "05:00"
timezone: "US/Eastern"
- package-ecosystem: "docker"
directory: "/frontend-react"
schedule:
interval: "weekly"
interval: "monthly"
day: "sunday"
time: "05:00"
timezone: "US/Eastern"
- package-ecosystem: "docker"
directory: "/operations/utils/postgres"
schedule:
interval: "weekly"
interval: "monthly"
day: "sunday"
time: "05:00"
timezone: "US/Eastern"
- package-ecosystem: "docker"
directory: "/operations/dnsmasq"
schedule:
interval: "weekly"
interval: "monthly"
day: "sunday"
time: "05:00"
timezone: "US/Eastern"
Expand All @@ -60,110 +60,110 @@ updates:
- package-ecosystem: "github-actions"
# Workflow files stored in `.github/workflows`
directory: "/"
open-pull-requests-limit: 100
open-pull-requests-limit: 10
schedule:
interval: "daily"
interval: "monthly"
# GitHub local actions
# These entries need to be updated for every new action created
- package-ecosystem: "github-actions"
directory: "/.github/actions/Start-AzFunction"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/Start-PostgresDB"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/Stop-AzFunction"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/Stop-PostgresDB"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/notifications"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/build-backend"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/build-frontend"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/build-vars"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/db-backup"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/db-query"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/db-restore"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/demo-env"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/deploy-backend"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/deploy-frontend"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/mount-share"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/runner-ip"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/sonarcloud"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/vpn-azure"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/retry"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/az-cost"
schedule:
interval: "daily"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/.github/actions/build-submissions"
schedule:
interval: "daily"
interval: "monthly"

- package-ecosystem: "github-actions"
directory: "/.github/actions/connect-ovpn"
schedule:
interval: "daily"
interval: "monthly"

- package-ecosystem: "github-actions"
directory: "/.github/actions/checksum-validate"
schedule:
interval: "daily"
interval: "monthly"

# Frontend
- package-ecosystem: "npm"
directory: "/frontend-react"
open-pull-requests-limit: 100
open-pull-requests-limit: 10
schedule:
interval: "monthly"
day: "sunday"
Expand Down Expand Up @@ -436,12 +436,12 @@ updates:
- package-ecosystem: "terraform"
directory: "/operations/app/terraform/vars/test"
schedule:
interval: "weekly"
interval: "monthly"

# shared
- package-ecosystem: "gradle"
directory: "/shared"
open-pull-requests-limit: 100
open-pull-requests-limit: 10
schedule:
interval: "monthly"
day: "sunday"
Expand Down Expand Up @@ -474,7 +474,7 @@ updates:
# Backend
- package-ecosystem: "gradle"
directory: "/prime-router"
open-pull-requests-limit: 100
open-pull-requests-limit: 10
schedule:
interval: "monthly"
day: "sunday"
Expand Down
7 changes: 4 additions & 3 deletions frontend-react-original/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@microsoft/applicationinsights-react-js": "^18.3.6",
"@microsoft/applicationinsights-web": "^3.3.6",
"@okta/okta-react": "^6.10.0",
"@okta/okta-signin-widget": "^7.43.1",
"@okta/okta-signin-widget": "^7.44.1",
"@react-pdf/renderer": "^4.1.6",
"@rest-hooks/rest": "^3.0.3",
"@tanstack/react-query": "^5.75.7",
Expand All @@ -20,7 +20,7 @@
"classnames": "^2.5.1",
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
"dompurify": "^3.2.7",
"dompurify": "^3.3.3",
"export-to-csv-fix-source-map": "^0.2.1",
"focus-trap-react": "^11.0.3",
"history": "^5.3.0",
Expand Down Expand Up @@ -206,7 +206,8 @@
"@okta/okta-auth-js": ">=7.8.1",
"cookie": ">=0.7.0",
"send": ">=0.19.0",
"tar": ">=7.5.10"
"tar": ">=7.5.10",
"dompurify": ">=3.2.7"
},
"engines": {
"node": "^20.15"
Expand Down
6 changes: 5 additions & 1 deletion frontend-react-original/src/utils/LazyRouteMarkdown.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { render, screen } from "@testing-library/react";
import { lazy } from "react";
import { createMemoryRouter, RouterProvider } from "react-router";
import * as md from "./__fixtures__/markdown-example.mdx";
import * as md from "./__mocks__/markdown-example.mdx";

import { lazyRouteMarkdown } from "./LazyRouteMarkdown";

Expand All @@ -13,6 +13,10 @@ vi.mock("react-helmet-async", () => {
};
});

vi.mock("../layouts/Markdown/MarkdownLayout", () => ({
default: ({ children }: any) => <article>{children}</article>,
}));

describe("lazyRouteMarkdown", () => {
test("works with react-router", async () => {
const Component = lazy(lazyRouteMarkdown(() => Promise.resolve(md)));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test
26 changes: 7 additions & 19 deletions frontend-react-original/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2343,9 +2343,9 @@ __metadata:
languageName: node
linkType: hard

"@okta/okta-signin-widget@npm:^7.43.1":
version: 7.43.1
resolution: "@okta/okta-signin-widget@npm:7.43.1"
"@okta/okta-signin-widget@npm:^7.44.1":
version: 7.44.1
resolution: "@okta/okta-signin-widget@npm:7.44.1"
dependencies:
"@okta/okta-auth-js": 7.14.0
"@sindresorhus/to-milliseconds": ^1.0.0
Expand All @@ -2369,7 +2369,7 @@ __metadata:
dependenciesMeta:
fsevents:
optional: true
checksum: fa828380fcecefe6b1e8439914e504074b23d3b827316f190c4a2daa4a8f26ca515950324d93c430d92ab354ef3f1d81fe2cb788be8e65fa7aad0d1ea1724b28
checksum: 123c55c9a383e2d1fad0b6bd74c59a1296a549c4754017a94150ae71ecc8a617752c717e6facca0fbca68effc2d904a8e2e1f50b4d3e0fd0642ac376abf0b44b
languageName: node
linkType: hard

Expand Down Expand Up @@ -6388,19 +6388,7 @@ __metadata:
languageName: node
linkType: hard

"dompurify@npm:*":
version: 3.2.5
resolution: "dompurify@npm:3.2.5"
dependencies:
"@types/trusted-types": ^2.0.7
dependenciesMeta:
"@types/trusted-types":
optional: true
checksum: bd3b40810cc74312970dc6b99d38450ec839c81fb56c27d2c1b815ce0206b73e9cd4fe2e9021f735a1aaebf017990a63e6454e7d9c893f72b365b94d030ec9c4
languageName: node
linkType: hard

"dompurify@npm:^3.2.7":
"dompurify@npm:>=3.2.7":
version: 3.3.3
resolution: "dompurify@npm:3.3.3"
dependencies:
Expand Down Expand Up @@ -11888,7 +11876,7 @@ __metadata:
"@microsoft/applicationinsights-react-js": ^18.3.6
"@microsoft/applicationinsights-web": ^3.3.6
"@okta/okta-react": ^6.10.0
"@okta/okta-signin-widget": ^7.43.1
"@okta/okta-signin-widget": ^7.44.1
"@playwright/test": ^1.52.0
"@react-pdf/renderer": ^4.1.6
"@rest-hooks/rest": ^3.0.3
Expand Down Expand Up @@ -11943,7 +11931,7 @@ __metadata:
cross-env: ^7.0.3
date-fns: ^4.1.0
date-fns-tz: ^3.2.0
dompurify: ^3.2.7
dompurify: ^3.3.3
dotenv-flow: ^4.1.0
eslint: ^9.26.0
eslint-config-prettier: ^10.1.2
Expand Down
2 changes: 1 addition & 1 deletion frontend-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@microsoft/applicationinsights-react-js": "^18.3.6",
"@microsoft/applicationinsights-web": "^3.3.6",
"@okta/okta-react": "^6.10.0",
"@okta/okta-signin-widget": "^7.43.1",
"@okta/okta-signin-widget": "^7.44.1",
"@react-pdf/renderer": "^4.1.6",
"@rest-hooks/rest": "^3.0.3",
"@tanstack/react-query": "^5.75.7",
Expand Down
4 changes: 4 additions & 0 deletions frontend-react/src/utils/LazyRouteMarkdown.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ vi.mock("react-helmet-async", () => {
};
});

vi.mock("../layouts/Markdown/MarkdownLayout", () => ({
default: ({ children }: any) => <article>{children}</article>,
}));

describe("lazyRouteMarkdown", () => {
test("works with react-router", async () => {
const Component = lazy(lazyRouteMarkdown(() => Promise.resolve(md)));
Expand Down
10 changes: 5 additions & 5 deletions frontend-react/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2343,9 +2343,9 @@ __metadata:
languageName: node
linkType: hard

"@okta/okta-signin-widget@npm:^7.43.1":
version: 7.43.1
resolution: "@okta/okta-signin-widget@npm:7.43.1"
"@okta/okta-signin-widget@npm:^7.44.1":
version: 7.44.1
resolution: "@okta/okta-signin-widget@npm:7.44.1"
dependencies:
"@okta/okta-auth-js": 7.14.0
"@sindresorhus/to-milliseconds": ^1.0.0
Expand All @@ -2369,7 +2369,7 @@ __metadata:
dependenciesMeta:
fsevents:
optional: true
checksum: fa828380fcecefe6b1e8439914e504074b23d3b827316f190c4a2daa4a8f26ca515950324d93c430d92ab354ef3f1d81fe2cb788be8e65fa7aad0d1ea1724b28
checksum: 123c55c9a383e2d1fad0b6bd74c59a1296a549c4754017a94150ae71ecc8a617752c717e6facca0fbca68effc2d904a8e2e1f50b4d3e0fd0642ac376abf0b44b
languageName: node
linkType: hard

Expand Down Expand Up @@ -11876,7 +11876,7 @@ __metadata:
"@microsoft/applicationinsights-react-js": ^18.3.6
"@microsoft/applicationinsights-web": ^3.3.6
"@okta/okta-react": ^6.10.0
"@okta/okta-signin-widget": ^7.43.1
"@okta/okta-signin-widget": ^7.44.1
"@playwright/test": ^1.52.0
"@react-pdf/renderer": ^4.1.6
"@rest-hooks/rest": ^3.0.3
Expand Down
2 changes: 1 addition & 1 deletion prime-router/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ dependencies {
implementation("org.yaml:snakeyaml:2.5")
implementation("io.github.linuxforhealth:hl7v2-fhir-converter") {
version {
branch = "master"
branch = "main"
}
}
implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:8.0.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"valueString" : "X"
} ]
} ],
"status" : "unknown",
"status" : "cancelled",
"code" : {
"coding" : [ {
"extension" : [ {
Expand Down
Loading