From 91538b1b8692859f0ee65fd9160b671f8dea67db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E6=B9=9B?= <0x1304570@gmail.com>
Date: Fri, 26 Jan 2024 23:24:37 +1300
Subject: [PATCH] fix: some bugs (#6882)

* fix: operator toast control error

* fix: adapt to small screen margins
---
 config-ui/src/routes/layout/layout.tsx | 2 +-
 config-ui/src/utils/operator.ts        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config-ui/src/routes/layout/layout.tsx b/config-ui/src/routes/layout/layout.tsx
index 324bcac8896..bd28eea8485 100644
--- a/config-ui/src/routes/layout/layout.tsx
+++ b/config-ui/src/routes/layout/layout.tsx
@@ -162,7 +162,7 @@ export const Layout = () => {
               </ExternalLink>
             ))}
         </Header>
-        <Content style={{ margin: '16px auto', width: 1188 }}>
+        <Content style={{ margin: '16px auto', padding: '0 24px', width: 1188, boxSizing: 'border-box' }}>
           <Outlet />
           {!import.meta.env.DEVLAKE_COPYRIGHT_HIDE && (
             <Footer>
diff --git a/config-ui/src/utils/operator.ts b/config-ui/src/utils/operator.ts
index e14263b4f27..af3126ec995 100644
--- a/config-ui/src/utils/operator.ts
+++ b/config-ui/src/utils/operator.ts
@@ -46,14 +46,14 @@ export const operator = async <T>(request: () => Promise<T>, config?: OperateCon
     setOperating?.(true);
     const res = await request();
     const content = formatMessage?.() ?? 'Operation successfully completed';
-    if (!config?.hideToast || !config?.hideSuccessToast) {
+    if (!config?.hideToast && !config?.hideSuccessToast) {
       message.success(content);
     }
     return [true, res];
   } catch (err) {
     console.error('Operation failed.', err);
     const reason = formatReason?.(err) ?? (err as any).response?.data?.message ?? 'Operation failed.';
-    if (!config?.hideToast || !config?.hideErrorToast) {
+    if (!config?.hideToast && !config?.hideErrorToast) {
       message.error(reason);
     }