Merge pull request #1 from microsoft/main

Bump @types/react from 18.2.56 to 18.2.73 in /webapp (microsoft#911)
nabeelp · Apr 8, 2024 · 4d5cab9 · 4d5cab9
2 parents c89e70d + 7bd9d6a
commit 4d5cab9
Show file tree

Hide file tree

Showing 9 changed files with 2,853 additions and 2,311 deletions.
diff --git a/webapp/.eslintrc.cjs b/webapp/.eslintrc.cjs
@@ -40,6 +40,9 @@ module.exports = {
         'react/react-in-jsx-scope': 'off',
         'react/prop-types': 'off',
         'react/jsx-props-no-spreading': 'off',
+        '@typescript-eslint/restrict-template-expressions': 'off',
+        '@typescript-eslint/use-unknown-in-catch-callback-variable': 'off',
+        '@typescript-eslint/prefer-promise-reject-errors': 'off',
     },
     settings: {
         react: {

diff --git a/webapp/package.json b/webapp/package.json
@@ -15,9 +15,9 @@
     "eject": "react-scripts eject"
   },
   "dependencies": {
-    "@azure/msal-browser": "^2.38.4",
-    "@azure/msal-react": "^1.5.11",
-    "@fluentui/react-components": "^9.47.2",
+    "@azure/msal-browser": "^3.11.1",
+    "@azure/msal-react": "^2.0.14",
+    "@fluentui/react-components": "^9.47.3",
     "@fluentui/react-icons": "^2.0.233",
     "@fluentui/react-northstar": "^0.66.4",
     "@microsoft/signalr": "^8.0.0",
@@ -34,11 +34,11 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@types/debug": "^4.1.12",
-    "@types/node": "^20.11.30",
-    "@types/react": "^18.2.56",
+    "@types/node": "^20.12.3",
+    "@types/react": "^18.2.74",
     "@types/react-dom": "^18.2.23",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
     "react-scripts": "^5.0.1",
@@ -59,4 +59,4 @@
     ]
   },
   "packageManager": "yarn@1.22.19"
-}
+}
diff --git a/webapp/src/components/FileUploader.tsx b/webapp/src/components/FileUploader.tsx
@@ -10,7 +10,7 @@ const useClasses = makeStyles({
 interface FileUploaderProps {
     acceptedExtensions: string[] | undefined;
     onSelectedFile: (file: File) => void;
-    ref?: React.Ref<HTMLInputElement>;
+    ref?: React.Ref<HTMLInputElement> | string;
 }
 
 export const FileUploader: React.FC<FileUploaderProps> = forwardRef<HTMLInputElement, FileUploaderProps>(

diff --git a/webapp/src/components/chat/prompt-dialog/PromptDialog.tsx b/webapp/src/components/chat/prompt-dialog/PromptDialog.tsx
@@ -100,7 +100,7 @@ export const PromptDialog: React.FC<IPromptDialogProps> = ({ message }) => {
                 value &&
                 !(value as string).includes('User has also shared some document snippets:')
             ) {
-                value += '\nNo relevant document memories.';
+                value = (value as string) + '\nNo relevant document memories.';
             }
 
             return value && key !== 'metaPromptTemplate' ? (

diff --git a/webapp/src/components/chat/shared/EditChatName.tsx b/webapp/src/components/chat/shared/EditChatName.tsx
@@ -84,8 +84,8 @@ export const EditChatName: React.FC<IEditChatNameProps> = ({ name, chatId, exitE
             className={classes.root}
             style={{
                 display: 'flex',
-                flexDirection: `${textButtons ? 'column' : 'row'}`,
-                gap: `${textButtons ? tokens.spacingVerticalS : tokens.spacingVerticalNone}`,
+                flexDirection: textButtons ? 'column' : 'row',
+                gap: textButtons ? tokens.spacingVerticalS : tokens.spacingVerticalNone,
             }}
             title={'Edit chat name'}
             aria-label={`Edit chat name for "${name}"`}

diff --git a/webapp/src/components/header/settings-dialog/SettingSection.tsx b/webapp/src/components/header/settings-dialog/SettingSection.tsx
@@ -46,7 +46,7 @@ export const SettingSection: React.FC<ISettingsSectionProps> = ({ setting, conte
             <div
                 style={{
                     display: 'flex',
-                    flexDirection: `${setting.stackVertically ? 'column' : 'row'}`,
+                    flexDirection: setting.stackVertically ? 'column' : 'row',
                     flexWrap: 'wrap',
                 }}
             >

diff --git a/webapp/src/components/open-api-plugins/cards/PluginCard.tsx b/webapp/src/components/open-api-plugins/cards/PluginCard.tsx
@@ -40,7 +40,7 @@ export const PluginCard: React.FC<PluginCardProps> = ({ plugin, isHosted }) => {
     return (
         <BaseCard
             image={icon}
-            header={`${name}`}
+            header={name}
             secondaryText={publisher}
             description={description}
             action={

diff --git a/webapp/src/libs/services/ChatService.ts b/webapp/src/libs/services/ChatService.ts
@@ -152,7 +152,7 @@ export class ChatService extends BaseService {
 
                         if (propertyDetails.value) {
                             openApiVariables.push({
-                                key: `${property}`,
+                                key: property,
                                 value: propertyDetails.value,
                             });
                         }

diff --git a/webapp/yarn.lock b/webapp/yarn.lock