Merge pull request #821 from karrioapi/advanced-admin

[release] karrio 2025.5

Author: danh91

CHANGELOG.md

@@ -1 +1 @@
-2025.5rc14
+2025.5rc15

apps/api/karrio/server/VERSION

@@ -138,6 +138,10 @@
             "app": "karrio.server.pricing",
             "module": "karrio.server.pricing",
         },
+        {
+            "app": "karrio.server.analytics",
+            "module": "karrio.server.analytics",
+        },
         {
             "app": "karrio.server.apps",
             "module": "karrio.server.apps",
@@ -192,6 +196,9 @@
 SHIPPING_RULES = (
     importlib.util.find_spec("karrio.server.automation") is not None  # type:ignore
 )
+ADVANCED_ANALYTICS = (
+    importlib.util.find_spec("karrio.server.analytics") is not None  # type:ignore
+) and config("ADVANCED_ANALYTICS", default=(True if DEBUG else False), cast=bool)
 
 
 # Feature flags
@@ -209,6 +216,7 @@
     ("PERSIST_SDK_TRACING", bool),
     ("WORKFLOW_MANAGEMENT", bool),
     ("SHIPPING_RULES", bool),
+    ("ADVANCED_ANALYTICS", bool),
 ]
 
 

apps/api/karrio/server/settings/base.py

@@ -129,6 +129,15 @@
         if importlib.util.find_spec("karrio.server.automation") is not None
         else None
     ),
+    "ADVANCED_ANALYTICS": (
+        (
+            base.ADVANCED_ANALYTICS,
+            "Advanced analytics",
+            bool,
+        )
+        if importlib.util.find_spec("karrio.server.analytics") is not None
+        else None
+    ),
     "PERSIST_SDK_TRACING": (
         base.PERSIST_SDK_TRACING,
         "Persist SDK tracing",

apps/api/karrio/server/settings/constance.py

@@ -32,3 +32,8 @@ def user_verified_callback(user):
 
 
 EMAIL_VERIFIED_CALLBACK = user_verified_callback
+
+# Compatibility with django-email-verification expected settings
+# Some versions expect EMAIL_MAIL_CALLBACK to be present.
+# Reuse the same verified callback to activate the user when appropriate.
+EMAIL_MAIL_CALLBACK = user_verified_callback

apps/api/karrio/server/settings/email.py

@@ -22,3 +22,6 @@ Sentry.init({
     return scope;
   },
 });
+
+// Export the required hook for Sentry navigation instrumentation
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;

apps/dashboard/instrumentation-client.ts

@@ -1,8 +1,8 @@
-import { withSentryConfig } from "@sentry/nextjs";
-import path from "path";
 import CopyWebpackPlugin from "copy-webpack-plugin";
-import { fileURLToPath } from "url";
+import { withSentryConfig } from "@sentry/nextjs";
 import { readdirSync, statSync } from "fs";
+import { fileURLToPath } from "url";
+import path from "path";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const BASE_PATH = process.env.NEXT_PUBLIC_BASE_PATH || "";
@@ -78,7 +78,6 @@ const nextConfig = {
     "@karrio/ui",
     "@karrio/lib",
     "@karrio/types",
-    "@karrio/trpc",
     "@karrio/admin",
     "@karrio/developers",
     "@karrio/app-store",

apps/dashboard/next.config.mjs

@@ -0,0 +1,3 @@
+import { dynamicMetadata } from "@karrio/core/components/metadata";
+export { default } from "@karrio/core/modules/Settings";
+export const generateMetadata = dynamicMetadata("Settings");

apps/dashboard/src/app/(base)/(dashboard)/settings/page.tsx

@@ -0,0 +1,3 @@
+import { dynamicMetadata } from "@karrio/core/components/metadata";
+export { default } from "@karrio/core/modules/Shippers/details";
+export const generateMetadata = dynamicMetadata("Shippers Details");

apps/dashboard/src/app/(base)/(dashboard)/shippers/accounts/[id]/page.tsx

@@ -0,0 +1,3 @@
+import { dynamicMetadata } from "@karrio/core/components/metadata";
+export { default } from "@karrio/core/modules/Shippers";
+export const generateMetadata = dynamicMetadata("Shippers Accounts");