Jul 3, 2024 · Jul 1, 2024 · Jul 1, 2024 · Jul 1, 2024 · Jul 2, 2024 · Jul 2, 2024
diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts
  return validationErrors.map((error) => error.detail).join("\n");
 };

 export const getErrorDetail = (error: unknown): string | undefined| null=> {
 export const getErrorDetail = (error: unknown): string | undefined => {
  if (error instanceof Error) {
    return "Please check the developer console for more details.";
  }

  if (isApiError(error)) {
    return error.response.data.detail;
  }

  if (isApiErrorResponse(error)) {
    return error.detail;
  }
  return null;

  return undefined;
 };
diff --git a/site/src/modules/resources/AgentLogs/useAgentLogs.ts b/site/src/modules/resources/AgentLogs/useAgentLogs.ts
  enabled?: boolean;
 }>;

 /**
 * Defines a custom hook that gives you all workspace agent logs for a given
 * workspace.
 *
 * Depending on the status of the workspace, all logs may or may not be
 * available.
 */
 export function useAgentLogs(
  options: UseAgentLogsOptions,
 ): readonly WorkspaceAgentLog[] | undefined {
  const { workspaceId, agentId, agentLifeCycleState, enabled = true } = options;

  const queryClient = useQueryClient();
  const queryOptions = agentLogs(workspaceId, agentId);
  const query = useQuery({
    ...queryOptions,
    enabled,
  });
  const logs = query.data;
  const { data: logs, isFetched } = useQuery({ ...queryOptions, enabled });

  // Track the ID of the last log received when the initial logs response comes
  // back. If the logs are not complete, the ID will mark the start point of the
  // Web sockets response so that the remaining logs can be received over time
  const lastQueriedLogId = useRef(0);
  useEffect(() => {
    if (logs && lastQueriedLogId.current === 0) {
      lastQueriedLogId.current = logs[logs.length - 1].id;
    const isAlreadyTracking = lastQueriedLogId.current !== 0;
    if (isAlreadyTracking) {
      return;
    }

    const lastLog = logs?.at(-1);
    if (lastLog !== undefined) {
      lastQueriedLogId.current = lastLog.id;
    }
  }, [logs]);

  });

  useEffect(() => {
    if (agentLifeCycleState !== "starting" || !query.isFetched) {
    if (agentLifeCycleState !== "starting" || !isFetched) {
      return;
    }

    return () => {
      socket.close();
    };
  }, [addLogs, agentId, agentLifeCycleState,query.isFetched]);
  }, [addLogs, agentId, agentLifeCycleState, isFetched]);

  return logs;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -110,15 +110,18 @@ export const getValidationErrorMessage = (error: unknown): string => {
		return validationErrors.map((error) => error.detail).join("\n");
		};

		export const getErrorDetail = (error: unknown): string \| undefined\| null=> {
		export const getErrorDetail = (error: unknown): string \| undefined => {
		if (error instanceof Error) {
		return "Please check the developer console for more details.";
		}

		if (isApiError(error)) {
		return error.response.data.detail;
		}

		if (isApiErrorResponse(error)) {
		return error.detail;
		}
		return null;

		return undefined;
		};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,22 +15,35 @@ export type UseAgentLogsOptions = Readonly<{
		enabled?: boolean;
		}>;

		/**
		* Defines a custom hook that gives you all workspace agent logs for a given
		* workspace.
		*
		* Depending on the status of the workspace, all logs may or may not be
		* available.
		*/
		export function useAgentLogs(
		options: UseAgentLogsOptions,
		): readonly WorkspaceAgentLog[] \| undefined {
		const { workspaceId, agentId, agentLifeCycleState, enabled = true } = options;

		const queryClient = useQueryClient();
		const queryOptions = agentLogs(workspaceId, agentId);
		const query = useQuery({
		...queryOptions,
		enabled,
		});
		const logs = query.data;
		const { data: logs, isFetched } = useQuery({ ...queryOptions, enabled });

		// Track the ID of the last log received when the initial logs response comes
		// back. If the logs are not complete, the ID will mark the start point of the
		// Web sockets response so that the remaining logs can be received over time
		const lastQueriedLogId = useRef(0);
		useEffect(() => {
		if (logs && lastQueriedLogId.current === 0) {
		lastQueriedLogId.current = logs[logs.length - 1].id;
		const isAlreadyTracking = lastQueriedLogId.current !== 0;
		if (isAlreadyTracking) {
		return;
		}

		const lastLog = logs?.at(-1);
		if (lastLog !== undefined) {
		lastQueriedLogId.current = lastLog.id;
		}
		}, [logs]);

Expand All		@@ -42,7 +55,7 @@ export function useAgentLogs(
		});

		useEffect(() => {
		if (agentLifeCycleState !== "starting" \|\| !query.isFetched) {
		if (agentLifeCycleState !== "starting" \|\| !isFetched) {
		return;
		}

Expand All		@@ -69,7 +82,7 @@ export function useAgentLogs(
		return () => {
		socket.close();
		};
		}, [addLogs, agentId, agentLifeCycleState,query.isFetched]);
		}, [addLogs, agentId, agentLifeCycleState, isFetched]);

		return logs;
		}