From 9c120a1e9726caf3c7f23674007915a8086a7444 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 30 Oct 2023 07:59:58 -0700 Subject: [PATCH] simplify refresh, run pre-commit --- docs/widgets/services/iframe.md | 14 ++++++++++++-- src/utils/config/service-helpers.js | 22 +++++++++++----------- src/widgets/iframe/component.jsx | 25 ++++++++----------------- src/widgets/iframe/widget.js | 3 +-- tailwind.config.js | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/widgets/services/iframe.md b/docs/widgets/services/iframe.md index 303d8e7c..4c1c8839 100644 --- a/docs/widgets/services/iframe.md +++ b/docs/widgets/services/iframe.md @@ -2,7 +2,9 @@ title: iFrame Description: Add a custom iFrame Widget --- + ### name + **Type:** string
**Default:** null
**Required:** Yes
@@ -10,6 +12,7 @@ Description: Add a custom iFrame Widget **Example:** "myIframe" ### src + **Type:** string (URL)
**Default:** null
**Required:** Yes
@@ -17,6 +20,7 @@ Description: Add a custom iFrame Widget **Example:** "http://example.com" ### sizes + **Type:** object
**Default:** {"xs": '60', "sm": "60", "md": "80", "lg": "80", "xl": "80", "2xl": "80"}
**Required:** No
@@ -24,6 +28,7 @@ Description: Add a custom iFrame Widget **Example:** "{"xs": '32', "sm": "12", "md": "44", "lg": "60", "xl": "72", "2xl": "80"}" ### referrerpolicy + **Type:** string ["no-referrer" | "no-referrer-when-downgrade" | "origin" | "origin-when-cross-origin" | "same-origin" | "strict-origin-when-cross-origin" | "unsafe-url"]
**Default:** null
**Required:** No
@@ -31,6 +36,7 @@ Description: Add a custom iFrame Widget **Example:** "no-referrer" ### allowfullscreen + **Type:** boolean [true | false]
**Default:** null
**Required:** No
@@ -38,6 +44,7 @@ Description: Add a custom iFrame Widget **Example:** false ### loading + **Type:** string ["eager" | "lazy"]
**Default:** null
**Required:** No
@@ -45,6 +52,7 @@ Description: Add a custom iFrame Widget **Example:** "lazy" ### allowScrolling + **Type:** string ["yes" | "no"]
**Default:** null
**Required:** No
@@ -52,6 +60,7 @@ Description: Add a custom iFrame Widget **Example:** "no" ### border + **Type:** number
**Default:** null
**Required:** No
@@ -59,6 +68,7 @@ Description: Add a custom iFrame Widget **Example:** 2 ### refreshInterval + **Type:** number (in milliseconds)
**Default:** null
**Required:** No
@@ -66,6 +76,7 @@ Description: Add a custom iFrame Widget **Example:** 2000 ### allowPolicy + **Type:** string
**Default:** null
**Required:** No
@@ -77,7 +88,7 @@ widget: type: iframe name: myIframe src: "http://example.com" - sizes: {"xs": '60', "sm": "60", "md": "80", "lg": "80", "xl": "80", "2xl": "80"} + sizes: { "xs": "60", "sm": "60", "md": "80", "lg": "80", "xl": "80", "2xl": "80" } referrerPolicy: "same-origin" allowPolicy: "" allowFullscreen: "false" @@ -88,4 +99,3 @@ widget: border: 0 refreshInterval: 2000 ``` - diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 17e2f0df..333015a0 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -366,14 +366,14 @@ export function cleanServiceGroups(groups) { firstDayInWeek, view, maxEvents, - src, + src, // iframe widget sizes, referrerPolicy, allowPolicy, allowFullscreen, loadingStrategy, allowScrolling, - border + border, } = cleanedService.widget; let fieldsList = fields; @@ -422,15 +422,15 @@ export function cleanServiceGroups(groups) { if (podSelector) cleanedService.widget.podSelector = podSelector; } if (type === "iframe") { - if (src) cleanedService.widget.src = src - if (sizes) cleanedService.widget.sizes = sizes - if (referrerPolicy) cleanedService.widget.referrerPolicy = referrerPolicy - if (allowPolicy) cleanedService.widget.allowPolicy = allowPolicy - if (allowFullscreen) cleanedService.widget.allowFullscreen = allowFullscreen - if (loadingStrategy) cleanedService.widget.loadingStrategy = loadingStrategy - if (allowScrolling) cleanedService.widget.allowScrolling = allowScrolling - if (border) cleanedService.widget.border = border - if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval + if (src) cleanedService.widget.src = src; + if (sizes) cleanedService.widget.sizes = sizes; + if (referrerPolicy) cleanedService.widget.referrerPolicy = referrerPolicy; + if (allowPolicy) cleanedService.widget.allowPolicy = allowPolicy; + if (allowFullscreen) cleanedService.widget.allowFullscreen = allowFullscreen; + if (loadingStrategy) cleanedService.widget.loadingStrategy = loadingStrategy; + if (allowScrolling) cleanedService.widget.allowScrolling = allowScrolling; + if (border) cleanedService.widget.border = border; + if (refreshInterval) cleanedService.widget.refreshInterval = refreshInterval; } if (["opnsense", "pfsense"].includes(type)) { if (wan) cleanedService.widget.wan = wan; diff --git a/src/widgets/iframe/component.jsx b/src/widgets/iframe/component.jsx index 7218cbd1..758fe739 100644 --- a/src/widgets/iframe/component.jsx +++ b/src/widgets/iframe/component.jsx @@ -10,27 +10,18 @@ export default function Component({ service }) { useEffect(() => { if (widget?.refreshInterval) { - const refreshInterval = setInterval( - () => { - setRefreshTimer(refreshTimer + 1); - }, - widget?.refreshInterval < 1000 ? 1000 : widget?.refreshInterval + setInterval( + () => setRefreshTimer(refreshTimer + 1), + widget?.refreshInterval < 1000 ? 1000 : widget?.refreshInterval, ); - return () => clearInterval(refreshInterval); } - return undefined; }, [refreshTimer, widget?.refreshInterval]); - const scrollingDisableStyle = - widget?.allowScrolling === "no" - ? "pointer-events:none; overflow: hidden" - : ""; + const scrollingDisableStyle = widget?.allowScrolling === "no" ? "pointer-events:none; overflow: hidden" : ""; - const sizeClasses = `h-${widget?.sizes?.xs || 80} sm:h-${ - widget?.sizes?.sm || 80 - } md:h-${widget?.sizes?.md || 80} lg:h-${widget?.sizes?.lg || 80} xl:h-${ - widget?.sizes?.xl || 80 - } 2xl:h-${widget?.sizes?.["2xl"] || 80}`; + const sizeClasses = `h-${widget?.sizes?.xs || 80} sm:h-${widget?.sizes?.sm || 80} md:h-${ + widget?.sizes?.md || 80 + } lg:h-${widget?.sizes?.lg || 80} xl:h-${widget?.sizes?.xl || 80} 2xl:h-${widget?.sizes?.["2xl"] || 80}`; return ( @@ -59,7 +50,7 @@ function Block({ children }) {
{children} diff --git a/src/widgets/iframe/widget.js b/src/widgets/iframe/widget.js index 51912efb..8c8a6b68 100644 --- a/src/widgets/iframe/widget.js +++ b/src/widgets/iframe/widget.js @@ -1,4 +1,3 @@ -const widget = { -}; +const widget = {}; export default widget; diff --git a/tailwind.config.js b/tailwind.config.js index 3c713c13..5d425938 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -78,7 +78,7 @@ module.exports = { "dark:bg-orange-400", { pattern: /h-([0-96])/, - variants: ["sm","md","lg","xl","2xl"], + variants: ["sm", "md", "lg", "xl", "2xl"], }, ], };