Skip to content

Commit

Permalink
Merge branch 'main' into devsecops/bethbeza/manage-dependabot-schedule
Browse files Browse the repository at this point in the history
  • Loading branch information
bethbeza authored Dec 18, 2024
2 parents 42349ac + 7b13fee commit 5f43e16
Show file tree
Hide file tree
Showing 55 changed files with 2,497 additions and 594 deletions.
42 changes: 21 additions & 21 deletions frontend-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"classnames": "^2.5.1",
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
"dompurify": "^3.2.2",
"dompurify": "^3.2.3",
"export-to-csv-fix-source-map": "^0.2.1",
"focus-trap-react": "^10.3.1",
"history": "^5.3.0",
Expand Down Expand Up @@ -110,24 +110,24 @@
},
"devDependencies": {
"@eslint/compat": "^1.2.4",
"@eslint/js": "^9.16.0",
"@eslint/js": "^9.17.0",
"@mdx-js/react": "^3.1.0",
"@mdx-js/rollup": "^3.1.0",
"@playwright/test": "^1.49.0",
"@playwright/test": "^1.49.1",
"@rest-hooks/test": "^7.3.1",
"@storybook/addon-a11y": "^8.4.6",
"@storybook/addon-actions": "^8.4.6",
"@storybook/addon-essentials": "^8.4.6",
"@storybook/addon-interactions": "^8.4.6",
"@storybook/addon-links": "^8.4.6",
"@storybook/blocks": "^8.4.6",
"@storybook/components": "^8.4.6",
"@storybook/core-events": "^8.4.6",
"@storybook/addon-a11y": "^8.4.7",
"@storybook/addon-actions": "^8.4.7",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-interactions": "^8.4.7",
"@storybook/addon-links": "^8.4.7",
"@storybook/blocks": "^8.4.7",
"@storybook/components": "^8.4.7",
"@storybook/core-events": "^8.4.7",
"@storybook/mdx2-csf": "1.1.0",
"@storybook/react": "^8.4.6",
"@storybook/react-vite": "^8.4.6",
"@storybook/react": "^8.4.7",
"@storybook/react-vite": "^8.4.7",
"@storybook/testing-library": "^0.2.2",
"@storybook/theming": "^8.4.6",
"@storybook/theming": "^8.4.7",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
Expand All @@ -149,12 +149,12 @@
"@vitest/coverage-istanbul": "^2.1.8",
"@vitest/ui": "^2.1.8",
"autoprefixer": "^10.4.20",
"browserslist": "^4.24.2",
"browserslist": "^4.24.3",
"browserslist-useragent-regexp": "^4.1.3",
"chromatic": "^11.20.0",
"chromatic": "^11.20.2",
"cross-env": "^7.0.3",
"dotenv-flow": "^4.1.0",
"eslint": "9.16.0",
"eslint": "9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
Expand All @@ -170,12 +170,12 @@
"globals": "^15.13.0",
"husky": "^9.1.7",
"jsdom": "^25.0.1",
"lint-staged": "^15.2.10",
"lint-staged": "^15.2.11",
"mockdate": "^3.0.5",
"msw": "^2.6.7",
"msw": "^2.6.8",
"msw-storybook-addon": "^2.0.4",
"npm-run-all": "^4.1.5",
"otpauth": "^9.3.5",
"otpauth": "^9.3.6",
"patch-package": "^8.0.0",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
Expand All @@ -184,7 +184,7 @@
"remark-mdx-frontmatter": "^5.0.0",
"remark-mdx-toc": "^0.3.1",
"sass": "^1.81.0",
"storybook": "^8.4.6",
"storybook": "^8.4.7",
"storybook-addon-remix-react-router": "^3.0.2",
"ts-node": "^10.9.2",
"tslib": "^2.8.1",
Expand Down
5 changes: 5 additions & 0 deletions frontend-react/src/AppRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { SenderType } from "./utils/DataDashboardUtils";
import { lazyRouteMarkdown } from "./utils/LazyRouteMarkdown";
import { PERMISSIONS } from "./utils/UsefulTypes";

const ReportTestingPage = lazy(() => import("./components/Admin/MessageTesting/MessageTesting"));
/* Content Pages */
const Home = lazy(lazyRouteMarkdown(() => import("./content/home/index.mdx")));
const About = lazy(lazyRouteMarkdown(() => import("./content/about/index.mdx")));
Expand Down Expand Up @@ -437,6 +438,10 @@ export const appRoutes: RouteObject[] = [
path: "orgreceiversettings/org/:orgname/receiver/:receivername/action/:action",
element: <EditReceiverSettingsPage />,
},
{
path: "orgreceiversettings/org/:orgname/receiver/:receivername/action/:action/message-testing",
element: <ReportTestingPage />,
},
{
path: "orgsendersettings/org/:orgname/sender/:sendername/action/:action",
element: <EditSenderSettingsPage />,
Expand Down
Loading

0 comments on commit 5f43e16

Please sign in to comment.