perf: filter field convert sync (#857)

* perf: optimize select field type convert sync logic * fix: forbid trigger upload when resolve import file * fix: type error
teableio · Aug 25, 2024 · 9c69d8d · 9c69d8d
1 parent c170769
commit 9c69d8d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 41 deletions.
diff --git a/apps/nestjs-backend/src/features/field/field-calculate/field-view-sync.service.ts b/apps/nestjs-backend/src/features/field/field-calculate/field-view-sync.service.ts
@@ -6,9 +6,10 @@ import type {
   ISelectFieldOptions,
   IFilterItem,
   IFilter,
+  IFilterValue,
 } from '@teable/core';
 import { PrismaService } from '@teable/db-main-prisma';
-import { isEqual, differenceBy, find } from 'lodash';
+import { isEqual, differenceBy, find, isEmpty } from 'lodash';
 import { ViewService } from '../../view/view.service';
 import type { IFieldInstance } from '../model/factory';
 
@@ -154,54 +155,23 @@ export class FieldViewSyncService {
 
     const transformFilter = (filter: IFilterSet | IFilterItem): IFilterSet | IFilterItem => {
       if ('filterSet' in filter) {
+        const newFilterSet = filter.filterSet.map(transformFilter);
         return {
           conjunction: filter.conjunction,
-          filterSet: filter.filterSet.map(transformFilter),
+          filterSet: newFilterSet.filter((item) => !isEmpty(item)),
         };
       } else {
         // target item
-        if (filter.fieldId === fieldId) {
-          const newValue = transformValue(filter.value);
-          return {
-            ...filter,
-            value: filter.value !== null ? newValue : null,
-            shouldDelete: newValue === null,
-          } as IFilterItem & {
-            shouldDelete: boolean;
-          };
+        if (filter.fieldId === fieldId && filter.value !== null) {
+          const newValue = transformValue(filter.value) as IFilterValue;
+          return (newValue ? { ...filter, value: newValue } : {}) as IFilterItem;
         }
         return {
           ...filter,
         };
       }
     };
 
-    const deleteConvertEmptyFilterItem = (
-      filter: IFilterSet | IFilterItem
-    ): IFilterSet | IFilterItem => {
-      if ('filterSet' in filter) {
-        return {
-          conjunction: filter.conjunction,
-          filterSet: filter.filterSet
-            .filter((item) => {
-              if (!Array.isArray(item)) {
-                return !(
-                  item as IFilterItem & {
-                    shouldDelete: boolean;
-                  }
-                ).shouldDelete;
-              }
-              return true;
-            })
-            .filter(transformFilter),
-        };
-      } else {
-        return {
-          ...filter,
-        };
-      }
-    };
-
-    return deleteConvertEmptyFilterItem(transformFilter(data)) as IFilterSet;
+    return transformFilter(data) as IFilterSet;
   }
 }
diff --git a/apps/nextjs-app/src/features/app/blocks/import-table/upload-panel/UploadPanel.tsx b/apps/nextjs-app/src/features/app/blocks/import-table/upload-panel/UploadPanel.tsx
@@ -2,7 +2,7 @@ import { generateAttachmentId } from '@teable/core';
 import type { SUPPORTEDTYPE, INotifyVo } from '@teable/openapi';
 import { UploadType } from '@teable/openapi';
 import { AttachmentManager } from '@teable/sdk/components';
-import { Spin, Button } from '@teable/ui-lib';
+import { Spin, Button, cn } from '@teable/ui-lib';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Process } from './Process';
@@ -25,7 +25,11 @@ const UploadPanel = (props: IUploadPanelProps) => {
   const [isImporting, setIsImporting] = useState(false);
 
   return (
-    <div className="relative flex h-96 items-center justify-center">
+    <div
+      className={cn('relative flex h-96 items-center justify-center', {
+        'pointer-events-none': isImporting,
+      })}
+    >
       {!file ? (
         <Trigger
           onBeforeUpload={() => {
@@ -51,7 +55,7 @@ const UploadPanel = (props: IUploadPanelProps) => {
             onChange(file);
           }}
         >
-          <div className="flex h-full cursor-pointer items-center justify-center rounded-sm border-2 border-dashed hover:border-secondary">
+          <div className="flex h-full items-center justify-center rounded-sm border-2 border-dashed hover:border-secondary">
             {!isImporting ? (
               <Button variant="ghost">{t('table:import.tips.importWayTip')}</Button>
             ) : (