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

Merge branch 'develop' into feature/split-invite

Browse Source
This commit is contained in:
Viktor Fomin 2023-09-14 12:24:28 +03:00
commit d363808d00
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/public/locales/en/Files.json
View File

@ -3,6 +3,7 @@
"AddMembersDescription": "You can add new team members manually or invite them via link.", "AddMembersDescription": "You can add new team members manually or invite them via link.",
"AddNewExternalLink": "Add new external link", "AddNewExternalLink": "Add new external link",
"AddNewLink": "Add new link", "AddNewLink": "Add new link",
"CreateNewLink": "Create new link",
"All": "All", "All": "All",
"AllFiles": "All files", "AllFiles": "All files",
"AllLinksAreDisabled": "All links are disabled", "AllLinksAreDisabled": "All links are disabled",
@ -71,6 +72,7 @@
"InviteUsersInRoom": "Invite users in room", "InviteUsersInRoom": "Invite users in room",
"LimitByTimePeriod": "Limit by time period", "LimitByTimePeriod": "Limit by time period",
"LinkAddedSuccessfully": "Link added successfully", "LinkAddedSuccessfully": "Link added successfully",
"LinkCreatedSuccessfully": "Link successfully created",
"LinkDeletedSuccessfully": "Link deleted successfully", "LinkDeletedSuccessfully": "Link deleted successfully",
"LinkDisabledSuccessfully": "Link disabled successfully", "LinkDisabledSuccessfully": "Link disabled successfully",
"LinkEditedSuccessfully": "Link edited successfully", "LinkEditedSuccessfully": "Link edited successfully",

2
packages/client/src/components/FilesSelector/utils.ts
View File

@ -26,7 +26,7 @@ export const getHeaderLabel = (
return t("Translations:CreateMasterFormFromFile"); return t("Translations:CreateMasterFormFromFile");
if (!!filterParam) return t("Common:SelectFile"); if (!!filterParam) return t("Common:SelectFile");
return t("Common:Save"); return t("Common:SaveButton");
}; };
export const getAcceptButtonLabel = ( export const getAcceptButtonLabel = (

3
packages/client/src/components/panels/EditLinkPanel/LinkBlock.js
View File

@ -7,6 +7,7 @@ import FieldContainer from "@docspace/components/field-container";
const LinkBlock = (props) => { const LinkBlock = (props) => {
const { const {
t, t,
isEdit,
isLoading, isLoading,
shareLink, shareLink,
linkNameValue, linkNameValue,
@ -40,6 +41,7 @@ const LinkBlock = (props) => {
isDisabled={isLoading} isDisabled={isLoading}
/> />
{isEdit && (
<TextInput <TextInput
scale scale
size="base" size="base"
@ -50,6 +52,7 @@ const LinkBlock = (props) => {
value={linkValue} value={linkValue}
placeholder={t("ExternalLink")} placeholder={t("ExternalLink")}
/> />
)}
</div> </div>
); );
}; };

7
packages/client/src/components/panels/EditLinkPanel/index.js
View File

@ -113,7 +113,7 @@ const EditLinkPanel = (props) => {
} else { } else {
copy(link?.sharedTo?.shareLink); copy(link?.sharedTo?.shareLink);
toastr.success(t("Files:LinkAddedSuccessfully")); toastr.success(t("Files:LinkCreatedSuccessfully"));
} }
}) })
.catch((err) => toastr.error(err?.message)) .catch((err) => toastr.error(err?.message))
@ -179,13 +179,14 @@ const EditLinkPanel = (props) => {
> >
<div className="edit-link_header"> <div className="edit-link_header">
<Heading className="edit-link_heading"> <Heading className="edit-link_heading">
{isEdit ? t("Files:EditLink") : t("Files:AddNewLink")} {isEdit ? t("Files:EditLink") : t("Files:CreateNewLink")}
</Heading> </Heading>
</div> </div>
<StyledScrollbar stype="mediumBlack"> <StyledScrollbar stype="mediumBlack">
<div className="edit-link_body"> <div className="edit-link_body">
<LinkBlock <LinkBlock
t={t} t={t}
isEdit={isEdit}
isLoading={isLoading} isLoading={isLoading}
shareLink={shareLink} shareLink={shareLink}
linkNameValue={linkNameValue} linkNameValue={linkNameValue}
@ -230,7 +231,7 @@ const EditLinkPanel = (props) => {
scale scale
primary primary
size="normal" size="normal"
label={t("Common:SaveButton")} label={isEdit ? t("Common:SaveButton") : t("Common:Create")}
isDisabled={isLoading || !linkNameIsValid || isExpired} isDisabled={isLoading || !linkNameIsValid || isExpired}
onClick={onSave} onClick={onSave}
/> />

2
packages/common/components/Navigation/StyledNavigation.js
View File

@ -174,6 +174,8 @@ const StyledContainer = styled.div`
.title-icon { .title-icon {
min-width: 16px; min-width: 16px;
min-height: 16px; min-height: 16px;
width: 16px;
height: 16px;
svg { svg {
path, path,

2
packages/components/table-container/TableHeader.js
View File

@ -248,6 +248,8 @@ class TableHeader extends React.Component {
? containerRef.current ? containerRef.current
: document.getElementById("table-container"); : document.getElementById("table-container");
if (!container) return;
// // 400 - it is desktop info panel width // // 400 - it is desktop info panel width
// const minSize = infoPanelVisible ? size.tablet - 400 : size.tablet; // const minSize = infoPanelVisible ? size.tablet - 400 : size.tablet;