Fix alert edit page

Author: copyhold

public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx

@@ -39,8 +39,7 @@ import { RuleEditorSection } from '../RuleEditorSection';
 import { errorFromCurrentCondition, errorFromPreviewData, findRenamedDataQueryReferences, refIdExists } from '../util';
 
 import { CloudDataSourceSelector } from './CloudDataSourceSelector';
-// LOGZ.IO CHANGE :: DEV-46521 remove rule type switch
-// import { SmartAlertTypeDetector } from './SmartAlertTypeDetector';
+import { SmartAlertTypeDetector } from './SmartAlertTypeDetector';
 import { DESCRIPTIONS } from './descriptions';
 import {
   addExpressions,
@@ -372,12 +371,6 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
     condition,
   ]);
 
-  // LOGZ.IO CHANGE :: DEV-46521 remove rule type switch. need this useless call
-  // in order to mitigate the not-in-use error
-  useEffect(() => {
-    onClickSwitch();
-  }, [onClickSwitch]);
-
   const { sectionTitle, helpLabel, helpContent, helpLink } = DESCRIPTIONS[type ?? RuleFormType.grafana];
 
   return (
@@ -438,14 +431,12 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
               }}
             />
           </Field>
-          {/* 
-          // LOGZ.IO CHANGE :: DEV-46521 remove rule type switch
           <SmartAlertTypeDetector
             editingExistingRule={editingExistingRule}
             queries={queries}
             rulesSourcesWithRuler={rulesSourcesWithRuler}
             onClickSwitch={onClickSwitch}
-          /> */}
+          />
         </Stack>
       )}
 
@@ -477,14 +468,18 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
               Add query
             </Button>
           </Tooltip>
-          {/* 
-          // LOGZ.IO CHANGE :: DEV-46521 remove rule type switch
           <SmartAlertTypeDetector
             editingExistingRule={editingExistingRule}
             rulesSourcesWithRuler={rulesSourcesWithRuler}
             queries={queries}
             onClickSwitch={onClickSwitch}
-          /> */}
+            />
+          <SmartAlertTypeDetector
+            editingExistingRule={editingExistingRule}
+            rulesSourcesWithRuler={rulesSourcesWithRuler}
+            queries={queries}
+            onClickSwitch={onClickSwitch}
+          />
           {/* Expression Queries */}
           <Stack direction="column" gap={0}>
             <Text element="h5">Expressions</Text>

public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/SmartAlertTypeDetector.tsx

@@ -93,6 +93,8 @@ export function SmartAlertTypeDetector({
   // if we can't switch to data-source managed, disable it
   // TODO figure out how to show a popover to the user to indicate _why_ it's disabled
   const disabledOptions = canSwitch ? [] : [RuleFormType.cloudAlerting];
+  
+  return null;
 
   return (
     <Stack direction="column" gap={1} alignItems="flex-start">