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

Merge branch 'release/v1.0.0' into feature/profile-menu

Browse Source
This commit is contained in:
Nikita Gopienko 2023-04-07 14:20:51 +03:00
commit c8424987a5
16 changed files with 70 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/appsettings.json
View File

@ -124,6 +124,7 @@
"teamlab-site": "http://www.onlyoffice.com",
"help-center": "https://helpcenter.onlyoffice.com/{ru|de|fr|es|it}",
"book-training-email": "training@onlyoffice.com",
"documentation-email": "documentation@onlyoffice.com",
"max-upload-size" : 5242880,
"zendesk-key" : ""
},

1
packages/client/public/locales/en/InfoPanel.json
View File

@ -26,6 +26,7 @@
"FeedUpdateUser": "has been assigned role {{role}}",
"FileExtension": "File extension",
"FilesEmptyScreenText": "See file and folder details here",
"HistoryEmptyScreenText": "Activity history will be shown here",
"ItemsSelected": "Items selected",
"LastModifiedBy": "Last modified by",
"PendingInvitations": "Pending invitations",

61
packages/client/src/pages/AccountsHome/Section/Body/RowView/PeopleRowContainer.js
View File

@ -43,7 +43,7 @@ const StyledRowContainer = styled(RowContainer)`
.user-row {
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
margin-top: -4px;
margin-top: -3px;
${marginStyles}
}
@ -53,7 +53,7 @@ const StyledRowContainer = styled(RowContainer)`
.user-row {
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
margin-top: -4px;
margin-top: -3px;
${marginStyles}
}
@ -70,7 +70,7 @@ const StyledRowContainer = styled(RowContainer)`
border-bottom: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
padding-bottom: 1px;
padding-top: 1px;
${marginStyles}
}
.user-row::after {
@ -81,61 +81,11 @@ const StyledRowContainer = styled(RowContainer)`
.user-row {
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
margin-top: -4px;
margin-top: -3px;
${marginStyles}
}
}
.row-selected {
.user-row {
.styled-element {
padding-top: 1px;
}
}
}
@media (max-width: 1024px) {
.row-selected {
.user-row {
margin-top: -3px !important;
padding-bottom: 0.8px !important;
padding-top: 0.8px !important;
.styled-element {
padding-bottom: 0.8px;
.owner_icon {
padding-bottom: 0.8px;
}
}
.expandButton {
padding-bottom: 0.8px;
}
.mainIcons {
.paid-badge {
margin-top: -1px;
}
}
}
}
}
${(props) =>
props.sectionWidth <= 500 &&
css`
.row-selected {
.user-row {
.mainIcons {
.paid-badge {
margin-top: 0.8px !important;
}
}
}
}
`}
`;
const PeopleRowContainer = ({
@ -174,8 +124,7 @@ const PeopleRowContainer = ({
hasMoreFiles={hasMoreAccounts}
itemCount={filterTotal}
filesLength={peopleList.length}
itemHeight={57.6}
sectionWidth={sectionWidth}
itemHeight={58}
>
{peopleList.map((item) => (
<SimpleUserRow

58
packages/client/src/pages/AccountsHome/Section/Body/RowView/SimpleUserRow.js
View File

@ -70,58 +70,12 @@ const StyledSimpleUserRow = styled(Row)`
cursor: pointer;
${checkedStyle}
@media (min-width: 1024px) {
margin-top: -4px !important;
padding-top: 1px;
padding-bottom: 1px;
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
border-bottom: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
.styled-checkbox-container {
.styled-element {
padding-top: 1px;
}
}
}
@media (max-width: 1024px) {
margin-top: -3px !important;
padding-top: 0.8px;
padding-bottom: 0.8px;
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
border-bottom: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
.owner_icon {
padding-bottom: 0.8px;
}
.mainIcons {
.paid-badge {
margin-top: -1px;
}
}
.expandButton {
padding-bottom: 0.8px;
}
}
${(props) =>
props.sectionWidth <= 500 &&
css`
.mainIcons {
.paid-badge {
margin-top: 0.8px !important;
}
}
`}
margin-top: -3px;
padding-bottom: 1px;
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
border-bottom: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
}
`}

18
packages/client/src/pages/AccountsHome/Section/Body/TableView/TableContainer.js
View File

@ -43,24 +43,6 @@ const StyledTableContainer = styled(TableContainer)`
.table-container_row-context-menu-wrapper {
${contextCss}
}
.table-container_cell {
.paid-badge {
p {
padding-top: 1px;
}
}
}
}
:hover {
.table-container_cell {
.paid-badge {
p {
padding-top: 1px;
}
}
}
}
.table-row-selected + .table-row-selected {

7
packages/client/src/pages/AccountsHome/Section/Body/TableView/TableRow.js
View File

@ -29,12 +29,6 @@ const StyledPeopleRow = styled(TableRow)`
border-top: ${(props) =>
`1px solid ${props.theme.filesSection.tableView.row.borderColor}`};
margin-top: -1px;
.paid-badge {
p {
padding-top: 1px;
}
}
}
.table-container_user-name-cell {
@ -344,7 +338,6 @@ const PeopleTableRow = (props) => {
hasAccess={true}
className="table-container_row-checkbox-wrapper"
checked={isChecked}
style={{ borderBottom: "none" }}
>
<div className="table-container_element">{element}</div>
<Checkbox

7
packages/client/src/pages/Home/InfoPanel/Body/styles/noItem.js
View File

@ -15,6 +15,13 @@ const StyledNoItemContainer = styled.div`
text-align: center;
}
.no-history-text {
font-weight: 700;
font-size: 16px;
line-height: 22px;
text-align: center;
}
.no-thumbnail-img-wrapper {
width: 75px;
height: 75px;

3
packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
View File

@ -7,6 +7,7 @@ import { StyledHistoryList, StyledHistorySubtitle } from "../../styles/history";
import Loaders from "@docspace/common/components/Loaders";
import { getRelativeDateDay } from "./../../helpers/HistoryHelper";
import HistoryBlock from "./HistoryBlock";
import NoHistory from "../NoItem/NoHistory";
const History = ({
t,
@ -100,7 +101,7 @@ const History = ({
}, [selection]);
if (showLoader) return <Loaders.InfoPanelViewLoader view="history" />;
if (!history) return null;
if (!history || history?.feeds.length === 0) return <NoHistory t={t} />;
return (
<>

31
packages/client/src/pages/Home/InfoPanel/Body/views/NoItem/NoHistory.js Normal file
View File

@ -0,0 +1,31 @@
import EmptyScreenRecentUrl from "PUBLIC_DIR/images/empty_screen_recent.svg?url";
import EmptyScreenRecentDarkUrl from "PUBLIC_DIR/images/empty_screen_recent_dark.svg?url";
import React from "react";
import { inject, observer } from "mobx-react";
import Text from "@docspace/components/text";
import { StyledNoItemContainer } from "../../styles/noItem";
const NoHistory = ({ t, theme }) => {
const imageSrc = theme.isBase
? EmptyScreenRecentUrl
: EmptyScreenRecentDarkUrl;
return (
<StyledNoItemContainer className="info-panel_gallery-empty-screen">
<div className="no-thumbnail-img-wrapper">
<img src={imageSrc} alt="No History Image" />
</div>
<Text className="no-history-text" textAlign="center">
{t("HistoryEmptyScreenText")}
</Text>
</StyledNoItemContainer>
);
};
export default inject(({ auth }) => {
return {
theme: auth.settingsStore.theme,
};
})(observer(NoHistory));

2
packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
View File

@ -7,7 +7,7 @@ import styled, { css } from "styled-components";
import marginStyles from "./CommonStyles";
import { isTablet } from "@docspace/components/utils/device";
import { Base } from "@docspace/components/themes";
import { tablet } from "@docspace/components/utils/device";
const StyledRowContainer = styled(RowContainer)`
.row-list-item:first-child {
.row-selected {

18
packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
View File

@ -40,13 +40,17 @@ const StyledSimpleFilesRow = styled(Row)`
cursor: pointer;
${checkedStyle}
margin-top:-2px;
padding-top: 1px;
padding-bottom: 1px;
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
border-bottom: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
${(props) =>
!props.showHotkeyBorder &&
css`
margin-top: -2px;
padding-top: 1px;
padding-bottom: 1px;
border-top: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
border-bottom: ${(props) =>
`1px ${props.theme.filesSection.tableView.row.borderColor} solid`};
`}
}
`};
position: unset;

1
packages/client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
View File

@ -36,7 +36,6 @@ const FileNameCell = ({
className="table-container_element-wrapper"
hasAccess={true}
checked={checked}
style={{ borderBottom: "none" }}
>
<div className="table-container_element-container">
<div className="table-container_element">{element}</div>

2
packages/common/components/FilterInput/index.js
View File

@ -201,7 +201,7 @@ const FilterInput = React.memo(
removeSelectedItem={removeSelectedItemAction}
/>
))}
{selectedItems.length > 1 && (
{selectedItems.filter((item) => item.label).length > 1 && (
<Link
className={"clear-all-link"}
isHovered

1
web/ASC.Web.Api/Api/Settings/SettingsController.cs
View File

@ -164,6 +164,7 @@ public class SettingsController : BaseSettingsController
settings.DomainValidator = _tenantDomainValidator;
settings.ZendeskKey = _setupInfo.ZendeskKey;
settings.BookTrainingEmail = _setupInfo.BookTrainingEmail;
settings.DocumentationEmail = _setupInfo.DocumentationEmail;
settings.Firebase = new FirebaseDto
{

1
web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
View File

@ -56,6 +56,7 @@ public class SettingsDto
public TenantDomainValidator DomainValidator { get; set; }
public string ZendeskKey { get; set; }
public string BookTrainingEmail { get; set; }
public string DocumentationEmail { get; set; }
public PluginsDto Plugins { get; set; }

2
web/ASC.Web.Core/SetupInfo.cs
View File

@ -39,6 +39,7 @@ public class SetupInfo
public string RequestTraining { get; private set; }
public string ZendeskKey { get; private set; }
public string BookTrainingEmail { get; private set; }
public string DocumentationEmail { get; private set; }
public string UserVoiceURL { get; private set; }
public string MainLogoURL { get; private set; }
public string MainLogoMailTmplURL { get; private set; }
@ -122,6 +123,7 @@ public class SetupInfo
DemoOrder = GetAppSettings("web.demo-order", string.Empty);
ZendeskKey = GetAppSettings("web:zendesk-key", string.Empty);
BookTrainingEmail = GetAppSettings("web:book-training-email", string.Empty);
DocumentationEmail = GetAppSettings("web:documentation-email", string.Empty);
RequestTraining = GetAppSettings("web.request-training", string.Empty);
MainLogoURL = GetAppSettings("web.logo.main", string.Empty);
MainLogoMailTmplURL = GetAppSettings("web.logo.mail.tmpl", string.Empty);