bbovenzi commented on code in PR #31113: URL: https://github.com/apache/airflow/pull/31113#discussion_r1192447476
########## airflow/www/static/js/api/useDagCode.ts: ########## @@ -0,0 +1,98 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import axios, { AxiosResponse } from "axios"; +import { useQuery } from "react-query"; +import { useRef, useEffect, useState } from "react"; + +import { getMetaValue } from "src/utils"; +import type { API } from "src/types"; +import useErrorToast from "../utils/useErrorToast"; + +interface DagCodeData { + lastParsedTime?: string; + codeSource?: string; +} + +export default function useDagCode() { + const errorToast = useErrorToast(); + const [data, setData] = useState<DagCodeData>({ + lastParsedTime: "N/A", + codeSource: "", + }); + + const dagQuery = useQuery( + ["dagQuery"], + () => { + const dagApiUrl = getMetaValue("dag_api"); + return axios.get<AxiosResponse, API.DAG>(dagApiUrl); + }, + { + onError: (error: Error) => { Review Comment: We mainly use `errorToast` for edit actions. We don't really need it here. If we want to show an error to a user, we should do it in the dga code react component. ########## airflow/www/static/js/dag/details/dagCode/CodeBlock.tsx: ########## @@ -0,0 +1,69 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { PrismLight as SyntaxHighlighter } from "react-syntax-highlighter"; +import { oneLight } from "react-syntax-highlighter/dist/esm/styles/prism"; +import python from "react-syntax-highlighter/dist/esm/languages/prism/python"; +import React, { useRef, useState } from "react"; +import { Box, Button } from "@chakra-ui/react"; + +SyntaxHighlighter.registerLanguage("python", python); + +interface Props { + code: string; +} +export default function CodeBlock({ code }: Props) { + const dagCodeRef = useRef(null); + const [codeWrap, setCodeWrap] = useState(false); + const toggleCodeWrap = () => setCodeWrap(!codeWrap); + + return ( + <Box + ref={dagCodeRef} Review Comment: Are we using this ref for anything? ########## airflow/www/static/js/api/useDagCode.ts: ########## @@ -0,0 +1,98 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import axios, { AxiosResponse } from "axios"; +import { useQuery } from "react-query"; +import { useRef, useEffect, useState } from "react"; + +import { getMetaValue } from "src/utils"; +import type { API } from "src/types"; +import useErrorToast from "../utils/useErrorToast"; + +interface DagCodeData { + lastParsedTime?: string; + codeSource?: string; +} + +export default function useDagCode() { + const errorToast = useErrorToast(); + const [data, setData] = useState<DagCodeData>({ + lastParsedTime: "N/A", + codeSource: "", + }); + + const dagQuery = useQuery( + ["dagQuery"], + () => { + const dagApiUrl = getMetaValue("dag_api"); + return axios.get<AxiosResponse, API.DAG>(dagApiUrl); + }, + { + onError: (error: Error) => { + errorToast({ + error, + }); + }, + } + ); + + const dagSourceQuery = useQuery( + ["dagSourceQuery"], + () => { + const fileToken = dagQuery.data?.fileToken || ""; + const dagSourceApiUrl = getMetaValue("dag_source_api").replace( + "_FILE_TOKEN_", + fileToken + ); + return axios.get<AxiosResponse, string>(dagSourceApiUrl, { + headers: { Accept: "text/plain" }, + }); + }, + { + enabled: false, Review Comment: ```suggestion enabled: !!dagQuery.data.fileToken ``` And then we can return the entire dagSourceQuery and remove all of the `useEffect`s ########## airflow/www/static/js/dag/details/dagCode/index.tsx: ########## @@ -0,0 +1,43 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import React, { useRef } from "react"; +import { Box, Heading } from "@chakra-ui/react"; +import { useOffsetTop } from "src/utils"; +import Time from "src/components/Time"; + +import { useDagCode } from "src/api"; +import CodeBlock from "./CodeBlock"; + +const DagCode = () => { + const dagCodeRef = useRef<HTMLDivElement>(null); + const offsetTop = useOffsetTop(dagCodeRef); + const { lastParsedTime, codeSource = "" } = useDagCode(); Review Comment: Let's also pull in `isLoading` and have a spinner. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
