cherry-pick (#794)

* fix: create tag/edge statement with empty [NULL|NOT NULL] value (#762) mod: [email protected] (cherry picked from commit f48cef7) * fix: resolves page crash issue during to many attribute editing on `/import/edit/${id}` page (#792) docs: assistant (cherry picked from commit 9c19645) * fix: import template file (#793) (cherry picked from commit 2db7ea2)
vesoft-inc · Apr 23, 2024 · 9a8bf5a · 9a8bf5a
1 parent 6cb77bf
commit 9a8bf5a
Show file tree

Hide file tree

Showing 12 changed files with 181 additions and 171 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ Use when you want shutdown the web app
 kill -9 $(lsof -t -i :7001)
 ```
 
-## Documentation 3.9.0
+## Documentation 3.9.2
 [中文](https://docs.nebula-graph.com.cn/3.6.0/nebula-studio/about-studio/st-ug-what-is-graph-studio/)
 [ENGLISH](https://docs.nebula-graph.io/3.6.0/nebula-studio/about-studio/st-ug-what-is-graph-studio/)
 

diff --git a/app/components/CSVPreviewLink/index.tsx b/app/components/CSVPreviewLink/index.tsx
@@ -31,7 +31,8 @@ const CSVPreviewLink = (props: IProps) => {
     let data = [];
     readString(sample, {
       delimiter,
-      worker: true,
+      // @ts-ignore
+      worker: false,
       skipEmptyLines: true,
       step: (row) => {
         data = [...data, row.data];

diff --git a/app/components/FileConfigSetting/index.tsx b/app/components/FileConfigSetting/index.tsx
@@ -75,7 +75,8 @@ const FileConfigSetting = (props: IProps) => {
       if (activeItem.sample !== undefined) {
         readString(activeItem.sample, {
           delimiter: activeItem.delimiter || ',',
-          worker: true,
+          // @ts-ignore
+          worker: false,
           skipEmptyLines: true,
           step: (row) => {
             content = [...content, row.data];

diff --git a/app/pages/Import/DatasourceList/LocalFileList/PreviewFileModal/index.tsx b/app/pages/Import/DatasourceList/LocalFileList/PreviewFileModal/index.tsx
@@ -53,7 +53,8 @@ const PreviewFileModal = (props: IProps) => {
       let data = [];
       readString(sample, {
         delimiter: delimiter || file.delimiter,
-        worker: true,
+        // @ts-ignore
+        worker: false,
         skipEmptyLines: true,
         step: (row) => {
           data = [...data, row.data];

diff --git a/app/pages/LLMBot/chat.tsx b/app/pages/LLMBot/chat.tsx
@@ -24,7 +24,7 @@ function Chat() {
     const newMessages = [
       ...beforeMessages,
       { role: 'user', content: currentInput },
-      { role: 'assistant', content: '', status: 'pending' }, // asistant can't be changed
+      { role: 'assistant', content: '', status: 'pending' }, // assistant can't be changed
     ];
     llm.update({
       currentInput: '',

diff --git a/app/pages/LLMBot/index.tsx b/app/pages/LLMBot/index.tsx
@@ -26,7 +26,7 @@ function LLMBot() {
         content={<Chat />}
         title={
           <div className={styles.llmBotTitle}>
-            <div className={styles.llmBotTitleInner}>AI Asistant</div>
+            <div className={styles.llmBotTitleInner}>AI Assistant</div>
             <div className={styles.llmBotHandler}>
               text2match
               <Switch

diff --git a/app/stores/llm.ts b/app/stores/llm.ts
@@ -6,7 +6,7 @@ import * as ngqlDoc from '@app/utils/ngql';
 import schema from './schema';
 import rootStore from '.';
 
-export const matchPrompt = `I want you to be a NebulaGraph database asistant.
+export const matchPrompt = `I want you to be a NebulaGraph database assistant.
 There are below document.
 ----
 Use only the provided relationship types and properties in the schema.
@@ -49,7 +49,7 @@ the reference documentation provided is: \n
 ----
 Please marked(\`\`\`ngql) for markdown code block to write the ngql and answer the user's question with the question language`;
 
-export const AgentTask = `Assume you are a NebulaGraph AI chat asistant. You need to help the user to write NGQL or solve other question. 
+export const AgentTask = `Assume you are a NebulaGraph AI chat assistant. You need to help the user to write NGQL or solve other question. 
 You have access to the following information:
 1. The user's console NGQL context is: {current_ngql}
 2. The user's current graph space is: {space_name}

diff --git a/app/utils/gql.ts b/app/utils/gql.ts
@@ -114,9 +114,11 @@ export const getTagOrEdgeCreateGQL = (params: {
           }
           const _type =
             item.type !== 'fixed_string' ? item.type : item.type + `(${item.fixedLength ? item.fixedLength : ''})`;
-          const _null = item.allowNull ? 'NULL' : 'NOT NULL';
+          // `[NULL | NOT NULL]` is not required
+          // in `CREATE TAG` or `CREATE EDGE` statement, the default value is `NULL` if not specified
+          const _null = item.allowNull === undefined ? '' : item.allowNull ? 'NULL' : 'NOT NULL';
           const _comment = item.comment ? `COMMENT "${handleEscape(item.comment)}"` : '';
-          const conbine = [handleKeyword(item.name), _type, _null, valueStr, _comment];
+          const conbine = [handleKeyword(item.name), _type, _null, valueStr, _comment].filter(Boolean);
           return conbine.join(' ');
         })
         .join(', ')