IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Replaced some code tot selectors

Browse Source
This commit is contained in:
Alexey Safronov 2020-10-07 12:47:55 +03:00
parent 19f5206e3f
commit 2e74a1bde3
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
products/ASC.Files/Client/src/components/Article/Header/index.js
View File

@ -2,7 +2,7 @@ import React from "react";
import { connect } from "react-redux";
import { store, Headline, Loaders } from "asc-web-common";
const { getCurrentProduct } = store.auth.selectors;
const { getCurrentProductName } = store.auth.selectors;
const ArticleHeaderContent = ({ currentModuleName }) => {
return currentModuleName ? (
@ -13,9 +13,9 @@ const ArticleHeaderContent = ({ currentModuleName }) => {
};
const mapStateToProps = (state) => {
const currentModule = getCurrentProduct(state);
const currentModuleName = getCurrentProductName(state);
return {
currentModuleName: (currentModule && currentModule.title) || "",
currentModuleName,
};
};

6
products/ASC.People/Client/src/components/Article/Header/index.js
View File

@ -2,7 +2,7 @@ import React from "react";
import { connect } from "react-redux";
import { store, Headline, Loaders } from "asc-web-common";
const { getCurrentProduct } = store.auth.selectors;
const { getCurrentProductName } = store.auth.selectors;
const ArticleHeaderContent = ({ currentModuleName }) => {
return currentModuleName ? (
@ -13,9 +13,9 @@ const ArticleHeaderContent = ({ currentModuleName }) => {
};
const mapStateToProps = (state) => {
const currentModule = getCurrentProduct(state);
const currentModuleName = getCurrentProductName(state);
return {
currentModuleName: (currentModule && currentModule.title) || "",
currentModuleName,
};
};

22
products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
View File

@ -24,7 +24,11 @@ import styled from "styled-components";
import { withRouter } from "react-router";
import { withTranslation } from "react-i18next";
const { getCurrentProduct } = initStore.auth.selectors;
const {
getCurrentProductName,
getSettings,
getCurrentUser,
} = initStore.auth.selectors;
const MainContainer = styled.div`
display: flex;
@ -473,17 +477,19 @@ const convertGroups = (groups) => {
};
function mapStateToProps(state) {
const currentModule = getCurrentProduct(state);
const currentModuleName = getCurrentProductName(state);
const settings = getSettings(state);
const { groupHeadCaption, groupsCaption, groupCaption } = settings;
return {
settings: state.auth.settings,
settings,
group: state.group.targetGroup,
groups: convertGroups(state.people.groups),
users: convertUsers(state.people.selector.users), //TODO: replace to api requests with search
groupHeadCaption: state.auth.settings.customNames.groupHeadCaption,
groupsCaption: state.auth.settings.customNames.groupsCaption,
groupCaption: state.auth.settings.customNames.groupCaption,
me: state.auth.user,
currentModuleName: (currentModule && currentModule.title) || "",
groupHeadCaption,
groupsCaption,
groupCaption,
me: getCurrentUser(state),
currentModuleName,
};
}