Fix types from other plugins

elastic · Jun 29, 2023 · b50a3e0 · b50a3e0
1 parent b070bd9
commit b50a3e0
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 8 deletions.
diff --git a/..._solution/server/lib/detection_engine/rule_management/logic/export/get_export_all.test.ts b/..._solution/server/lib/detection_engine/rule_management/logic/export/get_export_all.test.ts
@@ -39,6 +39,7 @@ const connectors = [
     config: {},
     isPreconfigured: false,
     isDeprecated: false,
+    isSystemAction: false,
     referencedByCount: 1,
   },
   {
@@ -47,6 +48,7 @@ const connectors = [
     name: 'Email (preconfigured)',
     config: {},
     isPreconfigured: true,
+    isSystemAction: false,
     isDeprecated: false,
     referencedByCount: 1,
   },

diff --git a/...server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.test.ts b/...server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.test.ts
@@ -38,6 +38,7 @@ const connectors = [
     config: {},
     isPreconfigured: false,
     isDeprecated: false,
+    isSystemAction: false,
     referencedByCount: 1,
   },
   {
@@ -47,6 +48,7 @@ const connectors = [
     config: {},
     isPreconfigured: true,
     isDeprecated: false,
+    isSystemAction: false,
     referencedByCount: 1,
   },
 ];

diff --git a/...gine/rule_management/logic/import/action_connectors/import_rule_action_connectors.test.ts b/...gine/rule_management/logic/import/action_connectors/import_rule_action_connectors.test.ts
@@ -317,6 +317,7 @@ describe('importRuleActionConnectors', () => {
         id: 'cabc78e0-9031-11ed-b076-53cc4d57aaf1',
         referencedByCount: 1,
         isDeprecated: false,
+        isSystemAction: false,
       },
     ]);
     const actionsImporter2 = core.savedObjects.getImporter;
@@ -358,6 +359,7 @@ describe('importRuleActionConnectors', () => {
         id: 'cabc78e0-9031-11ed-b076-53cc4d57aaf1',
         referencedByCount: 1,
         isDeprecated: false,
+        isSystemAction: false,
       },
     ]);
 

diff --git a/...plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts b/...plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
@@ -874,6 +874,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
       ]);
       const [errors, output] = await getInvalidConnectors(rules, clients.actionsClient);
@@ -918,6 +919,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
         {
           id: '789',
@@ -926,6 +928,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
       ]);
       const [errors, output] = await getInvalidConnectors(rules, clients.actionsClient);
@@ -976,6 +979,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
         {
           id: '789',
@@ -984,6 +988,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
       ]);
       const [errors, output] = await getInvalidConnectors(rules, clients.actionsClient);
@@ -1041,6 +1046,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
         {
           id: '789',
@@ -1049,6 +1055,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
       ]);
       const [errors, output] = await getInvalidConnectors(rules, clients.actionsClient);
@@ -1108,6 +1115,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
         {
           id: '789',
@@ -1116,6 +1124,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
       ]);
       const [errors, output] = await getInvalidConnectors(rules, clients.actionsClient);
@@ -1216,6 +1225,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
         {
           id: '789',
@@ -1224,6 +1234,7 @@ describe('utils', () => {
           name: 'name',
           isPreconfigured: false,
           isDeprecated: false,
+          isSystemAction: false,
         },
       ]);
       const [errors, output] = await getInvalidConnectors(rules, clients.actionsClient);

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/es_index/es_index_params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/es_index/es_index_params.test.tsx
@@ -33,6 +33,7 @@ const actionConnector = {
   },
   id: 'es index connector',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
   name: 'test name',
   secrets: {},
@@ -45,6 +46,7 @@ const preconfiguredActionConnector = {
   },
   id: AlertHistoryEsIndexConnectorId,
   isPreconfigured: true,
