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

This commit is contained in:
DmitrySychugov 2023-06-02 17:26:13 +05:00
commit 2b1c90df55
12 changed files with 1262 additions and 996 deletions

View File

@ -3,7 +3,9 @@ name: Build packages
on:
push:
branches:
- feature/feature/build_upload_4testing
- release/*
- develop
- hotfix/*
paths:
- build/install/deb**
- build/install/rpm**

View File

@ -1,6 +1,6 @@
{
"name": "docspace",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"workspaces": {
"packages": [

View File

@ -1,6 +1,6 @@
{
"name": "@docspace/client",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"homepage": "",
"scripts": {

View File

@ -487,6 +487,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
"/files/trash/filter",
"/accounts",
"/accounts/changeOwner",
"/accounts/filter",
"/accounts/create/:type",

View File

@ -26,10 +26,16 @@ const PeopleSection = React.memo(() => {
/>
<PrivateRoute
exact
withManager
withManager
path={["/accounts"]}
component={HomeRedirectToFilter}
/>
<PrivateRoute
exact
withManager
path={["/accounts/changeOwner"]}
component={RedirectWithChangeOwnerDialog}
/>
<PrivateRoute
path={"/accounts/filter"}
withManager
@ -55,6 +61,20 @@ const HomeRedirectToFilter = (props) => {
return <Redirect to={`/accounts/filter?${urlFilter}`} />;
};
const RedirectWithChangeOwnerDialog = (props) => {
const filter = Filter.getDefault();
const urlFilter = filter.toUrlParams();
return (
<Redirect
to={{
pathname: "/accounts/filter",
search: `?${urlFilter}`,
state: { openChangeOwnerDialog: true },
}}
/>
);
};
const PeopleContent = (props) => {
const { loadBaseInfo, isLoading, setFirstLoad } = props;

View File

@ -44,6 +44,8 @@ const PureHome = ({
withPaging,
onClickBack,
setPortalTariff,
setChangeOwnerDialogVisible,
}) => {
const { location } = history;
const { pathname } = location;
@ -73,6 +75,9 @@ const PureHome = ({
setIsLoading(false);
setIsRefresh(false);
});
if (location?.state?.openChangeOwnerDialog)
setChangeOwnerDialogVisible(true);
}
}, [pathname, location, setSelectedNode]);
@ -140,24 +145,15 @@ export default inject(
const { settingsStore, currentTariffStatusStore } = auth;
const { setPortalTariff } = currentTariffStatusStore;
const { showCatalog, withPaging } = settingsStore;
const {
usersStore,
selectedGroupStore,
loadingStore,
viewAs,
} = peopleStore;
const { usersStore, selectedGroupStore, loadingStore, viewAs } =
peopleStore;
const { getUsersList } = usersStore;
const { selectedGroup } = selectedGroupStore;
const { setSelectedNode } = treeFoldersStore;
const { onClickBack } = filesActionsStore;
const {
isLoading,
setIsLoading,
setIsRefresh,
firstLoad,
setFirstLoad,
} = loadingStore;
const { isLoading, setIsLoading, setIsRefresh, firstLoad, setFirstLoad } =
loadingStore;
const { setChangeOwnerDialogVisible } = peopleStore.dialogStore;
return {
setPortalTariff,
isAdmin: auth.isAdmin,
@ -176,6 +172,7 @@ export default inject(
snackbarExist: auth.settingsStore.snackbarExist,
withPaging,
onClickBack,
setChangeOwnerDialogVisible,
};
}
)(observer(withRouter(Home)));

View File

@ -132,7 +132,12 @@ const FilesSection = React.memo(({ withMainButton }) => {
exact
restricted
withManager
path={["/accounts", "/accounts/filter", "/accounts/create/:type"]}
path={[
"/accounts",
"/accounts/changeOwner",
"/accounts/filter",
"/accounts/create/:type",
]}
component={Accounts}
/>

View File

@ -1,6 +1,6 @@
{
"name": "@docspace/common",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"scripts": {
"build": "echo 'skip it'",

View File

@ -1,6 +1,6 @@
{
"name": "@docspace/components",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"scripts": {
"build": "echo 'skip it'",

View File

@ -1,6 +1,6 @@
{
"name": "@docspace/editor",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"homepage": "/doceditor",
"scripts": {

View File

@ -1,6 +1,6 @@
{
"name": "@docspace/login",
"version": "1.0.1",
"version": "1.1.0",
"private": true,
"homepage": "/login",
"scripts": {

2187
yarn.lock

File diff suppressed because it is too large Load Diff