From 19e0db6f6fee79b8969b8884dbe657cc8073b698 Mon Sep 17 00:00:00 2001 From: Sylvia Crowe Date: Fri, 21 Feb 2025 01:04:14 -0800 Subject: [PATCH 1/3] style: change color and icon for s3 frontend --- frontend/app/modals/conntypeahead.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/app/modals/conntypeahead.tsx b/frontend/app/modals/conntypeahead.tsx index 632a9685c0..7a56386b80 100644 --- a/frontend/app/modals/conntypeahead.tsx +++ b/frontend/app/modals/conntypeahead.tsx @@ -127,12 +127,10 @@ function createS3SuggestionItems( // behavior return s3Profiles.map((profileName) => { const connStatus = connStatusMap.get(profileName); - const connColorNum = computeConnColorNum(connStatus); const item: SuggestionConnectionItem = { status: "connected", - icon: "arrow-right-arrow-left", - iconColor: - connStatus?.status == "connected" ? `var(--conn-icon-color-${connColorNum})` : "var(--grey-text-color)", + icon: "database", + iconColor: "var(--accent-color)", value: profileName, label: profileName, current: profileName == connection, From 4b3cf2b47f444e0e93b2417f6c8adf257060bfcd Mon Sep 17 00:00:00 2001 From: Sylvia Crowe Date: Fri, 21 Feb 2025 01:41:27 -0800 Subject: [PATCH 2/3] style: add line wrapping on the error boundary This let's frontend errors display in a way that's more readable in small blocks. --- frontend/app/app.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/app/app.scss b/frontend/app/app.scss index 9162136c4b..6652c9ac81 100644 --- a/frontend/app/app.scss +++ b/frontend/app/app.scss @@ -72,11 +72,12 @@ a.plain-link { } .error-boundary { + white-space: pre-wrap; color: var(--error-color); } .error-color { - color: var(--error-color); + color: var(--error-color); } /* OverlayScrollbars styling */ From faf5ff6bc06feb4c16e03930e7dd7d89478f43e9 Mon Sep 17 00:00:00 2001 From: Sylvia Crowe Date: Fri, 21 Feb 2025 11:49:09 -0800 Subject: [PATCH 3/3] fix: special case for null fileInfo This allows renders to be displayed properly when the file info fails to load. --- frontend/app/view/preview/preview.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/app/view/preview/preview.tsx b/frontend/app/view/preview/preview.tsx index 8e202de8cd..6a86be3b12 100644 --- a/frontend/app/view/preview/preview.tsx +++ b/frontend/app/view/preview/preview.tsx @@ -485,7 +485,11 @@ export class PreviewModel implements ViewModel { const fileName = fileInfo?.name; const connErr = getFn(this.connectionError); const editMode = getFn(this.editMode); + const genErr = getFn(this.errorMsgAtom); + if (!fileInfo) { + return { errorStr: `Load Error: ${genErr?.text}` }; + } if (connErr != "") { return { errorStr: `Connection Error: ${connErr}` }; } @@ -1072,10 +1076,14 @@ function PreviewView({ const filePath = useAtomValue(model.metaFilePath); const [errorMsg, setErrorMsg] = useAtom(model.errorMsgAtom); const connection = useAtomValue(model.connectionImmediate); + const fileInfo = useAtomValue(model.statFile); useEffect(() => { + if (!fileInfo) { + return; + } setErrorMsg(null); - }, [connection, filePath]); + }, [connection, filePath, fileInfo]); if (connStatus?.status != "connected") { return null;