-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Description: This PR implements the new service overview page. This PR introduced the monaco editor back into the codebase, currently mainly configured for read only mode. When we come to add it back to the forms validating the writing behavior will be done then. ### Screenshot  ## Is this change user facing? YES
- Loading branch information
Showing
17 changed files
with
269 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import { Editor, OnChange, OnMount, useMonaco } from "@monaco-editor/react"; | ||
| import { isDefined } from "../utils"; | ||
| import { useMemo, useRef, useState } from "react"; | ||
| import { editor } from "monaco-editor"; | ||
| import { Box } from "@chakra-ui/react"; | ||
|
|
||
| type CodeEditorProps = { | ||
| text: string; | ||
| onTextChange?: (newText: string) => void; | ||
| showLineNumbers?: boolean; | ||
| }; | ||
|
|
||
| export const CodeEditor = ({ text, onTextChange, showLineNumbers }: CodeEditorProps) => { | ||
| const isReadOnly = !isDefined(onTextChange); | ||
| const [editor, setEditor] = useState<editor.IStandaloneCodeEditor>(); | ||
|
|
||
| const handleContentSizeChange = (e: editor.IContentSizeChangedEvent) => { | ||
| editor?.layout({ width: 500, height: e.contentHeight }); | ||
| }; | ||
|
|
||
| const handleMount: OnMount = (editor, monaco) => { | ||
| setEditor(editor); | ||
| monaco.editor.defineTheme("kurtosis-theme", { | ||
| base: "vs-dark", | ||
| inherit: true, | ||
| rules: [], | ||
| colors: {}, | ||
| }); | ||
| monaco.editor.setTheme("kurtosis-theme"); | ||
| editor.onDidContentSizeChange(handleContentSizeChange); | ||
| }; | ||
|
|
||
| const handleChange: OnChange = (value, ev) => { | ||
| if (isDefined(value) && onTextChange) { | ||
| onTextChange(value); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <Box width={"100%"} minHeight={`${editor?.getContentHeight() || 10}px`}> | ||
| <Editor | ||
| onMount={handleMount} | ||
| value={text} | ||
| onChange={handleChange} | ||
| options={{ | ||
| readOnly: isReadOnly, | ||
| lineNumbers: showLineNumbers || (!isDefined(showLineNumbers) && !isReadOnly) ? "on" : "off", | ||
| minimap: { enabled: false }, | ||
| wordWrap: "on", | ||
| wrappingStrategy: "advanced", | ||
| scrollBeyondLastLine: false, | ||
| renderLineHighlight: isReadOnly ? "none" : "line", | ||
| selectionHighlight: !isReadOnly, | ||
| occurrencesHighlight: !isReadOnly, | ||
| overviewRulerLanes: isReadOnly ? 0 : 3, | ||
| }} | ||
| defaultLanguage={"json"} | ||
| theme={"vs-dark"} | ||
| height={"100%"} | ||
| /> | ||
| </Box> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { ButtonGroup, Card, Flex, Text } from "@chakra-ui/react"; | ||
| import { CopyButton } from "./CopyButton"; | ||
| import { DownloadButton } from "./DownloadButton"; | ||
| import { CodeEditor } from "./CodeEditor"; | ||
|
|
||
| type FileDisplayProps = { | ||
| title: string; | ||
| value: string; | ||
| filename: string; | ||
| }; | ||
|
|
||
| export const FileDisplay = ({ value, filename, title }: FileDisplayProps) => { | ||
| return ( | ||
| <Flex flexDirection={"column"} gap={"12px"} height={"100%"}> | ||
| <Flex justifyContent={"space-between"}> | ||
| <Text fontSize={"sm"} fontWeight={"medium"}> | ||
| {title} | ||
| </Text> | ||
| <ButtonGroup isAttached> | ||
| <CopyButton contentName={title.toLowerCase()} valueToCopy={value} /> | ||
| <DownloadButton fileName={filename} valueToDownload={value} /> | ||
| </ButtonGroup> | ||
| </Flex> | ||
| <Card height={"100%"}> | ||
| <CodeEditor text={value} /> | ||
| </Card> | ||
| </Flex> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
enclave-manager/web/src/components/enclaves/tables/PortsTable.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import { Link, Flex, Text } from "@chakra-ui/react"; | ||
| import { ColumnDef, createColumnHelper } from "@tanstack/react-table"; | ||
| import { Port } from "enclave-manager-sdk/build/api_container_service_pb"; | ||
| import { useMemo } from "react"; | ||
| import { DataTable } from "../../DataTable"; | ||
| import { transportProtocolToString } from "../utils"; | ||
| import { CopyButton } from "../../CopyButton"; | ||
| import { ExternalLinkIcon } from "@chakra-ui/icons"; | ||
|
|
||
| const columnHelper = createColumnHelper<Port>(); | ||
|
|
||
| type PortsTableProps = { | ||
| ports: Port[]; | ||
| ip: string; | ||
| isPublic?: boolean; | ||
| }; | ||
|
|
||
| export const PortsTable = ({ ports, ip, isPublic }: PortsTableProps) => { | ||
| const columns = useMemo<ColumnDef<Port, any>[]>( | ||
| () => [ | ||
| columnHelper.accessor("number", { | ||
| header: "Port", | ||
| cell: ({ row, getValue }) => ( | ||
| <Flex flexDirection={"column"} gap={"10px"}> | ||
| <Text>{row.original.maybeApplicationProtocol || "Unknown protocol"}</Text> | ||
| <Text fontSize={"xs"} color={"gray.400"} fontWeight={"semibold"}> | ||
| {row.original.number}/{transportProtocolToString(row.original.transportProtocol)} | ||
| </Text> | ||
| </Flex> | ||
| ), | ||
| }), | ||
| columnHelper.accessor("maybeApplicationProtocol", { | ||
| header: "Link", | ||
| minSize: 800, | ||
| cell: ({ row }) => ( | ||
| <Text width={"100%"}> | ||
| {isPublic && ( | ||
| <Link | ||
| href={`${row.original.maybeApplicationProtocol}://${ip}:${row.original.number}`} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| isExternal | ||
| > | ||
| {row.original.maybeApplicationProtocol}://{ip}:{row.original.number} <ExternalLinkIcon mx="2px" /> | ||
| </Link> | ||
| )} | ||
| {!isPublic && `${row.original.maybeApplicationProtocol}://${ip}:${row.original.number}`} | ||
| </Text> | ||
| ), | ||
| }), | ||
| columnHelper.display({ | ||
| id: "copyButton", | ||
| cell: ({ row }) => ( | ||
| <Flex justifyContent={"flex-end"}> | ||
| <CopyButton | ||
| contentName={"link"} | ||
| valueToCopy={`${row.original.maybeApplicationProtocol}://${ip}:${row.original.number}`} | ||
| /> | ||
| </Flex> | ||
| ), | ||
| }), | ||
| ], | ||
| [], | ||
| ); | ||
|
|
||
| return <DataTable columns={columns} data={ports} defaultSorting={[{ id: "number", desc: true }]} />; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import { Port_TransportProtocol } from "enclave-manager-sdk/build/api_container_service_pb"; | ||
|
|
||
| export function transportProtocolToString(protocol: Port_TransportProtocol) { | ||
| switch (protocol) { | ||
| case Port_TransportProtocol.TCP: | ||
| return "TCP"; | ||
| case Port_TransportProtocol.SCTP: | ||
| return "SCTP"; | ||
| case Port_TransportProtocol.UDP: | ||
| return "UDP"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "files": { | ||
| "main.js": "./static/js/main.8b855950.js", | ||
| "main.js": "./static/js/main.90108866.js", | ||
| "index.html": "./index.html", | ||
| "main.8b855950.js.map": "./static/js/main.8b855950.js.map" | ||
| "main.90108866.js.map": "./static/js/main.90108866.js.map" | ||
| }, | ||
| "entrypoints": [ | ||
| "static/js/main.8b855950.js" | ||
| "static/js/main.90108866.js" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="The Kurtosis Enclave Manager Web UI."/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.8b855950.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> | ||
| <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="The Kurtosis Enclave Manager Web UI."/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.90108866.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> |
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...ver/webapp/static/js/main.8b855950.js.map → ...ver/webapp/static/js/main.90108866.js.map
Large diffs are not rendered by default.
Oops, something went wrong.