quietlight/skraak.app - Change J2RLNDEXTGAV4BB6ANIIR7XJLJBHSB4NFQWSBWHNAFB6DMLGS5RAC

Added a filter on files route and component for night/day, also removed file metadata console logging as not needed and its messy

Created by AEj8dahVWy718uSSFPe9VSRJ5qX5G8pC2zvFzJJ8yzBd on April 21, 2025

J2RLNDEXTGAV4BB6ANIIR7XJLJBHSB4NFQWSBWHNAFB6DMLGS5RAC

Dependencies

In channels

main

Change contents

Replacement in src/worker/index.ts at line 94 [4.240196]

∅:D[2.18003] → [3.11787:11868]

B:BD[3.11787] → [3.11787:11868]

    const userId = jwtPayload.sub; // Subject claim usually contains the user ID

[2.18003]

[3.11868]

    const userId = jwtPayload.sub; // User ID from JWT // Subject claim usually contains the user ID

Replacement in src/worker/index.ts at line 124 [4.240196]

∅:D[2.18084] → [5.5912:5993]

B:BD[5.5912] → [5.5912:5993]

    const userId = jwtPayload.sub; // Subject claim usually contains the user ID

[2.18084]

[5.5993]

    const userId = jwtPayload.sub; // User ID from JWT // Subject claim usually contains the user ID

Replacement in src/worker/index.ts at line 171 [4.240196]

∅:D[2.18165] → [6.590:671]

B:BD[6.590] → [6.590:671]

    const userId = jwtPayload.sub; // Subject claim usually contains the user ID

[2.18165]

[5.7524]

    const userId = jwtPayload.sub; // User ID from JWT // Subject claim usually contains the user ID

Replacement in src/worker/index.ts at line 253 [4.240196]

B:BD[2.18309] → [2.18309:18424]

    const jwtPayload = (c as unknown as { jwtPayload: JWTPayload }).jwtPayload;
    const userId = jwtPayload.sub;

[2.18309]

[2.18424]

    // const jwtPayload = (c as unknown as { jwtPayload: JWTPayload }).jwtPayload;
    // const userId = jwtPayload.sub; // User ID from JWT

Insertion in src/worker/index.ts at line 260 [4.240196]

[2.18633]

    const solarNight = c.req.query("solarNight");
    const civilNight = c.req.query("civilNight");

Deletion in src/worker/index.ts at line 263 [4.240196]

B:BD[2.18638] → [2.18638:18761]

    console.log(`Files API called with clusterId: ${clusterId}, page: ${page}, pageSize: ${pageSize}, userId: ${userId}`);

Insertion in src/worker/index.ts at line 287 [4.240196]

[2.19483]

    
    // Build filter conditions
    let whereConditions = sqlExpr`${file.clusterId} = ${clusterId} AND ${file.active} = true`;
    
    // Add filters for solarNight if specified
    if (solarNight === 'true') {
      whereConditions = sqlExpr`${whereConditions} AND ${file.maybeSolarNight} = true`;
    } else if (solarNight === 'false') {
      whereConditions = sqlExpr`${whereConditions} AND (${file.maybeSolarNight} = false OR ${file.maybeSolarNight} IS NULL)`;
    }
    
    // Add filters for civilNight if specified
    if (civilNight === 'true') {
      whereConditions = sqlExpr`${whereConditions} AND ${file.maybeCivilNight} = true`;
    } else if (civilNight === 'false') {
      whereConditions = sqlExpr`${whereConditions} AND (${file.maybeCivilNight} = false OR ${file.maybeCivilNight} IS NULL)`;
    }

Replacement in src/worker/index.ts at line 311 [4.240196]

B:BD[2.19672] → [2.19672:19771]

      .where(
        sqlExpr`${file.clusterId} = ${clusterId} AND ${file.active} = true`
      );

[2.19672]

[2.19771]

      .where(whereConditions);

Replacement in src/worker/index.ts at line 317 [4.240196]
B:BD[2.19959] → [2.19959:19986]
```
    // First get the files
```
[2.19959]
[2.19986]
```
    // First get the files using the same conditions as the count query
```

Replacement in src/worker/index.ts at line 333 [4.240196]

B:BD[2.20461] → [2.20461:20559]

      .where(
        sqlExpr`${file.clusterId} = ${clusterId} AND ${file.active} = true`
      )

[2.20461]

[2.20559]

      .where(whereConditions)

Deletion in src/worker/index.ts at line 346 [4.240196]

B:BD[2.20899] → [2.20899:20998]

        // Add additional logging
        console.log("Fetching metadata for file IDs:", fileIds);

Deletion in src/worker/index.ts at line 358 [4.240196]
B:BD[2.21438] → [2.21438:21503]
```
        console.log("Metadata query results:", metadataResults);
```

Deletion in src/worker/index.ts at line 364 [4.240196]

B:BD[2.21761] → [2.21761:21907]

          // Log the raw metadata value and type
          console.log(`Raw metadata for ${item.fileId}:`, item.json, "Type:", typeof item.json);

Deletion in src/worker/index.ts at line 370 [4.240196]

B:BD[2.22200] → [2.22200:22274]

              console.log("Parsed JSON string metadata:", processedJson);

Deletion in src/worker/index.ts at line 376 [4.240196]

B:BD[2.22616] → [2.22616:22693]

              console.log("Parsed unescaped JSON metadata:", processedJson);

