Revert signal for loadRule as there is no tests

elastic · May 12, 2022 · e8fa815 · e8fa815
1 parent a9e9704
commit e8fa815
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 28 deletions.
diff --git a/x-pack/plugins/observability/public/hooks/use_fetch_rule.ts b/x-pack/plugins/observability/public/hooks/use_fetch_rule.ts
@@ -22,39 +22,29 @@ export function useFetchRule({ ruleId, http }: FetchRuleProps) {
 
   const fetchRuleSummary = useCallback(async () => {
     try {
-      isCancelledRef.current = false;
-      abortCtrlRef.current.abort();
-      abortCtrlRef.current = new AbortController();
       const [rule, ruleTypes] = await Promise.all([
         loadRule({
           http,
           ruleId,
-          signal: abortCtrlRef.current.signal,
         }),
         loadRuleTypes({ http }),
       ]);
 
-      if (!isCancelledRef.current) {
-        const ruleType = ruleTypes.find((type) => type.id === rule.ruleTypeId);
-        setRuleSummary((oldState: FetchRule) => ({
-          ...oldState,
-          isRuleLoading: false,
-          rule,
-          ruleType,
-        }));
-      }
+      const ruleType = ruleTypes.find((type) => type.id === rule.ruleTypeId);
+      setRuleSummary((oldState: FetchRule) => ({
+        ...oldState,
+        isRuleLoading: false,
+        rule,
+        ruleType,
+      }));
     } catch (error) {
-      if (!isCancelledRef.current) {
-        if (error.name !== 'AbortError') {
-          setRuleSummary((oldState: FetchRule) => ({
-            ...oldState,
-            isRuleLoading: false,
-            errorRule: RULE_LOAD_ERROR(
-              error instanceof Error ? error.message : typeof error === 'string' ? error : ''
-            ),
-          }));
-        }
-      }
+      setRuleSummary((oldState: FetchRule) => ({
+        ...oldState,
+        isRuleLoading: false,
+        errorRule: RULE_LOAD_ERROR(
+          error instanceof Error ? error.message : typeof error === 'string' ? error : ''
+        ),
+      }));
     }
   }, [ruleId, http]);
   useEffect(() => {

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
@@ -12,16 +12,14 @@ import { transformRule } from './common_transformations';
 
 export async function loadRule({
   http,
-  signal,
+
   ruleId,
 }: {
   http: HttpSetup;
-  signal: AbortSignal;
   ruleId: string;
 }): Promise<Rule> {
   const res = await http.get<AsApiContract<Rule>>(
-    `${INTERNAL_BASE_ALERTING_API_PATH}/rule/${encodeURIComponent(ruleId)}`,
-    { signal }
+    `${INTERNAL_BASE_ALERTING_API_PATH}/rule/${encodeURIComponent(ruleId)}`
   );
   return transformRule(res);
 }