fix: fix issues (#469)

vesoft-inc · Feb 22, 2023 · dc4fc62 · dc4fc62
1 parent 92eeaa1
commit dc4fc62
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/app/pages/Import/FileList/UploadConfigModal/index.tsx b/app/pages/Import/FileList/UploadConfigModal/index.tsx
@@ -96,7 +96,7 @@ const UploadConfigModal = (props: IProps) => {
   }, [data]);
   const deletePreviewFile = useCallback((e: React.MouseEvent, index: number) => {
     e.stopPropagation();
-    const isActive = activeItem.uid === data[index].uid;
+    const isActive = activeItem?.uid === data[index].uid;
     const newData = data.filter((_, i) => i !== index);
     const checkedNum = data.reduce((n, file) => n + (file.withHeader & 1), 0);
     setState({
@@ -175,7 +175,7 @@ const UploadConfigModal = (props: IProps) => {
         render: value => <span className={styles.limitWidth}>{value}</span>,
       };
     })
-    : [], [previewContent, activeItem]);
+    : [], [previewContent, activeItem?.withHeader]);
   const handleConfirm = useCallback(() => {
     const existFileName = fileList.map((file) => file.name);
     const repeatFiles = data.filter((file) => existFileName.includes(file.name));

diff --git a/app/pages/Import/FileList/index.tsx b/app/pages/Import/FileList/index.tsx
@@ -120,6 +120,7 @@ const FileList = () => {
           title={intl.get('common.ask')}
           okText={intl.get('common.confirm')}
           cancelText={intl.get('common.cancel')}
+          disabled={!selectFiles.length}
         >
           <Button className={styles.deleteBtn} disabled={!selectFiles.length}>
             {intl.get('import.deleteFiles')}

diff --git a/app/pages/Import/TaskCreate/SchemaConfig/FileMapping/index.tsx b/app/pages/Import/TaskCreate/SchemaConfig/FileMapping/index.tsx
@@ -34,6 +34,8 @@ const VIDSetting = observer((props: {
 }) => {
   const { keyMap: { idKey, idFunction, idPrefix, label }, data } = props;
   const { intl } = useI18n();
+  const { schema } = useStore();
+  const { spaceVidType } = schema;
   return <div className={styles.row}>
     <Collapse bordered={false} ghost className={styles.vidCollapse}>
       <Panel header={<div className={cls(styles.panelTitle, styles.spaceBetween)}>
@@ -57,7 +59,7 @@ const VIDSetting = observer((props: {
           </div>
         </>} />
       </div>} key="default">
-        {idFunction && <div className={styles.rowItem}>
+        {spaceVidType === 'INT64' && idFunction && <div className={styles.rowItem}>
           <span className={styles.label}>{intl.get('import.vidFunction')}</span>
           <Select
             bordered={false}

diff --git a/app/pages/Import/TaskCreate/SchemaConfig/index.tsx b/app/pages/Import/TaskCreate/SchemaConfig/index.tsx
@@ -44,7 +44,7 @@ const SelectMappingTargetHeader = observer((props: IHeaderProps) => {
       onClick={e => e.stopPropagation()}
       onChange={onSelect}
     >
-      {targetList.filter(t => !config.some(c => c.name === t)).map(t => (
+      {targetList?.filter(t => !config.some(c => c.name === t)).map(t => (
         <Option value={t} key={t}>
           {t}
         </Option>

diff --git a/app/stores/global.ts b/app/stores/global.ts
@@ -63,9 +63,10 @@ export class GlobalStore {
         },
       },
     );
-    resetStore();
+    // clear storage before reset store, some store data is related to storage
     this.clearStorage();
     this.clearCookies();
+    resetStore();
     this.ngqlRunner?.desctory();
     this.history.push(`/login${location.search}`);
   };
@@ -120,13 +121,14 @@ export class GlobalStore {
 
   getGraphAddress = async () => {
     const { code, data } = await service.execNGQL({ gql: 'show hosts graph;' });
-    return code !== 0 ? [] : data.tables.reduce((acc, cur) => {
-      if (isValidIP(cur.Host)) {
+    const list = code !== 0 ? [] : data.tables.reduce((acc, cur) => {
+      if (isValidIP(cur.Host) && cur.Status === 'ONLINE') {
         acc.push(`${cur.Host}:${cur.Port}`);
       }
       return acc;
     }
     , []);
+    return list.length ? list : [this.host];
   };
 }