Deletion in src/worker/index.ts at line 387 [4.240196]
B:BD[2.23026] → [2.23026:23085]
```
        console.log("Created metadata map:", metadataMap);
```
Deletion in src/worker/index.ts at line 420 [4.240196]
B:BD[2.24287] → [2.24287:24359]
```
      console.log(`Final metadata for file ${fileData.id}:`, metadata);
```

Replacement in src/worker/index.ts at line 427 [4.240196]

B:BD[2.24441] → [2.24441:24487]

    // Return paginated results with metadata

[2.24441]

[2.24487]

    // Return paginated results with metadata and applied filters

Insertion in src/worker/index.ts at line 437 [4.240196]

[2.24750]

      },
      filters: {
        solarNight: solarNight === 'true' ? true : solarNight === 'false' ? false : null,
        civilNight: civilNight === 'true' ? true : civilNight === 'false' ? false : null,

Deletion in src/worker/index.ts at line 444 [4.240196]

B:BD[2.24770] → [2.24770:24872]

    console.log(`Found ${files.length} files for cluster ${clusterId} (page ${page}/${totalPages})`);

Insertion in src/components/Files.tsx at line 34 [2.1]

[2.845]

}
interface FilesFilters {
  solarNight: boolean | null;
  civilNight: boolean | null;

Insertion in src/components/Files.tsx at line 44 [2.1]
[2.924]
[2.924]
```
  filters?: FilesFilters;
```

Insertion in src/components/Files.tsx at line 47 [2.1]

[2.927]

type NightFilter = 'none' | 'solarNight' | 'solarDay' | 'civilNight' | 'civilDay';

Insertion in src/components/Files.tsx at line 67 [2.1]

[2.1589]

  const [nightFilter, setNightFilter] = useState<NightFilter>('none');

Insertion in src/components/Files.tsx at line 93 [2.1]

[2.2303]

  };
  
  const formatMoonPhase = (phase: number | null | undefined): string => {
    if (phase === null || phase === undefined) return "—";
    try {
      return Number(phase).toFixed(2);
    } catch {
      return "—";
    }

Insertion in src/components/Files.tsx at line 108 [2.1]

[2.2475]

  };
  
  const handleFilterChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
    const value = event.target.value as NightFilter;
    setNightFilter(value);
    setCurrentPage(1); // Reset to first page when changing filters

Replacement in src/components/Files.tsx at line 134 [2.1]

B:BD[2.2865] → [2.2865:3039]

        // Fetch files for the selected cluster with pagination
        const url = `/api/files?clusterId=${encodeURIComponent(clusterId)}&page=${currentPage}&pageSize=100`;

[2.2865]

[2.3039]

        // Build URL with filters
        let url = `/api/files?clusterId=${encodeURIComponent(clusterId)}&page=${currentPage}&pageSize=100`;
        
        // Add night filters
        switch (nightFilter) {
          case 'solarNight':
            url += '&solarNight=true';
            break;
          case 'solarDay':
            url += '&solarNight=false';
            break;
          case 'civilNight':
            url += '&civilNight=true';
            break;
          case 'civilDay':
            url += '&civilNight=false';
            break;
          // 'none' doesn't add any filter parameters
        }

Deletion in src/components/Files.tsx at line 170 [2.1]

B:BD[2.3495] → [2.3495:3613]

        // Debug log to see the structure of the data
        console.log("Files API response:", data.data);

Deletion in src/components/Files.tsx at line 184 [2.1]

B:BD[2.4100] → [2.4100:4198]

        
        console.log("Has valid metadata:", validMetadata, "Sample file:", data.data[0]);

Replacement in src/components/Files.tsx at line 198 [2.1]

B:BD[2.4581] → [2.4581:4659]

  }, [isAuthenticated, authLoading, getAccessToken, clusterId, currentPage]);

[2.4581]

[2.4659]

  }, [isAuthenticated, authLoading, getAccessToken, clusterId, currentPage, nightFilter]);

Replacement in src/components/Files.tsx at line 208 [2.1]

B:BD[2.4999] → [2.4999:5122]

          {pagination && (
            <div className="text-gray-600 text-sm">
              {pagination.totalItems} files

[2.4999]

[2.5122]

          <div className="flex items-center gap-4">
            <div className="flex items-center">
              <select
                id="nightFilter"
                value={nightFilter}
                onChange={handleFilterChange}
                className="rounded-md border border-gray-300 bg-white py-1 px-3 text-sm shadow-sm focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary"
              >
                <option value="none">No filter</option>
                <option value="solarNight">Solar night</option>
                <option value="solarDay">Solar day</option>
                <option value="civilNight">Civil night</option>
                <option value="civilDay">Civil day</option>
              </select>

Replacement in src/components/Files.tsx at line 223 [2.1]

B:BD[2.5141] → [2.5141:5154]

)}

[2.5141]

[2.5154]

            {pagination && (
              <div className="text-gray-600 text-sm">
                {pagination.totalItems} files
              </div>
            )}
          </div>

Replacement in src/components/Files.tsx at line 257 [2.1]

B:BD[2.6346] → [2.6346:6438]

                  <TableHead className="py-3 font-bold text-sm uppercase">Night</TableHead>

[2.6346]

[2.6438]

                  <TableHead className="py-3 font-bold text-sm uppercase">Moon Phase</TableHead>

Replacement in src/components/Files.tsx at line 271 [2.1]

B:BD[2.7313] → [2.7313:7377]

                      {file.maybeSolarNight ? "True" : "False"}

[2.7313]

[2.7377]

                      {formatMoonPhase(file.moonPhase)}