Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up preview.tsx (#310)

Browse Source
This commit is contained in:
Evan Simkowitz 2024-09-03 18:27:41 -07:00 committed by GitHub
parent ceb53f5614
commit eeceb17c75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
frontend/app/view/preview/preview.tsx
View File

@ -3,7 +3,9 @@
import { TypeAheadModal } from "@/app/modals/typeaheadmodal"; import { TypeAheadModal } from "@/app/modals/typeaheadmodal";
import { ContextMenuModel } from "@/app/store/contextmenu"; import { ContextMenuModel } from "@/app/store/contextmenu";
import { tryReinjectKey } from "@/app/store/keymodel";
import { Markdown } from "@/element/markdown"; import { Markdown } from "@/element/markdown";
import { NodeModel } from "@/layout/index";
import { createBlock, globalStore, refocusNode } from "@/store/global"; import { createBlock, globalStore, refocusNode } from "@/store/global";
import * as services from "@/store/services"; import * as services from "@/store/services";
import * as WOS from "@/store/wos"; import * as WOS from "@/store/wos";
@ -22,9 +24,6 @@ import { CenteredDiv } from "../../element/quickelems";
import { CodeEditor } from "../codeeditor/codeeditor"; import { CodeEditor } from "../codeeditor/codeeditor";
import { CSVView } from "./csvview"; import { CSVView } from "./csvview";
import { DirectoryPreview } from "./directorypreview"; import { DirectoryPreview } from "./directorypreview";
import { tryReinjectKey } from "@/app/store/keymodel";
import { NodeModel } from "@/layout/index";
import "./preview.less"; import "./preview.less";
const MaxFileSize = 1024 * 1024 * 10; // 10MB const MaxFileSize = 1024 * 1024 * 10; // 10MB
@ -134,17 +133,19 @@ export class PreviewModel implements ViewModel {
this.blockAtom = WOS.getWaveObjectAtom<Block>(`block:${blockId}`); this.blockAtom = WOS.getWaveObjectAtom<Block>(`block:${blockId}`);
this.monacoRef = createRef(); this.monacoRef = createRef();
this.viewIcon = jotai.atom((get) => { this.viewIcon = jotai.atom((get) => {
let blockData = get(this.blockAtom); const blockData = get(this.blockAtom);
const fileName = get(this.metaFilePath);
const mimeTypeLoadable = get(this.fileMimeTypeLoadable);
if (blockData?.meta?.icon) { if (blockData?.meta?.icon) {
return blockData.meta.icon; return blockData.meta.icon;
} }
const mimeType = util.jotaiLoadableValue(get(this.fileMimeTypeLoadable), ""); const mimeType = util.jotaiLoadableValue(mimeTypeLoadable, "");
if (mimeType == "directory") { if (mimeType == "directory") {
return { return {
elemtype: "iconbutton", elemtype: "iconbutton",
icon: "folder-open", icon: "folder-open",
longClick: (e: React.MouseEvent<any>) => { longClick: (e: React.MouseEvent<any>) => {
let menuItems: ContextMenuItem[] = []; const menuItems: ContextMenuItem[] = [];
menuItems.push({ menuItems.push({
label: "Go to Home", label: "Go to Home",
click: () => this.goHistory("~"), click: () => this.goHistory("~"),
@ -169,8 +170,7 @@ export class PreviewModel implements ViewModel {
}, },
}; };
} }
const fileName = get(this.metaFilePath); return iconForFile(mimeType);
return iconForFile(mimeType, fileName);
}); });
this.editMode = jotai.atom((get) => { this.editMode = jotai.atom((get) => {
const blockData = get(this.blockAtom); const blockData = get(this.blockAtom);
@ -181,7 +181,7 @@ export class PreviewModel implements ViewModel {
const loadableSV = get(this.loadableSpecializedView); const loadableSV = get(this.loadableSpecializedView);
const isCeView = loadableSV.state == "hasData" && loadableSV.data.specializedView == "codeedit"; const isCeView = loadableSV.state == "hasData" && loadableSV.data.specializedView == "codeedit";
let headerPath = get(this.metaFilePath); let headerPath = get(this.metaFilePath);
let loadablePath: Loadable<string> = get(this.loadableStatFilePath); const loadablePath: Loadable<string> = get(this.loadableStatFilePath);
if (loadablePath.state == "hasData" && !util.isBlank(loadablePath.data)) { if (loadablePath.state == "hasData" && !util.isBlank(loadablePath.data)) {
headerPath = loadablePath.data; headerPath = loadablePath.data;
} }
@ -246,7 +246,7 @@ export class PreviewModel implements ViewModel {
this.endIconButtons = jotai.atom((get) => { this.endIconButtons = jotai.atom((get) => {
const mimeType = util.jotaiLoadableValue(get(this.fileMimeTypeLoadable), ""); const mimeType = util.jotaiLoadableValue(get(this.fileMimeTypeLoadable), "");
if (mimeType == "directory") { if (mimeType == "directory") {
let showHiddenFiles = get(this.showHiddenFiles); const showHiddenFiles = get(this.showHiddenFiles);
return [ return [
{ {
elemtype: "iconbutton", elemtype: "iconbutton",
@ -347,7 +347,7 @@ export class PreviewModel implements ViewModel {
return { specializedView: "streaming" }; return { specializedView: "streaming" };
} }
if (!fileInfo) { if (!fileInfo) {
let fileNameStr = fileName ? " " + JSON.stringify(fileName) : ""; const fileNameStr = fileName ? " " + JSON.stringify(fileName) : "";
return { errorStr: "File Not Found" + fileNameStr }; return { errorStr: "File Not Found" + fileNameStr };
} }
if (fileInfo.size > MaxFileSize) { if (fileInfo.size > MaxFileSize) {
@ -741,7 +741,7 @@ function CSVViewPreview({ model, parentRef }: SpecializedViewProps) {
return <CSVView parentRef={parentRef} readonly={true} content={fileContent} filename={fileName} />; return <CSVView parentRef={parentRef} readonly={true} content={fileContent} filename={fileName} />;
} }
function iconForFile(mimeType: string, fileName: string): string { function iconForFile(mimeType: string): string {
if (mimeType == null) { if (mimeType == null) {
mimeType = "unknown"; mimeType = "unknown";
} }
@ -764,11 +764,6 @@ function iconForFile(mimeType: string, fileName: string): string {
(mimeType.includes("json") || mimeType.includes("yaml") || mimeType.includes("toml"))) (mimeType.includes("json") || mimeType.includes("yaml") || mimeType.includes("toml")))
) { ) {
return "file-code"; return "file-code";
} else if (mimeType === "directory") {
if (fileName == "~" || fileName == "~/") {
return "home";
}
return "folder-open";
} else { } else {
return "file"; return "file";
} }