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

Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

Browse Source
This commit is contained in:
Elyor Djalilov 2024-04-04 17:41:15 +05:00
commit 41b4c79538
9 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js
View File

@ -85,7 +85,7 @@ const CreateRoomDialog = ({
const startRoomParams = {
type: undefined,
title: title,
title: title ?? "",
tags: [],
isPrivate: false,
storageLocation: {

3
packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
View File

@ -72,7 +72,8 @@ const EditRoomDialog = ({
.join("|")
.toLowerCase() &&
((prevParams.icon.uploadedFile === "" &&
currentParams.icon.uploadedFile === null) ||
(currentParams.icon.uploadedFile === null ||
currentParams.icon.uploadedFile === undefined)) ||
prevParams.icon.uploadedFile === currentParams.icon.uploadedFile) &&
prevParams.quota === currentParams.quota
);

1
packages/client/src/components/panels/AddUsersPanel/index.tsx
View File

@ -495,6 +495,7 @@ const AddUsersPanel = ({
>
<Selector
withHeader
alwaysShowFooter
headerProps={{
// Todo: Update groups empty screen texts when they are ready
headerLabel: t("Common:ListAccounts"),

43
packages/client/src/components/panels/InvitePanel/index.js
View File

@ -412,28 +412,27 @@ const InvitePanel = ({
) : (
bodyInvitePanel
)}
{hasInvitedUsers && (
<StyledButtons>
<Button
className="send-invitation"
scale={true}
size={"normal"}
isDisabled={hasErrors}
primary
onClick={onClickSend}
label={t("SendInvitation")}
isLoading={isLoading}
/>
<Button
className="cancel-button"
scale={true}
size={"normal"}
onClick={onClose}
label={t("Common:CancelButton")}
isDisabled={isLoading}
/>
</StyledButtons>
)}
<StyledButtons>
<Button
className="send-invitation"
scale={true}
size={"normal"}
isDisabled={hasErrors || !hasInvitedUsers}
primary
onClick={onClickSend}
label={t("SendInvitation")}
isLoading={isLoading}
/>
<Button
className="cancel-button"
scale={true}
size={"normal"}
onClick={onClose}
label={t("Common:CancelButton")}
isDisabled={isLoading}
/>
</StyledButtons>
</>
)}
</>

9
packages/client/src/pages/PortalSettings/categories/data-management/index.js
View File

@ -53,6 +53,7 @@ const DataManagementWrapper = (props) => {
t,
isNotPaidPeriod,
currentDeviceType,
} = props;
const navigate = useNavigate();
@ -143,6 +144,13 @@ const DataManagementWrapper = (props) => {
data={data}
startSelect={currentTab}
onSelect={(e) => onSelect(e)}
topProps={
currentDeviceType === DeviceType.desktop
? 0
: currentDeviceType === DeviceType.mobile
? "53px"
: "61px"
}
/>
);
};
@ -172,6 +180,7 @@ export default inject(
buttonSize,
isNotPaidPeriod,
currentColorScheme,
currentDeviceType,
};
},
)(withTranslation(["Settings", "Common"])(observer(DataManagementWrapper)));

4
packages/shared/components/filter/Filter.styled.ts
View File

@ -152,7 +152,7 @@ const StyledButton = styled.div<{ isOpen: boolean }>`
StyledButton.defaultProps = { theme: Base };
const StyledFilterBlock = styled.div<{ showFooter?: boolean }>`
const StyledFilterBlock = styled.div`
position: fixed;
top: 0;
@ -198,7 +198,7 @@ const StyledFilterBlock = styled.div<{ showFooter?: boolean }>`
}
.filter-body {
height: ${(props) => (props.showFooter ? "calc(100% - 125px)" : "100%")};
height: calc(100% - 125px);
.combo-item {
padding: 0;

41
packages/shared/components/filter/sub-components/FilterBlock.tsx
View File

@ -528,7 +528,7 @@ const FilterBlock = ({
</StyledControlContainer>
</StyledFilterBlock>
) : (
<StyledFilterBlock showFooter={showFooter}>
<StyledFilterBlock>
<StyledFilterBlockHeader>
<Heading size={HeadingSize.medium} level={HeadingLevel.h1}>
{filterHeader}
@ -574,25 +574,26 @@ const FilterBlock = ({
</Scrollbar>
)}
</div>
{showFooter && (
<StyledFilterBlockFooter>
<Button
id="filter_apply-button"
size={ButtonSize.normal}
primary
label={t("Common:ApplyButton")}
scale
onClick={onFilterAction}
/>
<Button
id="filter_cancel-button"
size={ButtonSize.normal}
label={t("Common:CancelButton")}
scale
onClick={hideFilterBlock}
/>
</StyledFilterBlockFooter>
)}
<StyledFilterBlockFooter>
<Button
id="filter_apply-button"
size={ButtonSize.normal}
primary
label={t("Common:ApplyButton")}
scale
onClick={onFilterAction}
isDisabled={!showFooter}
/>
<Button
id="filter_cancel-button"
size={ButtonSize.normal}
label={t("Common:CancelButton")}
scale
onClick={hideFilterBlock}
isDisabled={isLoading}
/>
</StyledFilterBlockFooter>
<StyledControlContainer id="filter_close" onClick={hideFilterBlock}>
<StyledCrossIcon />

13
packages/shared/components/selector/Selector.tsx
View File

@ -46,6 +46,7 @@ import {
TSelectorFooterCheckbox,
TWithTabs,
TSelectorInfo,
TBreadCrumb,
} from "./Selector.types";
const Selector = ({
@ -150,7 +151,11 @@ const Selector = ({
const [isFooterCheckboxChecked, setIsFooterCheckboxChecked] =
React.useState<boolean>(isChecked || false);
const [selectedAccess, setSelectedAccess] =
React.useState<TAccessRight | null>(null);
React.useState<TAccessRight | null>(() => {
if (selectedAccessRight) return { ...selectedAccessRight };
return null;
});
const [requestRunning, setRequestRunning] = React.useState<boolean>(false);
@ -596,7 +601,11 @@ const Selector = ({
selectedItemsCount={newSelectedItems.length}
onSubmit={onSubmitAction}
submitButtonLabel={submitButtonLabel}
disableSubmitButton={disableSubmitButton}
disableSubmitButton={
alwaysShowFooter
? newSelectedItems.length === 0 || disableSubmitButton
: disableSubmitButton
}
submitButtonId={submitButtonId}
requestRunning={requestRunning}
// cancel button

1
packages/shared/selectors/People/index.tsx
View File

@ -376,6 +376,7 @@ const PeopleSelector = ({
return (
<Selector
id={id}
alwaysShowFooter
className={className}
style={style}
renderCustomItem={renderCustomItem}