Merge branch 'develop' into feature/login-redesign
This commit is contained in:
commit
1abe5f4122
@ -5,7 +5,6 @@ import {
|
||||
AppServerConfig,
|
||||
FileStatus,
|
||||
} from "@appserver/common/constants";
|
||||
import toastr from "@appserver/components/toast/toastr";
|
||||
import { combineUrl } from "@appserver/common/utils";
|
||||
|
||||
import Badges from "../components/Badges";
|
||||
@ -36,18 +35,11 @@ export default function withBadges(WrappedComponent) {
|
||||
};
|
||||
|
||||
onBadgeClick = () => {
|
||||
const {
|
||||
item,
|
||||
selectedFolderPathParts,
|
||||
markAsRead,
|
||||
setNewFilesPanelVisible,
|
||||
} = this.props;
|
||||
const { item, markAsRead, setNewFilesPanelVisible } = this.props;
|
||||
if (item.fileExst) {
|
||||
markAsRead([], [item.id], item);
|
||||
} else {
|
||||
const newFolderIds = selectedFolderPathParts;
|
||||
newFolderIds.push(item.id);
|
||||
setNewFilesPanelVisible(true, newFolderIds, item);
|
||||
setNewFilesPanelVisible(true, null, item);
|
||||
}
|
||||
};
|
||||
|
||||
@ -115,7 +107,6 @@ export default function withBadges(WrappedComponent) {
|
||||
treeFoldersStore,
|
||||
filesActionsStore,
|
||||
versionHistoryStore,
|
||||
selectedFolderStore,
|
||||
dialogsStore,
|
||||
filesStore,
|
||||
settingsStore,
|
||||
@ -146,7 +137,6 @@ export default function withBadges(WrappedComponent) {
|
||||
isTabletView,
|
||||
setIsVerHistoryPanel,
|
||||
fetchFileVersions,
|
||||
selectedFolderPathParts: selectedFolderStore.pathParts,
|
||||
markAsRead,
|
||||
setNewFilesPanelVisible,
|
||||
setIsLoading,
|
||||
|
@ -1,7 +1,5 @@
|
||||
import React from "react";
|
||||
import { inject, observer } from "mobx-react";
|
||||
import { Trans } from "react-i18next";
|
||||
|
||||
import toastr from "studio/toastr";
|
||||
import {
|
||||
AppServerConfig,
|
||||
@ -177,7 +175,6 @@ export default function withContent(WrappedContent) {
|
||||
createFolder,
|
||||
fileActionTemplateId,
|
||||
isDesktop,
|
||||
isLoading,
|
||||
isPrivacy,
|
||||
item,
|
||||
openDocEditor,
|
||||
@ -198,8 +195,6 @@ export default function withContent(WrappedContent) {
|
||||
|
||||
let title = itemTitle;
|
||||
|
||||
if (isLoading) return;
|
||||
|
||||
setIsLoading(true);
|
||||
|
||||
const itemId = e.currentTarget.dataset.itemid;
|
||||
@ -461,7 +456,6 @@ export default function withContent(WrappedContent) {
|
||||
const {
|
||||
createFile,
|
||||
createFolder,
|
||||
isLoading,
|
||||
openDocEditor,
|
||||
renameFolder,
|
||||
setIsLoading,
|
||||
@ -511,7 +505,6 @@ export default function withContent(WrappedContent) {
|
||||
folderFormValidation,
|
||||
homepage: config.homepage,
|
||||
isDesktop: isDesktopClient,
|
||||
isLoading,
|
||||
isPrivacy: isPrivacyFolder,
|
||||
isTrashFolder: isRecycleBinFolder,
|
||||
openDocEditor,
|
||||
|
@ -66,7 +66,7 @@ class ArticleBodyContent extends React.Component {
|
||||
};
|
||||
|
||||
onShowNewFilesPanel = (folderId) => {
|
||||
this.props.setNewFilesPanelVisible(true, [folderId]);
|
||||
this.props.setNewFilesPanelVisible(true, folderId);
|
||||
};
|
||||
|
||||
render() {
|
||||
|
@ -113,8 +113,13 @@ class DialogsStore {
|
||||
this.destFolderId = destFolderId;
|
||||
};
|
||||
|
||||
setNewFilesPanelVisible = async (visible, newIds, item) => {
|
||||
const id = newIds && newIds[newIds.length - 1];
|
||||
setNewFilesPanelVisible = async (visible, newId, item) => {
|
||||
const { pathParts } = this.selectedFolderStore;
|
||||
|
||||
const id = visible && !newId ? item.id : newId;
|
||||
const newIds = newId ? [newId] : pathParts;
|
||||
item && pathParts.push(item.id);
|
||||
|
||||
let newFilesPanelVisible = visible;
|
||||
|
||||
if (visible) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { makeAutoObservable } from "mobx";
|
||||
import { makeAutoObservable, runInAction } from "mobx";
|
||||
import api from "@appserver/common/api";
|
||||
import {
|
||||
FolderType,
|
||||
@ -519,8 +519,11 @@ class FilesStore {
|
||||
data.current.rootFolderType === FolderType.Privacy;
|
||||
|
||||
this.setFilesFilter(filterData, isPrefSettings); //TODO: FILTER
|
||||
this.setFolders(isPrivacyFolder && isMobile ? [] : data.folders);
|
||||
this.setFiles(isPrivacyFolder && isMobile ? [] : data.files);
|
||||
|
||||
runInAction(() => {
|
||||
this.setFolders(isPrivacyFolder && isMobile ? [] : data.folders);
|
||||
this.setFiles(isPrivacyFolder && isMobile ? [] : data.files);
|
||||
});
|
||||
|
||||
if (clearFilter) {
|
||||
this.fileActionStore.setAction({ type: null });
|
||||
@ -1314,6 +1317,14 @@ class FilesStore {
|
||||
}
|
||||
}
|
||||
|
||||
get filterType() {
|
||||
return this.filter.filterType;
|
||||
}
|
||||
|
||||
get filterSearch() {
|
||||
return this.filter.search;
|
||||
}
|
||||
|
||||
onCreateAddTempItem = (items) => {
|
||||
const { getFileIcon, getFolderIcon } = this.filesSettingsStore;
|
||||
const { extension, title } = this.fileActionStore;
|
||||
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE für Business",
|
||||
"SubHeader": "Dokumente, Projekte, Kunden & E-Mails",
|
||||
"ButtonLabel": "Kostenlos testen",
|
||||
"Link": "https://www.onlyoffice.com/de/registration.aspx?utm_source=personal&utm_campaign=BannerPersonalCloud"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE für PC",
|
||||
"SubHeader": "Gratis Alternative zu MS Office",
|
||||
"ButtonLabel": "Herunterladen",
|
||||
"Link": "https://www.onlyoffice.com/de/download-desktop.aspx?utm_source=personal&utm_campaign=BannerPersonalDesktop"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE für Schulen",
|
||||
"SubHeader": "Endecken Sie alle Rabatte",
|
||||
"ButtonLabel": "Mehr erfahren",
|
||||
"Link": "https://www.onlyoffice.com/de/education.aspx?utm_source=personal&utm_campaign=BannerPersonalEducation"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE On-Premises",
|
||||
"SubHeader": "Schützen Sie Ihre Dokumente",
|
||||
"ButtonLabel": "Jetzt erhalten",
|
||||
"Link": "https://www.onlyoffice.com/de/download-workspace.aspx?utm_source=personal&utm_campaign=BannerPersonalEnterprise"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE Integration",
|
||||
"SubHeader": "Editoren für Ihre Plattform",
|
||||
"ButtonLabel": "Jetzt integrieren",
|
||||
"Link": "https://www.onlyoffice.com/de/connectors.aspx?utm_source=personal&utm_campaign=BannerPersonalIntegration"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE pour les entreprises",
|
||||
"SubHeader": "Documents, projets, clients et mails.",
|
||||
"ButtonLabel": "Commencer l’essai gratuit",
|
||||
"Link": "https://www.onlyoffice.com/fr/registration.aspx?utm_source=personal&utm_campaign=BannerPersonalCloud"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE pour le PC",
|
||||
"SubHeader": "Alternative gratuite à MS Office",
|
||||
"ButtonLabel": "Télécharger",
|
||||
"Link": "https://www.onlyoffice.com/fr/download-desktop.aspx?utm_source=personal&utm_campaign=BannerPersonalDesktop"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE éducation",
|
||||
"SubHeader": "Voir toutes les offres",
|
||||
"ButtonLabel": "En savoir plus",
|
||||
"Link": "https://www.onlyoffice.com/fr/education.aspx?utm_source=personal&utm_campaign=BannerPersonalEducation"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "Solution auto-hébergée",
|
||||
"SubHeader": "Vos docs en toute sécurité",
|
||||
"ButtonLabel": "Obtenir maintenant",
|
||||
"Link": "https://www.onlyoffice.com/fr/download-workspace.aspx?utm_source=personal&utm_campaign=BannerPersonalEnterprise"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE intégration",
|
||||
"SubHeader": "Éditeurs pour votre plateforme",
|
||||
"ButtonLabel": "Intégrer maintenant",
|
||||
"Link": "https://www.onlyoffice.com/fr/connectors.aspx?utm_source=personal&utm_campaign=BannerPersonalIntegration"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE per business",
|
||||
"SubHeader": "Documenti, progetti, clienti ed e-mail",
|
||||
"ButtonLabel": "Inizia la prova gratuita",
|
||||
"Link": "https://www.onlyoffice.com/it/registration.aspx?utm_source=personal&utm_campaign=BannerPersonalCloud"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE per PC",
|
||||
"SubHeader": "Alternativa gratuita a MS Office",
|
||||
"ButtonLabel": "Scarica",
|
||||
"Link": "https://www.onlyoffice.com/it/download-desktop.aspx?utm_source=personal&utm_campaign=BannerPersonalDesktop"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE per scuole",
|
||||
"SubHeader": "Informazioni sugli sconti",
|
||||
"ButtonLabel": "Per saperne di più",
|
||||
"Link": "https://www.onlyoffice.com/it/education.aspx?utm_source=personal&utm_campaign=BannerPersonalEducation"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE sul server",
|
||||
"SubHeader": "Mantieni documenti al sicuro",
|
||||
"ButtonLabel": "Scaricalo ora",
|
||||
"Link": "https://www.onlyoffice.com/it/download-workspace.aspx?utm_source=personal&utm_campaign=BannerPersonalEnterprise"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE integrazioni",
|
||||
"SubHeader": "Editor per la tua piattaforma",
|
||||
"ButtonLabel": "Connetti ora",
|
||||
"Link": "https://www.onlyoffice.com/it/connectors.aspx?utm_source=personal&utm_campaign=BannerPersonalIntegration"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE for business",
|
||||
"SubHeader": "Docs, projects, clients & emails",
|
||||
"ButtonLabel": "Start free trial",
|
||||
"Link": "https://www.onlyoffice.com/pt/registration.aspx?utm_source=personal&utm_campaign=BannerPersonalCloud"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE for PC",
|
||||
"SubHeader": "Get a free alternative to MS Office",
|
||||
"ButtonLabel": "Download",
|
||||
"Link": "https://www.onlyoffice.com/pt/download-desktop.aspx?utm_source=personal&utm_campaign=BannerPersonalDesktop"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE for schools",
|
||||
"SubHeader": "Learn about education discounts",
|
||||
"ButtonLabel": "Learn more",
|
||||
"Link": "https://www.onlyoffice.com/pt/education.aspx?utm_source=personal&utm_campaign=BannerPersonalEducation"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE on-premises",
|
||||
"SubHeader": "Keep your docs and projects safe",
|
||||
"ButtonLabel": "Get it now",
|
||||
"Link": "https://www.onlyoffice.com/pt/download-workspace.aspx?utm_source=personal&utm_campaign=BannerPersonalEnterprise"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE for integration",
|
||||
"SubHeader": "Use online editors with your platform",
|
||||
"ButtonLabel": "Integrate now",
|
||||
"Link": "https://www.onlyoffice.com/pt/connectors.aspx?utm_source=personal&utm_campaign=BannerPersonalIntegration"
|
||||
}
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE локально",
|
||||
"SubHeader": "Обеспечьте сохранность документов и проектов",
|
||||
"ButtonLabel": "Получить сейчас",
|
||||
"Link": "https://www.onlyoffice.com/ru/download-commercial.aspx?utm_source=personal&utm_campaign=BannerPersonalEnterprise"
|
||||
"Header": "ONLYOFFICE локально",
|
||||
"SubHeader": "Обеспечьте сохранность документов и проектов",
|
||||
"ButtonLabel": "Получить сейчас",
|
||||
"Link": "https://www.onlyoffice.com/ru/download-workspace.aspx?utm_source=personal&utm_campaign=BannerPersonalEnterprise"
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"Header": "ONLYOFFICE для интеграции",
|
||||
"SubHeader": "Используйте онлайн-редакторы с вашей платформой",
|
||||
"ButtonLabel": "Интегрировать сейчас",
|
||||
"Link": "https://www.onlyoffice.com/ru/connectors.aspx?utm_source=personal&utm_campaign=BannerPersonalIntegration"
|
||||
"Header": "ONLYOFFICE для интеграции",
|
||||
"SubHeader": "Используйте онлайн-редакторы с вашей платформой",
|
||||
"ButtonLabel": "Интегрировать сейчас",
|
||||
"Link": "https://www.onlyoffice.com/ru/connectors.aspx?utm_source=personal&utm_campaign=BannerPersonalIntegration"
|
||||
}
|
||||
|
4480
web/ASC.Web.Campaigns/yarn.lock
Normal file
4480
web/ASC.Web.Campaigns/yarn.lock
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user