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

Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display

Browse Source
This commit is contained in:
Dmitry Sychugov 2021-10-15 16:53:45 +05:00
commit 58fce28bf5
10 changed files with 21 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/ASC.Data.Storage/BaseStorage.cs
View File

@ -53,35 +53,22 @@ namespace ASC.Data.Storage
protected EmailValidationKeyProvider EmailValidationKeyProvider { get; }
protected IHttpContextAccessor HttpContextAccessor { get; }
protected IOptionsMonitor<ILog> Options { get; }
public BaseStorage(
TempStream tempStream,
TenantManager tenantManager,
PathUtils pathUtils,
EmailValidationKeyProvider emailValidationKeyProvider,
IOptionsMonitor<ILog> options)
{
TempStream = tempStream;
TenantManager = tenantManager;
PathUtils = pathUtils;
EmailValidationKeyProvider = emailValidationKeyProvider;
Options = options;
Log = options.CurrentValue;
}
public BaseStorage(
TempStream tempStream,
TenantManager tenantManager,
PathUtils pathUtils,
EmailValidationKeyProvider emailValidationKeyProvider,
IHttpContextAccessor httpContextAccessor,
IOptionsMonitor<ILog> options) : this(
tempStream,
tenantManager,
pathUtils,
emailValidationKeyProvider,
options)
IOptionsMonitor<ILog> options)
{
TempStream = tempStream;
TenantManager = tenantManager;
PathUtils = pathUtils;
EmailValidationKeyProvider = emailValidationKeyProvider;
Options = options;
Log = options.CurrentValue;
HttpContextAccessor = httpContextAccessor;
}

16
common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
View File

@ -76,21 +76,7 @@ namespace ASC.Data.Storage.DiscStorage
return this;
}
public DiscDataStore(
TempStream tempStream,
TenantManager tenantManager,
PathUtils pathUtils,
EmailValidationKeyProvider emailValidationKeyProvider,
IOptionsMonitor<ILog> options,
EncryptionSettingsHelper encryptionSettingsHelper,
EncryptionFactory encryptionFactory)
: base(tempStream, tenantManager, pathUtils, emailValidationKeyProvider, options)
{
EncryptionSettingsHelper = encryptionSettingsHelper;
EncryptionFactory = encryptionFactory;
}
public DiscDataStore(
TempStream tempStream,
TenantManager tenantManager,

11
common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
View File

@ -71,16 +71,7 @@ namespace ASC.Data.Storage.GoogleCloud
private Uri _bucketSSlRoot;
private bool _lowerCasing = true;
public GoogleCloudStorage(
TempStream tempStream,
TenantManager tenantManager,
PathUtils pathUtils,
EmailValidationKeyProvider emailValidationKeyProvider,
IOptionsMonitor<ILog> options) : base(tempStream, tenantManager, pathUtils, emailValidationKeyProvider, options)
{
}
public GoogleCloudStorage(
TempStream tempStream,
TenantManager tenantManager,

15
common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
View File

@ -64,20 +64,7 @@ namespace ASC.Data.Storage.RackspaceCloud
private Uri _cnameSSL;
private readonly ILog _logger;
public RackspaceCloudStorage(
TempPath tempPath,
TempStream tempStream,
TenantManager tenantManager,
PathUtils pathUtils,
EmailValidationKeyProvider emailValidationKeyProvider,
IOptionsMonitor<ILog> options)
: base(tempStream, tenantManager, pathUtils, emailValidationKeyProvider, options)
{
_logger = options.Get("ASC.Data.Storage.Rackspace.RackspaceCloudStorage");
TempPath = tempPath;
}
public RackspaceCloudStorage(
TempPath tempPath,
TempStream tempStream,

12
common/ASC.Data.Storage/S3/S3Storage.cs
View File

@ -77,17 +77,7 @@ namespace ASC.Data.Storage.S3
private bool _revalidateCloudFront;
private string _distributionId = string.Empty;
private string _subDir = string.Empty;
public S3Storage(
TempStream tempStream,
TenantManager tenantManager,
PathUtils pathUtils,
EmailValidationKeyProvider emailValidationKeyProvider,
IOptionsMonitor<ILog> options)
: base(tempStream, tenantManager, pathUtils, emailValidationKeyProvider, options)
{
}
public S3Storage(
TempStream tempStream,
TenantManager tenantManager,

2
config/nginx/onlyoffice.conf
View File

@ -24,7 +24,7 @@ map $request_uri $header_x_frame_options {
map $request_uri $cache_control {
default "no-cache, no-store, must-revalidate";
# ~*^/(api\/2\.0.*|storage|login\.ashx|products\/.+\/httphandlers\/filehandler\.ashx|ChunkedUploader.ashx|apisystem|sh) "no-cache, no-store, must-revalidate";
~*\/(api\/2\.0.*|storage|login\.ashx|products\/.+\/httphandlers\/filehandler\.ashx|ChunkedUploader.ashx|apisystem|sh|remoteEntry\.js) "no-cache, no-store, must-revalidate";
~*\.(ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|rss|atom|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf|md|css|js)$ "public, no-transform";
}

2
packages/asc-web-common/components/PageLayout/index.js
View File

@ -461,7 +461,7 @@ class PageLayout extends React.Component {
{!isMobile && uploadFiles && !dragging && (
<StyledSelectoWrapper>
<Selecto
boundContainer={".section-body"}
boundContainer={".section-wrapper"}
dragContainer={".section-body"}
selectableTargets={[".files-item"]}
hitRate={0}

2
products/ASC.Files/Client/src/components/EditingWrapperComponent.js
View File

@ -161,7 +161,7 @@ const EditingWrapperComponent = (props) => {
tabIndex={1}
isAutoFocussed={true}
onChange={renameTitle}
onKeyPress={onKeyUpUpdateItem}
onKeyUp={onKeyUpUpdateItem}
onKeyDown={onEscapeKeyPress}
onFocus={onFocus}
isDisabled={isLoading}

8
products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
View File

@ -42,16 +42,16 @@ class DeleteDialogComponent extends React.Component {
}
componentDidMount() {
document.addEventListener("keydown", this.onKeydown, false);
document.addEventListener("keyup", this.onKeyUp, false);
}
componentWillUnmount() {
document.removeEventListener("keydown", this.onKeydown, false);
document.removeEventListener("keyup", this.onKeyUp, false);
}
onKeydown = (e) => {
onKeyUp = (e) => {
if (e.keyCode === 27) this.onClose();
if (e.keyCode === 13) this.onDelete();
if (e.keyCode === 13 || e.which === 13) this.onDelete();
};
onDelete = () => {

4
web/ASC.Web.Client/src/Shell.jsx
View File

@ -137,8 +137,6 @@ const MyProfileRoute = (props) => (
</React.Suspense>
);
let index = 0;
const Shell = ({ items = [], page = "home", ...rest }) => {
const {
isLoaded,
@ -351,7 +349,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
const remoteEntryURL = combineUrl(
window.location.origin,
appURL,
`remoteEntry.js?__index=${++index}`
`remoteEntry.js`
);
const system = {