feat(optional-policies): add a separate alert message for optional po…

…licy updates
FriendsOfFlarum · Dec 5, 2024 · b39bcb3 · b39bcb3
1 parent d6304b2
commit b39bcb3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/js/src/forum/components/AcceptPoliciesModal.js b/js/src/forum/components/AcceptPoliciesModal.js
@@ -10,7 +10,9 @@ export default class AcceptPoliciesModal extends Modal {
     super.oninit(vnode);
 
     app.store.all('fof-terms-policies').forEach((policy) => {
-      this[policy.form_key()] = false;
+      const state = app.session.user.fofTermsPoliciesState()[policy.id()];
+      // For optional policies, maintain current acceptance status
+      this[policy.form_key()] = policy.optional() ? state?.is_accepted || false : false;
     });
   }
 

diff --git a/js/src/forum/components/UpdateAlert.tsx b/js/src/forum/components/UpdateAlert.tsx
@@ -14,13 +14,20 @@ export default class UpdateAlert {
       return false;
     }
 
-    const user = app.session.user;
+    const { user } = app.session;
 
     return user && user.fofTermsPoliciesHasUpdate();
   }
 
+  hasOnlyOptionalUpdates() {
+    const { user } = app.session;
+    return user && !user.fofTermsPoliciesMustAccept() && user.fofTermsPoliciesHasUpdate();
+  }
+
   view() {
-    if (!this.shouldShowAlert() || !app.session.user) {
+    const { user } = app.session;
+
+    if (!this.shouldShowAlert() || !user) {
       return null;
     }
 
@@ -37,7 +44,7 @@ export default class UpdateAlert {
 
     const dismissControl = [];
 
-    if (!app.session.user.fofTermsPoliciesMustAccept()) {
+    if (!user.fofTermsPoliciesMustAccept()) {
       dismissControl.push(
         <Button
           icon="fas fa-times"
@@ -54,9 +61,11 @@ export default class UpdateAlert {
       <div className="Alert Alert-info">
         <div className="container">
           <span className="Alert-body">
-            {app.session.user.fofTermsPoliciesMustAccept()
-              ? app.translator.trans('fof-terms.forum.update-alert.must-accept-message')
-              : app.translator.trans('fof-terms.forum.update-alert.can-accept-message')}
+            {this.hasOnlyOptionalUpdates()
+              ? app.translator.trans('fof-terms.forum.update-alert.can-accept-optional-message')
+              : user.fofTermsPoliciesMustAccept()
+                ? app.translator.trans('fof-terms.forum.update-alert.must-accept-message')
+                : app.translator.trans('fof-terms.forum.update-alert.can-accept-message')}
           </span>
           <ul className="Alert-controls">{listItems(controls.concat(dismissControl))}</ul>
         </div>

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -72,6 +72,7 @@ fof-terms:
         update-alert:
             must-accept-message: We've temporarily restricted access to your account while you check out the new terms.
             can-accept-message: We recently updated the terms. You must accept them to continue using this website.
+            can-accept-optional-message: We recently updated the terms. You can review them at your convenience.
             review: Click here to review and accept the new terms
             close: Close