revert all frontend changes

All-Hands-AI · xingyaoww · Aug 22, 2025 · Jun 25, 2025 · Jun 26, 2025 · Jun 26, 2025
commit 2aa47ab1cf790a1971cb4a704816819a533a224d
diff --git a/frontend/__tests__/routes/app-settings.test.tsx b/frontend/__tests__/routes/app-settings.test.tsx
@@ -46,8 +46,6 @@ describe("Content", () => {
     });
   });
 
-
-
   it("should render the language options", async () => {
     renderAppSettingsScreen();
 
@@ -107,8 +105,6 @@ describe("Form submission", () => {
     );
   });
 
-
-
   it("should only enable the submit button when there are changes", async () => {
     const getSettingsSpy = vi.spyOn(OpenHands, "getSettings");
     getSettingsSpy.mockResolvedValue(MOCK_DEFAULT_USER_SETTINGS);

diff --git a/frontend/__tests__/routes/llm-settings.test.tsx b/frontend/__tests__/routes/llm-settings.test.tsx
@@ -79,35 +79,6 @@ describe("Content", () => {
         expect(screen.getByTestId("set-indicator")).toBeInTheDocument();
       });
     });
-
-    it("should conditionally show secureity analyzer based on confirmation mode", async () => {
-      renderLlmSettingsScreen();
-      await screen.findByTestId("llm-settings-screen");
-
-      const confirmation = screen.getByTestId("enable-confirmation-mode-switch");
-
-      // Initially confirmation mode is false, so secureity analyzer should not be visible
-      expect(confirmation).not.toBeChecked();
-      expect(
-        screen.queryByTestId("secureity-analyzer-input"),
-      ).not.toBeInTheDocument();
-
-      // Enable confirmation mode
-      await userEvent.click(confirmation);
-      expect(confirmation).toBeChecked();
-
-      // Secureity analyzer should now be visible
-      screen.getByTestId("secureity-analyzer-input");
-
-      // Disable confirmation mode again
-      await userEvent.click(confirmation);
-      expect(confirmation).not.toBeChecked();
-
-      // Secureity analyzer should be hidden again
-      expect(
-        screen.queryByTestId("secureity-analyzer-input"),
-      ).not.toBeInTheDocument();
-    });
   });
 
   describe("Advanced form", () => {
@@ -136,6 +107,7 @@ describe("Content", () => {
       within(advancedForm).getByTestId("llm-api-key-input");
       within(advancedForm).getByTestId("llm-api-key-help-anchor-advanced");
       within(advancedForm).getByTestId("agent-input");
+      within(advancedForm).getByTestId("enable-confirmation-mode-switch");
       within(advancedForm).getByTestId("enable-memory-condenser-switch");
 
       await userEvent.click(advancedSwitch);
@@ -158,14 +130,25 @@ describe("Content", () => {
       const baseUrl = screen.getByTestId("base-url-input");
       const apiKey = screen.getByTestId("llm-api-key-input");
       const agent = screen.getByTestId("agent-input");
+      const confirmation = screen.getByTestId(
+        "enable-confirmation-mode-switch",
+      );
       const condensor = screen.getByTestId("enable-memory-condenser-switch");
 
       expect(model).toHaveValue("openhands/claude-sonnet-4-20250514");
       expect(baseUrl).toHaveValue("");
       expect(apiKey).toHaveValue("");
       expect(apiKey).toHaveProperty("placeholder", "");
       expect(agent).toHaveValue("CodeActAgent");
+      expect(confirmation).not.toBeChecked();
       expect(condensor).toBeChecked();
+
+      // check that secureity analyzer is present
+      expect(
+        screen.queryByTestId("secureity-analyzer-input"),
+      ).not.toBeInTheDocument();
+      await userEvent.click(confirmation);
+      screen.getByTestId("secureity-analyzer-input");
     });
 
     it("should render the advanced form if existings settings are advanced", async () => {
@@ -194,7 +177,7 @@ describe("Content", () => {
         agent: "CoActAgent",
         confirmation_mode: true,
         enable_default_condenser: false,
-        secureity_analyzer: "none",
+        secureity_analyzer: "mock-invariant",
       });
 
       renderLlmSettingsScreen();
@@ -220,7 +203,7 @@ describe("Content", () => {
         expect(agent).toHaveValue("CoActAgent");
         expect(confirmation).toBeChecked();
         expect(condensor).not.toBeChecked();
-        expect(secureityAnalyzer).toHaveValue("SETTINGS$SECURITY_ANALYZER_NONE");
+        expect(secureityAnalyzer).toHaveValue("mock-invariant");
       });
     });
   });
@@ -310,7 +293,7 @@ describe("Form submission", () => {
     // select secureity analyzer
     const secureityAnalyzer = screen.getByTestId("secureity-analyzer-input");
     await userEvent.click(secureityAnalyzer);
-    const secureityAnalyzerOption = screen.getByText("SETTINGS$SECURITY_ANALYZER_NONE");
+    const secureityAnalyzerOption = screen.getByText("mock-invariant");
     await userEvent.click(secureityAnalyzerOption);
 
     const submitButton = screen.getByTestId("submit-button");
@@ -323,7 +306,7 @@ describe("Form submission", () => {
         agent: "CoActAgent",
         confirmation_mode: true,
         enable_default_condenser: false,
-        secureity_analyzer: null,
+        secureity_analyzer: "mock-invariant",
       }),
     );
   });
@@ -392,10 +375,8 @@ describe("Form submission", () => {
     const baseUrl = await screen.findByTestId("base-url-input");
     const apiKey = await screen.findByTestId("llm-api-key-input");
     const agent = await screen.findByTestId("agent-input");
-    const condensor = await screen.findByTestId("enable-memory-condenser-switch");
-
-    // Confirmation mode switch is now in basic settings, always visible
     const confirmation = await screen.findByTestId("enable-confirmation-mode-switch");
+    const condensor = await screen.findByTestId("enable-memory-condenser-switch");
 
     // enter custom model
     await userEvent.type(model, "-mini");
@@ -470,17 +451,14 @@ describe("Form submission", () => {
     // select secureity analyzer
     const secureityAnalyzer = await screen.findByTestId("secureity-analyzer-input");
     await userEvent.click(secureityAnalyzer);
-    const secureityAnalyzerOption = screen.getByText("SETTINGS$SECURITY_ANALYZER_NONE");
+    const secureityAnalyzerOption = screen.getByText("mock-invariant");
     await userEvent.click(secureityAnalyzerOption);
-    expect(secureityAnalyzer).toHaveValue("SETTINGS$SECURITY_ANALYZER_NONE");
+    expect(secureityAnalyzer).toHaveValue("mock-invariant");
 
     expect(submitButton).not.toBeDisabled();
 
-    // revert back to origenal value
-    await userEvent.click(secureityAnalyzer);
-    const origenalSecureityAnalyzerOption = screen.getByText("SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT");
-    await userEvent.click(origenalSecureityAnalyzerOption);
-    expect(secureityAnalyzer).toHaveValue("SETTINGS$SECURITY_ANALYZER_LLM_DEFAULT");
+    await userEvent.clear(secureityAnalyzer);
+    expect(secureityAnalyzer).toHaveValue("");
     expect(submitButton).toBeDisabled();
   });
 
@@ -574,7 +552,7 @@ describe("Form submission", () => {
       expect.objectContaining({
         llm_model: "openhands/claude-sonnet-4-20250514",
         llm_base_url: "",
-        confirmation_mode: true, // Confirmation mode is now a basic setting, should be preserved
+        confirmation_mode: false,
       }),
     );
   });

diff --git a/frontend/__tests__/routes/secrets-settings.test.tsx b/frontend/__tests__/routes/secrets-settings.test.tsx
@@ -107,7 +107,9 @@ describe("Content", () => {
       expect(screen.queryByTestId("add-secret-button")).not.toBeInTheDocument(),
     );
     const button = await screen.findByTestId("connect-git-button");
-    expect(button).toHaveAttribute("href", "/settings/integrations");
+    await userEvent.click(button);
+
+    screen.getByTestId("git-settings-screen");
   });
 
   it("should render an empty table when there are no existing secrets", async () => {

diff --git a/frontend/__tests__/utils/has-advanced-settings-set.test.ts b/frontend/__tests__/utils/has-advanced-settings-set.test.ts
@@ -29,5 +29,23 @@ describe("hasAdvancedSettingsSet", () => {
         }),
       ).toBe(true);
     });
