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

Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

Browse Source
This commit is contained in:
Maria Sukhova 2023-04-17 15:20:10 +03:00
commit 232c6bbdf1
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/pages/Home/index.js
View File

@ -337,11 +337,19 @@ class PureHome extends React.Component {
secondaryProgressDataStoreIcon,
itemsSelectionLength,
itemsSelectionTitle,
refreshFiles,
} = this.props;
if (this.props.isHeaderVisible !== prevProps.isHeaderVisible) {
this.props.setHeaderVisible(this.props.isHeaderVisible);
}
if (isProgressFinished !== prevProps.isProgressFinished) {
setTimeout(() => {
console.log("render refresh", refreshFiles());
}, 100);
}
if (
isProgressFinished &&
itemsSelectionTitle &&

5
packages/client/src/store/FilesStore.js
View File

@ -1128,8 +1128,9 @@ class FilesStore {
return newFilter;
};
refreshFiles = () => {
return this.fetchFiles(this.selectedFolderStore.id, this.filter);
refreshFiles = async () => {
const res = await this.fetchFiles(this.selectedFolderStore.id, this.filter);
return res;
};
fetchFiles = (

9
web/ASC.Web.Core/Users/CustomNamingPeople.cs
View File

@ -179,8 +179,13 @@ public class CustomNamingPeople
public string Substitute<T>(string resourceKey) where T : class
{
var text = (string)typeof(T).GetProperty(resourceKey, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic).GetValue(null, null);
return Substitute(text);
var prop = typeof(T).GetProperty(resourceKey, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
if (prop != null)
{
var text = (string)prop.GetValue(null, null);
return Substitute(text);
}
return null;
}
public string Substitute(string text)