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

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

View File

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

View File

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

View File

@ -179,9 +179,14 @@ public class CustomNamingPeople
public string Substitute<T>(string resourceKey) where T : class 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); 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 Substitute(text);
} }
return null;
}
public string Substitute(string text) public string Substitute(string text)
{ {