+  isSystemAction: false as const,
   isDeprecated: false,
   name: 'Alert history Elasticsearch index',
   secrets: {},

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/gen_ai/params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/gen_ai/params.test.tsx
@@ -65,6 +65,7 @@ describe('Gen AI Params Fields renders', () => {
         id: 'test',
         actionTypeId: '.gen-ai',
         isPreconfigured: false,
+        isSystemAction: false as const,
         isDeprecated: false,
         name: 'My GenAI Connector',
         config: {

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/jira/jira_params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/jira/jira_params.test.tsx
@@ -50,6 +50,7 @@ const connector: ActionConnector = {
   name: 'Test',
   isPreconfigured: false,
   isDeprecated: false,
+  isSystemAction: false as const,
 };
 const editAction = jest.fn();
 const defaultProps = {

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/helpers.test.ts b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/helpers.test.ts
@@ -23,6 +23,7 @@ const deprecatedConnector: ActionConnector = {
   name: 'Test',
   isPreconfigured: false,
   isDeprecated: true,
+  isSystemAction: false as const,
 };
 
 const validConnector = {

diff --git a/.../plugins/stack_connectors/public/connector_types/lib/servicenow/servicenow_connectors.tsx b/.../plugins/stack_connectors/public/connector_types/lib/servicenow/servicenow_connectors.tsx
@@ -131,6 +131,7 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps> = ({
           ...connectorToUpdate,
           isDeprecated,
           isPreconfigured: false,
+          isSystemAction: false,
           actionTypeId,
         });
 

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_choices.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/lib/servicenow/use_choices.test.tsx
@@ -27,6 +27,7 @@ const actionConnector = {
   actionTypeId: '.servicenow',
   name: 'ServiceNow ITSM',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
   config: {
     apiUrl: 'https://dev94428.service-now.com/',

diff --git a/...k/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_choices.test.tsx b/...k/plugins/stack_connectors/public/connector_types/lib/servicenow/use_get_choices.test.tsx
@@ -28,6 +28,7 @@ const actionConnector = {
   actionTypeId: '.servicenow',
   name: 'ServiceNow ITSM',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
   config: {
     apiUrl: 'https://dev94428.service-now.com/',

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/opsgenie/params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/opsgenie/params.test.tsx
@@ -45,6 +45,7 @@ describe('OpsgenieParamFields', () => {
     actionTypeId: '.test',
     name: 'Test',
     isPreconfigured: false,
+    isSystemAction: false as const,
     isDeprecated: false,
   };
 

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/resilient/resilient_params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/resilient/resilient_params.test.tsx
@@ -39,6 +39,7 @@ const connector = {
   actionTypeId: '.test',
   name: 'Test',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
 };
 

diff --git a/...s/stack_connectors/public/connector_types/servicenow_itom/servicenow_itom_params.test.tsx b/...s/stack_connectors/public/connector_types/servicenow_itom/servicenow_itom_params.test.tsx
@@ -41,6 +41,7 @@ const connector: ActionConnector = {
   actionTypeId: '.test',
   name: 'Test',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
 };
 

diff --git a/...s/stack_connectors/public/connector_types/servicenow_itsm/servicenow_itsm_params.test.tsx b/...s/stack_connectors/public/connector_types/servicenow_itsm/servicenow_itsm_params.test.tsx
@@ -46,6 +46,7 @@ const connector: ActionConnector = {
   actionTypeId: '.test',
   name: 'Test',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
 };
 

diff --git a/...ins/stack_connectors/public/connector_types/servicenow_sir/servicenow_sir_params.test.tsx b/...ins/stack_connectors/public/connector_types/servicenow_sir/servicenow_sir_params.test.tsx
@@ -48,6 +48,7 @@ const connector: ActionConnector = {
   actionTypeId: '.test',
   name: 'Test',
   isPreconfigured: false,
+  isSystemAction: false as const,
   isDeprecated: false,
 };
 

diff --git a/x-pack/plugins/stack_connectors/public/connector_types/swimlane/swimlane_params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/swimlane/swimlane_params.test.tsx
@@ -36,6 +36,7 @@ describe('SwimlaneParamsFields renders', () => {
     actionTypeId: '.test',
     name: 'Test',
     isPreconfigured: false,
+    isSystemAction: false as const,
     isDeprecated: false,
   };
 

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/settings/api.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/settings/api.ts
@@ -61,6 +61,7 @@ export const fetchConnectors = async (): Promise<ActionConnector[]> => {
       is_preconfigured: isPreconfigured,
       is_deprecated: isDeprecated,
       is_missing_secrets: isMissingSecrets,
+      is_system_action: isSystemAction,
       ...res
     }) => ({
       ...res,
@@ -69,6 +70,7 @@ export const fetchConnectors = async (): Promise<ActionConnector[]> => {
       isDeprecated,
       isPreconfigured,
       isMissingSecrets,
+      isSystemAction,
     })
   );
 };

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
@@ -41,5 +41,6 @@ export async function loadAllActions({ http }: { http: HttpSetup }): Promise<Act
   const res = await http.get<Parameters<typeof rewriteResponseRes>[0]>(
     `${BASE_ACTION_API_PATH}/connectors`
   );
-  return rewriteResponseRes(res);
+
+  return rewriteResponseRes(res) as ActionConnector[];
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
@@ -49,5 +49,5 @@ export async function createActionConnector({
     `${BASE_ACTION_API_PATH}/connector`,
     { body: JSON.stringify(rewriteBodyRequest(connector)) }
   );
-  return rewriteBodyRes(res);
+  return rewriteBodyRes(res) as ActionConnector;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
@@ -51,5 +51,5 @@ export async function updateActionConnector({
     }
   );
 
-  return rewriteBodyRes(res);
+  return rewriteBodyRes(res) as ActionConnector;
 }
diff --git a/...rs_actions_ui/public/application/sections/action_connector_form/action_type_form.test.tsx b/...rs_actions_ui/public/application/sections/action_connector_form/action_type_form.test.tsx
@@ -556,7 +556,7 @@ function getActionTypeForm({
     id: 'test',
     isPreconfigured: false,
     isDeprecated: false,
-    isSystemAction: false,
+    isSystemAction: false as const,
     name: 'test name',
     secrets: {},
   };
@@ -580,7 +580,7 @@ function getActionTypeForm({
       id: 'test',
       isPreconfigured: false,
       isDeprecated: false,
-      isSystemAction: false,
+      isSystemAction: false as const,
       name: 'test name',
       secrets: {},
     },
@@ -590,7 +590,7 @@ function getActionTypeForm({
       actionTypeId: '.server-log',
       isPreconfigured: false,
       isDeprecated: false,
-      isSystemAction: false,
+      isSystemAction: false as const,
       config: {},
       secrets: {},
     },

diff --git a/...ctions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx b/...ctions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
@@ -69,7 +69,7 @@ describe('connectors_selection', () => {
       id: 'testId',
       isPreconfigured: false,
       isDeprecated: false,
-      isSystemAction: false,
+      isSystemAction: false as const,
       name: 'test pagerduty',
       secrets: {},
     },

diff --git a/...ions_ui/public/application/sections/action_connector_form/edit_connector_flyout/index.tsx b/...ions_ui/public/application/sections/action_connector_form/edit_connector_flyout/index.tsx
@@ -260,7 +260,7 @@ const EditConnectorFlyoutComponent: React.FC<EditConnectorFlyoutProps> = ({
         />
         <EuiFlyoutBody>
           {selectedTab === EditConnectorTabs.Configuration ? (
-            !connector.isPreconfigured ? (
+            !connector.isPreconfigured && !connector.isSystemAction ? (
               <>
                 {isEdit && (
                   <>

diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -287,17 +287,25 @@ export type PreConfiguredActionConnector = Omit<
   'config' | 'secrets'
 > & {
   isPreconfigured: true;
+  isSystemAction: false;
 };
 
 export type UserConfiguredActionConnector<Config, Secrets> = ActionConnectorProps<
   Config,
   Secrets
 > & {
   isPreconfigured: false;
+  isSystemAction: false;
+};
+
+export type SystemAction = Omit<ActionConnectorProps<never, never>, 'config' | 'secrets'> & {
+  isSystemAction: true;
+  isPreconfigured: false;
 };
 
 export type ActionConnector<Config = Record<string, unknown>, Secrets = Record<string, unknown>> =
   | PreConfiguredActionConnector
+  | SystemAction
   | UserConfiguredActionConnector<Config, Secrets>;
 
 export type ActionConnectorWithoutId<

diff --git a/x-pack/plugins/uptime/public/legacy_uptime/state/api/alerts.ts b/x-pack/plugins/uptime/public/legacy_uptime/state/api/alerts.ts
@@ -38,6 +38,7 @@ export const fetchConnectors = async (): Promise<ActionConnector[]> => {
       is_preconfigured: isPreconfigured,
       is_deprecated: isDeprecated,
       is_missing_secrets: isMissingSecrets,
+      is_system_action: isSystemAction,
       ...res
     }) => ({
       ...res,
@@ -46,6 +47,7 @@ export const fetchConnectors = async (): Promise<ActionConnector[]> => {
       isDeprecated,
       isPreconfigured,
       isMissingSecrets,
+      isSystemAction,
     })
   );
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,5 +51,5 @@ export async function updateActionConnector({ @@
         }
       );
-      return rewriteBodyRes(res);
+      return rewriteBodyRes(res) as ActionConnector;
     }