Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: DnsHole controls timer #953

Merged
merged 5 commits into from
Aug 28, 2024
Merged

fix: DnsHole controls timer #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01fac01
fix: DnsHole controls timer
hillaliy Aug 9, 2024
6df2b33
fix: use plural naming
hillaliy Aug 10, 2024
00e4f2f
fix: reviewed changes
hillaliy Aug 17, 2024
56b6c34
fix: change ControlsCard to jsx component
hillaliy Aug 17, 2024
6d04ee1
fix: DeepSource
hillaliy Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/integrations/src/adguard-home/adguard-home-integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar
}
}

public async disableAsync(duration?: number): Promise<void> {
public async disableAsync(duration = 0): Promise<void> {
const response = await fetch(`${this.integration.url}/control/protection`, {
method: "POST",
headers: {
Expand All @@ -132,7 +132,7 @@ export class AdGuardHomeIntegration extends Integration implements DnsHoleSummar
},
body: JSON.stringify({
enabled: false,
duration: duration,
duration: duration * 1000,
}),
});
if (!response.ok) {
Expand Down
6 changes: 3 additions & 3 deletions packages/widgets/src/dns-hole/controls/TimerModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import { useI18n } from "@homarr/translation/client";
interface TimerModalProps {
opened: boolean;
close: () => void;
integrationIds: string[];
selectedIntegrationIds: string[];
disableDns: (data: { duration: number; integrationId: string }) => void;
}

const TimerModal = ({ opened, close, integrationIds, disableDns }: TimerModalProps) => {
const TimerModal = ({ opened, close, selectedIntegrationIds, disableDns }: TimerModalProps) => {
const t = useI18n();
const [hours, setHours] = useState(0);
const [minutes, setMinutes] = useState(0);
Expand All @@ -21,7 +21,7 @@ const TimerModal = ({ opened, close, integrationIds, disableDns }: TimerModalPro

const handleSetTimer = () => {
const duration = hours * 3600 + minutes * 60;
integrationIds.forEach((integrationId) => {
selectedIntegrationIds.forEach((integrationId) => {
disableDns({ duration, integrationId });
});
setHours(0);
Expand Down
92 changes: 68 additions & 24 deletions packages/widgets/src/dns-hole/controls/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge
const [status, setStatus] = useState<{ integrationId: string; enabled: boolean }[]>(
integrationIds.map((id) => ({ integrationId: id, enabled: false })),
);
const [selectedIntegrationIds, setSelectedIntegrationIds] = useState<string[]>([]);
const [opened, { close, open }] = useDisclosure(false);

const [data] = clientApi.widget.dnsHole.summary.useSuspenseQuery(
Expand Down Expand Up @@ -67,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
Expand All @@ -90,17 +91,25 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge
</Tooltip>

<Tooltip label={t("widget.dnsHoleControls.controls.setTimer")}>
<Button onClick={open} disabled={allDisabled} variant="light" color="yellow" fullWidth h="2rem">
<Button
onClick={() => {
setSelectedIntegrationIds(enabledIntegrations);
open();
}}
disabled={enabledIntegrations.length === 0}
variant="light"
color="yellow"
fullWidth
h="2rem"
>
<IconClockPause size={20} />
</Button>
</Tooltip>

<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
Expand All @@ -113,24 +122,49 @@ export default function DnsHoleControlsWidget({ options, integrationIds }: Widge
)}

<Stack gap="2.5cqmin" flex={1} justify={options.showToggleAllButtons ? "flex-end" : "space-evenly"}>
{data.map((integrationData) =>
ControlsCard(integrationData.integrationId, integrationData.integrationKind, toggleDns, status, open, t),
)}
{data.map((integrationData) => (
<ControlsCard
key={integrationData.integrationId}
integrationId={integrationData.integrationId}
integrationKind={integrationData.integrationKind}
toggleDns={toggleDns}
status={status}
setSelectedIntegrationIds={setSelectedIntegrationIds}
open={open}
t={t}
/>
))}
</Stack>

<TimerModal opened={opened} close={close} integrationIds={integrationIds} disableDns={disableDns} />
<TimerModal
opened={opened}
close={close}
selectedIntegrationIds={selectedIntegrationIds}
disableDns={disableDns}
/>
</Flex>
);
}

const ControlsCard = (
integrationId: string,
integrationKind: string,
toggleDns: (integrationId: string) => void,
status: { integrationId: string; enabled: boolean }[],
open: () => void,
t: TranslationFunction,
) => {
interface ControlsCardProps {
integrationId: string;
integrationKind: string;
toggleDns: (integrationId: string) => void;
status: { integrationId: string; enabled: boolean }[];
setSelectedIntegrationIds: (integrationId: string[]) => void;
open: () => void;
t: TranslationFunction;
}

const ControlsCard: React.FC<ControlsCardProps> = ({
integrationId,
integrationKind,
toggleDns,
status,
setSelectedIntegrationIds,
open,
t,
}) => {
const integrationStatus = status.find((item) => item.integrationId === integrationId);
const isEnabled = integrationStatus?.enabled ?? false;
const integrationDef = integrationKind === "piHole" ? integrationDefs.piHole : integrationDefs.adGuardHome;
Expand All @@ -149,7 +183,17 @@ const ControlsCard = (
{t(`widget.dnsHoleControls.controls.${isEnabled ? "enabled" : "disabled"}`)}
</Badge>
</UnstyledButton>
<ActionIcon disabled={!isEnabled} size={20} radius="xl" top="2.67px" variant="default" onClick={open}>
<ActionIcon
disabled={!isEnabled}
size={20}
radius="xl"
top="2.67px"
variant="default"
onClick={() => {
setSelectedIntegrationIds([integrationId]);
open();
}}
>
<IconClockPause size={20} color="red" />
</ActionIcon>
</Flex>
Expand Down