Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: refactor monaco initialization #1012

Merged
merged 5 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

16 changes: 5 additions & 11 deletions frontend/src/components/Editor/EditorComponents/Editor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { request, useInitialPayload } from 'near-social-bridge';
import type { ReactElement } from 'react';
import type { Method, Event } from '@/pages/api/generateCode';

Expand Down Expand Up @@ -31,14 +31,12 @@
import DeveloperToolsContainer from '../EditorViewContainer/DeveloperToolsContainer';
import EditorMenuContainer from '../EditorViewContainer/EditorMenuContainer';
import QueryAPIStorageManager from '../QueryApiStorageManager';
import { block_details } from './block_details';
import { FileSwitcher } from './FileSwitcher';
import { GlyphContainer } from './GlyphContainer';
import ResizableLayoutEditor from './ResizableLayoutEditor';

declare const monaco: any;
const INDEXER_TAB_NAME = 'indexer.js';
const SCHEMA_TAB_NAME = 'schema.sql';
const originalSQLCode = formatSQL(defaultSchema);
const originalIndexingCode = formatIndexingCode(defaultCode);
const pgSchemaTypeGen = new PgSchemaTypeGen();
Expand Down Expand Up @@ -106,7 +104,6 @@
const [heights, setHeights] = useState<number[]>(initialHeights);

const [diffView, setDiffView] = useState<boolean>(false);
const [blockView, setBlockView] = useState<boolean>(false);

const [launchPadDefaultCode, setLaunchPadDefaultCode] = useState<string>('');
const [launchPadDefaultSchema, setLaunchPadDefaultSchema] = useState<string>('');
Expand Down Expand Up @@ -172,7 +169,7 @@
console.error(error);
}
})();
}, []);

useEffect(() => {
//* Load saved code from local storage if it exists else load code from context
Expand All @@ -190,7 +187,7 @@
monacoEditorRef.current.setPosition(savedCursorPosition || { lineNumber: 1, column: 1 });
monacoEditorRef.current.focus();
}
}, [indexerDetails.code]);

useEffect(() => {
//* Load saved schema from local storage if it exists else load code from context
Expand All @@ -201,7 +198,7 @@
schemaErrorHandler(schemaError);
formattedSchema && setSchema(formattedSchema);
}
}, [indexerDetails.schema]);

useEffect(() => {
const { error: schemaError } = validateSQLSchema(schema);
Expand All @@ -213,11 +210,11 @@
}

handleCodeGen();
}, [fileName, launchPadDefaultSchema]);

useEffect(() => {
cacheToLocal();
}, [indexingCode, schema]);

useEffect(() => {
if (!monacoEditorRef.current) return;
Expand All @@ -228,16 +225,16 @@
return () => {
editorInstance.dispose();
};
}, [monacoEditorRef.current]);

useEffect(() => {
storageManager?.setSchemaTypes(schemaTypes);
handleCodeGen();
}, [schemaTypes, monacoMount]);

useEffect(() => {
storageManager?.setDebugList(heights);
}, [heights]);

