diff --git a/packages/client/public/locales/en/InfoPanel.json b/packages/client/public/locales/en/InfoPanel.json index 3f4e443569..2b381b2378 100644 --- a/packages/client/public/locales/en/InfoPanel.json +++ b/packages/client/public/locales/en/InfoPanel.json @@ -1,33 +1,29 @@ { "AccountsEmptyScreenText": "See users details here", + "AddedRoomTags": "Tags added.", "Administration": "Administration", - "AndMoreLabel": "and {{count}} more", + "AndMoreLabel": "and <1>{{count}} more", "CreationDate": "Creation date", "Data": "Data", "DateModified": "Date modified", + "DeletedRoomTags": "Tags removed.", "ExpectUsers": "Expect users", - "FeedCreateFileSeveral": "Files added", - "FeedCreateFileSingle": "File created", - "FeedCreateFolderSeveral": "Folders added", - "FeedCreateFolderSingle": "Folder created", - "FeedCreateRoom": "«{{roomTitle}}» room created", - "FeedCreateRoomTag": "Tags added", - "FeedCreateUser": "Users added", - "FeedDeleteFile": "Files removed", - "FeedDeleteFolder": "Folders removed", - "FeedDeleteRoomTag": "Tags removed", - "FeedDeleteUser": "User removed", + "FeedLinkWasDeleted": "Link was deleted", "FeedLocationLabel": "Folder «{{folderTitle}}»", - "FeedMoveFile": "Files moved", - "FeedMoveFolder": "Folders moved", - "FeedRenameFile": "File renamed", - "FeedRenameFolder": "Folder renamed", - "FeedRenameRoom": "Room «{{oldRoomTitle}}» renamed to «{{roomTitle}}».", - "FeedUpdateFile": "File updated", - "FeedUpdateRoom": "Icon changed", - "FeedUpdateUser": "has been assigned role {{role}}", + "FileConverted": "File converted.", + "FileCopied": "Files copied.", + "FileCreated": "File created.", + "FileDeleted": "Files removed.", "FileExtension": "File extension", + "FileMoved": "Files moved.", + "FileRenamed": "File renamed.", "FilesEmptyScreenText": "See file and folder details here", + "FileUploaded": "Files added.", + "FolderCopied": "Folders copied.", + "FolderCreated": "Folder created.", + "FolderDeleted": "Folders removed.", + "FolderMoved": "Folders moved.", + "FolderRenamed": "Folder renamed.", "GalleryEmptyScreenText": "See form template details here", "GroupsEmptyScreenText": "See group details here", "HistoryEmptyScreenText": "Activity history will be shown here", @@ -35,11 +31,25 @@ "ItemsSelected": "Items selected", "LastModifiedBy": "Last modified by", "Properties": "Properties", + "RoomCreated": "<1>«{{roomTitle}}» room created", + "RoomCreateUser": "Users added.", + "RoomExternalLinkCreated": "Link created.", + "RoomExternalLinkDeleted": "Link <1>«{{linkTitle}}» deleted.", + "RoomExternalLinkRenamed": "Link <1>«{{oldLinkTitle}}» renamed to <1>«{{linkTitle}}»", + "RoomGroupAdded": "Groups added.", + "RoomGroupRemove": "Group removed", + "RoomLogoCreated": "Icon changed", + "RoomLogoDeleted": "Icon changed", + "RoomRemoveUser": "User removed.", + "RoomRenamed": "Room <1>«{{oldRoomTitle}}» renamed to <1>«{{roomTitle}}»", "RoomsEmptyScreenTent": "See rooms details here", + "RoomUpdateAccessForGroup": "has been assigned role", + "RoomUpdateAccessForUser": "has been assigned role", "SelectedUsers": "Selected accounts", "StorageType": "Storage type", "SubmenuDetails": "Details", "SubmenuHistory": "History", + "UserFileUpdated": "File updated.", "Users": "Users", "Versions": "Versions" } diff --git a/packages/client/src/components/Article/Body/index.js b/packages/client/src/components/Article/Body/index.js index 059b8ac8f0..619538936a 100644 --- a/packages/client/src/components/Article/Body/index.js +++ b/packages/client/src/components/Article/Body/index.js @@ -109,28 +109,20 @@ const ArticleBodyContent = (props) => { path = getCategoryUrl(CategoryType.Personal); - if (activeItemId === myFolderId && folderId === selectedFolderId) - return; - break; case archiveFolderId: const archiveFilter = RoomsFilter.getDefault(userId); archiveFilter.searchArea = RoomSearchArea.Archive; params = archiveFilter.toUrlParams(userId, true); path = getCategoryUrl(CategoryType.Archive); - if (activeItemId === archiveFolderId && folderId === selectedFolderId) - return; + break; case recycleBinFolderId: const recycleBinFilter = FilesFilter.getDefault(); recycleBinFilter.folder = folderId; params = recycleBinFilter.toUrlParams(); path = getCategoryUrl(CategoryType.Trash); - if ( - activeItemId === recycleBinFolderId && - folderId === selectedFolderId - ) - return; + break; case "accounts": const accountsFilter = AccountsFilter.getDefault(); @@ -138,7 +130,6 @@ const ArticleBodyContent = (props) => { path = getCategoryUrl(CategoryType.Accounts); withTimer = false; - if (activeItemId === "accounts" && isAccounts) return; break; case "settings": @@ -155,12 +146,11 @@ const ArticleBodyContent = (props) => { roomsFilter.searchArea = RoomSearchArea.Active; params = roomsFilter.toUrlParams(userId, true); path = getCategoryUrl(CategoryType.Shared); - if (activeItemId === roomsFolderId && folderId === selectedFolderId) - return; + break; } - path += `?${params}`; + path += `?${params}&date=${new Date().getTime()}`; if (openingNewTab(path, e)) return; diff --git a/packages/client/src/components/GlobalEvents/EditRoomEvent.js b/packages/client/src/components/GlobalEvents/EditRoomEvent.js index 4db5b0a64d..5f2d82ec8c 100644 --- a/packages/client/src/components/GlobalEvents/EditRoomEvent.js +++ b/packages/client/src/components/GlobalEvents/EditRoomEvent.js @@ -156,7 +156,6 @@ const EditRoomEvent = ({ isTitleChanged || isQuotaChanged ? await editRoom(item.id, editRoomParams) : item; - room.isLogoLoading = true; const createTagActions = []; @@ -177,7 +176,7 @@ const EditRoomEvent = ({ }; } if (tags.length) { - actions.push(addTagsToRoom(room.id, tags)); + actions.push(addTagsToRoom(room.id, newTags)); room.tags = tags; } if (removedTags.length) @@ -189,7 +188,7 @@ const EditRoomEvent = ({ room = await removeLogoFromRoom(room.id); } - if (roomParams.icon.uploadedFile) { + if (roomParams.iconWasUpdated && roomParams.icon.uploadedFile) { updateRoom(item, { ...room, logo: { big: item.logo.original }, diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js index 3a14f2b349..dadc52c5da 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js @@ -129,7 +129,7 @@ const SetRoomParams = ({ if (!icon.uploadedFile !== disableImageRescaling) setDisableImageRescaling(!icon.uploadedFile); - setRoomParams({ ...roomParams, icon: icon }); + setRoomParams({ ...roomParams, icon: icon, iconWasUpdated: true }); }; const onOwnerChange = () => { diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagList.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagList.js index 8c5d2bdaa0..4568edca14 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagList.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagList.js @@ -37,16 +37,10 @@ const StyledTagList = styled.div` width: 100%; .set_room_params-tag_input-tag { - background: ${(props) => - props.theme.createEditRoomDialog.tagInput.tagBackground}; padding: 6px 8px; border-radius: 3px; margin: 0; - :hover { - background: ${(props) => - props.theme.createEditRoomDialog.tagInput.tagHoverBackground}; - } .tag-icon { ${({ theme }) => theme.interfaceDirection === "rtl" diff --git a/packages/client/src/components/panels/NewFilesPanel/index.js b/packages/client/src/components/panels/NewFilesPanel/index.js index e629666919..26965d6bbf 100644 --- a/packages/client/src/components/panels/NewFilesPanel/index.js +++ b/packages/client/src/components/panels/NewFilesPanel/index.js @@ -24,41 +24,34 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -import { useState, useEffect, useMemo } from "react"; -import { Backdrop } from "@docspace/shared/components/backdrop"; +import { useState, useMemo } from "react"; +import { inject, observer } from "mobx-react"; +import { withTranslation } from "react-i18next"; +import { ReactSVG } from "react-svg"; + import { Loader } from "@docspace/shared/components/loader"; import { Text } from "@docspace/shared/components/text"; -import { Heading } from "@docspace/shared/components/heading"; -import { Aside } from "@docspace/shared/components/aside"; import { Row } from "@docspace/shared/components/row"; import { Button } from "@docspace/shared/components/button"; -import { withTranslation } from "react-i18next"; import { toastr } from "@docspace/shared/components/toast"; -import { Portal } from "@docspace/shared/components/portal"; - -import { ReactSVG } from "react-svg"; import { - StyledAsidePanel, - StyledContent, - StyledHeaderContent, - StyledBody, - StyledFooter, - StyledSharingBody, - StyledLink, -} from "../StyledPanels"; -import { inject, observer } from "mobx-react"; -import { combineUrl } from "@docspace/shared/utils/combineUrl"; -import config from "PACKAGE_FILE"; + ModalDialog, + ModalDialogType, +} from "@docspace/shared/components/modal-dialog"; import { DialogAsideSkeleton } from "@docspace/shared/skeletons/dialog"; -import withLoader from "../../../HOCs/withLoader"; + +import FilesFilter from "@docspace/shared/api/files/filter"; +import { combineUrl } from "@docspace/shared/utils/combineUrl"; + import { getCategoryTypeByFolderType, getCategoryUrl, } from "SRC_DIR/helpers/utils"; -import FilesFilter from "@docspace/shared/api/files/filter"; -import { DeviceType } from "@docspace/shared/enums"; -const SharingBodyStyle = { height: `calc(100vh - 156px)` }; +import { StyledNewFilesBody, StyledLink } from "../StyledPanels"; +import withLoader from "../../../HOCs/withLoader"; + +import config from "PACKAGE_FILE"; const NewFilesPanel = (props) => { const { @@ -295,61 +288,44 @@ const NewFilesPanel = (props) => { }); }, [onNewFileClick, getItemIcon, currentOpenFileId]); - const element = ( - - - - - ); - - return currentDeviceType === DeviceType.mobile ? ( - - ) : ( - element + return ( + + {t("NewFiles")} + + {!isLoading ? ( + {filesListNode} + ) : ( +
+ + {`${t("Common:LoadingProcessing")} ${t( + "Common:LoadingDescription", + )}`} +
+ )} +
+ +