From 102b6692fd1f8e843d8cc0dd3dddb186541f8ac7 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 18 Nov 2022 15:45:09 +0400 Subject: [PATCH 1/4] [DE mobile] Fix Bug 59760 --- apps/common/mobile/lib/view/SharingSettings.jsx | 8 +++++--- .../mobile/src/view/settings/Settings.jsx | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/common/mobile/lib/view/SharingSettings.jsx b/apps/common/mobile/lib/view/SharingSettings.jsx index 22f60e4b8..5c11a1a34 100644 --- a/apps/common/mobile/lib/view/SharingSettings.jsx +++ b/apps/common/mobile/lib/view/SharingSettings.jsx @@ -6,17 +6,19 @@ import { Device } from "../../utils/device"; const SharingSettings = props => { const { t } = useTranslation(); + const storeAppOptions = props.storeAppOptions; + const sharingSettingsUrl = storeAppOptions.sharingSettingsUrl; const _t = t('Common.Collaboration', {returnObjects: true}); - const url = 'https://nct.onlyoffice.com/Products/Files/Share.aspx?fileid=142278'; + // const url = 'https://nct.onlyoffice.com/Products/Files/Share.aspx?fileid=142278'; return (
- +
) } -export default SharingSettings; \ No newline at end of file +export default inject("storeAppOptions")(observer(SharingSettings)); \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index 32ed242c6..9c0bf1ba5 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -84,6 +84,7 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => const { t } = useTranslation(); const _t = t('Settings', {returnObjects: true}); const appOptions = props.storeAppOptions; + const sharingSettingsUrl = appOptions.sharingSettingsUrl; const storeReview = props.storeReview; const displayMode = storeReview.displayMode; const navbar = @@ -191,9 +192,12 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => onClick={onoptionclick.bind(this, "/application-settings/")}> - - - + {sharingSettingsUrl && + + + + } {_canDownload && From 31b901fa6b7e382d99002b1378f5262db19b4d4e Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 18 Nov 2022 15:59:43 +0400 Subject: [PATCH 2/4] [DE PE SSE mobile] Fix Bug 59732 --- .../mobile/lib/view/collaboration/Collaboration.jsx | 13 +++++++++++-- .../mobile/src/view/settings/Settings.jsx | 7 ------- .../mobile/src/view/settings/Settings.jsx | 10 ---------- .../mobile/src/view/settings/Settings.jsx | 10 ---------- 4 files changed, 11 insertions(+), 29 deletions(-) diff --git a/apps/common/mobile/lib/view/collaboration/Collaboration.jsx b/apps/common/mobile/lib/view/collaboration/Collaboration.jsx index d029838b9..ea3e08840 100644 --- a/apps/common/mobile/lib/view/collaboration/Collaboration.jsx +++ b/apps/common/mobile/lib/view/collaboration/Collaboration.jsx @@ -4,11 +4,10 @@ import { Popover, List, ListItem, Navbar, NavRight, Sheet, BlockTitle, Page, Vie import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import {Device} from "../../../utils/device"; - import {ReviewController, ReviewChangeController} from "../../controller/collaboration/Review"; import {PageDisplayMode} from "./Review"; - import {ViewCommentsController, ViewCommentsSheetsController} from "../../controller/collaboration/Comments"; +import SharingSettings from "../SharingSettings"; const PageUsers = inject("users")(observer(props => { const { t } = useTranslation(); @@ -81,6 +80,10 @@ const routes = [ allComments: true } } + }, + { + path: '/sharing-settings/', + component: SharingSettings } ]; @@ -88,6 +91,7 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => { const { t } = useTranslation(); const _t = t('Common.Collaboration', {returnObjects: true}); const appOptions = props.storeAppOptions; + const sharingSettingsUrl = appOptions.sharingSettingsUrl; const isViewer = appOptions.isViewer; return ( @@ -103,6 +107,11 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => { } + {sharingSettingsUrl && + + + + } {props.users.editUsers.length > 0 && diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index 9c0bf1ba5..2533eace1 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -84,7 +84,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => const { t } = useTranslation(); const _t = t('Settings', {returnObjects: true}); const appOptions = props.storeAppOptions; - const sharingSettingsUrl = appOptions.sharingSettingsUrl; const storeReview = props.storeReview; const displayMode = storeReview.displayMode; const navbar = @@ -192,12 +191,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => onClick={onoptionclick.bind(this, "/application-settings/")}> - {sharingSettingsUrl && - - - - } {_canDownload && diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index 2f2615383..d302d6ae5 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -47,13 +47,6 @@ const routes = [ path: '/about/', component: About }, - - // Sharing Settings - - { - path: '/sharing-settings/', - component: SharingSettings - } /*{ path: '/presentation-settings/', component: PresentationSettingsController, @@ -186,9 +179,6 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( - - - {_canDownload && diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index ea36d7edd..6950042cd 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -67,13 +67,6 @@ const routes = [ { path: '/direction/', component: Direction - }, - - // Sharing Settings - - { - path: '/sharing-settings/', - component: SharingSettings } ]; @@ -196,9 +189,6 @@ const SettingsList = inject("storeAppOptions")(observer(props => { - - - {_canDownload && From 1bb6c0e0026f0e85efa939743f3f89b46b742b45 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 18 Nov 2022 16:46:11 +0400 Subject: [PATCH 3/4] [DE mobile] Fix Bug 59720 --- apps/documenteditor/mobile/src/view/edit/Edit.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index 749499a8d..d28625b46 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -339,13 +339,6 @@ const EditTabs = props => { component: }) } - if (settings.indexOf('paragraph') > -1) { - editors.push({ - caption: _t.textParagraph, - id: 'edit-paragraph', - component: - }) - } if (settings.indexOf('text') > -1) { editors.push({ caption: _t.textText, @@ -353,6 +346,13 @@ const EditTabs = props => { component: }) } + if (settings.indexOf('paragraph') > -1) { + editors.push({ + caption: _t.textParagraph, + id: 'edit-paragraph', + component: + }) + } } return ( From bdf39b536f80e52326afd56fdcc6bedfc923db5d Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 18 Nov 2022 17:24:35 +0400 Subject: [PATCH 4/4] Removed useless comment --- apps/common/mobile/lib/view/SharingSettings.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/common/mobile/lib/view/SharingSettings.jsx b/apps/common/mobile/lib/view/SharingSettings.jsx index 5c11a1a34..32e184eee 100644 --- a/apps/common/mobile/lib/view/SharingSettings.jsx +++ b/apps/common/mobile/lib/view/SharingSettings.jsx @@ -9,7 +9,6 @@ const SharingSettings = props => { const storeAppOptions = props.storeAppOptions; const sharingSettingsUrl = storeAppOptions.sharingSettingsUrl; const _t = t('Common.Collaboration', {returnObjects: true}); - // const url = 'https://nct.onlyoffice.com/Products/Files/Share.aspx?fileid=142278'; return (