fix hardcoded project id

This commit is contained in:
shamsmosowi
2021-11-30 20:23:33 +07:00
parent 5004ab7076
commit dba197cc0b
2 changed files with 14 additions and 4 deletions

View File

@@ -22,18 +22,25 @@ import BuildLogs from "./BuildLogs";
import EmptyState from "@src/components/EmptyState";
import { useProjectContext } from "@src/contexts/ProjectContext";
import { useAppContext } from "@src/contexts/AppContext";
import { cloudLogFiltersAtom, cloudLogFetcher } from "./utils";
export default function CloudLogsModal(props: IModalProps) {
const { rowyRun, tableState, table, compatibleRowyRunVersion } =
useProjectContext();
const { projectId } = useAppContext();
const [cloudLogFilters, setCloudLogFilters] = useAtom(cloudLogFiltersAtom);
const { data, mutate, isValidating } = useSWR(
cloudLogFilters.type === "build"
? null
: ["/logs", rowyRun, cloudLogFilters, tableState?.tablePath || ""],
: [
"/logs",
rowyRun,
projectId,
cloudLogFilters,
tableState?.tablePath || "",
],
cloudLogFetcher,
{
fallbackData: [],

View File

@@ -26,6 +26,7 @@ export const cloudLogFiltersAtom = atomWithHash<CloudLogFilters>(
export const cloudLogFetcher = (
endpointRoot: string,
rowyRun: IProjectContext["rowyRun"],
projectId: string,
cloudLogFilters: CloudLogFilters,
tablePath: string
) => {
@@ -34,7 +35,9 @@ export const cloudLogFetcher = (
switch (cloudLogFilters.type) {
case "webhook":
logQuery.push(`logName = "projects/rowyio/logs/rowy-webhook-events"`);
logQuery.push(
`logName = "projects/${projectId}/logs/rowy-webhook-events"`
);
logQuery.push(`jsonPayload.url : "${tablePath}"`);
if (
Array.isArray(cloudLogFilters.webhook) &&
@@ -48,7 +51,7 @@ export const cloudLogFetcher = (
break;
case "audit":
logQuery.push(`logName = "projects/rowyio/logs/rowy-audit"`);
logQuery.push(`logName = "projects/${projectId}/logs/rowy-audit"`);
logQuery.push(`jsonPayload.ref.collectionPath = "${tablePath}"`);
if (cloudLogFilters.auditRowId)
logQuery.push(