From 3d4f29cec2928588e033d03ac18aa47f1e1db01a Mon Sep 17 00:00:00 2001
From: dhruvjoshi <dhruv.joshi@navi.com>
Date: Mon, 19 Feb 2024 14:45:25 +0530
Subject: [PATCH] INFRA-2907 | fix pr comments

---
 package.json                           |  5 +++--
 src/coreform/database/DatabaseForm.tsx |  4 ++--
 src/models/ManifestValidationSchema.ts |  2 +-
 yarn.lock                              | 25 ++++++++++++++++---------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index f85a272..01ef769 100644
--- a/package.json
+++ b/package.json
@@ -62,8 +62,9 @@
     "@types/jest": "^24.9.1",
     "@types/lodash": "^4.14.202",
     "@types/material-ui": "^0.21.16",
-    "@types/react": "^17.0.75",
-    "@types/react-dom": "^17.0.25",
+    "@types/react": "^18.0.38",
+    "@types/react-dom": "^18.0.11",
+    "@types/react-mentions": "^4.1.6",
     "@types/react-router-dom": "^5.3.3",
     "@types/yup": "^0.29.13",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
diff --git a/src/coreform/database/DatabaseForm.tsx b/src/coreform/database/DatabaseForm.tsx
index c4ff028..d5a1941 100644
--- a/src/coreform/database/DatabaseForm.tsx
+++ b/src/coreform/database/DatabaseForm.tsx
@@ -354,14 +354,14 @@ const DatabaseConfiguration = () => {
     }
   }, [sqlVersion])
 
-  const getAllPsqlVersions = () => {
+  const getAllPsqlVersions = (): ReadonlyArray<string> => {
     const filteredPsqlVersion = Object.values(PsqlEngineVersionUpgradeCompatibleList)
       ?.flat()
       ?.filter((version) => !version?.startsWith(VERSIONS_TO_SKIP_PREFIX));
     return [...new Set(filteredPsqlVersion)].sort();
   };
 
-  const getPsqlEngineVersionList = () => {
+  const getPsqlEngineVersionList = (): ReadonlyArray<string> => {
     if (previousPsqlVersion) {
       return PsqlEngineVersionUpgradeCompatibleList[previousPsqlVersion]
     } else {
diff --git a/src/models/ManifestValidationSchema.ts b/src/models/ManifestValidationSchema.ts
index 4aac0a3..13072cb 100644
--- a/src/models/ManifestValidationSchema.ts
+++ b/src/models/ManifestValidationSchema.ts
@@ -407,7 +407,7 @@ const databaseValidationSchema = yup.object({
     instanceName: yup.string().matches(/^[a-z0-9\-.]*$/, 'Should have alphanum and hyphen only').required('is Required'),
     dbEngineType: yup.string().required('is Required').oneOf(DatabaseEngineList, 'Invalid Engine Type'),
     PsqlEngineVersion: psqlEngineVersionValidationSchema,
-    awsInstanceClass: yup.string().required('valid instance class is required'),
+    awsInstanceClass: yup.string().required('Valid instance class is required'),
     sizeInGb: yup.number().required('is Required').min(20).max(500).test('test', 'Minimum size for IOPS storage type is 100', (value, context) => {
         if (context.options?.context?.extraResources?.database?.storageType === 'io1' && value! < 100) {
             return false;
diff --git a/yarn.lock b/yarn.lock
index 52043e5..81762e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2101,12 +2101,19 @@
     "@types/create-react-class" "*"
     "@types/react" "*"
 
-"@types/react-dom@^17.0.25":
-  version "17.0.25"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
-  integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
+"@types/react-dom@^18.0.11":
+  version "18.2.19"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.19.tgz#b84b7c30c635a6c26c6a6dfbb599b2da9788be58"
+  integrity sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==
   dependencies:
-    "@types/react" "^17"
+    "@types/react" "*"
+
+"@types/react-mentions@^4.1.6":
+  version "4.1.13"
+  resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.13.tgz#293e56e14c502f6a73217fece0b870e54a0cc657"
+  integrity sha512-kRulAAjlmhCtsJ9bapO0foocknaE/rEuFKpmFEU81fBfnXZmZNBaJ9J/DBjwigT3WDHjQVUmYoi5sxEXrcdzAw==
+  dependencies:
+    "@types/react" "*"
 
 "@types/react-router-dom@^5.3.3":
   version "5.3.3"
@@ -2150,10 +2157,10 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@^17", "@types/react@^17.0.75":
-  version "17.0.75"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.75.tgz#cffbc76840a12fcadaf5a3cf14878bb06efcf73d"
-  integrity sha512-MSA+NzEzXnQKrqpO63CYqNstFjsESgvJAdAyyJ1n6ZQq/GLgf6nOfIKwk+Twuz0L1N6xPe+qz5xRCJrbhMaLsw==
+"@types/react@^18.0.38":
+  version "18.2.56"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.56.tgz#2d3e9021a0b6eb5bfc227761cc61b1c6dc6e0cd8"
+  integrity sha512-NpwHDMkS/EFZF2dONFQHgkPRwhvgq/OAvIaGQzxGSBmaeR++kTg6njr15Vatz0/2VcCEwJQFi6Jf4Q0qBu0rLA==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"