const cacheToLocal = () => {
if (!storageManager || !monacoEditorRef.current) return;
Expand Down Expand Up @@ -463,24 +460,21 @@
indexerError={indexerError}
/>
<GlyphContainer style={{ height: '100%', width: '100%' }}>
{/* @ts-ignore remove after refactoring Resizable Editor to ts*/}
<ResizableLayoutEditor
fileName={fileName}
indexingCode={indexingCode}
blockView={blockView}
diffView={diffView}
isCreateNewIndexer={isCreateNewIndexer}
onChangeCode={handleOnChangeCode}
onChangeSchema={handleOnChangeSchema}
block_details={block_details}
originalSQLCode={originalSQLCode}
originalIndexingCode={originalIndexingCode}
schema={schema}
isCreateNewIndexer={isCreateNewIndexer}
onMount={handleEditorWillMount}
indexingCode={indexingCode}
schema={schema}
launchPadDefaultCode={launchPadDefaultCode}
launchPadDefaultSchema={launchPadDefaultSchema}
contextCode={contextCode}
contextSchema={contextSchema}
originalSQLCode={originalSQLCode}
originalIndexingCode={originalIndexingCode}
/>
</GlyphContainer>
</div>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,189 +1,114 @@
import { DiffEditorComponent } from './DiffEditorComponent';
import { MonacoEditorComponent } from './MonacoEditorComponent';
import { defaultCode, defaultSchema } from '@/utils/formatters';
import { useDragResize } from '@/utils/resize';
import React from 'react';
import MonacoEditor, { DiffEditor } from '@monaco-editor/react';
import GraphqlPlayground from '../../Playground';

const containerStyle = {
display: 'flex',
flexDirection: 'row',
width: '100%',
height: '100vh',
const editorOptions = {
wordWrap: 'on',
minimap: { enabled: false },
folding: false,
lineNumberMinChars: 3,
scrollBeyondLastLine: true,
automaticLayout: true,
formatOnPaste: true,
definitionLinkOpensInPeek: true,
font: 'serif',
};

const editorContainerStyle = {
width: '100%',
display: 'flex',
justifyContent: 'center',
minWidth: '100px',
};
const getEditorOptions = (options, readOnly) => ({
...options,
readOnly,
});

const dragBarStyle = {
width: '10px',
backgroundColor: 'gray',
cursor: 'col-resize',
};
const getDiffEditorOptions = (options, readOnly) => ({
...options,
readOnly,
});

const getDefaultValues = (launchPadDefault, context, original) => launchPadDefault || context || original;

const ResizableEditor = ({
accountId,
const ResizableLayoutEditor = ({
fileName,
blockView,
diffView,
consoleView,
onChangeCode,
onChangeSchema,
block_details,
launchPadDefaultSchema,
contextSchema,
originalSQLCode,
launchPadDefaultCode,
contextCode,
originalIndexingCode,
schema,
indexingCode,
onMount,
isCreateNewIndexer,
onMount,
onChangeSchema,
onChangeCode,
}) => {
const { firstRef, secondRef, dragBarRef } = useDragResize({
direction: 'horizontal',
initiallyHidden: null,
defaultSizeRelation: 3,
sizeThresholdFirst: 60,
sizeThresholdSecond: 60,
});
const determineEditorProps = () => {
const isSchemaEditor = fileName === 'schema.sql';
const isCodeEditor = fileName === 'indexer.js';

// Render logic based on fileName
const editorComponents = {
GraphiQL: () => <GraphqlPlayground />,
'indexer.js': () =>
diffView ? (
<DiffEditorComponent
key="code-diff"
original={originalIndexingCode}
modified={indexingCode}
language="typescript"
readOnly={false}
onMount={onMount}
/>
) : (
<MonacoEditorComponent
key="code-editor"
value={indexingCode}
height="100vh"
defaultValue={defaultCode}
defaultLanguage="typescript"
readOnly={false}
onChange={onChangeCode}
onMount={onMount}
options={{
wordWrap: 'on',
minimap: { enabled: false },
folding: false,
lineNumberMinChars: 3,
scrollBeyondLastLine: true,
automaticLayout: true,
formatOnPaste: true,
definitionLinkOpensInPeek: true,
// glyphMargin: true,
font: 'serif',
}}
/>
),
'schema.sql': () =>
diffView ? (
<DiffEditorComponent
key="schema-diff"
original={originalSQLCode}
modified={schema}
language="sql"
readOnly={isCreateNewIndexer === true ? false : true}
onMount={onMount}
/>
) : (
<MonacoEditorComponent
key="schema-editor"
value={schema}
defaultValue={defaultSchema}
defaultLanguage="sql"
readOnly={isCreateNewIndexer === true ? false : false}
onChange={onChangeSchema}
onMount={onMount}
options={{
wordWrap: 'on',
minimap: { enabled: false },
folding: false,
lineNumberMinChars: 3,
scrollBeyondLastLine: true,
automaticLayout: true,
formatOnPaste: true,
definitionLinkOpensInPeek: true,
glyphMargin: true,
font: 'serif',
}}
if (!isSchemaEditor && !isCodeEditor) return null;

const defaultValue = isSchemaEditor
? getDefaultValues(launchPadDefaultSchema, contextSchema, originalSQLCode)
: getDefaultValues(launchPadDefaultCode, contextCode, originalIndexingCode);

const value = isSchemaEditor ? schema : indexingCode;
const readOnly = isSchemaEditor && !isCreateNewIndexer;

return {
editorProps: {
onMount,
options: getEditorOptions(editorOptions, readOnly),
defaultValue,
value,
readOnly,
onChange: isSchemaEditor ? onChangeSchema : onChangeCode,
language: isSchemaEditor ? 'sql' : 'typescript',
},
diffProps: {
original: defaultValue,
modified: value,
language: isSchemaEditor ? 'sql' : 'typescript',
readOnly,
options: getDiffEditorOptions(editorOptions, readOnly),
},
};
};

const renderEditor = () => {
if (fileName === 'GraphiQL') return <GraphqlPlayground />;

const { editorProps, diffProps } = determineEditorProps();

if (diffView) {
return (
<DiffEditor
key={`${fileName}-diff`}
original={diffProps.original}
modified={diffProps.modified}
language={diffProps.language}
onMount={editorProps.onMount}
options={diffProps.options}
theme="vs-dark"
/>
),
);
}

return (
<MonacoEditor
key={`${fileName}-editor`}
value={editorProps.value}
defaultValue={editorProps.defaultValue}
defaultLanguage={editorProps.language}
onMount={editorProps.onMount}
onChange={editorProps.onChange}
options={editorProps.options}
theme="vs-dark"
/>
);
};

return (
<div style={containerStyle}>
<div ref={firstRef} style={editorContainerStyle}>
{editorComponents[fileName] && editorComponents[fileName]()}
</div>
<div ref={dragBarRef} style={dragBarStyle} />
</div>
);
return <div className="h-[85vh]">{renderEditor()}</div>;
};

export default function ResizableLayoutEditor({
accountId,
fileName,
blockView,
diffView,
consoleView,
onChangeCode,
onChangeSchema,
block_details,
originalSQLCode,
originalIndexingCode,
schema,
indexingCode,
onMount,
isCreateNewIndexer,
launchPadDefaultCode,
launchPadDefaultSchema,
contextCode,
contextSchema,
}) {
const {
dragBarRef: dragBarRefConsole,
firstRef: firstRefEditor,
secondRef: secondRefConsole,
} = useDragResize({
direction: 'vertical',
initiallyHidden: 'second',
defaultSizeRelation: 3,
sizeThresholdFirst: 60,
sizeThresholdSecond: 20,
});

const defaultCode = launchPadDefaultCode ? launchPadDefaultCode : contextCode ? contextCode : originalIndexingCode;
const defaultSchema = launchPadDefaultSchema ? launchPadDefaultSchema : contextSchema ? contextSchema : originalSQLCode;

return (
<div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
{/* Code Editor */}
<div ref={firstRefEditor} style={{ overflow: 'auto' }}>
<ResizableEditor
accountId={accountId}
fileName={fileName}
blockView={blockView}
diffView={diffView}
onChangeCode={onChangeCode}
onChangeSchema={onChangeSchema}
block_details={block_details}
indexingCode={indexingCode}
originalIndexingCode={defaultCode}
schema={schema}
originalSQLCode={defaultSchema}
onMount={onMount}
/>
</div>
</div>
);
}
export default React.memo(ResizableLayoutEditor);
Loading