diff --git a/app/layout.tsx b/app/layout.tsx
index 8a90f75d47..1a38b15008 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -9,11 +9,18 @@ export const metadata: Metadata = {
export default function RootLayout({
children,
-}: Readonly<{
+}: {
children: React.ReactNode
-}>) {
+}) {
return (
+
+
+
{children}
)
diff --git a/lib/utils.ts b/lib/utils.ts
index bd0c391ddd..52c9d71b84 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -1,6 +1,13 @@
-import { clsx, type ClassValue } from "clsx"
+import { type ClassValue, clsx } from "clsx"
import { twMerge } from "tailwind-merge"
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}
+
+export const getTimestamp = () => {
+ if (typeof window === 'undefined') {
+ return Date.now()
+ }
+ return window.INITIAL_TIMESTAMP || Date.now()
+}
diff --git a/stores/notifications/notifications-store.ts b/stores/notifications/notifications-store.ts
index 48455e0f17..ead27dbf8c 100644
--- a/stores/notifications/notifications-store.ts
+++ b/stores/notifications/notifications-store.ts
@@ -1,6 +1,7 @@
import { create } from 'zustand'
import { devtools } from 'zustand/middleware'
import { NotificationType, Notification, NotificationStore } from './types'
+import { getTimestamp } from '@/lib/utils'
export const useNotificationStore = create()(
devtools(
@@ -8,10 +9,10 @@ export const useNotificationStore = create()(
notifications: [],
addNotification: (type, message) => {
const notification: Notification = {
- id: crypto.randomUUID(),
+ id: typeof window === 'undefined' ? '1' : crypto.randomUUID(),
type,
message,
- timestamp: Date.now(),
+ timestamp: getTimestamp(),
isVisible: true,
}
set((state) => ({
diff --git a/stores/workflow/history-middleware.ts b/stores/workflow/history-middleware.ts
index 8ecc91e631..37589d577b 100644
--- a/stores/workflow/history-middleware.ts
+++ b/stores/workflow/history-middleware.ts
@@ -1,6 +1,7 @@
import { StateCreator } from 'zustand'
import { WorkflowState, WorkflowStore } from './types'
import { HistoryEntry, WorkflowHistory, HistoryActions } from './history-types'
+import { getTimestamp } from '@/lib/utils'
const MAX_HISTORY_LENGTH = 20
@@ -80,7 +81,7 @@ export const createHistoryEntry = (
blocks: { ...state.blocks },
edges: [...state.edges ],
},
- timestamp: Date.now(),
+ timestamp: getTimestamp(),
action,
})
diff --git a/types/global.d.ts b/types/global.d.ts
new file mode 100644
index 0000000000..1f73c046b4
--- /dev/null
+++ b/types/global.d.ts
@@ -0,0 +1,3 @@
+interface Window {
+ INITIAL_TIMESTAMP?: number;
+}
\ No newline at end of file