fix: some bugs (apache#6882)

* fix: operator toast control error * fix: adapt to small screen margins
merico-dev · Jan 26, 2024 · 21eb4ca · 21eb4ca
1 parent 51a08ae
commit 21eb4ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
     }