refactor: migrated sessions page to controller (#3257)

thorsten · Nov 25, 2024 · 6aa5eb0 · 6aa5eb0
1 parent 17b768d
commit 6aa5eb0
Show file tree

Hide file tree

Showing 17 changed files with 437 additions and 335 deletions.
diff --git a/phpmyfaq/admin/assets/src/api/statistics.js b/phpmyfaq/admin/assets/src/api/statistics.js
@@ -75,3 +75,45 @@ export const clearRatings = async (csrfToken) => {
     console.error(error);
   }
 };
+export const clearVisits = async (csrfToken) => {
+  try {
+    const response = await fetch(`./api/statistics/visits/clear`, {
+      method: 'DELETE',
+      cache: 'no-cache',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        csrfToken: csrfToken,
+      }),
+      redirect: 'follow',
+      referrerPolicy: 'no-referrer',
+    });
+
+    return await response.json();
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+export const deleteSessions = async (csrfToken, month) => {
+  try {
+    const response = await fetch(`./api/statistics/sessions`, {
+      method: 'DELETE',
+      cache: 'no-cache',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        csrfToken: csrfToken,
+        month: month,
+      }),
+      redirect: 'follow',
+      referrerPolicy: 'no-referrer',
+    });
+
+    return await response.json();
+  } catch (error) {
+    console.error(error);
+  }
+};
diff --git a/phpmyfaq/admin/assets/src/index.js b/phpmyfaq/admin/assets/src/index.js
@@ -16,8 +16,10 @@
 import { getLatestVersion, renderVisitorCharts, renderTopTenCharts, handleVerificationModal } from './dashboard';
 import {
   handleClearRatings,
+  handleClearVisits,
   handleCreateReport,
   handleDeleteAdminLog,
+  handleDeleteSessions,
   handleSessions,
   handleStatistics,
 } from './statistics';
@@ -131,6 +133,8 @@ document.addEventListener('DOMContentLoaded', async () => {
   handleCreateReport();
   handleTruncateSearchTerms();
   handleClearRatings();
+  handleClearVisits();
+  handleDeleteSessions();
 
   // Configuration → FAQ configuration
   await handleConfiguration();

diff --git a/phpmyfaq/admin/assets/src/statistics/sessions.js b/phpmyfaq/admin/assets/src/statistics/sessions.js
@@ -13,7 +13,8 @@
  * @since     2024-01-14
  */
 
-import { pushErrorNotification } from '../utils';
+import { pushErrorNotification, pushNotification } from '../utils';
+import { clearVisits, deleteSessions } from '../api/index.js';
 
 export const handleSessions = () => {
   const firstHour = document.getElementById('firstHour');
@@ -67,3 +68,40 @@ export const handleSessions = () => {
     });
   }
 };
+
+export const handleClearVisits = () => {
+  const buttonClearRatings = document.getElementById('pmf-admin-clear-visits');
+
+  if (buttonClearRatings) {
+    buttonClearRatings.addEventListener('click', async (event) => {
+      event.preventDefault();
+      const csrf = event.target.getAttribute('data-pmf-csrf');
+      const response = await clearVisits(csrf);
+
+      if (response.success) {
+        pushNotification(response.success);
+      } else {
+        pushErrorNotification(response.error);
+      }
+    });
+  }
+};
+
+export const handleDeleteSessions = () => {
+  const buttonClearRatings = document.getElementById('pmf-admin-delete-sessions');
+
+  if (buttonClearRatings) {
+    buttonClearRatings.addEventListener('click', async (event) => {
+      event.preventDefault();
+      const csrf = document.getElementById('pmf-csrf-token').value;
+      const month = document.getElementById('month').value;
+      const response = await deleteSessions(csrf, month);
+
+      if (response.success) {
+        pushNotification(response.success);
+      } else {
+        pushErrorNotification(response.error);
+      }
+    });
+  }
+};
diff --git a/phpmyfaq/admin/header.php b/phpmyfaq/admin/header.php
@@ -112,7 +112,8 @@
 $secLevelEntries['statistics'] .= $adminHelper->addMenuEntry(
     PermissionType::STATISTICS_VIEWLOGS->value,
     'viewsessions',
-    'ad_menu_session'
+    'ad_menu_session',
+    'statistics/sessions'
 );
 $secLevelEntries['statistics'] .= $adminHelper->addMenuEntry(
     PermissionType::STATISTICS_ADMINLOG->value,

diff --git a/phpmyfaq/admin/index.php b/phpmyfaq/admin/index.php
@@ -318,13 +318,6 @@
             case 'adminlog':
                 require 'statistics.admin-log.php';
                 break;
-            case 'viewsessions':
-            case 'clear-visits':
-                require 'statistics.sessions.php';
-                break;
-            case 'sessionbrowse':
-                require 'statistics.sessions.day.php';
-                break;
             case 'viewsession':
                 require 'statistics.show.php';
                 break;

diff --git a/phpmyfaq/admin/statistics.sessions.day.php b/phpmyfaq/admin/statistics.sessions.day.php
diff --git a/phpmyfaq/admin/statistics.sessions.php b/phpmyfaq/admin/statistics.sessions.php
diff --git a/phpmyfaq/assets/templates/admin/statistics/sessions.day.twig b/phpmyfaq/assets/templates/admin/statistics/sessions.day.twig
@@ -1,29 +1,33 @@
-<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-  <h1 class="h2">
-    <i aria-hidden="true" class="bi bi-tasks"></i>
-    {{ adminHeaderSessionsPerDay }} {{ currentDay }}
-  </h1>
-</div>
+{% extends '@admin/index.twig' %}
 
-<div class="row">
-  <div class="col-lg-12">
-    <table class="table table-striped align-middle">
-      <thead>
-        <tr>
-          <th>{{ msgIpAddress }}</th>
-          <th>{{ msgSessionDate }}</th>
-          <th>{{ msgSession }}</th>
-        </tr>
-      </thead>
-      <tbody>
-      {% for sid, data in sessionData %}
-        <tr>
-          <td>{{ data.ip }}</td>
-          <td>{{ data.time | date }}</td>
-          <td><a href="?action=viewsession&id={{ sid }}">{{ sid }}</a></td>
-        </tr>
-      {% endfor %}
-      </tbody>
-    </table>
+{% block content %}
+  <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+    <h1 class="h2">
+      <i aria-hidden="true" class="bi bi-tasks"></i>
+      {{ adminHeaderSessionsPerDay }} {{ currentDay }}
+    </h1>
   </div>
-</div>
+
+  <div class="row">
+    <div class="col-lg-12">
+      <table class="table table-striped align-middle">
+        <thead>
+          <tr>
+            <th>{{ msgIpAddress }}</th>
+            <th>{{ msgSessionDate }}</th>
+            <th>{{ msgSession }}</th>
+          </tr>
+        </thead>
+        <tbody>
+        {% for sid, data in sessionData %}
+          <tr>
+            <td>{{ data.ip }}</td>
+            <td>{{ data.time | date }}</td>
+            <td><a href="?action=viewsession&id={{ sid }}">{{ sid }}</a></td>
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+{% endblock %}