Merge pull request #4791 from plan-player-analytics/4769

Bugfixes

Author: AuroraLS3

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/line/LineGraph.java

@@ -64,7 +64,7 @@ public String toHighChartsSeries() {
             }
             lastX = date;
 
-            arrayBuilder.append("[").append(date).append(",").append(y).append("]");
+            arrayBuilder.append("[").append(date).append(",").append(y < 0 ? null : y).append("]");
             if (i < size - 1) {
                 arrayBuilder.append(",");
             }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java

@@ -88,7 +88,7 @@ private void removeProviders(Collection<Integer> providerIds, Collection<Integer
         if (!providerIds.isEmpty()) {
             execute(new ExecStatement(
                     DELETE_FROM + ExtensionProviderTable.TABLE_NAME +
-                            WHERE + ExtensionProviderTable.PLUGIN_ID +
+                            WHERE + ExtensionProviderTable.ID +
                             " IN (" + Sql.nParameters(providerIds.size()) + ")"
             ) {
                 @Override
@@ -100,7 +100,7 @@ public void prepare(PreparedStatement statement) throws SQLException {
         if (!tableProviderIds.isEmpty()) {
             execute(new ExecStatement(
                     DELETE_FROM + ExtensionTableProviderTable.TABLE_NAME +
-                            WHERE + ExtensionTableProviderTable.PLUGIN_ID +
+                            WHERE + ExtensionTableProviderTable.ID +
                             " IN (" + Sql.nParameters(tableProviderIds.size()) + ")"
             ) {
                 @Override

Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/ExtensionsDatabaseTest.java

@@ -35,11 +35,13 @@
 import com.djrapitops.plan.gathering.domain.ActiveSession;
 import com.djrapitops.plan.gathering.domain.WorldTimes;
 import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.settings.config.ExtensionSettings;
 import com.djrapitops.plan.storage.database.DatabaseTestPreparer;
 import com.djrapitops.plan.storage.database.transactions.commands.RemoveEverythingTransaction;
 import com.djrapitops.plan.storage.database.transactions.events.PlayerRegisterTransaction;
 import com.djrapitops.plan.storage.database.transactions.events.StoreSessionTransaction;
 import com.djrapitops.plan.storage.database.transactions.events.StoreWorldNameTransaction;
+import com.djrapitops.plan.storage.database.transactions.init.RemoveOldExtensionsTransaction;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.jupiter.api.BeforeEach;
@@ -54,6 +56,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -75,6 +78,10 @@ default void unregisterExtensions() {
         extensionService.unregister(new TableExtension());
         extensionService.unregister(new ThrowingExtension());
         extensionService.unregister(new ClickEventTestExtension());
+        ExtensionSettings extensionSettings = config().getExtensionSettings();
+        extensionSettings.setEnabled("PlayerExtension", true);
+        extensionSettings.setEnabled("TableExtension", true);
+        extensionSettings.setEnabled("ServerExtension", true);
     }
 
     @Test
@@ -91,6 +98,28 @@ default void removeEverythingRemovesServerExtensionData() {
         assertTrue(db().query(new ExtensionServerDataQuery(serverUUID())).isEmpty());
     }
 
+    @Test
+    default void removeOldExtensionDataCleansData() {
+        db().executeTransaction(new PlayerRegisterTransaction(TestConstants.PLAYER_ONE_UUID, System::currentTimeMillis, TestConstants.PLAYER_ONE_NAME));
+
+        ExtensionSvc extensionService = extensionService();
+        extensionService.register(new TableExtension());
+        extensionService.register(new PlayerExtension());
+        extensionService.register(new ServerExtension());
+        extensionService.updatePlayerValues(playerUUID, TestConstants.PLAYER_ONE_NAME, CallEvents.MANUAL);
+        extensionService.updateServerValues(CallEvents.MANUAL);
+
+        ExtensionSettings extensionSettings = config().getExtensionSettings();
+        extensionSettings.setEnabled("PlayerExtension", false);
+        extensionSettings.setEnabled("TableExtension", false);
+        extensionSettings.setEnabled("ServerExtension", false);
+
+        db().executeTransaction(new RemoveOldExtensionsTransaction(extensionSettings, TimeUnit.DAYS.toMillis(1), serverUUID()));
+
+        assertTrue(db().query(new ExtensionPlayerDataQuery(playerUUID)).isEmpty());
+        assertTrue(db().query(new ExtensionServerDataQuery(serverUUID())).isEmpty());
+    }
+
     @Test
     default void extensionPlayerValuesAreStored() {
         db().executeTransaction(new PlayerRegisterTransaction(TestConstants.PLAYER_ONE_UUID, System::currentTimeMillis, TestConstants.PLAYER_ONE_NAME));

Plan/react/dashboard/src/components/cards/server/graphs/GraphSeriesCard.tsx

@@ -288,11 +288,11 @@ export const GraphSeriesCard = ({id, identifier}: Props) => {
             name: t('html.label.ping'), icon: faSignal,
             color: 'var(--color-data-performance-ping)',
             permission: 'page.server.performance.graphs.ping',
-            data: pingSeries ? [] : undefined
+            data: pingSeries ? [{}] : undefined
         }, {
             show: false,
             id: PerformanceGraphId.PING_MIN,
-            name: t('html.label.bestPing'), icon: faSignal, color: 'ping',
+            name: t('html.label.bestPing'), icon: faSignal, color: "var(--color-graphs-ping-min)",
             permission: 'page.server.performance.graphs.ping',
             data: pingSeries?.min_ping_series,
             options: {
@@ -303,7 +303,7 @@ export const GraphSeriesCard = ({id, identifier}: Props) => {
         }, {
             show: false,
             id: PerformanceGraphId.PING_AVG,
-            name: t('html.label.averagePing'), icon: faSignal, color: 'ping',
+            name: t('html.label.averagePing'), icon: faSignal, color: "var(--color-graphs-ping-avg)",
             permission: 'page.server.performance.graphs.ping',
             data: pingSeries?.avg_ping_series,
             options: {
@@ -314,7 +314,7 @@ export const GraphSeriesCard = ({id, identifier}: Props) => {
         }, {
             show: false,
             id: PerformanceGraphId.PING_MAX,
-            name: t('html.label.worstPing'), icon: faSignal, color: 'ping',
+            name: t('html.label.worstPing'), icon: faSignal, color: "var(--color-graphs-ping-max)",
             permission: 'page.server.performance.graphs.ping',
             data: pingSeries?.max_ping_series,
             options: {

Plan/react/dashboard/src/util/format/useDateFormatter.js

@@ -42,7 +42,7 @@ export const useDateFormatter = (includeSeconds, overrides = {}) => {
         const dayMs = 24 * 60 * 60 * 1000;
         const timestamp = date - offset;
         const now = Date.now() - offset;
-        const fromStartOfToday = (now - offset) % dayMs;
+        const fromStartOfToday = now % dayMs;
         const today = now - fromStartOfToday;
         const yesterday = today - dayMs;
         const tomorrow = today + dayMs;