Web:People:Components: change 'catalog' component to 'article' component
This commit is contained in:
parent
7a22ead503
commit
25f088462f
@ -15,10 +15,10 @@ import CatalogItem from "@appserver/components/catalog-item";
|
||||
const departmentsIcon = "images/departments.group.react.svg";
|
||||
const groupIcon = "/static/images/catalog.folder.react.svg";
|
||||
|
||||
const CatalogBodyContent = ({
|
||||
const ArticleBodyContent = ({
|
||||
selectedKey,
|
||||
groups,
|
||||
toggleCatalogOpen,
|
||||
toggleArticleOpen,
|
||||
showText,
|
||||
groupsCaption,
|
||||
history,
|
||||
@ -61,7 +61,7 @@ const CatalogBodyContent = ({
|
||||
|
||||
if (window.location.pathname.indexOf("/people/filter") > 0) {
|
||||
selectGroup(groupId);
|
||||
if (isMobileOnly || isMobile()) toggleCatalogOpen();
|
||||
if (isMobileOnly || isMobile()) toggleArticleOpen();
|
||||
} else {
|
||||
const newFilter = isRoot ? Filter.getDefault() : filter.clone();
|
||||
|
||||
@ -74,10 +74,10 @@ const CatalogBodyContent = ({
|
||||
`/filter?${urlFilter}`
|
||||
);
|
||||
history.push(url);
|
||||
if (isMobileOnly || isMobile()) toggleCatalogOpen();
|
||||
if (isMobileOnly || isMobile()) toggleArticleOpen();
|
||||
}
|
||||
},
|
||||
[changeTitleDocument, selectGroup, toggleCatalogOpen, filter]
|
||||
[changeTitleDocument, selectGroup, toggleArticleOpen, filter]
|
||||
);
|
||||
|
||||
const getItems = React.useCallback(
|
||||
@ -111,7 +111,7 @@ const CatalogBodyContent = ({
|
||||
{!isVisitor &&
|
||||
(firstLoad || !isLoaded ? (
|
||||
isLoading || !isLoaded ? (
|
||||
<Loaders.PeopleCatalogLoader />
|
||||
<Loaders.ArticleGroup />
|
||||
) : (
|
||||
<div
|
||||
style={!isAdmin && isMobileOnly ? { marginTop: "16px" } : null}
|
||||
@ -146,11 +146,11 @@ const CatalogBodyContent = ({
|
||||
);
|
||||
};
|
||||
|
||||
const BodyContent = withTranslation("Article")(withRouter(CatalogBodyContent));
|
||||
const BodyContent = withTranslation("Article")(withRouter(ArticleBodyContent));
|
||||
|
||||
export default inject(({ auth, peopleStore }) => {
|
||||
const { settingsStore, setDocumentTitle, isAdmin } = auth;
|
||||
const { customNames, showText, toggleCatalogOpen } = settingsStore;
|
||||
const { customNames, showText, toggleArticleOpen } = settingsStore;
|
||||
const {
|
||||
groupsStore,
|
||||
selectedGroupStore,
|
||||
@ -179,6 +179,6 @@ export default inject(({ auth, peopleStore }) => {
|
||||
filter,
|
||||
|
||||
showText,
|
||||
toggleCatalogOpen,
|
||||
toggleArticleOpen,
|
||||
};
|
||||
})(observer(BodyContent));
|
@ -2,7 +2,7 @@ import React from "react";
|
||||
import Loaders from "@appserver/common/components/Loaders";
|
||||
import { inject, observer } from "mobx-react";
|
||||
|
||||
const CatalogHeaderContent = ({
|
||||
const ArticleHeaderContent = ({
|
||||
isVisitor,
|
||||
isLoading,
|
||||
isLoaded,
|
||||
@ -32,4 +32,4 @@ export default inject(({ auth, peopleStore }) => {
|
||||
firstLoad: loadingStore.firstLoad,
|
||||
currentModuleName: auth.product.title,
|
||||
};
|
||||
})(observer(CatalogHeaderContent));
|
||||
})(observer(ArticleHeaderContent));
|
@ -2,7 +2,7 @@ import React from "react";
|
||||
//import PropTypes from "prop-types";
|
||||
import { withRouter } from "react-router";
|
||||
import MainButton from "@appserver/components/main-button";
|
||||
import InviteDialog from "./../../dialogs/InviteDialog/index";
|
||||
import InviteDialog from "../../dialogs/InviteDialog/index";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import toastr from "studio/toastr";
|
||||
import Loaders from "@appserver/common/components/Loaders";
|
||||
@ -17,7 +17,7 @@ import {
|
||||
} from "@appserver/components/utils/device";
|
||||
import MobileView from "./MobileView";
|
||||
|
||||
class CatalogMainButtonContent extends React.Component {
|
||||
class ArticleMainButtonContent extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
@ -159,7 +159,7 @@ class CatalogMainButtonContent extends React.Component {
|
||||
/>
|
||||
) : firstLoad || !isLoaded ? (
|
||||
isLoading || !isLoaded ? (
|
||||
<Loaders.MainButton />
|
||||
<Loaders.ArticleButton />
|
||||
) : (
|
||||
<MainButton
|
||||
isDisabled={false}
|
||||
@ -216,7 +216,7 @@ export default withRouter(
|
||||
};
|
||||
})(
|
||||
withTranslation(["Article", "Common", "Translations"])(
|
||||
observer(CatalogMainButtonContent)
|
||||
observer(ArticleMainButtonContent)
|
||||
)
|
||||
)
|
||||
);
|
@ -0,0 +1,3 @@
|
||||
export { default as ArticleHeaderContent } from "./Header";
|
||||
export { default as ArticleBodyContent } from "./Body";
|
||||
export { default as ArticleMainButtonContent } from "./MainButton";
|
@ -1,3 +0,0 @@
|
||||
export { default as CatalogHeaderContent } from "./Header";
|
||||
export { default as CatalogBodyContent } from "./Body";
|
||||
export { default as CatalogMainButtonContent } from "./MainButton";
|
Loading…
Reference in New Issue
Block a user