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

Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces

Browse Source 
# Conflicts:
#	products/ASC.Files/Client/src/store/InitFilesStore.js
This commit is contained in:
Artem Tarasov 2021-02-25 18:42:10 +03:00
commit c35d0612f0
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/asc-web-common/components/FilterInput/sub-components/FilterButton.js
View File

@ -17,7 +17,6 @@ class FilterButton extends React.PureComponent {
return (
<ContextMenuButton
className="filter-button"
color="#A3A9AE"
directionY="bottom"
getData={getData}
iconName="images/rectangle.filter.react.svg"

3
packages/asc-web-components/icon-button/index.js
View File

@ -126,7 +126,7 @@ class IconButton extends React.PureComponent {
if (!isEmpty(newState)) this.setState(newState);
}
render() {
//console.log("IconButton render");
//console.log("IconButton render", this.state.currentIconColor);
const {
className,
size,
@ -195,7 +195,6 @@ IconButton.propTypes = {
};
IconButton.defaultProps = {
color: "#d0d5da",
size: 25,
isFill: true,
iconName: "static/images/a-z.sorting.react.svg",

2
products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
View File

@ -85,7 +85,7 @@ class TreeFolders extends React.Component {
iconUrl = "images/catalog.private.react.svg";
break;
case FolderType.TRASH:
iconUrl = "static/images/catalog.trash.react.svg";
iconUrl = "images/catalog.trash.react.svg";
break;
default:
break;

10
products/ASC.Files/Client/src/store/InitFilesStore.js
View File

@ -1,12 +1,12 @@
import { makeObservable, action, observable, computed } from "mobx";
import store from "@appserver/common/store";
import store from "studio/store";
import { updateTempContent } from "@appserver/common/utils";
import filesStore from "./FilesStore";
import treeFoldersStore from "./TreeFoldersStore";
import config from "../../package.json";
const { authStore } = store;
const { isAdmin } = authStore;
const { auth } = store;
const { isAdmin } = auth;
class InitFilesStore {
isLoaded = false;
@ -88,14 +88,14 @@ class InitFilesStore {
}
initFiles = () => {
const isAuthenticated = authStore.isAuthenticated;
const isAuthenticated = auth.isAuthenticated;
const {
getPortalCultures,
isDesktopClient,
getIsEncryptionSupport,
getEncryptionKeys,
setModuleInfo,
} = authStore.settingsStore;
} = auth.settingsStore;
const homepage = "/products/files"; //TODO: add homepage to config?
setModuleInfo(homepage, "e67be73d-f9ae-4ce1-8fec-1880cb518cb4");