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 2676681b..b8e71b4a 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 = "safe"; -export type AVStatusUnsafe = "uploaded" | "scanning" | "scan_failed" | "malicious" | "skipped"; +export type AVStatusSafe = "uploaded" | "safe"; +export type AVStatusUnsafe = "scanning" | "scan_failed" | "malicious" | "skipped"; export type AVStatus = AVStatusSafe | AVStatusUnsafe; /** diff --git a/tdrive/backend/node/src/services/documents/services/index.ts b/tdrive/backend/node/src/services/documents/services/index.ts index 3b91eb96..294d4f8c 100644 --- a/tdrive/backend/node/src/services/documents/services/index.ts +++ b/tdrive/backend/node/src/services/documents/services/index.ts @@ -1119,7 +1119,8 @@ export class DocumentsService { // Check files in the current directory const maliciousFiles = entities.filter( - child => !child.is_directory && child.av_status !== "safe", + child => + !child.is_directory && child.av_status && !["uploaded", "safe"].includes(child.av_status), ); if (maliciousFiles.length > 0) { diff --git a/tdrive/frontend/src/app/features/router/services/router-service.ts b/tdrive/frontend/src/app/features/router/services/router-service.ts index 5c7799b9..9d19a27f 100644 --- a/tdrive/frontend/src/app/features/router/services/router-service.ts +++ b/tdrive/frontend/src/app/features/router/services/router-service.ts @@ -8,7 +8,7 @@ import Login from '@views/login/login'; import Logout from '@views/login/logout'; import Error from '@views/error'; import Join from '@views/join'; -import PublicMainView from '@views/client/body/drive/shared'; +import PublicMainView from '@views/client/body/drive/shared-view'; import Observable from '../../../deprecated/Observable/Observable'; import { getWorkspacesByCompany } from '@features/workspaces/state/workspace-list'; diff --git a/tdrive/frontend/src/app/views/client/body/drive/shared-view.tsx b/tdrive/frontend/src/app/views/client/body/drive/shared-view.tsx new file mode 100644 index 00000000..8041985e --- /dev/null +++ b/tdrive/frontend/src/app/views/client/body/drive/shared-view.tsx @@ -0,0 +1,10 @@ +import { lazy, Suspense } from 'react'; +const Shared = lazy(() => import('@views/client/body/drive/shared')); + +export default () => { + return ( + }> + + + ); +}; diff --git a/tdrive/frontend/src/app/views/client/body/drive/shared.tsx b/tdrive/frontend/src/app/views/client/body/drive/shared.tsx index a00dc7aa..77b75c62 100755 --- a/tdrive/frontend/src/app/views/client/body/drive/shared.tsx +++ b/tdrive/frontend/src/app/views/client/body/drive/shared.tsx @@ -3,6 +3,7 @@ import { useEffect, useState } from 'react'; import MenusBodyLayer from '@components/menus/menus-body-layer'; import Api from '@features/global/framework/api-service'; import Languages from '@features/global/services/languages-service'; +import { useFeatureToggles } from '@components/locked-features-components/feature-toggles-hooks'; import { addApiUrlIfNeeded } from '@features/global/utils/URLUtils'; import RouterService from '@features/router/services/router-service'; import Drive from '@views/client/body/drive'; @@ -28,6 +29,7 @@ import LocalStorage from 'app/features/global/framework/local-storage-service'; export default () => { const companyId = useRouterCompany(); + const { FeatureToggles, activeFeatureNames } = useFeatureToggles(); //Create a different local storage for shared view useEffect(() => { @@ -61,34 +63,38 @@ export default () => { } return ( -
-
-
- {group.logo && ( - - )} - - Twake Drive - + + <> +
+ +
+ + + +
+ + +
- -
-
- - - -
- - - -
+ + ); };