fix: charts (unkeyed#125)

chronark · glamboyosa · commit f9c747df02f3 · 2023-07-19T17:18:22.000+01:00
diff --git a/apps/api/pkg/env/env_test.go b/apps/api/pkg/env/env_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/unkeyed/unkey/apps/api/pkg/env"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
+	"github.com/unkeyed/unkey/apps/api/pkg/env"
 )
 
 func TestString_WhenSet(t *testing.T) {
diff --git a/apps/api/pkg/server/api_get.go b/apps/api/pkg/server/api_get.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/gofiber/fiber/v2"
+	"github.com/unkeyed/unkey/apps/api/pkg/database"
 )
 
 type GetApiRequest struct {
diff --git a/apps/api/pkg/server/api_get_test.go b/apps/api/pkg/server/api_get_test.go
@@ -8,14 +8,14 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/unkeyed/unkey/apps/api/pkg/cache"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/logging"
 	"github.com/unkeyed/unkey/apps/api/pkg/testutil"
 	"github.com/unkeyed/unkey/apps/api/pkg/tracing"
 	"github.com/unkeyed/unkey/apps/api/pkg/uid"
-	"github.com/stretchr/testify/require"
 )
 
 func TestGetApi_Exists(t *testing.T) {
diff --git a/apps/api/pkg/server/key_create.go b/apps/api/pkg/server/key_create.go
@@ -3,13 +3,13 @@ package server
 import (
 	"errors"
 	"fmt"
+	"github.com/gofiber/fiber/v2"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/hash"
 	"github.com/unkeyed/unkey/apps/api/pkg/kafka"
 	"github.com/unkeyed/unkey/apps/api/pkg/keys"
 	"github.com/unkeyed/unkey/apps/api/pkg/uid"
-	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
 	"net/http"
 	"strings"
diff --git a/apps/api/pkg/server/key_create_test.go b/apps/api/pkg/server/key_create_test.go
@@ -12,13 +12,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
 	"github.com/unkeyed/unkey/apps/api/pkg/cache"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/logging"
 	"github.com/unkeyed/unkey/apps/api/pkg/testutil"
 	"github.com/unkeyed/unkey/apps/api/pkg/tracing"
-	"github.com/stretchr/testify/require"
 )
 
 func TestCreateKey_Simple(t *testing.T) {
diff --git a/apps/api/pkg/server/key_delete_test.go b/apps/api/pkg/server/key_delete_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/unkeyed/unkey/apps/api/pkg/testutil"
 	"github.com/unkeyed/unkey/apps/api/pkg/tracing"
 
-	"github.com/unkeyed/unkey/apps/api/pkg/uid"
 	"github.com/stretchr/testify/require"
+	"github.com/unkeyed/unkey/apps/api/pkg/uid"
 )
 
 func TestDeleteKey(t *testing.T) {
diff --git a/apps/api/pkg/server/key_verify.go b/apps/api/pkg/server/key_verify.go
@@ -2,10 +2,10 @@ package server
 
 import (
 	"errors"
+	"github.com/gofiber/fiber/v2"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/ratelimit"
 	"github.com/unkeyed/unkey/apps/api/pkg/tinybird"
-	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
 	"net/http"
 	"time"
diff --git a/apps/api/pkg/server/key_verify_test.go b/apps/api/pkg/server/key_verify_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/unkeyed/unkey/apps/api/pkg/ratelimit"
 	"github.com/unkeyed/unkey/apps/api/pkg/tracing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/unkeyed/unkey/apps/api/pkg/hash"
 	"github.com/unkeyed/unkey/apps/api/pkg/logging"
 	"github.com/unkeyed/unkey/apps/api/pkg/testutil"
 	"github.com/unkeyed/unkey/apps/api/pkg/uid"
-	"github.com/stretchr/testify/require"
 )
 
 func TestVerifyKey_Simple(t *testing.T) {
diff --git a/apps/api/pkg/server/keys_list.go b/apps/api/pkg/server/keys_list.go
@@ -3,8 +3,8 @@ package server
 import (
 	"errors"
 	"fmt"
-	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/gofiber/fiber/v2"
+	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"net/http"
 )
 
diff --git a/apps/api/pkg/server/keys_list_test.go b/apps/api/pkg/server/keys_list_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
 	"github.com/unkeyed/unkey/apps/api/pkg/cache"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
@@ -18,7 +19,6 @@ import (
 	"github.com/unkeyed/unkey/apps/api/pkg/testutil"
 	"github.com/unkeyed/unkey/apps/api/pkg/tracing"
 	"github.com/unkeyed/unkey/apps/api/pkg/uid"
-	"github.com/stretchr/testify/require"
 )
 
 func TestListKeys_Simple(t *testing.T) {
diff --git a/apps/api/pkg/server/root_key_create.go b/apps/api/pkg/server/root_key_create.go
@@ -8,12 +8,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gofiber/fiber/v2"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/hash"
 	"github.com/unkeyed/unkey/apps/api/pkg/kafka"
 	"github.com/unkeyed/unkey/apps/api/pkg/keys"
 	"github.com/unkeyed/unkey/apps/api/pkg/uid"
-	"github.com/gofiber/fiber/v2"
 )
 
 type CreateRootKeyRequest struct {
diff --git a/apps/api/pkg/server/root_key_create_test.go b/apps/api/pkg/server/root_key_create_test.go
@@ -11,12 +11,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
 	"github.com/unkeyed/unkey/apps/api/pkg/cache"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/logging"
 	"github.com/unkeyed/unkey/apps/api/pkg/testutil"
 	"github.com/unkeyed/unkey/apps/api/pkg/tracing"
-	"github.com/stretchr/testify/require"
 )
 
 func TestRootCreateKey_Simple(t *testing.T) {
diff --git a/apps/api/pkg/server/server.go b/apps/api/pkg/server/server.go
@@ -12,14 +12,14 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 
+	"github.com/go-playground/validator/v10"
 	"github.com/unkeyed/unkey/apps/api/pkg/cache"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/kafka"
 	"github.com/unkeyed/unkey/apps/api/pkg/logging"
 	"github.com/unkeyed/unkey/apps/api/pkg/ratelimit"
 	"github.com/unkeyed/unkey/apps/api/pkg/tinybird"
-	"github.com/go-playground/validator/v10"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
diff --git a/apps/api/pkg/server/util.go b/apps/api/pkg/server/util.go
@@ -3,8 +3,8 @@ package server
 import (
 	"strings"
 
-	"github.com/unkeyed/unkey/apps/api/pkg/hash"
 	"github.com/gofiber/fiber/v2"
+	"github.com/unkeyed/unkey/apps/api/pkg/hash"
 )
 
 // Return the hash of the key used for authentication
diff --git a/apps/api/pkg/testutil/setup.go b/apps/api/pkg/testutil/setup.go
@@ -6,13 +6,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
 	"github.com/unkeyed/unkey/apps/api/pkg/database"
 	"github.com/unkeyed/unkey/apps/api/pkg/entities"
 	"github.com/unkeyed/unkey/apps/api/pkg/hash"
 	"github.com/unkeyed/unkey/apps/api/pkg/logging"
 	"github.com/unkeyed/unkey/apps/api/pkg/uid"
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
 )
 
 type resources struct {
diff --git a/apps/web/app/(authenticated)/(app)/app/[apiId]/ApiPage.tsx b/apps/web/app/(authenticated)/(app)/app/[apiId]/ApiPage.tsx
diff --git a/apps/web/app/(authenticated)/(app)/app/[apiId]/keys/[keyId]/page.tsx b/apps/web/app/(authenticated)/(app)/app/[apiId]/keys/[keyId]/page.tsx
@@ -28,18 +28,13 @@ export default async function ApiPage(props: { params: { keyId: string } }) {
     keyId: key.id,
   });
 
-  const now = new Date();
-  const year = now.getUTCFullYear();
-  const month = now.getUTCMonth();
-  const start = new Date(year, month, 0, 0, 0, 0, 0);
-  const end = new Date(start.getTime());
-  end.setUTCMonth(end.getUTCMonth() + 1);
+  const end = new Date().setUTCHours(0, 0, 0, 0);
+  const start = end - 30 * 24 * 60 * 60 * 1000;
 
   const usageOverTime = fillRange(
     usage.data.map(({ time, usage }) => ({ value: usage, time })),
-    start.getTime(),
-    end.getTime(),
-    "1d",
+    start,
+    end,
   ).map(({ value, time }) => ({
     x: new Date(time).toUTCString(),
     y: value,
diff --git a/apps/web/app/(authenticated)/(app)/app/[apiId]/page.tsx b/apps/web/app/(authenticated)/(app)/app/[apiId]/page.tsx
@@ -6,6 +6,7 @@ import { db, eq, schema } from "@unkey/db";
 import { getActiveCount, getUsage } from "@/lib/tinybird";
 import { sql } from "drizzle-orm";
 import { redirect } from "next/navigation";
+import { formatNumber } from "@/lib/fmt";
 
 export const revalidate = 0;
 
@@ -38,21 +39,15 @@ export default async function ApiPage(props: { params: { apiId: string } }) {
     workspaceId: api.workspaceId,
     apiId: api.id,
   });
-  const now = new Date();
-  const year = now.getUTCFullYear();
-  const month = now.getUTCMonth();
-  const start = new Date(year, month, 0, 0, 0, 0, 0);
-  const end = new Date(start.getTime());
-  end.setUTCMonth(end.getUTCMonth() + 1);
-
+  const end = new Date().setUTCHours(0, 0, 0, 0);
+  const start = end - 30 * 24 * 60 * 60 * 1000;
   const keys = await keysP;
   const active = await activeP;
 
   const usageOverTime = fillRange(
     usage.data.map(({ time, usage }) => ({ value: usage, time })),
-    start.getTime(),
-    end.getTime(),
-    "1d",
+    start,
+    end,
   ).map(({ value, time }) => ({
     x: new Date(time).toUTCString(),
     y: value,
@@ -62,19 +57,19 @@ export default async function ApiPage(props: { params: { apiId: string } }) {
     <div className="grid grid-cols-3 gap-4">
       <Card className="col-span-1">
         <CardHeader>
-          <CardTitle>{keys}</CardTitle>
+          <CardTitle>{formatNumber(keys)}</CardTitle>
           <CardDescription>Total Keys</CardDescription>
         </CardHeader>
       </Card>
       <Card className="col-span-1">
         <CardHeader>
-          <CardTitle>{active.data.at(0)?.active ?? 0}</CardTitle>
+          <CardTitle>{formatNumber(active.data.at(0)?.active ?? 0)}</CardTitle>
           <CardDescription>Active Keys (30 days)</CardDescription>
         </CardHeader>
       </Card>
       <Card className="col-span-1">
         <CardHeader>
-          <CardTitle>{usage.data.reduce((sum, day) => sum + day.usage, 0)}</CardTitle>
+          <CardTitle>{formatNumber(usage.data.reduce((sum, day) => sum + day.usage, 0))}</CardTitle>
           <CardDescription>Verifications (30 days)</CardDescription>
         </CardHeader>
       </Card>
diff --git a/apps/web/app/(authenticated)/(app)/app/settings/page.tsx b/apps/web/app/(authenticated)/(app)/app/settings/page.tsx
@@ -35,7 +35,6 @@ export default async function SettingsPage() {
     usage.data.map(({ time, usage }) => ({ value: usage, time })),
     start.getTime(),
     end.getTime(),
-    "1d",
   ).map(({ value, time }) => ({
     x: new Date(time).toUTCString(),
     y: value,
diff --git a/apps/web/app/(landing)/page.tsx b/apps/web/app/(landing)/page.tsx
diff --git a/apps/web/components/ApiKeyTable/index.tsx b/apps/web/components/ApiKeyTable/index.tsx
diff --git a/apps/web/lib/fmt.ts b/apps/web/lib/fmt.ts
diff --git a/apps/web/lib/utils.ts b/apps/web/lib/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- "github.com/unkeyed/unkey/apps/api/pkg/env"`
`11`	`10`	`"github.com/google/uuid"`
`12`	`11`	`"github.com/stretchr/testify/require"`
	`12`	`+ "github.com/unkeyed/unkey/apps/api/pkg/env"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestString_WhenSet(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- "github.com/unkeyed/unkey/apps/api/pkg/database"`
`9`	`8`	`"github.com/gofiber/fiber/v2"`
	`9`	`+ "github.com/unkeyed/unkey/apps/api/pkg/database"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type GetApiRequest struct {`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ import (`
`17`	`17`	`"github.com/unkeyed/unkey/apps/api/pkg/testutil"`
`18`	`18`	`"github.com/unkeyed/unkey/apps/api/pkg/tracing"`
`19`	`19`
`20`		`- "github.com/unkeyed/unkey/apps/api/pkg/uid"`
`21`	`20`	`"github.com/stretchr/testify/require"`
	`21`	`+ "github.com/unkeyed/unkey/apps/api/pkg/uid"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func TestDeleteKey(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package server`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/unkeyed/unkey/apps/api/pkg/database"`
`7`	`6`	`"github.com/gofiber/fiber/v2"`
	`7`	`+ "github.com/unkeyed/unkey/apps/api/pkg/database"`
`8`	`8`	`"net/http"`
`9`	`9`	`)`
`10`	`10`