[req-changes] Miscellaneous changes

- Changed getUserRadiusUsage refresh interval to 2 minutes - Don't show "Wifi Session Logged in" message if the user has exhausted there plan - Only show plan exhausted message if the subscription module is in use
openwisp · Jan 16, 2024 · ee39d09 · ee39d09
1 parent 7107f74
commit ee39d09
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 46 deletions.
diff --git a/client/components/status/__snapshots__/status.test.js.snap b/client/components/status/__snapshots__/status.test.js.snap
@@ -55,6 +55,13 @@ exports[`<Status /> interactions should show user's plan when subscription modul
              
             used
           </p>
+          <p
+            className="exhausted"
+          >
+            <strong>
+              USAGE_LIMIT_EXHAUSTED_TXT
+            </strong>
+          </p>
         </div>
         <div
           key="Max-Daily-Session-Traffic"
@@ -107,22 +114,10 @@ exports[`<Status /> interactions should show user's plan when subscription modul
           className="inner"
         >
           <p
-            className="status-content"
-            key="WiFi Login Successful!"
-          >
-            WiFi Login Successful!
-          </p>
-          <p
-            className="status-content"
-            key="You can now use the internet."
-          >
-            You can now use the internet.
-          </p>
-          <p
-            className="status-content"
-            key="You may leave this page open in case you want to log out."
+            className="status-contentplan-exhausted-message"
+            key="STATUS_EXHAUSTED_CONTENT"
           >
-            You may leave this page open in case you want to log out.
+            STATUS_EXHAUSTED_CONTENT
           </p>
           <p
             className="status-content"
@@ -244,12 +239,6 @@ exports[`<Status /> interactions should show user's plan when subscription modul
       type="hidden"
       value=""
     />
-    <input
-      name="mac_address"
-      readOnly={true}
-      type="text"
-      value="4e:ed:11:2b:17:ae"
-    />
   </form>
   <iframe
     className="hidden"
@@ -396,6 +385,13 @@ exports[`<Status /> interactions should show user's plan when subscription modul
              
             used
           </p>
+          <p
+            className="exhausted"
+          >
+            <strong>
+              USAGE_LIMIT_EXHAUSTED_TXT
+            </strong>
+          </p>
         </div>
         <div
           key="Max-Daily-Session-Traffic"
@@ -448,22 +444,10 @@ exports[`<Status /> interactions should show user's plan when subscription modul
           className="inner"
         >
           <p
-            className="status-content"
-            key="WiFi Login Successful!"
-          >
-            WiFi Login Successful!
-          </p>
-          <p
-            className="status-content"
-            key="You can now use the internet."
-          >
-            You can now use the internet.
-          </p>
-          <p
-            className="status-content"
-            key="You may leave this page open in case you want to log out."
+            className="status-contentplan-exhausted-message"
+            key="STATUS_EXHAUSTED_CONTENT"
           >
-            You may leave this page open in case you want to log out.
+            STATUS_EXHAUSTED_CONTENT
           </p>
           <p
             className="status-content"
@@ -585,12 +569,6 @@ exports[`<Status /> interactions should show user's plan when subscription modul
       type="hidden"
       value=""
     />
-    <input
-      name="mac_address"
-      readOnly={true}
-      type="text"
-      value="4e:ed:11:2b:17:ae"
-    />
   </form>
   <iframe
     className="hidden"

diff --git a/client/components/status/status.js b/client/components/status/status.js
@@ -271,7 +271,7 @@ export default class Status extends React.Component {
       await this.getUserRadiusUsage();
       this.getUserRadiusUsageIntervalId = setInterval(() => {
         this.getUserRadiusUsage();
-      }, 60000);
+      }, 12000);
     }
 
     window.addEventListener("resize", this.updateScreenWidth);
@@ -326,7 +326,7 @@ export default class Status extends React.Component {
   }
 
   async getUserRadiusUsage() {
-    const {cookies, orgSlug, logout, userData} = this.props;
+    const {cookies, orgSlug, logout, userData, setPlanExhausted} = this.props;
     const {showRadiusUsage} = this.state;
     const url = getUserRadiusUsageUrl(orgSlug);
     const auth_token = cookies.get(`${orgSlug}_auth_token`);
@@ -342,6 +342,13 @@ export default class Status extends React.Component {
         url,
       });
       options.userChecks = response.data.checks;
+      if (options.userChecks) {
+        options.userChecks.forEach((check) => {
+          if (check.value === check.result) {
+            setPlanExhausted(true);
+          }
+        });
+      }
       if (response.data.plan) {
         options.userPlan = response.data.plan;
       }
@@ -1021,8 +1028,9 @@ export default class Status extends React.Component {
                         )}{" "}
                         used
                       </p>
-                      {userPlan.is_free &&
-                        check.value === String(check.result) && (
+                      {settings.subscriptions &&
+                        userPlan.is_free &&
+                        planExhausted && (
                           <p className="exhausted">
                             <strong>{t`USAGE_LIMIT_EXHAUSTED_TXT`}</strong>
                           </p>

diff --git a/client/components/status/status.test.js b/client/components/status/status.test.js
@@ -1922,13 +1922,15 @@ describe("<Status /> interactions", () => {
     prop.statusPage.links = links;
     prop.statusPage.radius_usage_enabled = true;
     prop.isAuthenticated = true;
+    prop.planExhausted = true;
     prop.settings.subscriptions = true;
     wrapper = shallow(<Status {...prop} />, {
       context: {setLoading: jest.fn()},
     });
     wrapper.setState({showRadiusUsage: false});
     await tick();
     expect(wrapper).toMatchSnapshot();
+    expect(prop.setPlanExhausted).toHaveBeenCalledTimes(1);
     wrapper.find("#plan-upgrade-btn").simulate("click");
     await tick();
     expect(wrapper).toMatchSnapshot();