IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Viktor Fomin 2022-04-26 12:13:38 +03:00
commit 36ee64c312
13 changed files with 56 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
View File

@ -12,8 +12,8 @@ import Backdrop from "@appserver/components/backdrop";
const mobileView = css`
top: 64px;
width: 100vw !important;
height: calc(100vh - 64px) !important;
width: 100% !important;
height: calc(100% - 64px) !important;
`;
const StyledBlock = styled.div`
@ -22,8 +22,8 @@ const StyledBlock = styled.div`
right: 0;
width: 480px;
max-width: 100vw;
height: 100vh;
max-width: 100%;
height: 100%;
z-index: 400;

13
packages/asc-web-common/components/AdvancedSelector/sub-components/StyledFooter.js
View File

@ -7,6 +7,9 @@ const StyledFooter = styled.div`
padding: 16px;
height: 69px;
display: flex;
align-items: center;
${(props) =>
props.withEmbeddedComponent &&
css`
@ -18,6 +21,16 @@ const StyledFooter = styled.div`
css`
display: none;
`}
button {
min-height: 40px;
}
.embedded_combo-box {
.combo-button {
min-height: 42px;
}
}
`;
StyledFooter.defaultProps = { theme: Base };

2
packages/asc-web-components/main-button-mobile/index.js
View File

