Web: Files: Settings: Added display settings for none-admin user

packages/client/src/pages/Settings/Section/Body/CommonSettings.js

@@ -27,6 +27,7 @@ const CommonSettings = ({
   setRecentSetting,
 
   t,
+  showTitle,
 }) => {
   const [isLoadingFavorites, setIsLoadingFavorites] = React.useState(false);
   const [isLoadingRecent, setIsLoadingRecent] = React.useState(false);
@@ -70,6 +71,11 @@ const CommonSettings = ({
   return (
     <StyledSettings>
       <Box className="settings-section">
+        {showTitle && (
+          <Heading className="heading" level={2} size="xsmall">
+            {t("CommonSettings")}
+          </Heading>
+        )}
         <ToggleButton
           className="toggle-btn"
           label={t("OriginalCopy")}

packages/client/src/pages/Settings/Section/Body/index.js

@@ -2,7 +2,6 @@ import React, { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import styled, { css } from "styled-components";
 import { withRouter } from "react-router";
-import Error403 from "client/Error403";
 import Error520 from "client/Error520";
 //import ConnectClouds from "./ConnectedClouds";
 import { inject, observer } from "mobx-react";
@@ -23,16 +22,13 @@ const StyledContainer = styled.div`
   `}
 `;
 
-const SectionBodyContent = ({
-  setting,
-  isAdmin,
-  //enableThirdParty,
-  settingsIsLoaded,
-  isErrorSettings,
-  history,
-}) => {
+const SectionBodyContent = ({ isAdmin, isErrorSettings, history }) => {
   const { t } = useTranslation(["FilesSettings", "Common"]);
 
+  const setting = window.location.pathname.endsWith("/settings/common")
+    ? "common"
+    : "admin";
+
   const commonSettings = {
     id: "common",
     name: t("CommonSettings"),
@@ -51,13 +47,7 @@ const SectionBodyContent = ({
   //   content: <ConnectClouds />,
   // };
 
-  const data = [];
-
-  if (isAdmin) {
-    data.push(adminSettings);
-  }
-
-  data.push(commonSettings);
+  const data = [adminSettings, commonSettings];
 
   // if (enableThirdParty) {
   //   data.push(connectedCloud);
@@ -80,11 +70,15 @@ const SectionBodyContent = ({
     <Error520 />
   ) : (
     <StyledContainer>
-      <Submenu
-        data={data}
-        startSelect={setting === "common" ? commonSettings : adminSettings}
-        onSelect={onSelect}
-      />
+      {!isAdmin ? (
+        <CommonSettings t={t} showTitle={true} />
+      ) : (
+        <Submenu
+          data={data}
+          startSelect={setting === "common" ? commonSettings : adminSettings}
+          onSelect={onSelect}
+        />
+      )}
     </StyledContainer>
   );
 };

packages/client/src/pages/Settings/index.js

@@ -9,15 +9,12 @@ import { setDocumentTitle } from "@docspace/client/src/helpers/filesUtils";
 import { inject, observer } from "mobx-react";
 
 const PureSettings = ({
-  match,
   t,
   tReady,
   isLoading,
   isLoadedSettingsTree,
   setFirstLoad,
 }) => {
-  const { setting } = match.params;
-
   useEffect(() => {
     setFirstLoad(false);
   }, [setFirstLoad]);
@@ -45,11 +42,7 @@ const PureSettings = ({
       </Section.SectionHeader>
 
       <Section.SectionBody>
-        {inLoad ? (
-          <Loaders.SettingsFiles />
-        ) : (
-          <SectionBodyContent setting={setting} />
-        )}
+        {inLoad ? <Loaders.SettingsFiles /> : <SectionBodyContent />}
       </Section.SectionBody>
     </Section>
   );