Fixed hardcoded range
This commit is contained in:
@@ -51,20 +51,43 @@ export async function getRecentSpreadsheets(
|
|||||||
* Get data from a Google Sheet
|
* Get data from a Google Sheet
|
||||||
* @param refreshToken - Google refresh token
|
* @param refreshToken - Google refresh token
|
||||||
* @param spreadsheetId - ID of the spreadsheet
|
* @param spreadsheetId - ID of the spreadsheet
|
||||||
* @param range - Cell range to retrieve (default: A1:Z10)
|
* @param range - Optional cell range. If not provided, it will fetch the entire first sheet.
|
||||||
* @returns Sheet data as a 2D array
|
* @returns Sheet data as a 2D array
|
||||||
*/
|
*/
|
||||||
export async function getSpreadsheetData(
|
export async function getSpreadsheetData(
|
||||||
refreshToken: string,
|
refreshToken: string,
|
||||||
spreadsheetId: string,
|
spreadsheetId: string,
|
||||||
range: string = 'A1:Z10'
|
range?: string
|
||||||
): Promise<SheetData> {
|
): Promise<SheetData> {
|
||||||
const oauth = getAuthenticatedClient(refreshToken);
|
const oauth = getAuthenticatedClient(refreshToken);
|
||||||
const sheets = google.sheets({ version: 'v4', auth: oauth });
|
const sheets = google.sheets({ version: 'v4', auth: oauth });
|
||||||
|
|
||||||
|
let effectiveRange = range;
|
||||||
|
|
||||||
|
// If no range is provided, get the name of the first sheet and use that as the range
|
||||||
|
// to fetch all its content.
|
||||||
|
if (!effectiveRange) {
|
||||||
|
try {
|
||||||
|
const info = await getSpreadsheetInfo(refreshToken, spreadsheetId);
|
||||||
|
const firstSheetName = info.sheets?.[0]?.properties?.title;
|
||||||
|
|
||||||
|
if (firstSheetName) {
|
||||||
|
// To use a sheet name as a range, it must be quoted if it contains spaces or special characters.
|
||||||
|
effectiveRange = `'${firstSheetName}'`;
|
||||||
|
} else {
|
||||||
|
// Fallback if sheet name can't be determined.
|
||||||
|
effectiveRange = 'A1:Z1000'; // A sensible default for a large preview
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to get sheet info for spreadsheet ${spreadsheetId}`, error);
|
||||||
|
// Fallback if the info call fails
|
||||||
|
effectiveRange = 'A1:Z1000';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const response = await sheets.spreadsheets.values.get({
|
const response = await sheets.spreadsheets.values.get({
|
||||||
spreadsheetId,
|
spreadsheetId,
|
||||||
range
|
range: effectiveRange
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -2,17 +2,18 @@ import { json } from '@sveltejs/kit';
|
|||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
import { googleSheetsServer } from '$lib/google/sheets/server.js';
|
import { googleSheetsServer } from '$lib/google/sheets/server.js';
|
||||||
|
|
||||||
export const GET: RequestHandler = async ({ params, request }) => {
|
export const GET: RequestHandler = async ({ params, request, url }) => {
|
||||||
try {
|
try {
|
||||||
const { sheetId } = params;
|
const { sheetId } = params;
|
||||||
const authHeader = request.headers.get('authorization');
|
const authHeader = request.headers.get('authorization');
|
||||||
|
const range = url.searchParams.get('range') || undefined;
|
||||||
|
|
||||||
if (!authHeader?.startsWith('Bearer ')) {
|
if (!authHeader?.startsWith('Bearer ')) {
|
||||||
return json({ error: 'Missing or invalid authorization header' }, { status: 401 });
|
return json({ error: 'Missing or invalid authorization header' }, { status: 401 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const refreshToken = authHeader.slice(7);
|
const refreshToken = authHeader.slice(7);
|
||||||
const sheetData = await googleSheetsServer.getSpreadsheetData(refreshToken, sheetId, 'A1:Z10');
|
const sheetData = await googleSheetsServer.getSpreadsheetData(refreshToken, sheetId, range);
|
||||||
|
|
||||||
return json(sheetData);
|
return json(sheetData);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -172,8 +172,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Use the new unified API endpoint
|
// Use the new unified API endpoint, requesting only a preview range
|
||||||
const response = await fetch(`/private/api/google/sheets/${sheet.id}/data`, {
|
const response = await fetch(`/private/api/google/sheets/${sheet.id}/data?range=A1:Z10`, {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${localStorage.getItem('google_refresh_token')}`
|
Authorization: `Bearer ${localStorage.getItem('google_refresh_token')}`
|
||||||
|
|||||||
Reference in New Issue
Block a user