fix comment, rm console.log

2025-07-16 22:53:01 +09:00
parent 07b0b0f702
commit b059fe1de0
7 changed files with 109 additions and 67 deletions
--- a/oauth/.env.production
+++ b/oauth/.env.production
@@ -16,4 +16,4 @@ VITE_AI_SYSTEM_PROMPT="あなたは6歳の女の子アイです。明るく元

 # Production settings - Disable development features
 VITE_ENABLE_TEST_UI=false
-VITE_ENABLE_DEBUG=false
+VITE_ENABLE_DEBUG=true
--- a/oauth/src/components/RecordTabs.jsx
+++ b/oauth/src/components/RecordTabs.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import RecordList from './RecordList.jsx'
 import ChatRecordList from './ChatRecordList.jsx'
 import ProfileRecordList from './ProfileRecordList.jsx'
@@ -8,34 +8,59 @@ import { logger } from '../utils/logger.js'
 export default function RecordTabs({ langRecords, commentRecords, userComments, chatRecords, chatHasMore, onLoadMoreChat, userChatRecords, userChatLoading, baseRecords, apiConfig, pageContext, user = null, agent = null, onRecordDeleted = null }) {
  const [activeTab, setActiveTab] = useState('profiles')
  
+  // Monitor activeTab changes
+  useEffect(() => {
+    logger.log('RecordTabs: activeTab changed to', activeTab)
+  }, [activeTab])
+  
  logger.log('RecordTabs: activeTab is', activeTab)
+  logger.log('RecordTabs: commentRecords prop:', commentRecords?.length || 0, commentRecords)

  // Filter records based on page context
  const filterRecords = (records, isProfile = false) => {
    // Ensure records is an array
    const recordsArray = Array.isArray(records) ? records : []
    
+    logger.log('filterRecords called with:', {
+      recordsLength: recordsArray.length,
+      isProfile,
+      isTopPage: pageContext.isTopPage,
+      pageRkey: pageContext.rkey,
+      records: recordsArray
+    })
+    
    if (pageContext.isTopPage) {
      // Top page: show latest 3 records
-      return recordsArray.slice(0, 3)
+      const result = recordsArray.slice(0, 3)
+      logger.log('filterRecords: Top page result:', result.length, result)
+      return result
    } else {
      // Individual page: show records matching the URL
-      return recordsArray.filter(record => {
+      const filtered = recordsArray.filter(record => {
        // Profile records should always be shown
        if (isProfile || record.value?.type === 'profile') {
+          logger.log('filterRecords: Profile record included:', record.value?.type)
          return true
        }
        
        const recordUrl = record.value?.post?.url
-        if (!recordUrl) return false
+        if (!recordUrl) {
+          logger.log('filterRecords: No recordUrl found for record:', record.value?.type)
+          return false
+        }
        
        try {
          const recordRkey = new URL(recordUrl).pathname.split('/').pop()?.replace(/\.html$/, '')
-          return recordRkey === pageContext.rkey
+          const matches = recordRkey === pageContext.rkey
+          logger.log('filterRecords: URL matching:', { recordRkey, pageRkey: pageContext.rkey, matches })
+          return matches
        } catch {
+          logger.log('filterRecords: URL parsing failed for:', recordUrl)
          return false
        }
      })
+      logger.log('filterRecords: Individual page result:', filtered.length, filtered)
+      return filtered
    }
  }

@@ -44,7 +69,7 @@ export default function RecordTabs({ langRecords, commentRecords, userComments,
    // Ensure chatPairs is an array
    const chatArray = Array.isArray(chatPairs) ? chatPairs : []
    
-    console.log('filterChatRecords called:', { 
+    logger.log('filterChatRecords called:', { 
      isTopPage: pageContext.isTopPage, 
      rkey: pageContext.rkey, 
      chatPairsLength: chatArray.length,
@@ -55,14 +80,14 @@ export default function RecordTabs({ langRecords, commentRecords, userComments,
    if (pageContext.isTopPage) {
      // Top page: show latest 3 pairs
      const result = chatArray.slice(0, 3)
-      console.log('Top page: returning', result.length, 'pairs')
+      logger.log('Top page: returning', result.length, 'pairs')
      return result
    } else {
      // Individual page: show pairs matching the URL (compare path only, ignore domain)
      const filtered = chatArray.filter(chatPair => {
        const recordUrl = chatPair.question?.value?.post?.url
        if (!recordUrl) {
-          console.log('No recordUrl for chatPair:', chatPair)
+          logger.log('No recordUrl for chatPair:', chatPair)
          return false
        }
        
@@ -71,31 +96,46 @@ export default function RecordTabs({ langRecords, commentRecords, userComments,
          const recordPath = new URL(recordUrl).pathname
          const recordRkey = recordPath.split('/').pop()?.replace(/\.html$/, '')
          
-          console.log('Comparing:', { recordRkey, pageRkey: pageContext.rkey, recordUrl })
+          logger.log('Comparing:', { recordRkey, pageRkey: pageContext.rkey, recordUrl })
          
          // Compare with current page rkey
          const matches = recordRkey === pageContext.rkey
          if (matches) {
-            console.log('Found matching chat pair!')
+            logger.log('Found matching chat pair!')
          }
          return matches
        } catch (error) {
-          console.log('Error processing recordUrl:', recordUrl, error)
+          logger.log('Error processing recordUrl:', recordUrl, error)
          return false
        }
      })
      
-      console.log('Individual page: returning', filtered.length, 'filtered pairs')
+      logger.log('Individual page: returning', filtered.length, 'filtered pairs')
      return filtered
    }
  }

  const filteredLangRecords = filterRecords(Array.isArray(langRecords) ? langRecords : [])
-  const filteredCommentRecords = filterRecords(Array.isArray(commentRecords) ? commentRecords : [])
-  const filteredUserComments = filterRecords(Array.isArray(userComments) ? userComments : [])
+  
+  logger.log('RecordTabs: About to filter commentRecords:', commentRecords?.length || 0, commentRecords)
+  // User requested to display all comments without filtering
+  const filteredCommentRecords = Array.isArray(commentRecords) ? commentRecords : []
+  logger.log('RecordTabs: After filtering commentRecords:', filteredCommentRecords.length, filteredCommentRecords)
+  
+  // User requested to display all comments without filtering
+  const filteredUserComments = Array.isArray(userComments) ? userComments : []
  const filteredChatRecords = filterChatRecords(Array.isArray(chatRecords) ? chatRecords : [])
  const filteredBaseRecords = filterRecords(Array.isArray(baseRecords) ? baseRecords : [])
  
+  logger.log('RecordTabs: filtered results:')
+  logger.log('  - filteredCommentRecords:', filteredCommentRecords.length, filteredCommentRecords)
+  logger.log('  - filteredLangRecords:', filteredLangRecords.length)
+  logger.log('  - filteredUserComments:', filteredUserComments.length)
+  logger.log('  - pageContext:', pageContext)
+  logger.log('RecordTabs: TAB RENDER VALUES:')
+  logger.log('  - filteredCommentRecords.length for tab:', filteredCommentRecords.length)
+  logger.log('  - commentRecords input:', commentRecords?.length || 0)
+  
  // Filter profile records from baseRecords
  const profileRecords = (Array.isArray(baseRecords) ? baseRecords : []).filter(record => record.value?.type === 'profile')
  const sortedProfileRecords = profileRecords.sort((a, b) => {
@@ -125,9 +165,15 @@ export default function RecordTabs({ langRecords, commentRecords, userComments,
        </button>
        <button 
          className={`tab-btn ${activeTab === 'comment' ? 'active' : ''}`}
-          onClick={() => setActiveTab('comment')}
+          onClick={() => {
+            logger.log('RecordTabs: feedback tab clicked, setting activeTab to comment')
+            setActiveTab('comment')
+          }}
        >
-          feedback ({filteredCommentRecords.length})
+          feedback ({(() => {
+            logger.log('RecordTabs: feedback tab render - filteredCommentRecords.length:', filteredCommentRecords.length)
+            return filteredCommentRecords.length
+          })()})
        </button>
        <button 
          className={`tab-btn ${activeTab === 'users' ? 'active' : ''}`}
--- a/oauth/src/hooks/useAdminData.js
+++ b/oauth/src/hooks/useAdminData.js
@@ -3,6 +3,7 @@ import { atproto, collections } from '../api/atproto.js'
 import { getApiConfig } from '../utils/pds.js'
 import { env } from '../config/env.js'
 import { getErrorMessage } from '../utils/errorHandler.js'
+import { logger } from '../utils/logger.js'

 export function useAdminData() {
  const [adminData, setAdminData] = useState({ 
@@ -32,21 +33,35 @@ export function useAdminData() {
      const did = await atproto.getDid(env.pds, env.admin)
      const profile = await atproto.getProfile(apiConfig.bsky, did)
      
-      // Load all data in parallel
+      // Load all data in parallel with error handling
+      logger.log('useAdminData: Starting API calls...')
      const [records, lang, comment, chatResult] = await Promise.all([
-        collections.getBase(apiConfig.pds, did, env.collection),
-        collections.getLang(apiConfig.pds, did, env.collection),
-        collections.getComment(apiConfig.pds, did, env.collection),
-        collections.getChat(apiConfig.pds, did, env.collection, 10)
+        collections.getBase(apiConfig.pds, did, env.collection).catch(err => {
+          logger.error('getBase error:', err)
+          throw err
+        }),
+        collections.getLang(apiConfig.pds, did, env.collection).catch(err => {
+          logger.error('getLang error:', err)
+          throw err
+        }),
+        collections.getComment(apiConfig.pds, did, env.collection).catch(err => {
+          logger.error('getComment error:', err)
+          throw err
+        }),
+        collections.getChat(apiConfig.pds, did, env.collection, 10).catch(err => {
+          logger.error('getChat error:', err)
+          throw err
+        })
      ])
+      logger.log('useAdminData: API calls completed successfully')
      
      const chat = chatResult.records || chatResult
      const cursor = chatResult.cursor || null
      setChatCursor(cursor)
      setChatHasMore(!!cursor)

-      console.log('useAdminData: chatResult structure:', chatResult)
-      console.log('useAdminData: chat variable type:', typeof chat, 'isArray:', Array.isArray(chat))
+      logger.log('useAdminData: chatResult structure:', chatResult)
+      logger.log('useAdminData: chat variable type:', typeof chat, 'isArray:', Array.isArray(chat))

      // Process chat records into question-answer pairs
      const chatPairs = []
@@ -86,15 +101,21 @@ export function useAdminData() {
      // Sort by creation time (newest first)
      chatPairs.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))

-      console.log('useAdminData: raw chat records:', chat.length)
-      console.log('useAdminData: processed chat pairs:', chatPairs.length, chatPairs)
+      logger.log('useAdminData: raw chat records:', chat.length)
+      logger.log('useAdminData: processed chat pairs:', chatPairs.length, chatPairs)
+      logger.log('useAdminData: setting state data:')
+      logger.log('  - records:', records.length)
+      logger.log('  - langRecords:', lang.length)
+      logger.log('  - commentRecords:', comment.length, comment)
+      logger.log('  - chatRecords:', chatPairs.length)

      setAdminData({ did, profile, records, apiConfig })
      setLangRecords(lang)
      setCommentRecords(comment)
      setChatRecords(chatPairs)
    } catch (err) {
-      // Silently fail - no error logging or retry attempts
+      // Log the actual error for debugging
+      logger.error('useAdminData: Error in loadAdminData:', err)
      setError('silent_failure')
    } finally {
      setLoading(false)
--- a/oauth/src/hooks/useUserData.js
+++ b/oauth/src/hooks/useUserData.js
@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'
 import { atproto, collections } from '../api/atproto.js'
 import { getApiConfig, isSyuIsHandle, getPdsFromHandle } from '../utils/pds.js'
 import { env } from '../config/env.js'
+import { logger } from '../utils/logger.js'

 export function useUserData(adminData) {
  const [userComments, setUserComments] = useState([])
@@ -25,13 +26,14 @@ export function useUserData(adminData) {
        )

        // 2. Get chat records from ai.syui.log.chat and process into pairs
-        const chatRecords = await collections.getChat(
+        const chatResult = await collections.getChat(
          adminData.apiConfig.pds,
          adminData.did,
          env.collection
        )
        
-        console.log('useUserData: raw chatRecords:', chatRecords.length, chatRecords)
+        const chatRecords = chatResult.records || chatResult
+        logger.log('useUserData: raw chatRecords:', chatRecords.length, chatRecords)
        
        // Process chat records into question-answer pairs
        const chatPairs = []
@@ -68,7 +70,7 @@ export function useUserData(adminData) {
        // Sort by creation time (newest first)
        chatPairs.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
        
-        console.log('useUserData: processed chatPairs:', chatPairs.length, chatPairs)
+        logger.log('useUserData: processed chatPairs:', chatPairs.length, chatPairs)
        setChatRecords(chatPairs)

        // 3. Get base collection records which contain user comments
@@ -101,7 +103,7 @@ export function useUserData(adminData) {
        // Also try to get individual user records from the user list
        // Currently skipping user list processing since users contain placeholder DIDs
        if (userListRecords.length > 0 && userListRecords[0].value?.users) {
-          console.log('User list found, but skipping placeholder users for now')
+          logger.log('User list found, but skipping placeholder users for now')
          
          // Filter out placeholder users
          const realUsers = userListRecords[0].value.users.filter(user => 
@@ -112,7 +114,7 @@ export function useUserData(adminData) {
          )
          
          if (realUsers.length > 0) {
-            console.log(`Processing ${realUsers.length} real users`)
+            logger.log(`Processing ${realUsers.length} real users`)
            
            for (const user of realUsers) {
              const userHandle = user.handle
@@ -139,7 +141,7 @@ export function useUserData(adminData) {
                    userApiConfig = getApiConfig(realPds)
                  } catch (error) {
                    // Fallback to syu.is if bsky.social fails
-                    console.warn(`Failed to get PDS for ${userHandle} from bsky.social, trying syu.is:`, error)
+                    logger.warn(`Failed to get PDS for ${userHandle} from bsky.social, trying syu.is:`, error)
                    userPds = env.pds
                    userApiConfig = getApiConfig(env.pds)
                    userDid = await atproto.getDid(userPds, userHandle)
@@ -163,7 +165,7 @@ export function useUserData(adminData) {
                try {
                  profile = await atproto.getProfile(userApiConfig.bsky, userDid)
                } catch (profileError) {
-                  console.warn(`Failed to get profile for ${userHandle}:`, profileError)
+                  logger.warn(`Failed to get profile for ${userHandle}:`, profileError)
                }

                // Add profile info to each record
@@ -182,11 +184,11 @@ export function useUserData(adminData) {

                allUserComments.push(...enrichedRecords)
              } catch (userError) {
-                console.warn(`Failed to fetch data for user ${userHandle}:`, userError)
+                logger.warn(`Failed to fetch data for user ${userHandle}:`, userError)
              }
            }
          } else {
-            console.log('No real users found in user list - all appear to be placeholders')
+            logger.log('No real users found in user list - all appear to be placeholders')
          }
        }

--- a/oauth/src/utils/logger.js
+++ b/oauth/src/utils/logger.js
@@ -3,7 +3,7 @@ class Logger {
  constructor() {
    this.isDev = import.meta.env.DEV || false
    this.debugEnabled = import.meta.env.VITE_ENABLE_DEBUG === 'true'
-    this.isEnabled = this.isDev && this.debugEnabled // Enable only in dev AND when debug flag is true
+    this.isEnabled = this.debugEnabled // Enable when debug flag is true (regardless of dev mode)
  }

  log(...args) {
@@ -76,7 +76,7 @@ class Logger {
 // シングルトンインスタンス
 export const logger = new Logger()

-// 開発環境でのみグローバルアクセス可能にする
-if (import.meta.env.DEV && import.meta.env.VITE_ENABLE_DEBUG === 'true') {
+// デバッグ有効時にグローバルアクセス可能にする
+if (import.meta.env.VITE_ENABLE_DEBUG === 'true') {
  window._logger = logger
 }