Bump immer, redux and @reduxjs/toolkit (#110962) (#114341)

Co-authored-by: Xavier Mouligneau <189600+XavierM@users.noreply.github.com> Co-authored-by: Thomas Watson <w@tson.dk> Co-authored-by: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
elastic · Oct 14, 2021 · 923aa4e · 923aa4e
1 parent 18fc38e
commit 923aa4e
Show file tree

Hide file tree

Showing 24 changed files with 143 additions and 126 deletions.
diff --git a/package.json b/package.json
@@ -168,7 +168,7 @@
     "@mapbox/mapbox-gl-draw": "1.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
     "@mapbox/vector-tile": "1.3.1",
-    "@reduxjs/toolkit": "^1.5.1",
+    "@reduxjs/toolkit": "^1.6.1",
     "@slack/webhook": "^5.0.4",
     "@turf/along": "6.0.1",
     "@turf/area": "6.0.1",
@@ -252,7 +252,7 @@
     "i18n-iso-countries": "^4.3.1",
     "icalendar": "0.7.1",
     "idx": "^2.5.6",
-    "immer": "^8.0.1",
+    "immer": "^9.0.6",
     "inline-style": "^2.0.0",
     "intl": "^1.2.5",
     "intl-format-cache": "^2.1.0",
@@ -361,7 +361,7 @@
     "reactcss": "1.2.3",
     "recompose": "^0.26.0",
     "reduce-reducers": "^1.0.4",
-    "redux": "^4.0.5",
+    "redux": "^4.1.0",
     "redux-actions": "^2.6.5",
     "redux-devtools-extension": "^2.13.8",
     "redux-logger": "^3.0.6",

diff --git a/x-pack/plugins/canvas/types/state.ts b/x-pack/plugins/canvas/types/state.ts
@@ -7,10 +7,10 @@
 
 import { KibanaContext } from 'src/plugins/data/common';
 import {
+  AnyExpressionFunctionDefinition,
   Datatable,
   ExpressionValueFilter,
   ExpressionImage,
-  ExpressionFunction,
   PointSeries,
   Render,
   Style,
@@ -34,7 +34,7 @@ export interface AppState {
 
 interface StoreAppState {
   basePath: string;
-  serverFunctions: ExpressionFunction[];
+  serverFunctions: AnyExpressionFunctionDefinition[];
   ready: boolean;
 }
 

diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC, useCallback } from 'react';
-import { DeepPartial } from '@reduxjs/toolkit';
+import { PreloadedState } from '@reduxjs/toolkit';
 import { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { HashRouter, Route, RouteComponentProps, Switch } from 'react-router-dom';
@@ -192,7 +192,7 @@ export async function mountApp(
   const emptyState = getPreloadedState(storeDeps) as LensAppState;
   const lensStore: LensRootStore = makeConfigureStore(storeDeps, {
     lens: emptyState,
-  } as DeepPartial<LensState>);
+  } as PreloadedState<LensState>);
 
   const EditorRenderer = React.memo(
     (props: { id?: string; history: History<unknown>; editByValue?: boolean }) => {

diff --git a/x-pack/plugins/lens/public/mocks.tsx b/x-pack/plugins/lens/public/mocks.tsx
@@ -16,7 +16,7 @@ import moment from 'moment';
 import { Provider } from 'react-redux';
 import { act } from 'react-dom/test-utils';
 import { ReactExpressionRendererProps } from 'src/plugins/expressions/public';
-import { DeepPartial } from '@reduxjs/toolkit';
+import { PreloadedState } from '@reduxjs/toolkit';
 import { LensPublicStart } from '.';
 import { visualizationTypes } from './xy_visualization/types';
 import { navigationPluginMock } from '../../../../src/plugins/navigation/public/mocks';
@@ -479,7 +479,7 @@ export function makeLensStore({
       resolvedDateRange: getResolvedDateRange(data.query.timefilter.timefilter),
       ...preloadedState,
     },
-  } as DeepPartial<LensState>);
+  } as PreloadedState<LensState>);
 
   const origDispatch = store.dispatch;
   store.dispatch = jest.fn(dispatch || origDispatch);

diff --git a/x-pack/plugins/lens/public/state_management/index.ts b/x-pack/plugins/lens/public/state_management/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { configureStore, getDefaultMiddleware, DeepPartial } from '@reduxjs/toolkit';
+import { configureStore, getDefaultMiddleware, PreloadedState } from '@reduxjs/toolkit';
 import { createLogger } from 'redux-logger';
 import { useDispatch, useSelector, TypedUseSelectorHook } from 'react-redux';
 import { makeLensReducer, lensActions } from './lens_slice';
@@ -36,7 +36,7 @@ export const {
 
 export const makeConfigureStore = (
   storeDeps: LensStoreDeps,
-  preloadedState: DeepPartial<LensState>
+  preloadedState: PreloadedState<LensState>
 ) => {
   const middleware = [
     ...getDefaultMiddleware({

diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
diff --git a/...ugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx b/...ugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
@@ -148,14 +148,13 @@ export const OsqueryManagedPolicyCreateImportExtension = React.memo<
   // }, [editMode, replace]);
 
   const scheduledQueryGroupTableData = useMemo(() => {
-    const policyWithoutEmptyQueries = produce<
-      NewPackagePolicy,
-      OsqueryManagerPackagePolicy,
-      OsqueryManagerPackagePolicy
-    >(newPolicy, (draft) => {
-      draft.inputs[0].streams = filter(['compiled_stream.id', null], draft.inputs[0].streams);
-      return draft;
-    });
+    const policyWithoutEmptyQueries = produce<NewPackagePolicy, OsqueryManagerPackagePolicy>(
+      newPolicy,
+      (draft) => {
+        draft.inputs[0].streams = filter(['compiled_stream.id', null], draft.inputs[0].streams);
+        return draft;
+      }
+    );
 
     return policyWithoutEmptyQueries;
   }, [newPolicy]);
@@ -198,6 +197,7 @@ export const OsqueryManagedPolicyCreateImportExtension = React.memo<
         <EuiFlexGroup>
           <EuiFlexItem>
             <ScheduledQueryGroupQueriesTable
+              // @ts-expect-error update
               data={scheduledQueryGroupTableData.inputs[0].streams}
             />
           </EuiFlexItem>

diff --git a/x-pack/plugins/osquery/public/packs/common/pack_queries_field.tsx b/x-pack/plugins/osquery/public/packs/common/pack_queries_field.tsx
@@ -44,6 +44,7 @@ const PackQueriesFieldComponent = ({ field }) => {
     (newQuery) =>
       setValue(
         produce((draft) => {
+          // @ts-expect-error update
           draft.push({
             interval: newQuery.interval,
             query: newQuery.query.attributes.query,
@@ -56,6 +57,7 @@ const PackQueriesFieldComponent = ({ field }) => {
   );
 
   const handleRemoveQuery = useCallback(
+    // @ts-expect-error update
     (query) => setValue(produce((draft) => reject(['id', query.id], draft))),
     [setValue]
   );

diff --git a/x-pack/plugins/osquery/public/scheduled_query_groups/form/queries_field.tsx b/x-pack/plugins/osquery/public/scheduled_query_groups/form/queries_field.tsx
@@ -138,33 +138,42 @@ const QueriesFieldComponent: React.FC<QueriesFieldProps> = ({
         if (showEditQueryFlyout >= 0) {
           setValue(
             produce((draft) => {
+              // @ts-expect-error update
               draft[0].streams[showEditQueryFlyout].vars.id.value = updatedQuery.id;
+              // @ts-expect-error update
               draft[0].streams[showEditQueryFlyout].vars.interval.value = updatedQuery.interval;
+              // @ts-expect-error update
               draft[0].streams[showEditQueryFlyout].vars.query.value = updatedQuery.query;
 
               if (updatedQuery.platform?.length) {
+                // @ts-expect-error update
                 draft[0].streams[showEditQueryFlyout].vars.platform = {
                   type: 'text',
                   value: updatedQuery.platform,
                 };
               } else {
+                // @ts-expect-error update
                 delete draft[0].streams[showEditQueryFlyout].vars.platform;
               }
 
               if (updatedQuery.version?.length) {
+                // @ts-expect-error update
                 draft[0].streams[showEditQueryFlyout].vars.version = {
                   type: 'text',
                   value: updatedQuery.version,
                 };
               } else {
+                // @ts-expect-error update
                 delete draft[0].streams[showEditQueryFlyout].vars.version;
               }
 
               if (updatedQuery.ecs_mapping) {
+                // @ts-expect-error update
                 draft[0].streams[showEditQueryFlyout].vars.ecs_mapping = {
                   value: updatedQuery.ecs_mapping,
                 };
               } else {
+                // @ts-expect-error update
                 delete draft[0].streams[showEditQueryFlyout].vars.ecs_mapping;
               }
 
@@ -185,6 +194,7 @@ const QueriesFieldComponent: React.FC<QueriesFieldProps> = ({
         setValue(
           produce((draft) => {
             draft[0].streams.push(
+              // @ts-expect-error update
               getNewStream({
                 ...newQuery,
                 scheduledQueryGroupId,
@@ -221,6 +231,7 @@ const QueriesFieldComponent: React.FC<QueriesFieldProps> = ({
         produce((draft) => {
           forEach(parsedContent.queries, (newQuery, newQueryId) => {
             draft[0].streams.push(
+              // @ts-expect-error update
               getNewStream({
                 id: isOsqueryPackSupported ? newQueryId : `pack_${packName}_${newQueryId}`,
                 interval: newQuery.interval ?? parsedContent.interval,

diff --git a/x-pack/plugins/osquery/public/scheduled_query_groups/queries/ecs_mapping_editor_field.tsx b/x-pack/plugins/osquery/public/scheduled_query_groups/queries/ecs_mapping_editor_field.tsx
@@ -317,7 +317,7 @@ export interface ECSMappingEditorFieldRef {
 }
 
 export interface ECSMappingEditorFieldProps {
-  field: FieldHook<string>;
+  field: FieldHook<Record<string, unknown>>;
   query: string;
   fieldRef: MutableRefObject<ECSMappingEditorFieldRef>;
 }

diff --git a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
@@ -5,10 +5,14 @@
  * 2.0.
  */
 
-import { IFieldSubType } from '@kbn/es-query';
-import type { IIndexPattern } from 'src/plugins/data/public';
-import { IEsSearchRequest, IEsSearchResponse } from '../../../../../../src/plugins/data/common';
-import { DocValueFields, Maybe } from '../common';
+import type { IFieldSubType } from '@kbn/es-query';
+
+import type {
+  IEsSearchRequest,
+  IEsSearchResponse,
+  IIndexPattern,
+} from '../../../../../../src/plugins/data/common';
+import type { DocValueFields, Maybe } from '../common';
 
 interface FieldInfo {
   category: string;
@@ -66,12 +70,7 @@ export interface BrowserField {
   name: string;
   searchable: boolean;
   type: string;
-  subType?: {
-    [key: string]: unknown;
-    nested?: {
-      path: string;
-    };
-  };
+  subType?: IFieldSubType;
 }
 
 export type BrowserFields = Readonly<Record<string, Partial<BrowserField>>>;

diff --git a/x-pack/plugins/security_solution/public/app/types.ts b/x-pack/plugins/security_solution/public/app/types.ts
@@ -12,7 +12,6 @@ import {
   Action,
   Store,
   Dispatch,
-  PreloadedState,
   StateFromReducersMapObject,
   CombinedState,
 } from 'redux';
@@ -39,7 +38,7 @@ import { TimelineState } from '../timelines/store/timeline/types';
 export { SecurityPageName } from '../../common/constants';
 
 export interface SecuritySubPluginStore<K extends SecuritySubPluginKeyStore, T> {
-  initialState: Record<K, T | undefined>;
+  initialState: Record<K, T>;
   reducer: Record<K, Reducer<T, AnyAction>>;
   middleware?: Array<Middleware<{}, State, Dispatch<AppAction | Immutable<AppAction>>>>;
 }
@@ -70,14 +69,12 @@ export interface SecuritySubPluginWithStore<K extends SecuritySubPluginKeyStore,
 
 export interface SecuritySubPlugins extends SecuritySubPlugin {
   store: {
-    initialState: PreloadedState<
-      CombinedState<
-        StateFromReducersMapObject<
-          /** SubPluginsInitReducer, being an interface, will not work in `StateFromReducersMapObject`.
-           * Picking its keys does the trick.
-           **/
-          Pick<SubPluginsInitReducer, keyof SubPluginsInitReducer>
-        >
+    initialState: CombinedState<
+      StateFromReducersMapObject<
+        /** SubPluginsInitReducer, being an interface, will not work in `StateFromReducersMapObject`.
+         * Picking its keys does the trick.
+         **/
+        Pick<SubPluginsInitReducer, keyof SubPluginsInitReducer>
       >
     >;
     reducer: SubPluginsInitReducer;