fix: reviewed changes

homarr-labs · Aug 17, 2024 · 00e4f2f · 00e4f2f
1 parent 6df2b33
commit 00e4f2f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/packages/integrations/src/adguard-home/adguard-home-integration.ts b/packages/integrations/src/adguard-home/adguard-home-integration.ts
@@ -123,8 +123,7 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar
     }
   }
 
-  public async disableAsync(duration?: number): Promise<void> {
-    duration = duration ? duration * 1000 : 0;
+  public async disableAsync(duration = 0): Promise<void> {
     const response = await fetch(`${this.integration.url}/control/protection`, {
       method: "POST",
       headers: {
@@ -133,7 +132,7 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar
       },
       body: JSON.stringify({
         enabled: false,
-        duration: duration,
+        duration: duration * 1000,
       }),
     });
     if (!response.ok) {

diff --git a/packages/widgets/src/dns-hole/controls/component.tsx b/packages/widgets/src/dns-hole/controls/component.tsx
@@ -68,19 +68,19 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge
     }
   };
 
-  const allEnabled = status.every((item) => item.enabled);
-  const allDisabled = status.every((item) => !item.enabled);
+  const enabledIntegrations = integrationIds.filter((id) => status.find((item) => item.integrationId === id)?.enabled);
+  const disabledIntegrations = integrationIds.filter(
+    (id) => !status.find((item) => item.integrationId === id)?.enabled,
+  );
 
   return (
     <Flex h="100%" direction="column" gap={0} p="2.5cqmin">
       {options.showToggleAllButtons && (
         <Flex gap="2.5cqmin">
           <Tooltip label={t("widget.dnsHoleControls.controls.enableAll")}>
             <Button
-              onClick={() => {
-                integrationIds.forEach((integrationId) => enableDns({ integrationId }));
-              }}
-              disabled={allEnabled}
+              onClick={() => disabledIntegrations.forEach((integrationId) => enableDns({ integrationId }))}
+              disabled={disabledIntegrations.length === 0}
               variant="light"
               color="green"
               fullWidth
@@ -93,10 +93,10 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge
           <Tooltip label={t("widget.dnsHoleControls.controls.setTimer")}>
             <Button
               onClick={() => {
-                setSelectedIntegrationIds(integrationIds);
+                setSelectedIntegrationIds(enabledIntegrations);
                 open();
               }}
-              disabled={allDisabled}
+              disabled={enabledIntegrations.length === 0}
               variant="light"
               color="yellow"
               fullWidth
@@ -108,10 +108,8 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge
 
           <Tooltip label={t("widget.dnsHoleControls.controls.disableAll")}>
             <Button
-              onClick={() => {
-                integrationIds.forEach((integrationId) => disableDns({ integrationId, duration: 0 }));
-              }}
-              disabled={allDisabled}
+              onClick={() => enabledIntegrations.forEach((integrationId) => disableDns({ integrationId, duration: 0 }))}
+              disabled={enabledIntegrations.length === 0}
               variant="light"
               color="red"
               fullWidth
@@ -152,7 +150,7 @@ const ControlsCard = (
   integrationKind: string,
   toggleDns: (integrationId: string) => void,
   status: { integrationId: string; enabled: boolean }[],
-  setSelectedIntegration: (integrationId: string[]) => void,
+  setSelectedIntegrationIds: (integrationId: string[]) => void,
   open: () => void,
   t: TranslationFunction,
 ) => {
@@ -181,7 +179,7 @@ const ControlsCard = (
               top="2.67px"
               variant="default"
               onClick={() => {
-                setSelectedIntegration([integrationId]);
+                setSelectedIntegrationIds([integrationId]);
                 open();
               }}
             >