Web: Files: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()

This commit is contained in:
Artem Tarasov 2020-09-21 14:54:06 +03:00
parent 1bf4a243fd
commit 9df49dc613
4 changed files with 45 additions and 13 deletions

View File

@ -1,7 +1,7 @@
import React from "react";
import { connect } from "react-redux";
import { toastr, utils } from "asc-web-components";
import { store as initStore, utils as commonUtils } from "asc-web-common";
import { store as initStore } from "asc-web-common";
import TreeFolders from "./TreeFolders";
import TreeSettings from "./TreeSettings";
import {
@ -17,8 +17,10 @@ import {
import store from "../../../store/store";
import isEqual from "lodash/isEqual";
import { NewFilesPanel } from "../../panels";
import { setDocumentTitle } from "../../../helpers/utils";
const { getCurrentModule } = initStore.auth.selectors;
const { changeDocumentTitle } = commonUtils;
class ArticleBodyContent extends React.Component {
constructor(props) {
@ -27,8 +29,8 @@ class ArticleBodyContent extends React.Component {
const { organizationName, selectedFolderTitle, currentModuleName } = props;
selectedFolderTitle
? changeDocumentTitle(`${selectedFolderTitle} - ${currentModuleName}`)
: changeDocumentTitle(`${currentModuleName} - ${organizationName}`);
? setDocumentTitle(selectedFolderTitle)
: setDocumentTitle();
this.state = {
expandedKeys: this.props.filter.treeFolders,
@ -89,8 +91,8 @@ class ArticleBodyContent extends React.Component {
(e.node && e.node.props && e.node.props.title) || null;
selectedFolderTitle
? changeDocumentTitle(`${selectedFolderTitle} - ${currentModuleName}`)
: changeDocumentTitle(`${currentModuleName} - ${organizationName}`);
? setDocumentTitle(selectedFolderTitle)
: setDocumentTitle();
fetchFiles(data[0], newFilter, store.dispatch)
.catch(err => toastr.error(err))

View File

@ -2,7 +2,6 @@ import React, { useEffect } from "react";
import styled from "styled-components";
import { connect } from "react-redux";
import { Heading, ToggleButton } from "asc-web-components";
import { utils as commonUtils} from "asc-web-common";
import {
setUpdateIfExist,
@ -13,8 +12,7 @@ import {
setSelectedNode,
setForceSave
} from "../../../../../store/files/actions";
const { changeDocumentTitle } = commonUtils;
import { setDocumentTitle } from "../../../../../helpers/utils";
const StyledSettings = styled.div`
display: grid;
@ -44,8 +42,8 @@ const SectionBodyContent = ({
}) => {
useEffect(() => {
changeDocumentTitle(t(`${setting}`));
}, [setting, changeDocumentTitle]);
setDocumentTitle(t(`${setting}`));
}, [setting, setDocumentTitle]);
useEffect(() => {
if (setting !== selectedTreeNode[0]) {

View File

@ -12,12 +12,13 @@ import {
} from "../../Article";
import { SectionHeaderContent, SectionBodyContent } from "./Section";
import { createI18N } from "../../../helpers/i18n";
import { setDocumentTitle } from "../../../helpers/utils";
const i18n = createI18N({
page: "VersionHistory",
localesPath: "pages/VersionHistory"
});
const { changeLanguage, changeDocumentTitle } = utils;
const { changeLanguage } = utils;
class PureVersionHistory extends React.Component {
constructor(props) {
@ -36,7 +37,7 @@ class PureVersionHistory extends React.Component {
const { match, t } = this.props;
const { fileId } = match.params;
//changeDocumentTitle(`${t("GroupAction")} ${t("People")}`);
//setDocumentTitle(t("GroupAction"));
if (fileId) {
this.getFileVersions(fileId);

View File

@ -0,0 +1,31 @@
import { store as commonStore } from 'asc-web-common';
import store from '../store/store';
const { getCurrentModule } = commonStore.auth.selectors;
export const setDocumentTitle = (subTitle = null ) => {
const { auth: commonState } = store.getState();
const { isAuthenticated, modules, settings } = commonState;
const { organizationName, currentProductId } = settings;
let title, currentModule;
if(modules && currentProductId ){
currentModule = getCurrentModule(modules, currentProductId);
}
if (subTitle) {
if (isAuthenticated && currentModule) {
title = subTitle + ' - ' + currentModule.title;
} else {
title = subTitle + ' - ' + organizationName;
}
} else if (currentModule && organizationName) {
title = currentModule.title + ' - ' + organizationName;
} else {
title = organizationName;
}
document.title = title;
}