Merge pull request #13 from xtr-dev/dev

Dev

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "payload-feature-flags",
-  "version": "0.0.19",
+  "version": "0.0.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "payload-feature-flags",
-      "version": "0.0.19",
+      "version": "0.0.17",
       "license": "MIT",
       "devDependencies": {
         "@eslint/eslintrc": "^3.2.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtr-dev/payload-feature-flags",
-  "version": "0.0.20",
+  "version": "0.0.17",
   "description": "Feature flags plugin for Payload CMS - manage feature toggles, A/B tests, and gradual rollouts",
   "license": "MIT",
   "type": "module",

src/views/FeatureFlagsClient.tsx

@@ -1,6 +1,4 @@
 'use client'
-import React from 'react'
-import type { ListViewClientProps } from 'payload'
 import { useState, useEffect, useCallback, useMemo, memo } from 'react'
 import {
   useConfig,
@@ -238,7 +236,7 @@ const FeatureFlagsClientComponent = ({
           color: styles.text,
           margin: '0 0 0.5rem 0'
         }}>
-          Feature Flags
+          Feature Flags Dashboard
         </h1>
         <p style={{
           color: styles.textMuted,
@@ -666,4 +664,4 @@ const FeatureFlagsClientComponent = ({
 }
 
 export const FeatureFlagsClient = memo(FeatureFlagsClientComponent)
-export default FeatureFlagsClient
+export default FeatureFlagsClient

src/views/FeatureFlagsView.tsx

@@ -1,13 +1,19 @@
-import React from 'react'
-import type { ListViewServerProps } from 'payload'
+import type { AdminViewServerProps } from 'payload'
+import { DefaultTemplate } from '@payloadcms/next/templates'
+import { Gutter } from '@payloadcms/ui'
 import FeatureFlagsClient from './FeatureFlagsClient.js'
 import type { FeatureFlag } from '../types/index.js'
 
-async function fetchInitialFlags(payload: any, collectionSlug: string): Promise<FeatureFlag[]> {
+async function fetchInitialFlags(payload: any, searchParams?: Record<string, any>): Promise<FeatureFlag[]> {
   try {
+    const limit = Math.min(1000, parseInt(searchParams?.limit as string) || 100)
+    const page = Math.max(1, parseInt(searchParams?.page as string) || 1)
+    const collectionSlug = searchParams?.collectionSlug as string || 'feature-flags'
+
     const result = await payload.find({
       collection: collectionSlug,
-      limit: 1000,
+      limit,
+      page,
       sort: 'name',
     })
 
@@ -18,83 +24,131 @@ async function fetchInitialFlags(payload: any, collectionSlug: string): Promise<
   }
 }
 
-export default async function FeatureFlagsView(props: ListViewServerProps) {
-  const { collectionConfig, user, permissions, payload } = props
+export default async function FeatureFlagsView({
+  initPageResult,
+  params,
+  searchParams,
+}: AdminViewServerProps) {
+  const {
+    req: { user },
+    permissions,
+  } = initPageResult
 
   // Security check: User must be logged in
   if (!user) {
     return (
-      <div style={{
-        padding: '2rem',
-        textAlign: 'center',
-        color: 'var(--theme-error-500)',
-        backgroundColor: 'var(--theme-error-50)',
-        border: '1px solid var(--theme-error-200)',
-        borderRadius: '0.5rem',
-        margin: '2rem 0'
-      }}>
-        <h2 style={{ marginBottom: '1rem', color: 'var(--theme-error-600)' }}>
-          Authentication Required
-        </h2>
-        <p style={{ marginBottom: '1rem' }}>
-          You must be logged in to view the Feature Flags Dashboard.
-        </p>
-        <a
-          href="/admin/login"
-          style={{
-            display: 'inline-block',
-            padding: '0.75rem 1.5rem',
-            backgroundColor: 'var(--theme-error-500)',
-            color: 'white',
-            textDecoration: 'none',
-            borderRadius: '0.375rem',
-            fontWeight: '500'
-          }}
-        >
-          Go to Login
-        </a>
-      </div>
+      <DefaultTemplate
+        i18n={initPageResult.req.i18n}
+        locale={initPageResult.locale}
+        params={params}
+        payload={initPageResult.req.payload}
+        permissions={initPageResult.permissions}
+        searchParams={searchParams}
+        user={undefined}
+        visibleEntities={initPageResult.visibleEntities}
+      >
+        <Gutter>
+          <div style={{
+            padding: '2rem',
+            textAlign: 'center',
+            color: 'var(--theme-error-500)',
+            backgroundColor: 'var(--theme-error-50)',
+            border: '1px solid var(--theme-error-200)',
+            borderRadius: '0.5rem',
+            margin: '2rem 0'
+          }}>
+            <h2 style={{ marginBottom: '1rem', color: 'var(--theme-error-600)' }}>
+              Authentication Required
+            </h2>
+            <p style={{ marginBottom: '1rem' }}>
+              You must be logged in to view the Feature Flags Dashboard.
+            </p>
+            <a
+              href="/admin/login"
+              style={{
+                display: 'inline-block',
+                padding: '0.75rem 1.5rem',
+                backgroundColor: 'var(--theme-error-500)',
+                color: 'white',
+                textDecoration: 'none',
+                borderRadius: '0.375rem',
+                fontWeight: '500'
+              }}
+            >
+              Go to Login
+            </a>
+          </div>
+        </Gutter>
+      </DefaultTemplate>
     )
   }
 
-  // Security check: User must have permissions to access the collection
-  const canReadFeatureFlags = permissions?.collections?.[collectionConfig.slug]?.read
+  // Security check: User must have permissions to access feature-flags collection
+  const collectionSlug = searchParams?.collectionSlug as string || 'feature-flags'
+  const canReadFeatureFlags = permissions?.collections?.[collectionSlug]?.read
   if (!canReadFeatureFlags) {
     return (
-      <div style={{
-        padding: '2rem',
-        textAlign: 'center',
-        color: 'var(--theme-warning-600)',
-        backgroundColor: 'var(--theme-warning-50)',
-        border: '1px solid var(--theme-warning-200)',
-        borderRadius: '0.5rem',
-        margin: '2rem 0'
-      }}>
-        <h2 style={{ marginBottom: '1rem', color: 'var(--theme-warning-700)' }}>
-          Access Denied
-        </h2>
-        <p style={{ marginBottom: '1rem' }}>
-          You don't have permission to access the Feature Flags Dashboard.
-        </p>
-        <p style={{ fontSize: '0.875rem', color: 'var(--theme-warning-600)' }}>
-          Contact your administrator to request access to the {collectionConfig.slug} collection.
-        </p>
-      </div>
+      <DefaultTemplate
+        i18n={initPageResult.req.i18n}
+        locale={initPageResult.locale}
+        params={params}
+        payload={initPageResult.req.payload}
+        permissions={initPageResult.permissions}
+        searchParams={searchParams}
+        user={initPageResult.req.user || undefined}
+        visibleEntities={initPageResult.visibleEntities}
+      >
+        <Gutter>
+          <div style={{
+            padding: '2rem',
+            textAlign: 'center',
+            color: 'var(--theme-warning-600)',
+            backgroundColor: 'var(--theme-warning-50)',
+            border: '1px solid var(--theme-warning-200)',
+            borderRadius: '0.5rem',
+            margin: '2rem 0'
+          }}>
+            <h2 style={{ marginBottom: '1rem', color: 'var(--theme-warning-700)' }}>
+              Access Denied
+            </h2>
+            <p style={{ marginBottom: '1rem' }}>
+              You don't have permission to access the Feature Flags Dashboard.
+            </p>
+            <p style={{ fontSize: '0.875rem', color: 'var(--theme-warning-600)' }}>
+              Contact your administrator to request access to the feature-flags collection.
+            </p>
+          </div>
+        </Gutter>
+      </DefaultTemplate>
     )
   }
 
   // Fetch initial data server-side (only if user has access)
-  const initialFlags = await fetchInitialFlags(payload, collectionConfig.slug)
+  const initialFlags = await fetchInitialFlags(initPageResult.req.payload, searchParams)
 
-  // Check if user can update feature flags
-  const canUpdateFeatureFlags = permissions?.collections?.[collectionConfig.slug]?.update || false
+  // Check if user can update feature flags (use already defined collection slug)
+  const canUpdateFeatureFlags = permissions?.collections?.[collectionSlug]?.update || false
 
+  // Use DefaultTemplate with proper props structure from initPageResult
   return (
-    <FeatureFlagsClient
-      initialFlags={initialFlags}
-      canUpdate={canUpdateFeatureFlags}
-      maxFlags={100}
-      collectionSlug={collectionConfig.slug}
-    />
+    <DefaultTemplate
+      i18n={initPageResult.req.i18n}
+      locale={initPageResult.locale}
+      params={params}
+      payload={initPageResult.req.payload}
+      permissions={initPageResult.permissions}
+      searchParams={searchParams}
+      user={initPageResult.req.user || undefined}
+      visibleEntities={initPageResult.visibleEntities}
+    >
+      <Gutter>
+        <FeatureFlagsClient
+          initialFlags={initialFlags}
+          canUpdate={canUpdateFeatureFlags}
+          maxFlags={parseInt(searchParams?.maxFlags as string) || 100}
+          collectionSlug={collectionSlug}
+        />
+      </Gutter>
+    </DefaultTemplate>
   )
 }