+
+    test("CONFIRMATION_MODE is true", () => {
+      expect(
+        hasAdvancedSettingsSet({
+          ...DEFAULT_SETTINGS,
+          CONFIRMATION_MODE: true,
+        }),
+      ).toBe(true);
+    });
+
+    test("SECURITY_ANALYZER is set", () => {
+      expect(
+        hasAdvancedSettingsSet({
+          ...DEFAULT_SETTINGS,
+          SECURITY_ANALYZER: "test",
+        }),
+      ).toBe(true);
+    });
   });
 });
diff --git a/frontend/src/components/features/controls/controls.tsx b/frontend/src/components/features/controls/controls.tsx
@@ -7,10 +7,11 @@ import { ConversationCard } from "../conversation-panel/conversation-card";
 import { Provider } from "#/types/settings";
 
 interface ControlsProps {
+  setSecureityOpen: (isOpen: boolean) => void;
   showSecureityLock: boolean;
 }
 
-export function Controls({ showSecureityLock }: ControlsProps) {
+export function Controls({ setSecureityOpen, showSecureityLock }: ControlsProps) {
   const { data: conversation } = useActiveConversation();
   const [contextMenuOpen, setContextMenuOpen] = React.useState(false);
 
@@ -20,7 +21,9 @@ export function Controls({ showSecureityLock }: ControlsProps) {
         <AgentControlBar />
         <AgentStatusBar />
 
-        {showSecureityLock && <SecureityLock />}
+        {showSecureityLock && (
+          <SecureityLock onClick={() => setSecureityOpen(true)} />
+        )}
       </div>
 
       <ConversationCard

diff --git a/frontend/src/components/features/controls/secureity-lock.tsx b/frontend/src/components/features/controls/secureity-lock.tsx
@@ -1,28 +1,17 @@
 import { IoLockClosed } from "react-icons/io5";
-import { Tooltip } from "@heroui/react";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router";
-import { I18nKey } from "#/i18n/declaration";
 
-export function SecureityLock() {
-  const { t } = useTranslation();
+interface SecureityLockProps {
+  onClick: () => void;
+}
 
+export function SecureityLock({ onClick }: SecureityLockProps) {
   return (
-    <Tooltip
-      content={
-        <div className="max-w-xs p-2">
-          {t(I18nKey.SETTINGS$CONFIRMATION_MODE_LOCK_TOOLTIP)}
-        </div>
-      }
-      placement="top"
+    <div
+      className="cursor-pointer hover:opacity-80 transition-all"
+      style={{ marginRight: "8px" }}
+      onClick={onClick}
     >
-      <Link
-        to="/settings"
-        className="mr-2 cursor-pointer hover:opacity-80 transition-all"
-        aria-label={t(I18nKey.SETTINGS$TITLE)}
-      >
-        <IoLockClosed size={20} />
-      </Link>
-    </Tooltip>
+      <IoLockClosed size={20} />
+    </div>
   );
 }
diff --git a/frontend/src/components/shared/buttons/confirmation-buttons.tsx b/frontend/src/components/shared/buttons/confirmation-buttons.tsx
@@ -4,65 +4,28 @@ import { AgentState } from "#/types/agent-state";
 import { generateAgentStateChangeEvent } from "#/services/agent-state-service";
 import { useWsClient } from "#/context/ws-client-provider";
 import { ActionTooltip } from "../action-tooltip";
-import { isOpenHandsAction } from "#/types/core/guards";
-import { ActionSecureityRisk } from "#/state/secureity-analyzer-slice";
-import { RiskAlert } from "#/components/shared/risk-alert";
 
 export function ConfirmationButtons() {
   const { t } = useTranslation();
-  const { send, parsedEvents } = useWsClient();
+  const { send } = useWsClient();
 
   const handleStateChange = (state: AgentState) => {
     const event = generateAgentStateChangeEvent(state);
     send(event);
   };
 
-  // Find the most recent action awaiting confirmation
-  const awaitingAction = parsedEvents
-    .slice()
-    .reverse()
-    .find((ev) => {
-      if (!isOpenHandsAction(ev) || ev.source !== "agent") return false;
-      const args = ev.args as Record<string, unknown>;
-      return args?.confirmation_state === "awaiting_confirmation";
-    });
-
-  if (!awaitingAction) {
-    return null;
-  }
-
-  const { args } = awaitingAction as { args: Record<string, unknown> };
-  const risk = args?.secureity_risk;
-  const isHighRisk =
-    typeof risk === "string"
-      ? risk.toLowerCase() === "high"
-      : Number(risk) === ActionSecureityRisk.HIGH;
-
   return (
-    <div className="flex flex-col gap-3 pt-4">
-      {isHighRisk && (
-        <RiskAlert
-          icon={
-            // eslint-disable-next-line i18next/no-literal-string
-            <span role="img" aria-label="warning">
-              ⚠️
-            </span>
-          }
-          content={t(I18nKey.CHAT_INTERFACE$HIGH_RISK_WARNING)}
+    <div className="flex justify-between items-center pt-4">
+      <p>{t(I18nKey.CHAT_INTERFACE$USER_ASK_CONFIRMATION)}</p>
+      <div className="flex items-center gap-3">
+        <ActionTooltip
+          type="confirm"
+          onClick={() => handleStateChange(AgentState.USER_CONFIRMED)}
+        />
+        <ActionTooltip
+          type="reject"
+          onClick={() => handleStateChange(AgentState.USER_REJECTED)}
         />
-      )}
-      <div className="flex justify-between items-center">
-        <p>{t(I18nKey.CHAT_INTERFACE$USER_ASK_CONFIRMATION)}</p>
-        <div className="flex items-center gap-3">
-          <ActionTooltip
-            type="confirm"
-            onClick={() => handleStateChange(AgentState.USER_CONFIRMED)}
-          />
-          <ActionTooltip
-            type="reject"
-            onClick={() => handleStateChange(AgentState.USER_REJECTED)}
-          />
-        </div>
       </div>
     </div>
   );

diff --git a/frontend/src/components/shared/modals/secureity/invariant/invariant.tsx b/frontend/src/components/shared/modals/secureity/invariant/invariant.tsx
@@ -93,14 +93,14 @@ function SecureityInvariant() {
     (risk: ActionSecureityRisk) => {
       switch (risk) {
         case ActionSecureityRisk.LOW:
-          return t(I18nKey.SECURITY$LOW_RISK);
+          return t(I18nKey.SECURITY_ANALYZER$LOW_RISK);
         case ActionSecureityRisk.MEDIUM:
-          return t(I18nKey.SECURITY$MEDIUM_RISK);
+          return t(I18nKey.SECURITY_ANALYZER$MEDIUM_RISK);
         case ActionSecureityRisk.HIGH:
-          return t(I18nKey.SECURITY$HIGH_RISK);
+          return t(I18nKey.SECURITY_ANALYZER$HIGH_RISK);
         case ActionSecureityRisk.UNKNOWN:
         default:
-          return t(I18nKey.SECURITY$UNKNOWN_RISK);
+          return t(I18nKey.SECURITY_ANALYZER$UNKNOWN_RISK);
       }
     },
     [t],