From ba6c39d9b33f33d0fd125700ad3a460660c82c2a Mon Sep 17 00:00:00 2001 From: Montassar Ghanmy Date: Thu, 28 Nov 2024 13:12:15 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20Removed=20icon,=20warning=20and?= =?UTF-8?q?=20restrictions=20for=20av=20scanning=20status=20(#753)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../node/src/services/documents/entities/drive-file.ts | 4 ++-- .../frontend/src/app/views/client/body/drive/context-menu.tsx | 4 +++- .../app/views/client/body/drive/documents/document-row.tsx | 3 --- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tdrive/backend/node/src/services/documents/entities/drive-file.ts b/tdrive/backend/node/src/services/documents/entities/drive-file.ts index b8e71b4a..7ecb3f85 100644 --- a/tdrive/backend/node/src/services/documents/entities/drive-file.ts +++ b/tdrive/backend/node/src/services/documents/entities/drive-file.ts @@ -8,8 +8,8 @@ import * as UUIDTools from "../../../utils/uuid"; export const TYPE = "drive_files"; export type DriveScope = "personal" | "shared"; -export type AVStatusSafe = "uploaded" | "safe"; -export type AVStatusUnsafe = "scanning" | "scan_failed" | "malicious" | "skipped"; +export type AVStatusSafe = "uploaded" | "scanning" | "safe"; +export type AVStatusUnsafe = "scan_failed" | "malicious" | "skipped"; export type AVStatus = AVStatusSafe | AVStatusUnsafe; /** diff --git a/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx b/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx index df258cc5..b51edc10 100644 --- a/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx +++ b/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx @@ -67,7 +67,9 @@ export const useOnBuildContextMenu = ( const isPersonal = item?.scope === 'personal'; const selectedCount = checked.length; const notSafe = - !item?.is_directory && !['uploaded', 'safe'].includes(item?.av_status || ''); + !item?.is_directory && + (item?.av_status || '').length > 0 && + !['uploaded', 'scanning', 'safe'].includes(item?.av_status || ''); let menu: any[] = []; diff --git a/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx b/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx index bc00ce3e..fa3613ed 100644 --- a/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx +++ b/tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx @@ -93,9 +93,6 @@ export const DocumentRow = ({ {FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_AV_ENABLED) && (
- {item?.av_status === 'scanning' && ( - - )} {item?.av_status === 'malicious' && ( )}