Merge branch 'release/rc-v1.2.0' into feature/form-links

packages/client/src/HOCs/withFileActions.js

@@ -128,6 +128,7 @@ export default function withFileActions(WrappedFileItem) {
         e.target.tagName === "SPAN" ||
         e.target.tagName === "A" ||
         e.target.closest(".checkbox") ||
+        e.target.closest(".table-container_row-checkbox") ||
         e.button !== 0 ||
         e.target.closest(".expandButton") ||
         e.target.querySelector(".expandButton") ||

packages/client/src/HOCs/withQuickButtons.js

@@ -50,7 +50,15 @@ export default function withQuickButtons(WrappedComponent) {
     render() {
       const { isLoading, isCanWebEdit } = this.state;
 
-      const { t, theme, item, isAdmin, sectionWidth, viewAs } = this.props;
+      const {
+        t,
+        theme,
+        item,
+        isAdmin,
+        sectionWidth,
+        viewAs,
+        isPersonalRoom,
+      } = this.props;
 
       const quickButtonsComponent = (
         <QuickButtons
@@ -64,6 +72,7 @@ export default function withQuickButtons(WrappedComponent) {
           isCanWebEdit={isCanWebEdit}
           onClickLock={this.onClickLock}
           onClickFavorite={this.onClickFavorite}
+          isPersonalRoom={isPersonalRoom}
         />
       );
 

packages/client/src/components/QuickButtons.js

@@ -22,6 +22,7 @@ const QuickButtons = (props) => {
     onClickFavorite,
     viewAs,
     isCanWebEdit,
+    isPersonalRoom,
   } = props;
 
   const { id, locked, fileStatus, title, fileExst } = item;
@@ -56,7 +57,8 @@ const QuickButtons = (props) => {
 
   const setFavorite = () => onClickFavorite(isFavorite);
 
-  const isAvailableLockFile = fileExst && displayBadges && isCanWebEdit;
+  const isAvailableLockFile =
+    !isPersonalRoom && fileExst && displayBadges && isCanWebEdit;
 
   return (
     <div className="badges additional-badges">

packages/client/src/components/dialogs/ArchiveDialog/index.js

@@ -34,7 +34,7 @@ const ArchiveDialogComponent = (props) => {
     items,
   } = props;
 
-  const [requestRunning, setRequestRunning] = React.useState(false);
+  // const [requestRunning, setRequestRunning] = React.useState(false);
 
   useEffect(() => {
     window.addEventListener("keydown", onKeyPress);
@@ -43,19 +43,16 @@ const ArchiveDialogComponent = (props) => {
   }, []);
 
   const onClose = () => {
-    if (!requestRunning) {
-      setRestoreAllArchive(false);
-      setArchiveActionType(null);
-      setArchiveDialogVisible(false);
-    }
+    setRestoreAllArchive(false);
+    setArchiveActionType(null);
+    setArchiveDialogVisible(false);
   };
 
   const onAction = () => {
-    setRequestRunning(true);
-
+    setArchiveDialogVisible(false);
     setArchiveAction(action, items, t).then(() => {
-      setRequestRunning(false);
-      onClose();
+      setRestoreAllArchive(false);
+      setArchiveActionType(null);
     });
   };
 
@@ -116,7 +113,6 @@ const ArchiveDialogComponent = (props) => {
           size="normal"
           primary
           onClick={onAction}
-          isLoading={requestRunning}
           scale
         />
         <Button
@@ -125,7 +121,6 @@ const ArchiveDialogComponent = (props) => {
           label={t("Common:CancelButton")}
           size="normal"
           onClick={onClose}
-          isDisabled={requestRunning}
           scale
         />
       </ModalDialog.Footer>

packages/client/src/helpers/filesUtils.js

@@ -28,6 +28,8 @@ export const getFileTypeName = (fileType, t) => {
     case FileType.Presentation:
       return t("Files:Presentation");
     case FileType.Document:
+    case FileType.OFormTemplate:
+    case FileType.OForm:
       return t("Files:Document");
     default:
       return t("Files:Folder");

packages/client/src/pages/Home/InfoPanel/Header/index.js

@@ -31,8 +31,8 @@ const InfoPanelHeaderContent = (props) => {
     getIsGallery,
     getIsAccounts,
     isRootFolder,
-    rootFolderType,
-    selectionParentRoom,
+    // rootFolderType,
+    // selectionParentRoom,
   } = props;
 
   const isRooms = getIsRooms();
@@ -50,7 +50,7 @@ const InfoPanelHeaderContent = (props) => {
   const setHistory = () => setView("info_history");
   const setDetails = () => setView("info_details");
 
-  const isArchiveRoot = rootFolderType === FolderType.Archive;
+  //const isArchiveRoot = rootFolderType === FolderType.Archive;
 
   const submenuData = [
     {
@@ -72,15 +72,12 @@ const InfoPanelHeaderContent = (props) => {
       content: null,
     },
   ];
-  const selectionRoomRights = selectionParentRoom
-    ? selectionParentRoom.security?.Read
-    : selection?.security?.Read;
+  // const selectionRoomRights = selectionParentRoom
+  //   ? selectionParentRoom.security?.Read
+  //   : selection?.security?.Read;
+
+  const roomsSubmenu = [...submenuData];
 
-  const roomsSubmenu = isArchiveRoot
-    ? selectionRoomRights
-      ? [{ ...submenuData[0] }, { ...submenuData[2] }]
-      : [{ ...submenuData[2] }]
-    : [...submenuData];
   const personalSubmenu = [submenuData[1], submenuData[2]];
 
   const isTablet =
@@ -135,7 +132,7 @@ const InfoPanelHeaderContent = (props) => {
   );
 };
 
-export default inject(({ auth, selectedFolderStore, accessRightsStore }) => {
+export default inject(({ auth, selectedFolderStore }) => {
   const {
     selection,
     setIsVisible,
@@ -146,9 +143,12 @@ export default inject(({ auth, selectedFolderStore, accessRightsStore }) => {
     getIsRooms,
     getIsGallery,
     getIsAccounts,
-    selectionParentRoom,
+    //selectionParentRoom,
   } = auth.infoPanelStore;
-  const { isRootFolder, rootFolderType } = selectedFolderStore;
+  const {
+    isRootFolder,
+    // rootFolderType
+  } = selectedFolderStore;
 
   return {
     selection,
@@ -162,9 +162,9 @@ export default inject(({ auth, selectedFolderStore, accessRightsStore }) => {
     getIsAccounts,
 
     isRootFolder,
-    rootFolderType,
+    //  rootFolderType,
 
-    selectionParentRoom,
+    //selectionParentRoom,
   };
 })(
   withTranslation(["Common", "InfoPanel"])(

packages/client/src/pages/Home/Section/Filter/index.js

@@ -766,6 +766,12 @@ const SectionFilterContent = ({
 
           ...images,
           ...media,
+          {
+            id: "filter_type-all-files",
+            key: FilterType.FilesOnly.toString(),
+            group: FilterGroups.filterType,
+            label: t("AllFiles").toLowerCase(),
+          },
         ];
 
     const subjectOptions = [

packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js

@@ -322,6 +322,7 @@ class AmazonSettings extends React.Component {
             dropDownMaxHeight={300}
             isDisabled={this.isDisabled}
             tabIndex={2}
+            showDisabledItems
           />
         </StyledBody>
 
@@ -394,6 +395,7 @@ class AmazonSettings extends React.Component {
             dropDownMaxHeight={300}
             isDisabled={this.isDisabled}
             tabIndex={7}
+            showDisabledItems
           />
         </StyledBody>
 
@@ -437,6 +439,7 @@ class AmazonSettings extends React.Component {
                   dropDownMaxHeight={300}
                   isDisabled={this.isDisabled}
                   tabIndex={8}
+                  showDisabledItems
                 />
 
                 {managedKeys.label === this.customerManager && (

packages/client/src/pages/PortalSettings/categories/payments/PayerInformationContainer.js

@@ -92,6 +92,7 @@ const PayerInformationContainer = ({
           className="change-payer"
           tag="a"
           themeId={ThemeType.Link}
+          target="_blank"
         >
           {t("ChangePayer")}
         </ColorTheme>
@@ -114,6 +115,7 @@ const PayerInformationContainer = ({
           className="payer-info_account-link"
           tag="a"
           themeId={ThemeType.Link}
+          target="_blank"
         >
           {t("StripeCustomerPortal")}
         </ColorTheme>