From 252a36fbc3a7b0d771082b38d5abb29c3b6ee6f4 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Apr 2024 10:44:24 +0300 Subject: [PATCH 01/13] PortalSettings: Fixed page crash when going to quotas in portal settings in mobile view. --- packages/client/src/pages/PortalSettings/utils/settingsTree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/PortalSettings/utils/settingsTree.js b/packages/client/src/pages/PortalSettings/utils/settingsTree.js index da138860b0..87f7bfb490 100644 --- a/packages/client/src/pages/PortalSettings/utils/settingsTree.js +++ b/packages/client/src/pages/PortalSettings/utils/settingsTree.js @@ -392,7 +392,7 @@ export const settingsTree = [ children: [ { id: "portal-settings_catalog-storageManagement", - key: "6-0", + key: "6-1", icon: "", link: "disk-space", tKey: "StorageManagement", From 61239486a23266511c359a034e8bd0577e33d159 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Apr 2024 11:22:19 +0300 Subject: [PATCH 02/13] PortalSettings: Integration: Added disable button if all fields are not filled in. --- .../sub-components/consumerModalDialog.js | 85 +++++++++++-------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js index ba78c80f01..8d59da1736 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js @@ -24,7 +24,7 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -import React from "react"; +import React, { createRef } from "react"; import PropTypes from "prop-types"; import { Trans } from "react-i18next"; import { inject, observer } from "mobx-react"; @@ -58,15 +58,20 @@ class ConsumerModalDialog extends React.Component { constructor(props) { super(props); this.state = {}; + const required = createRef(); + required.current = []; + this.requiredRef = required.current; } mapTokenNameToState = () => { const { selectedConsumer } = this.props; - selectedConsumer.props.map((prop) => + selectedConsumer.props.map((prop) => { + this.requiredRef.push(prop.name); + this.setState({ [`${prop.name}`]: prop.value, - }), - ); + }); + }); }; onChangeHandler = (e) => { @@ -214,18 +219,54 @@ class ConsumerModalDialog extends React.Component { ); + inputsRender = (item, index) => { + const { onChangeHandler, state, props } = this; + const { selectedConsumer, isLoading } = props; + + return ( + + + + {item.title}: + + + + + + + ); + }; render() { const { selectedConsumer, onModalClose, dialogVisible, isLoading, t } = this.props; const { state, - onChangeHandler, updateConsumerValues, consumerInstruction, helpCenterDescription, supportTeamDescription, + requiredRef, } = this; + const isDisabled = requiredRef.some((name) => state[name].trim() === ""); + return ( {consumerInstruction} - {selectedConsumer.props.map((prop, i) => ( - - - - {prop.title}: - - - - - - - ))} + {selectedConsumer.props.map((prop, i) => + this.inputsRender(prop, i), + )} {supportTeamDescription} {helpCenterDescription} @@ -277,7 +292,7 @@ class ConsumerModalDialog extends React.Component { id="enable-button" label={isLoading ? t("Common:Sending") : t("Common:Enable")} isLoading={isLoading} - isDisabled={isLoading} + isDisabled={isLoading || isDisabled} scale onClick={updateConsumerValues} /> From fb3a6996de35afbcd33291db24da8f8af23e7b5e Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Apr 2024 11:27:15 +0300 Subject: [PATCH 03/13] PortalSettings: Fixed settings tree key for storage management. --- .../client/src/pages/PortalSettings/utils/settingsTree.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/utils/settingsTree.js b/packages/client/src/pages/PortalSettings/utils/settingsTree.js index 87f7bfb490..30212ba1a2 100644 --- a/packages/client/src/pages/PortalSettings/utils/settingsTree.js +++ b/packages/client/src/pages/PortalSettings/utils/settingsTree.js @@ -392,7 +392,7 @@ export const settingsTree = [ children: [ { id: "portal-settings_catalog-storageManagement", - key: "6-1", + key: "6-0", icon: "", link: "disk-space", tKey: "StorageManagement", @@ -400,14 +400,14 @@ export const settingsTree = [ children: [ { id: "portal-settings_catalog-storageManagement_quota-per-room", - key: "6-1-0", + key: "6-0-1", icon: "", link: "quota-per-room", tKey: "QuotaPerRoom", }, { id: "portal-settings_catalog-storageManagement_quota-per-user", - key: "6-1-1", + key: "6-0-2", icon: "", link: "quota-per-user", tKey: "QuotaPerUser", From b1908e91ba2910304e8e46c10c11c603971d6e9d Mon Sep 17 00:00:00 2001 From: VladaGazizova Date: Tue, 2 Apr 2024 12:03:02 +0300 Subject: [PATCH 04/13] =?UTF-8?q?Fixed=20Bug=2067191=20=E2=80=93=20Files.U?= =?UTF-8?q?pload.=20Nothing=20happens=20when=20you=20try=20to=20load=20a?= =?UTF-8?q?=20file/folder=20with=20the=20parent=20folder=20menu=20open.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/components/navigation/Navigation.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/shared/components/navigation/Navigation.tsx b/packages/shared/components/navigation/Navigation.tsx index 1655708d57..8b92dd8d32 100644 --- a/packages/shared/components/navigation/Navigation.tsx +++ b/packages/shared/components/navigation/Navigation.tsx @@ -115,7 +115,6 @@ const Navigation = ({ const onMissClick = React.useCallback( (e: MouseEvent) => { - e.preventDefault(); const path = e.composedPath && e.composedPath(); if (!firstClick) { From d53503e7263c9b8112c602772b2ee1588bc6f702 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Apr 2024 12:56:38 +0300 Subject: [PATCH 05/13] Client: PortalSettings: StorageManagement: Fixed display of statistics for SaaS mode. --- .../sub-components/Diagram.js | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js b/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js index 294229bb9d..bab73e1c4d 100644 --- a/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js +++ b/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js @@ -42,18 +42,25 @@ const calculateSize = (size, common) => { return (size * 100) / common; }; -const getTags = (obj, tenantCustomQuota, usedPortalSpace, t) => { +const getTags = ( + t, + standalone, + catalogs, + tenantCustomQuota, + maxTotalSizeByQuota, + usedPortalSpace, +) => { const array = []; const colors = ["#13B7EC", "#22C386", "#FF9933", "#FFD30F"]; let i = 0; - const commonSize = - tenantCustomQuota < usedPortalSpace && tenantCustomQuota !== -1 - ? usedPortalSpace - : tenantCustomQuota; + let commonSize = standalone ? tenantCustomQuota : maxTotalSizeByQuota; - for (let key in obj) { - const item = obj[key]; + if (standalone && tenantCustomQuota < usedPortalSpace) + commonSize = usedPortalSpace; + + for (let key in catalogs) { + const item = catalogs[key]; const { usedSpace, title } = item; const percentageSize = calculateSize(usedSpace, commonSize); @@ -73,15 +80,24 @@ const getTags = (obj, tenantCustomQuota, usedPortalSpace, t) => { }; const Diagram = (props) => { const { - tenantCustomQuota, maxWidth = 660, filesUsedSpace, - usedSpace, + usedPortalSpace, + maxTotalSizeByQuota, + standalone, + tenantCustomQuota, } = props; const { t } = useTranslation("Common"); - const elementsTags = getTags(filesUsedSpace, tenantCustomQuota, usedSpace, t); + const elementsTags = getTags( + t, + standalone, + filesUsedSpace, + tenantCustomQuota, + maxTotalSizeByQuota, + usedPortalSpace, + ); return ( @@ -109,11 +125,13 @@ const Diagram = (props) => { export default inject(({ storageManagement, currentQuotaStore }) => { const { filesUsedSpace } = storageManagement; - const { tenantCustomQuota, usedTotalStorageSizeCount } = currentQuotaStore; + const { tenantCustomQuota, usedTotalStorageSizeCount, maxTotalSizeByQuota } = + currentQuotaStore; return { tenantCustomQuota, filesUsedSpace, - usedSpace: usedTotalStorageSizeCount, + usedPortalSpace: usedTotalStorageSizeCount, + maxTotalSizeByQuota, }; })(observer(Diagram)); From 9b655b3365f3e09a6521906a7db43bbfc849511e Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Apr 2024 12:59:53 +0300 Subject: [PATCH 06/13] Client: PortalSettings: StorageManagement: Added display of progress if it is too small. --- .../categories/storage-management/StyledComponent.js | 5 +++-- .../categories/storage-management/sub-components/Diagram.js | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js b/packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js index 67c8c2a361..cd59ccbd88 100644 --- a/packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js +++ b/packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js @@ -145,8 +145,9 @@ const StyledDiagramComponent = styled.div` const StyledFolderTagSection = styled.div` height: 12px; - border-right: ${(props) => - `1px solid ${props.theme.client.settings.payment.backgroundColor}`}; + ${(props) => + props.width !== 0 && + `border-right: 1px solid ${props.theme.client.settings.payment.backgroundColor}`}; background: ${(props) => props.color}; width: ${(props) => props.width + "%"}; diff --git a/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js b/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js index bab73e1c4d..25a478eac9 100644 --- a/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js +++ b/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js @@ -63,7 +63,9 @@ const getTags = ( const item = catalogs[key]; const { usedSpace, title } = item; - const percentageSize = calculateSize(usedSpace, commonSize); + let percentageSize = calculateSize(usedSpace, commonSize); + if (percentageSize < 0.05 && percentageSize !== 0) percentageSize = 0.5; + const size = getConvertedSize(t, usedSpace); array.push({ From 5b94d309eff363f3855f9b554a43ff671afff7c1 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Apr 2024 13:11:47 +0300 Subject: [PATCH 07/13] Web: PortalSettings: StorageManagement: Removed display of the diagram if there is no storage limit in standalone mode. --- .../sub-components/Diagram.js | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js b/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js index 25a478eac9..22e64bcaf8 100644 --- a/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js +++ b/packages/client/src/pages/PortalSettings/categories/storage-management/sub-components/Diagram.js @@ -101,16 +101,19 @@ const Diagram = (props) => { usedPortalSpace, ); + const hidingSlider = standalone && tenantCustomQuota === -1; + return (
- {elementsTags.map((tag, index) => ( - - ))} + {!hidingSlider && + elementsTags.map((tag, index) => ( + + ))}
{elementsTags.map((tag, index) => ( @@ -125,15 +128,22 @@ const Diagram = (props) => { ); }; -export default inject(({ storageManagement, currentQuotaStore }) => { - const { filesUsedSpace } = storageManagement; - const { tenantCustomQuota, usedTotalStorageSizeCount, maxTotalSizeByQuota } = - currentQuotaStore; +export default inject( + ({ storageManagement, currentQuotaStore, settingsStore }) => { + const { filesUsedSpace } = storageManagement; + const { + tenantCustomQuota, + usedTotalStorageSizeCount, + maxTotalSizeByQuota, + } = currentQuotaStore; + const { standalone } = settingsStore; - return { - tenantCustomQuota, - filesUsedSpace, - usedPortalSpace: usedTotalStorageSizeCount, - maxTotalSizeByQuota, - }; -})(observer(Diagram)); + return { + tenantCustomQuota, + filesUsedSpace, + usedPortalSpace: usedTotalStorageSizeCount, + maxTotalSizeByQuota, + standalone, + }; + }, +)(observer(Diagram)); From a049560a44ce344404b2f3e695fbaf7ea3624bbe Mon Sep 17 00:00:00 2001 From: namushka Date: Tue, 2 Apr 2024 13:28:57 +0300 Subject: [PATCH 08/13] added locale-dependent guide links --- .../dialogs/SubmitToFormGallery/index.js | 15 +++++++++++++-- packages/client/src/store/OformsStore.js | 12 +++++++++++- packages/shared/api/oforms/index.js | 5 +++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/packages/client/src/components/dialogs/SubmitToFormGallery/index.js b/packages/client/src/components/dialogs/SubmitToFormGallery/index.js index 0e5763878c..77125e5fbb 100644 --- a/packages/client/src/components/dialogs/SubmitToFormGallery/index.js +++ b/packages/client/src/components/dialogs/SubmitToFormGallery/index.js @@ -27,7 +27,7 @@ import { Link } from "@docspace/shared/components/link"; import { ModalDialog } from "@docspace/shared/components/modal-dialog"; import { Button } from "@docspace/shared/components/button"; -import { useState, useRef } from "react"; +import { useState, useRef, useEffect } from "react"; import { observer, inject } from "mobx-react"; import { Trans, withTranslation } from "react-i18next"; import { ReactSVG } from "react-svg"; @@ -49,9 +49,12 @@ const SubmitToFormGallery = ({ currentColorScheme, canSubmitToFormGallery, submitToFormGallery, + fetchGuideLink, }) => { const [isSubmitting, setIsSubmitting] = useState(false); + const [guideLink, setGuideLink] = useState(null); + const abortControllerRef = useRef(new AbortController()); let formItemIsSet = !!formItem; @@ -118,6 +121,13 @@ const SubmitToFormGallery = ({ onClose(); }; + useEffect(() => { + (async () => { + const fetchedGuideLink = await fetchGuideLink(); + setGuideLink(fetchedGuideLink); + })(); + }, []); + if (!canSubmitToFormGallery()) return null; if (isSelectingForm) @@ -153,7 +163,7 @@ const SubmitToFormGallery = ({ approval in our { + const { uploadDomain, uploadDashboard } = this.settingsStore.formGallery; + const url = combineUrl(uploadDomain, uploadDashboard, `/blog-links`); + const guideLink = await getGuideLinkByLocale(url, locale); + return guideLink; + }; + filterOformsByCategory = (categorizeBy, categoryId) => { if (!categorizeBy || !categoryId) this.currentCategory = null; diff --git a/packages/shared/api/oforms/index.js b/packages/shared/api/oforms/index.js index 523b4fdb31..d09882ecbd 100644 --- a/packages/shared/api/oforms/index.js +++ b/packages/shared/api/oforms/index.js @@ -52,6 +52,11 @@ export const getCategoriesOfCategoryType = async (url, locale = "en") => { return res?.data?.data; }; +export const getGuideLinkByLocale = async (url, locale = "en") => { + const res = await axios.get(`${url}?locale=${locale}`); + return res?.data?.data?.[0].attributes?.link; +}; + export function submitToGallery(url, file, formName, language, signal) { const formData = new FormData(); formData.append("file", file); From f33a833b4948e579fc5e92db2c1daa9cb17b1a26 Mon Sep 17 00:00:00 2001 From: namushka Date: Tue, 2 Apr 2024 13:30:44 +0300 Subject: [PATCH 09/13] revert adding guide links as translation keys --- packages/client/public/locales/de/FormGallery.json | 1 - packages/client/public/locales/en/FormGallery.json | 1 - packages/client/public/locales/es/FormGallery.json | 1 - packages/client/public/locales/fr/FormGallery.json | 1 - packages/client/public/locales/it/FormGallery.json | 1 - packages/client/public/locales/ja-JP/FormGallery.json | 1 - packages/client/public/locales/pt-BR/FormGallery.json | 1 - packages/client/public/locales/zh-CN/FormGallery.json | 1 - 8 files changed, 8 deletions(-) diff --git a/packages/client/public/locales/de/FormGallery.json b/packages/client/public/locales/de/FormGallery.json index ecdebed04e..6693c69e3c 100644 --- a/packages/client/public/locales/de/FormGallery.json +++ b/packages/client/public/locales/de/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "Die Formular-Galerie ist momentan nicht verfügbar", "SelectForm": "Formular auswählen", "SubmitToGalleryDialogGuideInfo": "Erfahren Sie in unserem <1>Leitfaden, wie Sie perfekte Formulare erstellen und Ihre Chancen auf eine Genehmigung erhöhen können.", - "GuideLink": "https://www.onlyoffice.com/blog/de/2022/07/wenn-design-wichtig-ist-erstellung-schoner-formulare", "SubmitToGalleryDialogMainInfo": "Reichen Sie Ihr Formular in der öffentlichen Galerie ein, damit andere es für ihre Arbeit verwenden können. Sobald das Formular die Moderation bestanden hat, werden Sie benachrichtigt und für Ihren Beitrag belohnt.", "SuggestChanges": "Änderungen vorschlagen", "TemplateInfo": "Informationen zur Vorlage", diff --git a/packages/client/public/locales/en/FormGallery.json b/packages/client/public/locales/en/FormGallery.json index b10428bd07..ee3f30ad76 100644 --- a/packages/client/public/locales/en/FormGallery.json +++ b/packages/client/public/locales/en/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "Form gallery is temporarily unavailable", "SelectForm": "Select Form", "SubmitToGalleryDialogGuideInfo": "Learn how to create perfect forms and increase your chance to get approval in our <1>guide.", - "GuideLink": "https://www.onlyoffice.com/blog/2022/07/when-design-matters-how-to-create-beautiful-forms-with-oforms", "SubmitToGalleryDialogMainInfo": "Submit your form to the public gallery to let others use it in their work. Once the form passes moderation, you will be notified and rewarded for your contribution.", "SuggestChanges": "Suggest changes", "TemplateInfo": "Template info", diff --git a/packages/client/public/locales/es/FormGallery.json b/packages/client/public/locales/es/FormGallery.json index b09b013048..3f96aa90eb 100644 --- a/packages/client/public/locales/es/FormGallery.json +++ b/packages/client/public/locales/es/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "La galería de formularios no está disponible temporalmente ", "SelectForm": "Seleccionar formulario", "SubmitToGalleryDialogGuideInfo": "Aprenda a crear formularios perfectos y a aumentar sus posibilidades de obtener la aprobación en nuestra <1>guía.", - "GuideLink": "https://www.onlyoffice.com/blog/es/2022/07/como-crear-formularios-bonitos-con-oforms", "SubmitToGalleryDialogMainInfo": "Envíe su formulario a la galería pública para que otros puedan utilizarlo en su trabajo. Una vez que el formulario pase la moderación, recibirá una notificación y una recompensa por su contribución.", "SuggestChanges": "Sugerir cambios", "TemplateInfo": "Información sobre la plantilla", diff --git a/packages/client/public/locales/fr/FormGallery.json b/packages/client/public/locales/fr/FormGallery.json index 34cf264d08..8343b37b71 100644 --- a/packages/client/public/locales/fr/FormGallery.json +++ b/packages/client/public/locales/fr/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "La galerie de formulaires est temporairement indisponible", "SelectForm": "Sélectionner un formulaire", "SubmitToGalleryDialogGuideInfo": "Apprenez à créer des formulaires parfaits et augmentez vos chances d'obtenir une approbation dans notre <1>guide.", - "GuideLink": "https://www.onlyoffice.com/blog/fr/2022/07/creer-beaux-formulaires-avec-oforms", "SubmitToGalleryDialogMainInfo": "Soumettez votre formulaire à la galerie publique pour permettre à d'autres personnes de l'utiliser dans leur travail. Une fois le formulaire modéré, vous serez informé et récompensé pour votre contribution.", "SuggestChanges": "Proposer des modifications", "TemplateInfo": "Informations sur le modèle", diff --git a/packages/client/public/locales/it/FormGallery.json b/packages/client/public/locales/it/FormGallery.json index fdd2b9dabe..70d896f347 100644 --- a/packages/client/public/locales/it/FormGallery.json +++ b/packages/client/public/locales/it/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "La galleria dei moduli è temporaneamente non disponibile", "SelectForm": "Seleziona modulo", "SubmitToGalleryDialogGuideInfo": "Scopri come creare moduli perfetti e aumentare le tue possibilità di ottenere l'approvazione nella nostra <1>guida.", - "GuideLink": "https://www.onlyoffice.com/blog/it/2022/07/2022-07-come-creare-bellissimi-moduli-con-oform", "SubmitToGalleryDialogMainInfo": "Invia il tuo modulo alla galleria pubblica per consentire ad altri di utilizzarlo nel loro lavoro. Una volta che il modulo avrà superato la moderazione, riceverai una notifica e sarai ricompensato per il tuo contributo.", "SuggestChanges": "Suggerire modifiche", "TemplateInfo": "Informazioni sul modello", diff --git a/packages/client/public/locales/ja-JP/FormGallery.json b/packages/client/public/locales/ja-JP/FormGallery.json index 4a9d4be65e..c492dd070c 100644 --- a/packages/client/public/locales/ja-JP/FormGallery.json +++ b/packages/client/public/locales/ja-JP/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "フォームギャラリーは一時的に利用できません", "SelectForm": "フォームの選択", "SubmitToGalleryDialogGuideInfo": "<1>ガイドで、完璧なフォームを作成し、承認を得るチャンスを増やす方法を学びましょう。", - "GuideLink": "https://www.onlyoffice.com/blog/ja/2022/07/when-design-matters-how-to-create-beautiful-forms-with-oforms", "SubmitToGalleryDialogMainInfo": "あなたのフォームを公開ギャラリーに投稿して、他の人に使ってもらいましょう。フォームがモデレーションを通過すると、あなたに通知され、あなたの貢献に対して報酬が与えられます。", "SuggestChanges": "変更点のご提案", "TemplateInfo": "テンプレート情報", diff --git a/packages/client/public/locales/pt-BR/FormGallery.json b/packages/client/public/locales/pt-BR/FormGallery.json index aac5e6e2fb..32a8084f03 100644 --- a/packages/client/public/locales/pt-BR/FormGallery.json +++ b/packages/client/public/locales/pt-BR/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "A galeria de formulários está temporariamente indisponível", "SelectForm": "Selecione o formulário", "SubmitToGalleryDialogGuideInfo": "Aprenda como criar formulários perfeitos e aumente suas chances de obter aprovação em nosso <1>guide.", - "GuideLink": "https://www.onlyoffice.com/blog/es/2022/07/como-crear-formularios-bonitos-con-oforms", "SubmitToGalleryDialogMainInfo": "Envie seu formulário para a galeria pública para permitir que outras pessoas o utilizem em seus trabalhos. Assim que o formulário for aprovado na moderação, você será notificado e recompensado por sua contribuição.", "SuggestChanges": "Sugerir alterações", "TemplateInfo": "Informações do modelo", diff --git a/packages/client/public/locales/zh-CN/FormGallery.json b/packages/client/public/locales/zh-CN/FormGallery.json index ddd59e4a87..f8dd7dc01b 100644 --- a/packages/client/public/locales/zh-CN/FormGallery.json +++ b/packages/client/public/locales/zh-CN/FormGallery.json @@ -5,7 +5,6 @@ "ErrorViewHeader": "表单库暂时不可用", "SelectForm": "选择表单", "SubmitToGalleryDialogGuideInfo": "通过我们的<1>指南，了解如何创建完备的表单，提高获得批准的机会。", - "GuideLink": "https://www.onlyoffice.com/blog/zh-hans/2024/02/when-design-matters-how-to-create-beautiful-forms-with-oforms", "SubmitToGalleryDialogMainInfo": "将您的表单提交至公共表单库，让他人在工作中使用。表单通过审核，您就会收到通知、获得奖励。", "SuggestChanges": "提出修改建议", "TemplateInfo": "模板信息", From 61d1dead02b3ae68d5ebbade841bf2cd21c3267b Mon Sep 17 00:00:00 2001 From: VladaGazizova Date: Tue, 2 Apr 2024 13:35:25 +0300 Subject: [PATCH 10/13] =?UTF-8?q?Fixed=20Bug=2067164=20=E2=80=93=20Rooms.I?= =?UTF-8?q?nviteUsers.=20Show=20the=20popup=20helper=20window=20in=20the?= =?UTF-8?q?=20user's=20line=20with=20an=20invalid=20email=20when=20hoverin?= =?UTF-8?q?g=20the=20mouse=20over=20the=20!=20icon,=20and=20not=20when=20c?= =?UTF-8?q?licking.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/panels/InvitePanel/sub-components/Item.js | 1 + packages/shared/components/help-button/HelpButton.tsx | 5 +++-- packages/shared/components/help-button/HelpButton.types.tsx | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/panels/InvitePanel/sub-components/Item.js b/packages/client/src/components/panels/InvitePanel/sub-components/Item.js index e0fddb6bc8..b840824d7f 100644 --- a/packages/client/src/components/panels/InvitePanel/sub-components/Item.js +++ b/packages/client/src/components/panels/InvitePanel/sub-components/Item.js @@ -216,6 +216,7 @@ const Item = ({ displayType="auto" offsetRight={0} tooltipContent={t("EmailErrorMessage")} + openOnClick={false} size={16} color="#F21C0E" /> diff --git a/packages/shared/components/help-button/HelpButton.tsx b/packages/shared/components/help-button/HelpButton.tsx index a33537f373..56ad677a9a 100644 --- a/packages/shared/components/help-button/HelpButton.tsx +++ b/packages/shared/components/help-button/HelpButton.tsx @@ -51,6 +51,7 @@ const HelpButton = (props: HelpButtonProps) => { afterHide, tooltipMaxWidth, tooltipContent, + openOnClick = true, } = props; const currentId = id || uniqueId(); @@ -74,7 +75,7 @@ const HelpButton = (props: HelpButtonProps) => { {getContent ? ( { ) : ( Date: Tue, 2 Apr 2024 13:38:46 +0300 Subject: [PATCH 11/13] fixed oform language filter poritioning bug --- .../src/pages/FormGallery/Filter/LanguageFilter/index.styled.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js b/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js index 39f57c595d..e23c556cca 100644 --- a/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js +++ b/packages/client/src/pages/FormGallery/Filter/LanguageFilter/index.styled.js @@ -83,7 +83,7 @@ export const LanguageFilterSelectedItem = styled(DropDownItem)` margin: 0; width: 16px; height: 16px; - & > div { + div { display: flex; align-items: center; justify-content: center; From 3782c4be3a2d548f18f53fb40875f950f6df0271 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Apr 2024 13:47:52 +0300 Subject: [PATCH 12/13] Revert "Shared: ColorTheme: IconButton: fix style" This reverts commit 306ba6f0b1059cc2439a184f418b0c7ec6ed45b6. --- .../color-theme/styled-components/iconButton.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/shared/components/color-theme/styled-components/iconButton.ts b/packages/shared/components/color-theme/styled-components/iconButton.ts index 67ee7270d4..87a391978a 100644 --- a/packages/shared/components/color-theme/styled-components/iconButton.ts +++ b/packages/shared/components/color-theme/styled-components/iconButton.ts @@ -25,7 +25,7 @@ // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode import styled from "styled-components"; -import { commonIconsStyles, desktop } from "../../../utils"; +import { commonIconsStyles } from "../../../utils"; import { TColorScheme } from "../../../themes"; import { StyledIcon } from "../sub-components/StyledIcon"; @@ -43,12 +43,10 @@ const StyledIconTheme = styled(StyledIcon)< } } - @media ${desktop} { - &:hover { - svg { - path { - fill: ${(props) => props.$currentColorScheme?.main?.accent}; - } + &:hover { + svg { + path { + fill: ${(props) => props.$currentColorScheme?.main?.accent}; } } } From 884d76bc14ce814f8596fbd3ab11e28557a0c20a Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Apr 2024 13:56:37 +0300 Subject: [PATCH 13/13] Fix Bug 67204 Copy file/room link button doesn't work on mobile --- packages/client/src/HOCs/withBadges.js | 2 -- packages/client/src/components/QuickButtons.js | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/client/src/HOCs/withBadges.js b/packages/client/src/HOCs/withBadges.js index 96b51418c5..f85aea90b2 100644 --- a/packages/client/src/HOCs/withBadges.js +++ b/packages/client/src/HOCs/withBadges.js @@ -116,8 +116,6 @@ export default function withBadges(WrappedComponent) { }; onCopyPrimaryLink = async () => { - if (isMobileOnly) return; - const { t, item, getPrimaryLink } = this.props; const primaryLink = await getPrimaryLink(item.id); if (primaryLink) { diff --git a/packages/client/src/components/QuickButtons.js b/packages/client/src/components/QuickButtons.js index 1da6e822c6..bf0817799d 100644 --- a/packages/client/src/components/QuickButtons.js +++ b/packages/client/src/components/QuickButtons.js @@ -117,13 +117,8 @@ const QuickButtons = (props) => { !isArchiveFolder && !isTile; - const onShare = () => { - if (isMobile()) return; - onClickShare(); - }; - return ( -
+
{isAvailableLockFile && ( { iconName={LinkReactSvgUrl} className="badge copy-link icons-group" size={sizeQuickButton} - onClick={onShare} + onClick={onClickShare} color={colorShare} isDisabled={isDisabled} hoverColor={theme.filesQuickButtons.sharedColor}