+
{
scaledOptions={false}
size="content"
showDisabledItems={true}
- dropDownMaxHeight={dimension < 620 ? 200 : 364}
+ dropDownMaxHeight={dropDownMaxHeight}
manualWidth="280px"
isDefaultMode={
isMobileHorizontalOrientation
@@ -552,7 +575,7 @@ const MainProfile = (props) => {
scaledOptions={false}
size="content"
showDisabledItems={true}
- dropDownMaxHeight={dimension < 620 ? 200 : 364}
+ dropDownMaxHeight={dropDownMaxHeight}
manualWidth="280px"
isDefaultMode={
isMobileHorizontalOrientation
diff --git a/packages/client/src/pages/Sdk/index.js b/packages/client/src/pages/Sdk/index.js
index aace4bd817..438c0213be 100644
--- a/packages/client/src/pages/Sdk/index.js
+++ b/packages/client/src/pages/Sdk/index.js
@@ -82,10 +82,7 @@ const Sdk = ({
[FilterType.FoldersOnly]: t("Common:SelectTypeFiles", {
type: t("Translations:Folders").toLowerCase(),
}),
- [FilterType.OFormTemplateOnly]: t("Common:SelectTypeFiles", {
- type: t("Files:FormsTemplates").toLowerCase(),
- }),
- [FilterType.OFormOnly]: t("Common:SelectTypeFiles", {
+ [FilterType.Pdf]: t("Common:SelectTypeFiles", {
type: t("Files:Forms").toLowerCase(),
}),
EditorSupportedTypes: t("Common:SelectTypeFiles", {
diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js
index 2a0cef1eb7..22f6990ca4 100644
--- a/packages/client/src/store/FilesActionsStore.js
+++ b/packages/client/src/store/FilesActionsStore.js
@@ -1108,7 +1108,10 @@ class FilesActionStore {
: t("RoomPinned"),
),
)
- .catch((error) => console.log(error));
+ .catch((error) => {
+ console.log(error);
+ toastr.error(t("RoomsPinLimitMessage"));
+ });
case "unpin":
items.forEach((item) => {
updateRoomPin(item);
diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js
index e390b5ecdb..c8e6da28a2 100644
--- a/packages/client/src/store/FilesStore.js
+++ b/packages/client/src/store/FilesStore.js
@@ -2072,7 +2072,8 @@ class FilesStore {
item.viewAccessibility.ImageView || item.viewAccessibility.MediaView;
const canViewFile = item.viewAccessibility.WebView;
- const isMasterForm = item.fileExst === ".docxf";
+ const isOldForm =
+ item.fileExst === ".docxf" || item.fileExst === ".oform"; //TODO: Remove after change security options
const isPdf = item.fileExst === ".pdf";
let fileOptions = [
@@ -2197,10 +2198,10 @@ class FilesStore {
fileOptions = this.removeOptions(fileOptions, ["move"]);
}
- if (!(isMasterForm && canDuplicate))
+ if (!(isOldForm && canDuplicate))
fileOptions = this.removeOptions(fileOptions, ["make-form"]);
- if (!canSubmitToFormGallery || isMasterForm) {
+ if (!canSubmitToFormGallery || isOldForm) {
fileOptions = this.removeOptions(fileOptions, [
"submit-to-gallery",
"separator-SubmitToGallery",
@@ -3541,7 +3542,7 @@ class FilesStore {
case FilterType.ArchiveOnly:
return t("Archives");
case FilterType.FilesOnly:
- return t("AllFiles");
+ return t("Translations:Files");
case `room-${RoomsType.FillingFormsRoom}`:
return t("Common:FillingFormRooms");
case `room-${RoomsType.CustomRoom}`:
diff --git a/packages/client/src/store/UploadDataStore.js b/packages/client/src/store/UploadDataStore.js
index 4afea04396..a9330d3e41 100644
--- a/packages/client/src/store/UploadDataStore.js
+++ b/packages/client/src/store/UploadDataStore.js
@@ -1647,6 +1647,7 @@ class UploadDataStore {
.then(() =>
this.moveToCopyTo(destFolderId, pbData, true, fileIds, folderIds),
)
+ .catch((error) => toastr.error(error))
.finally(async () => {
//to update the status of trashIsEmpty filesStore
if (this.treeFoldersStore.isRecycleBinFolder)
diff --git a/packages/login/src/components/Login/Login.styled.ts b/packages/login/src/components/Login/Login.styled.ts
index 45256b64ef..8675c2ea90 100644
--- a/packages/login/src/components/Login/Login.styled.ts
+++ b/packages/login/src/components/Login/Login.styled.ts
@@ -33,7 +33,7 @@ import { mobile, tablet } from "@docspace/shared/utils/device";
export const LoginFormWrapper = styled.div<{ bgPattern: string }>`
width: 100%;
- height: 100vh;
+ height: 100dvh;
box-sizing: border-box;
diff --git a/packages/login/src/components/LoginForm/index.tsx b/packages/login/src/components/LoginForm/index.tsx
index d094913aeb..7a4578a463 100644
--- a/packages/login/src/components/LoginForm/index.tsx
+++ b/packages/login/src/components/LoginForm/index.tsx
@@ -306,8 +306,14 @@ const LoginForm = ({
return;
}
- checkConfirmLink(confirmData);
-
+ try {
+ if (confirmData) await checkConfirmLink(confirmData);
+ } catch (e) {
+ console.error(e);
+ }
+ return res;
+ })
+ .then((res: string | object) => {
const isConfirm = typeof res === "string" && res.includes("confirm");
const redirectPath =
referenceUrl || sessionStorage.getItem("referenceUrl");
@@ -364,6 +370,7 @@ const LoginForm = ({
router,
clientId,
referenceUrl,
+ loginData,
]);
const onBlurEmail = () => {
diff --git a/packages/shared/enums/index.ts b/packages/shared/enums/index.ts
index 1b6d6cfb90..2090aaaceb 100644
--- a/packages/shared/enums/index.ts
+++ b/packages/shared/enums/index.ts
@@ -142,8 +142,14 @@ export const enum FilterType {
ArchiveOnly = 10,
ByExtension = 11,
MediaOnly = 12,
- OFormTemplateOnly = 18,
- OFormOnly = 19,
+ FillingFormsRooms = 13,
+ EditingRooms = 14,
+ ReviewRooms = 15,
+ ReadOnlyRooms = 16,
+ CustomRooms = 17,
+ PublicRooms = 20,
+ FormRooms = 21,
+ Pdf = 22,
}
/**
@@ -556,7 +562,6 @@ export const enum FilesSelectorExtendedFilterTypes {
Media = "Media",
Archives = "Archives",
AllFiles = "AllFiles",
- FormTemplates = "FormTemplates",
Forms = "Forms",
}
diff --git a/packages/shared/selectors/Files/hooks/useFilesHelper.ts b/packages/shared/selectors/Files/hooks/useFilesHelper.ts
index c0d9ca1a94..d11606db84 100644
--- a/packages/shared/selectors/Files/hooks/useFilesHelper.ts
+++ b/packages/shared/selectors/Files/hooks/useFilesHelper.ts
@@ -158,16 +158,12 @@ const useFilesHelper = ({
filter.extension = "gz,tar";
break;
- case FilesSelectorFilterTypes.DOCXF:
- filter.filterType = FilterType.OFormTemplateOnly;
- break;
-
case FilesSelectorFilterTypes.XLSX:
filter.filterType = FilterType.SpreadsheetsOnly;
break;
case FilesSelectorFilterTypes.PDF:
- filter.extension = FilesSelectorFilterTypes.PDF;
+ filter.filterType = FilterType.Pdf;
break;
case FilterType.DocumentsOnly:
@@ -198,19 +194,12 @@ const useFilesHelper = ({
filter.filterType = FilterType.FoldersOnly;
break;
- case FilterType.OFormTemplateOnly:
- filter.filterType = FilterType.OFormTemplateOnly;
- break;
-
- case FilterType.OFormOnly:
- filter.filterType = FilterType.OFormOnly;
- break;
-
case FilterType.FilesOnly:
filter.filterType = FilterType.FilesOnly;
break;
case FilesSelectorFilterTypes.ALL:
+ filter.applyFilterOption = ApplyFilterOption.All;
filter.filterType = FilterType.None;
break;