Merge branch 'main' into dependabot/go_modules/major-22882ceb3e

CMS-Enterprise · Nov 13, 2024 · 14e88c3 · 14e88c3
2 parents 4827461 + 73fa1f8
commit 14e88c3
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 126 deletions.
diff --git a/package.json b/package.json
@@ -3,14 +3,14 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@apollo/client": "^3.11.8",
+    "@apollo/client": "^3.11.9",
     "@babel/plugin-syntax-class-properties": "^7.12.13",
     "@json2csv/formatters": "^7.0.6",
     "@json2csv/plainjs": "^7.0.6",
     "@json2csv/transforms": "^7.0.6",
     "@okta/okta-auth-js": "^6.1.0",
     "@okta/okta-react": "^6.9.0",
-    "@okta/okta-signin-widget": "^7.25.0",
+    "@okta/okta-signin-widget": "^7.25.1",
     "@tiptap/core": "^2.9.1",
     "@tiptap/extension-character-count": "^2.9.1",
     "@tiptap/extension-document": "^2.9.1",
@@ -52,10 +52,10 @@
     "formik": "^2.4.6",
     "graphql": "^15.8.0",
     "html-react-parser": "^5.1.18",
-    "i18next": "^23.16.4",
+    "i18next": "^23.16.5",
     "i18next-browser-languagedetector": "^5.0.0",
     "istanbul-lib-coverage": "^3.2.2",
-    "launchdarkly-react-client-sdk": "^3.5.0",
+    "launchdarkly-react-client-sdk": "^3.6.0",
     "lodash": "^4.17.21",
     "luxon": "^3.5.0",
     "no-scroll": "^2.1.1",
@@ -64,14 +64,14 @@
     "react-autosuggest": "^10.1.0",
     "react-dom": "^18.3.1",
     "react-ga4": "^2.1.0",
-    "react-hook-form": "^7.53.0",
+    "react-hook-form": "^7.53.2",
     "react-i18next": "^13.4.1",
     "react-idle-timer": "^5.7.2",
     "react-media": "^1.10.0",
     "react-modal": "^3.16.1",
     "react-redux": "^7.1.1",
     "react-router-dom": "^5.1.2",
-    "react-select": "^5.8.2",
+    "react-select": "^5.8.3",
     "react-table": "^7.8.0",
     "react-to-print": "^2.15.1",
     "redux": "^4.0.4",
@@ -130,7 +130,7 @@
   "devDependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
-    "@cypress/code-coverage": "^3.13.5",
+    "@cypress/code-coverage": "^3.13.6",
     "@cypress/webpack-preprocessor": "^6.0.1",
     "@graphql-codegen/cli": "5.0.3",
     "@graphql-codegen/client-preset": "^4.5.0",
@@ -154,7 +154,7 @@
     "apollo-link-error": "^1.1.13",
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",
-    "cypress": "^13.15.1",
+    "cypress": "^13.15.2",
     "cypress-otp": "^1.0.3",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^18.0.1",

diff --git a/src/components/MultiSelect/index.tsx b/src/components/MultiSelect/index.tsx
@@ -295,7 +295,7 @@ const MultiSelect = ({
         hideSelectedOptions={false}
         closeMenuOnSelect={false}
         tabSelectsValue={false}
-        onChange={selectedOptions => {
+        onChange={(selectedOptions: MultiSelectOptionProps[]) => {
           setSelected(selectedOptions);
           onChange(selectedOptions.map(option => option.value));
         }}

diff --git a/src/components/OktaUserSelect/index.tsx b/src/components/OktaUserSelect/index.tsx
@@ -324,8 +324,13 @@ export default function OktaUserSelect({
           : undefined
       }
       value={value ? { value, label: formatLabel(value) } : undefined}
-      onChange={item => updateContact(item?.value || null)}
-      onInputChange={(newValue, { action }) => {
+      onChange={(item: OktaUserSelectOption) =>
+        updateContact(item?.value || null)
+      }
+      onInputChange={(
+        newValue: string | undefined,
+        { action }: { action: string }
+      ) => {
         if (action !== 'input-blur' && action !== 'menu-close') {
           // If user selected a value, no need to query and debounce again
           if (action === 'set-value') {

diff --git a/src/components/OktaUserSelect/multiSelect.tsx b/src/components/OktaUserSelect/multiSelect.tsx
@@ -105,7 +105,10 @@ const OktaMultiSelect = ({
             email: contact.email
           })
         )}
-        onInputChange={(newValue, { action }) => {
+        onInputChange={(
+          newValue: string | undefined,
+          { action }: { action: string }
+        ) => {
           if (action !== 'input-blur' && action !== 'menu-close') {
             // If user selected a value, no need to query and debounce again
             if (action !== 'set-value') {
@@ -122,11 +125,8 @@ const OktaMultiSelect = ({
         hideSelectedOptions={false}
         closeMenuOnSelect={false}
         tabSelectsValue={false}
-        onChange={selectedOptions => {
-          // TODO: Figure out what's happening with typescript here
-          // @ts-ignore
+        onChange={(selectedOptions: MultiSelectOptionProps[]) => {
           setSelected(selectedOptions);
-          // @ts-ignore
           onChange(selectedOptions.map(option => option.value));
         }}
         value={selected}