Fixes to maintenance stuff (#5746)

* Fixes to maintenance stuff * remove leftover code * eslint
bigbluebutton · Mar 11, 2024 · e7dd4c9 · e7dd4c9
1 parent 78c4776
commit e7dd4c9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json
@@ -413,7 +413,8 @@
         "brand_image_deleted": "The brand image has been deleted.",
         "privacy_policy_updated": "The privacy policy has been updated.",
         "helpcenter_updated": "The help center link has been updated.",
-        "terms_of_service_updated": "The terms of service have been updated."
+        "terms_of_service_updated": "The terms of service have been updated.",
+        "maintenance_updated": "The maintenance banner has been updated."
       },
       "recording": {
         "recording_visibility_updated": "The recording visibility has been updated.",

diff --git a/app/javascript/App.jsx b/app/javascript/App.jsx
@@ -34,12 +34,7 @@ export default function App() {
 
   // useEffect hook for running notify maintenance banner on page load
   useEffect(() => {
-    // set a cookie for a day after maintenance banner dismissed
-    const maintenanceClosedAt = localStorage.getItem('maintenanceClosedAt');
-    const now = new Date();
-    const oneDayInMilliseconds = 24 * 60 * 60 * 1000;
-
-    if (maintenanceBanner.data && (!maintenanceClosedAt || now.getTime() - new Date(maintenanceClosedAt).getTime() > oneDayInMilliseconds)) {
+    if (maintenanceBanner.data) {
       const toastId = toast.info(maintenanceBanner.data, {
         position: 'top-center',
         autoClose: false,
@@ -50,7 +45,6 @@ export default function App() {
         progress: undefined,
         theme: 'light',
         className: 'text-center',
-        onClose: () => localStorage.setItem('maintenanceClosedAt', new Date().toISOString()),
       });
       localStorage.setItem('maintenanceBannerId', toastId);
     }

diff --git a/app/javascript/components/admin/site_settings/administration/LinksForm.jsx b/app/javascript/components/admin/site_settings/administration/LinksForm.jsx
@@ -48,5 +48,9 @@ export default function LinksForm({ id, value, mutation: useUpdateSiteSettingsAP
 LinksForm.propTypes = {
   id: PropTypes.string.isRequired,
   mutation: PropTypes.func.isRequired,
-  value: PropTypes.string.isRequired,
+  value: PropTypes.string,
+};
+
+LinksForm.defaultProps = {
+  value: '',
 };
diff --git a/app/javascript/components/admin/site_settings/administration/TextForm.jsx b/app/javascript/components/admin/site_settings/administration/TextForm.jsx
@@ -35,6 +35,7 @@ export default function TextForm({ id, value, mutation: useUpdateSiteSettingsAPI
   const clearForm = () => {
     methods.reset({ value: '' });
     toast.dismiss(maintenanceBannerId);
+    updateSiteSettingsAPI.mutate('');
   };
 
   return (
@@ -60,5 +61,9 @@ export default function TextForm({ id, value, mutation: useUpdateSiteSettingsAPI
 TextForm.propTypes = {
   id: PropTypes.string.isRequired,
   mutation: PropTypes.func.isRequired,
-  value: PropTypes.string.isRequired,
+  value: PropTypes.string,
+};
+
+TextForm.defaultProps = {
+  value: '',
 };
diff --git a/app/javascript/hooks/mutations/admin/site_settings/useUpdateSiteSetting.jsx b/app/javascript/hooks/mutations/admin/site_settings/useUpdateSiteSetting.jsx
@@ -60,6 +60,9 @@ export default function useUpdateSiteSetting(name) {
       case 'TermsOfService':
         toast.success(t('toast.success.site_settings.terms_of_service_updated'));
         break;
+      case 'Maintenance':
+        toast.success(t('toast.success.site_settings.maintenance_updated'));
+        break;
       default:
         toast.success(t('toast.success.site_settings.site_setting_updated'));
     }