Merge branch 'master' into tracking-schema-updates

Author: cwbeck

api/package.json

@@ -77,5 +77,8 @@
         "ssl-validator": "^1.0.7",
         "stripe": "^8.207.0",
         "twing": "^5.1.0"
+    },
+    "resolutions": {
+        "merge": "^2.1.1"
     }
 }

api/src/backends/databases/MongoDb.ts

@@ -274,7 +274,7 @@ export default class MongoDb extends BaseDatabase {
             getErrorFile(),
             getErrorMessage(),
         ].reduce((a, c) => {
-            return c === undefined ? a : Object.assign(a, c);
+            return c === undefined ? a : Object.assign(a as Record<string, any>, c);
         }, {} as { [k: string]: any }) as { [p: string]: any };
     }
 
@@ -1030,7 +1030,7 @@ export default class MongoDb extends BaseDatabase {
             );
 
         return [getRange(), getRevisionFilter(), getEnvironmentFilter()].reduce((a, c) => {
-            return c === undefined ? a : Object.assign(a, c);
+            return c === undefined ? a : Object.assign(a as Record<string, any>, c);
         }, {} as { [k: string]: any }) as { [p: string]: any };
     }
 

api/yarn.lock

@@ -111,7 +111,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.7</version>
+      <version>2.9.0</version>
     </dependency>
     <dependency>
       <groupId>com.maxmind.db</groupId>
@@ -138,11 +138,6 @@
       <artifactId>mongodb-driver-sync</artifactId>
       <version>4.1.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>42.2.23</version>
-    </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>s3</artifactId>

edge/pom.xml

@@ -21,12 +21,12 @@
         "apollo:generate": "apollo codegen:generate --target typescript --endpoint http://localhost:8082/graphql --outputFlat src/gql/generated --passthroughCustomScalars --customScalarsPrefix S8"
     },
     "dependencies": {
-        "@apollo/client": "^3.4.17",
+        "@apollo/client": "^3.6.6",
         "@babel/core": "^7.16.0",
         "@emotion/react": "^11.4.1",
         "@emotion/server": "^11.4.0",
         "@emotion/styled": "^11.3.0",
-        "@hcaptcha/react-hcaptcha": "^0.3.7",
+        "@hcaptcha/react-hcaptcha": "^0.3.10",
         "@mui/icons-material": "^5.0.4",
         "@mui/lab": "^5.0.0-alpha.51",
         "@mui/material": "^5.0.4",
@@ -39,9 +39,9 @@
         "@types/js-beautify": "^1.13.3",
         "@types/node": "^16.7.10",
         "@types/qrcode.react": "^1.0.2",
-        "@types/react": "^17.0.34",
+        "@types/react": "^17.0.45",
         "@types/react-color": "^3.0.5",
-        "@types/react-dom": "^17.0.9",
+        "@types/react-dom": "^17.0.17",
         "@types/react-sparklines": "^1.7.1",
         "@types/rimraf": "^3.0.2",
         "@typescript-eslint/eslint-plugin": "^5.3.1",
@@ -75,15 +75,22 @@
         "react-chartjs-2": "3.3.0",
         "react-color": "^2.19.3",
         "react-dom": "17.0.2",
-        "react-json-tree": "^0.15.0",
+        "react-json-tree": "^0.17.0",
         "react-sparklines": "^1.7.0",
         "rimraf": "^3.0.2",
-        "shiki": "^0.9.11",
+        "shiki": "^0.10.1",
         "ts-node": "^10.4.0",
-        "typescript": "^4.4.4",
+        "typescript": "^4.7.2",
         "wasm-dce": "^1.0.2",
         "wasm-loader": "^1.3.0",
         "webpack": "^5.51.2",
         "webpack-bundle-analyzer": "^4.5.0"
+    },
+    "resolutions": {
+        "lodash": "4.17.21",
+        "git-parse": "^2.1.1",
+        "@types/react": "17.0.45",
+        "@types/react-dom": "^17.0.17",
+        "shelljs": "^0.8.5"
     }
 }

ui/package.json

@@ -8,7 +8,7 @@ import { useRefresh } from '../hooks/useRefresh';
 
 const QueryLoaderAndError = <T,>(
     isPage: boolean,
-    queryResult: QueryResult<T>,
+    queryResult: QueryResult<T, any>,
     afterLoad: (
         data: T,
         valuesRefresh: (mustResetCache: boolean) => void,

ui/src/abstractions/QueryLoaderAndError.tsx

@@ -21,7 +21,7 @@ import { AlertRevisionFinal } from '../components/atoms/AlertRevisionFinal';
 export type TablePageProps<Row extends RowData, TableData> = {
     title: string;
     mainInfoProps?: InfoProps;
-    mainQuery: QueryResult<TableData>;
+    mainQuery: QueryResult<TableData, any>;
     tableId: string;
     entityName: string;
     columns: Column<Row>[];

ui/src/abstractions/TablePage.tsx

@@ -1,8 +1,8 @@
-import { FC, MouseEvent, SyntheticEvent, useState } from 'react';
-import { Box, Paper, Snackbar } from '@mui/material';
-import { Alert } from '@mui/material';
+import { FC, useState } from 'react';
+import { Alert, Box, Paper, Snackbar } from '@mui/material';
 import { CopyBlockProps } from '../../types/props/CopyBlockProps';
 import LazyShiki from './LibraryLoaders/LazyShiki';
+import { SnackbarProps } from '@mui/material/Snackbar/Snackbar';
 
 const CopyBlock: FC<CopyBlockProps> = (props: CopyBlockProps) => {
     const [open, setOpen] = useState(false);
@@ -19,7 +19,7 @@ const CopyBlock: FC<CopyBlockProps> = (props: CopyBlockProps) => {
         })();
     };
 
-    const handleClose = (event: SyntheticEvent | MouseEvent, reason?: string) => {
+    const handleClose: SnackbarProps['onClose'] = (event, reason) => {
         if (reason === 'clickaway') {
             return;
         }

ui/src/components/atoms/CopyBlock.tsx

@@ -1,7 +1,8 @@
-import { FC } from 'react';
 import { Alert } from '@mui/material';
+import { ChildrenOnlyProps } from '../../../types/props/ChildrenOnlyProps';
+import { FC } from 'react';
 
-export const DialogInfoAlert: FC = ({ children }) => {
+export const DialogInfoAlert: FC<ChildrenOnlyProps> = ({ children }) => {
     return (
         <Alert severity="info" className="DialogFormField">
             {children}

ui/src/components/atoms/DialogFormInputs/DialogInfoAlert.tsx

@@ -9,7 +9,7 @@ import { logError } from '../../utils/logUtils';
 
 type GqlErrorProps = {
     error: ApolloError;
-    onClose?: (event: SyntheticEvent | MouseEvent, reason?: string) => void;
+    onClose?: (event: SyntheticEvent | MouseEvent) => void;
 };
 
 const GqlError: FC<GqlErrorProps> = (props: GqlErrorProps) => {