diff --git a/apps/OpenSign/src/components/shared/fields/CreateFolder.js b/apps/OpenSign/src/components/shared/fields/CreateFolder.js index ec70bef19..37de11dfe 100644 --- a/apps/OpenSign/src/components/shared/fields/CreateFolder.js +++ b/apps/OpenSign/src/components/shared/fields/CreateFolder.js @@ -25,9 +25,11 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => { if (parentFolderId) { FolderQuery.equalTo("Folder", folderPtr); FolderQuery.equalTo("Type", "Folder"); + FolderQuery.notEqualTo("IsArchive", true); } else { FolderQuery.doesNotExist("Folder"); FolderQuery.equalTo("Type", "Folder"); + FolderQuery.notEqualTo("IsArchive", true); } const res = await FolderQuery.find(); @@ -49,6 +51,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => { const exsitQuery = new Parse.Query(folderCls); exsitQuery.equalTo("Name", name); exsitQuery.equalTo("Type", "Folder"); + exsitQuery.notEqualTo("IsArchive", true); if (parentFolderId) { exsitQuery.equalTo("Folder", folderPtr); } diff --git a/apps/OpenSign/src/components/shared/fields/FolderModal.js b/apps/OpenSign/src/components/shared/fields/FolderModal.js index 8bc46403c..25d1608b8 100644 --- a/apps/OpenSign/src/components/shared/fields/FolderModal.js +++ b/apps/OpenSign/src/components/shared/fields/FolderModal.js @@ -25,9 +25,11 @@ const FolderModal = (props) => { if (folderPtr) { FolderQuery.equalTo("Folder", folderPtr); FolderQuery.equalTo("Type", "Folder"); + FolderQuery.notEqualTo("IsArchive", true); } else { FolderQuery.doesNotExist("Folder"); FolderQuery.equalTo("Type", "Folder"); + FolderQuery.notEqualTo("IsArchive", true); } const res = await FolderQuery.find(); diff --git a/apps/OpenSign/src/components/shared/fields/SelectFolder.js b/apps/OpenSign/src/components/shared/fields/SelectFolder.js index 84bd44aa3..e9d0000b9 100644 --- a/apps/OpenSign/src/components/shared/fields/SelectFolder.js +++ b/apps/OpenSign/src/components/shared/fields/SelectFolder.js @@ -45,9 +45,11 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => { if (folderPtr) { FolderQuery.equalTo("Folder", folderPtr); FolderQuery.equalTo("Type", "Folder"); + FolderQuery.notEqualTo("IsArchive", true); } else { FolderQuery.doesNotExist("Folder"); FolderQuery.equalTo("Type", "Folder"); + FolderQuery.notEqualTo("IsArchive", true); } const res = await FolderQuery.find(); diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index 12d1c0f61..a1678fcd9 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -11,8 +11,8 @@ import TourContentWithBtn from "../primitives/TourContentWithBtn"; import Tour from "reactour"; import axios from "axios"; -const DriveBody = React.lazy( - () => import("../components/opensigndrive/DriveBody") +const DriveBody = React.lazy(() => + import("../components/opensigndrive/DriveBody") ); const Loader = () => { return ( @@ -300,6 +300,7 @@ function Opensigndrive() { const exsitQuery = new Parse.Query(foldercls); exsitQuery.equalTo("Name", newFolderName); exsitQuery.equalTo("Type", "Folder"); + exsitQuery.notEqualTo("IsArchive", true); if (parentId) { exsitQuery.equalTo("Folder", folderPtr); }