🔀 Merge remote-tracking branch 'origin/main' into release/v1.0.5

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 AVStatusSafe = "uploaded" | "safe";
-export type AVStatusUnsafe = "uploaded" | "scanning" | "scan_failed" | "malicious" | "skipped";
+export type AVStatusUnsafe = "scanning" | "scan_failed" | "malicious" | "skipped";
 export type AVStatus = AVStatusSafe | AVStatusUnsafe;
 
 /**

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) {

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';
 

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 (
+    <Suspense fallback={<></>}>
+      <Shared />
+    </Suspense>
+  );
+};

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 (
-    <div className="flex flex-col h-full w-full dark:bg-zinc-900">
+    <FeatureToggles features={activeFeatureNames}>
-      <div className="flex flex-row items-center justify-center bg-blue-500 px-4 py-2">
+      <>
-        <div className="grow flex flex-row items-center">
+        <div className="flex flex-col h-full w-full dark:bg-zinc-900">
-          {group.logo && (
+          <div className="flex flex-row items-center justify-center bg-blue-500 px-4 py-2">
-            <Avatar avatar={group.logo} className="inline-block mr-3" size="sm" type="square" />
+            <div className="grow flex flex-row items-center">
-          )}
+              {group.logo && (
-          <span className="text-white font-semibold" style={{ lineHeight: '32px' }}>
+                <Avatar avatar={group.logo} className="inline-block mr-3" size="sm" type="square" />
-            Twake Drive
+              )}
-          </span>
+              <span className="text-white font-semibold" style={{ lineHeight: '32px' }}>
+                Twake Drive
+              </span>
+            </div>
+            <div className="shrink-0">
+              <a href="https://twake.app" target="_BLANK" rel="noreferrer" className="!text-white">
+                <span className="nomobile text-white">
+                  {Languages.t('scenes.app.mainview.create_account')}
+                </span>
+                Twake Workplace &nbsp; 👉
+              </a>
+            </div>
+          </div>
+          <div className="h-full main-view public p-4 pb-16">
+            <AccessChecker folderId={documentId} token={token}>
+              <Drive initialParentId={documentId} inPublicSharing={true} />
+            </AccessChecker>
+          </div>
+          <MenusBodyLayer />
+          <UploadsViewer />
+          <CreateModalWithUploadZones initialParentId={documentId} />
         </div>
-        <div className="shrink-0">
+      </>
-          <a href="https://twake.app" target="_BLANK" rel="noreferrer" className="!text-white">
+    </FeatureToggles>
-            <span className="nomobile text-white">
-              {Languages.t('scenes.app.mainview.create_account')}
-            </span>
-            Twake Workplace &nbsp; 👉
-          </a>
-        </div>
-      </div>
-      <div className="h-full main-view public p-4 pb-16">
-        <AccessChecker folderId={documentId} token={token}>
-          <Drive initialParentId={documentId} inPublicSharing={true} />
-        </AccessChecker>
-      </div>
-      <MenusBodyLayer />
-      <UploadsViewer />
-      <CreateModalWithUploadZones initialParentId={documentId} />
-    </div>
   );
 };