@ -245,7 +245,7 @@ const MainButtonMobile = (props) => {
>
{isMobile || isTablet ? (
<Scrollbar
style={{ height: manualWidth || "400px" }}
style={{ position: "absolute" }}
scrollclass="section-scroll"
stype="mediumBlack"
ref={dropDownRef}

2
products/ASC.Files/Client/src/components/Article/Body/DownloadAppList.js
View File

@ -33,7 +33,7 @@ const DownloadAppListContainer = React.memo(({ t, theme }) => {
return (
<StyledDownloadAppList>
<Text className="download-app-text" fontSize="14px">
<Text className="download-app-text" fontSize="14px" noSelect={true}>
{t("Translations:DownloadApps")}
</Text>
<div className="download-app-list">

2
products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
View File

@ -141,9 +141,11 @@ class AddGroupsPanelComponent extends React.Component {
t={t}
access={accessRight}
directionX="right"
directionY="top"
onAccessChange={this.onAccessChange}
accessOptions={accessOptions}
arrowIconColor={theme.filesPanels.addGroups.arrowColor}
isEmbedded={true}
/>
}
headerLabel={t("AddGroupsForSharingButton")}

2
products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
View File

@ -139,9 +139,11 @@ class AddUsersPanelComponent extends React.Component {
t={t}
access={accessRight}
directionX="right"
directionY="top"
onAccessChange={this.onAccessChange}
accessOptions={accessOptions}
arrowIconColor={theme.filesPanels.addUsers.arrowColor}
isEmbedded={true}
/>
),
}

14
products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
View File

@ -5,6 +5,7 @@ import DropDownItem from "@appserver/components/drop-down-item";
import AccessRightSelect from "@appserver/components/access-right-select";
import { getAccessIcon } from "../../../helpers/files-helpers";
import { ReactSVG } from "react-svg";
import Backdrop from "@appserver/components/backdrop";
const {
FullAccess,
@ -33,6 +34,7 @@ const AccessComboBox = (props) => {
onRemoveUserClick,
isExternalLink,
isDefaultMode,
isEmbedded,
} = props;
const [isLoading, setIsLoading] = React.useState(true);
@ -255,7 +257,7 @@ const AccessComboBox = (props) => {
options={[]}
selectedOption={{}}
size="content"
className="panel_combo-box"
className={`panel_combo-box ${isEmbedded ? "embedded_combo-box" : ""}`}
scaled={false}
directionX={directionX}
directionY={directionY}
@ -266,10 +268,12 @@ const AccessComboBox = (props) => {
forwardRef={ref}
fixedDirection={fixedDirection}
>
<ReactSVG
src={selectedOption.icon}
className="sharing-access-combo-box-icon"
/>
{selectedOption?.icon && (
<ReactSVG
src={selectedOption?.icon}
className="sharing-access-combo-box-icon"
/>
)}
</ComboBox>
);
};

6
products/ASC.Files/Client/src/components/panels/SharingPanel/Item.js
View File

@ -67,7 +67,7 @@ const Item = ({
t={t}
access={item.access}
directionX="right"
directionY="bottom"
directionY="both"
accessOptions={externalAccessOptions}
onAccessChange={onChangeItemAccess}
itemId={item.sharedTo.id}
@ -75,8 +75,8 @@ const Item = ({
disableLink={false}
canDelete={true}
onRemoveUserClick={onRemoveUserClick}
isDefaultMode={false}
fixedDirection={true}
isDefaultMode={true}
fixedDirection={false}
/>
)}
</StyledItem>

15
products/ASC.Files/Client/src/components/panels/SharingPanel/StyledSharingPanel.js
View File

@ -12,8 +12,8 @@ const StyledContent = styled.div`
grid-template-columns: 1fr;
grid-template-rows: ${(props) =>
props.isNotifyUsers
? "53px calc(100% - 253px) 200px"
: "53px calc(100% - 161px) 108px"};
? "53px calc(100% - 254px) 201px"
: "53px calc(100% - 162px) 109px"};
`;
const StyledHeaderContent = styled.div`
@ -32,17 +32,6 @@ const StyledHeaderContent = styled.div`
align-items: center;
justify-content: space-between;
@media (max-width: 500px) {
width: 100vw;
max-width: 100vw;
}
${isMobileOnly &&
css`
width: 100vw;
max-width: 100vw;
`}
.sharing_panel-header-info {
display: flex;
align-items: center;

5
products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
View File

@ -869,6 +869,9 @@ const SharingPanel = inject(
updateUploadedItem,
} = uploadDataStore;
const isShared =
selection.length > 0 && selection[0].shared ? selection[0].shared : false;
return {
theme: auth.settingsStore.theme,
isPersonal: personal,
@ -905,7 +908,7 @@ const SharingPanel = inject(
id,
setBufferSelection,
access,
isShared: selection[0]?.shared ? selection[0].shared : false,
isShared: isShared,
};
}
)(

69
products/ASC.Files/Client/src/components/panels/StyledPanels.js
View File

@ -101,24 +101,14 @@ const StyledAsidePanel = styled.div`
@media (max-width: 500px) {
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100vw;
height: calc(100vh - 64px);
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100vw;
height: calc(100vh - 64px);
`}
}
${PanelStyles}
`;
@ -176,22 +166,11 @@ const StyledAddUsersPanelPanel = styled.div`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100vw;
height: calc(100vh - 64px);
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100vw;
height: calc(100vh - 64px);
`}
}
${PanelStyles}
.combo-button-label {
@ -211,22 +190,11 @@ const StyledAddGroupsPanel = styled.div`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100vw;
height: calc(100vh - 64px);
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100vw;
height: calc(100vh - 64px);
`}
}
${PanelStyles}
.combo-button-label {
@ -246,22 +214,11 @@ const StyledEmbeddingPanel = styled.div`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100vw;
height: calc(100vh - 64px);
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100vw;
height: calc(100vh - 64px);
`}
}
${PanelStyles}
`;

2
products/ASC.Files/Client/src/pages/Settings/Section/Body/index.js
View File

@ -81,7 +81,7 @@ const SectionBodyContent = ({
case "admin":
return 0;
case "connected-clouds":
return isAdmin ? (isPersonal ? 0 : 2) : 1;
return isPersonal ? 0 : isAdmin ? 2 : 1;
default:
return isAdmin ? 1 : 0;
}

2
products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
View File

@ -229,7 +229,7 @@ const VersionRow = (props) => {
{...linkStyles}
className="version_link-action"
>
{t("Translations:Restore")}
{t("Common:Restore")}
</Link>
)}
<Link