From fbf44a10e7623caed596aa7d2bd3eb2fc120a2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 3 May 2023 20:09:15 -0400
Subject: [PATCH] feat: expiration date for widgets

closes #10495
---
 public/language/en-GB/admin/extend/widgets.json       |  2 ++
 src/views/admin/partials/widget-settings.tpl          | 11 +++++++++++
 src/views/admin/partials/widgets/show_hide_groups.tpl |  4 ++--
 src/widgets/index.js                                  |  8 +++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/public/language/en-GB/admin/extend/widgets.json b/public/language/en-GB/admin/extend/widgets.json
index 0d24c2f32a..9adfb98ab5 100644
--- a/public/language/en-GB/admin/extend/widgets.json
+++ b/public/language/en-GB/admin/extend/widgets.json
@@ -26,5 +26,7 @@
 	"container.placeholder": "Drag and drop a container or enter HTML here.",
 	"show-to-groups": "Show to groups",
 	"hide-from-groups": "Hide from groups",
+	"start-date": "Start date",
+	"end-date": "End date",
 	"hide-on-mobile": "Hide on mobile"
 }
\ No newline at end of file
diff --git a/src/views/admin/partials/widget-settings.tpl b/src/views/admin/partials/widget-settings.tpl
index 260f111d0b..24f28bcb8a 100644
--- a/src/views/admin/partials/widget-settings.tpl
+++ b/src/views/admin/partials/widget-settings.tpl
@@ -10,6 +10,17 @@
 
 <!-- IMPORT admin/partials/widgets/show_hide_groups.tpl -->
 
+<div class="row mb-3">
+	<div class="col-lg-6">
+		<label class="form-label">[[admin/extend/widgets:start-date]]</label>
+		<input class="form-control" name="startDate" type="datetime-local" />
+	</div>
+	<div class="col-lg-6">
+		<label class="form-label">[[admin/extend/widgets:end-date]]</label>
+		<input class="form-control" name="endDate" type="datetime-local" />
+	</div>
+</div>
+
 <div class="form-check form-switch mb-3">
 	<input class="form-check-input" type="checkbox" name="hide-mobile" id="hide-mobile-check"/>
 	<label class="form-check-label" for="hide-mobile-check">[[admin/extend/widgets:hide-on-mobile]]</label>
diff --git a/src/views/admin/partials/widgets/show_hide_groups.tpl b/src/views/admin/partials/widgets/show_hide_groups.tpl
index 583a405947..766dad3b92 100644
--- a/src/views/admin/partials/widgets/show_hide_groups.tpl
+++ b/src/views/admin/partials/widgets/show_hide_groups.tpl
@@ -1,6 +1,6 @@
 <div class="row mb-3">
 	<div class="col-lg-6">
-		<label>[[admin/extend/widgets:show-to-groups]]</label>
+		<label class="form-label">[[admin/extend/widgets:show-to-groups]]</label>
 		<select name="groups" class="form-select" multiple size="10">
 			{{{ each groups }}}
 			<option value="{./displayName}">{./displayName}</option>
@@ -8,7 +8,7 @@
 		</select>
 	</div>
 	<div class="col-lg-6">
-		<label>[[admin/extend/widgets:hide-from-groups]]</label>
+		<label class="form-label">[[admin/extend/widgets:hide-from-groups]]</label>
 		<select name="groupsHideFrom" class="form-select" multiple size="10">
 			{{{ each groups }}}
 			<option value="{./displayName}">{./displayName}</option>
diff --git a/src/widgets/index.js b/src/widgets/index.js
index 03b765740a..0b5c736527 100644
--- a/src/widgets/index.js
+++ b/src/widgets/index.js
@@ -101,7 +101,13 @@ widgets.checkVisibility = async function (data, uid) {
 	if (data.groupsHideFrom.length) {
 		isHidden = await groups.isMemberOfAny(uid, data.groupsHideFrom);
 	}
-	return isVisible && !isHidden;
+
+	const isExpired = (
+		(data.startDate && Date.now() < new Date(data.startDate).getTime()) ||
+		(data.endDate && Date.now() > new Date(data.endDate).getTime())
+	);
+
+	return isVisible && !isHidden && !isExpired;
 };
 
 widgets.getWidgetDataForTemplates = async function (templates) {