CITKParus/P8-Panels
2
0
Fork 2
Code Issues Pull Requests 1 Projects Releases Wiki Activity

WEB APP: Приведение констант, экспортируемых из компонент и провайдеров контекста, к единому формату именования

Browse Source
This commit is contained in:
Mikhail Chechnev 2023-09-25 14:36:39 +03:00
parent ea90de6240
commit ce455e485b
11 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/app.js
View File

@ -14,7 +14,7 @@ import { ApplicationСtx } from "./context/application"; //Контекст пр
import { NavigationContext, NavigationCtx, getRootLocation } from "./context/navigation"; //Контекст навигации
import { P8PAppErrorPage } from "./components/p8p_app_error_page"; //Страница с ошибкой
import { P8PAppWorkspace } from "./components/p8p_app_workspace"; //Рабочее пространство панели
import { P8PPanelsMenuGrid, PANEL_SHAPE } from "./components/p8p_panels_menu"; //Меню панелей
import { P8PPanelsMenuGrid, P8P_PANELS_MENU_PANEL_SHAPE } from "./components/p8p_panels_menu"; //Меню панелей
import { TITLES, BUTTONS, ERRORS, ERRORS_HTTP } from "../app.text"; //Текстовые ресурсы и константы
//--------------------------
@ -69,7 +69,7 @@ const MainMenu = ({ panels = [] } = {}) => {
//Контроль свойств - главное меню приложения
MainMenu.propTypes = {
panels: PropTypes.arrayOf(PANEL_SHAPE).isRequired
panels: PropTypes.arrayOf(P8P_PANELS_MENU_PANEL_SHAPE).isRequired
};
//Рабочее пространство панели
@ -100,8 +100,8 @@ const Workspace = ({ panels = [], selectedPanel, children } = {}) => {
//Контроль свойств - главное меню приложения
Workspace.propTypes = {
panels: PropTypes.arrayOf(PANEL_SHAPE).isRequired,
selectedPanel: PANEL_SHAPE,
panels: PropTypes.arrayOf(P8P_PANELS_MENU_PANEL_SHAPE).isRequired,
selectedPanel: P8P_PANELS_MENU_PANEL_SHAPE,
children: PropTypes.element
};

6
app/components/p8p_app_workspace.js
View File

@ -23,7 +23,7 @@ import {
ListItemIcon,
ListItemText
} from "@mui/material"; //Интерфейсные компоненты
import { P8PPanelsMenuDrawer, PANEL_SHAPE } from "./p8p_panels_menu";
import { P8PPanelsMenuDrawer, P8P_PANELS_MENU_PANEL_SHAPE } from "./p8p_panels_menu";
//---------
//Константы
@ -113,8 +113,8 @@ const P8PAppWorkspace = ({ children, panels = [], selectedPanel, closeCaption, h
//Контроль свойств - Рабочее пространство
P8PAppWorkspace.propTypes = {
children: PropTypes.element,
panels: PropTypes.arrayOf(PANEL_SHAPE).isRequired,
selectedPanel: PANEL_SHAPE,
panels: PropTypes.arrayOf(P8P_PANELS_MENU_PANEL_SHAPE).isRequired,
selectedPanel: P8P_PANELS_MENU_PANEL_SHAPE,
closeCaption: PropTypes.string.isRequired,
homeCaption: PropTypes.string.isRequired,
onHomeNavigate: PropTypes.func,

14
app/components/p8p_data_grid.js
View File

@ -10,20 +10,20 @@
import React, { useState } from "react"; //Классы React
import PropTypes from "prop-types"; //Контроль свойств компонента
import { deepCopyObject } from "../core/utils"; //Вспомогательные процедуры и функции
import { P8PTable, P8P_TABLE_SIZE, P8P_TABLE_DATA_TYPE, P8P_FILTER_SHAPE } from "./p8p_table"; //Таблица
import { P8PTable, P8P_TABLE_SIZE, P8P_TABLE_DATA_TYPE, P8P_TABLE_FILTER_SHAPE } from "./p8p_table"; //Таблица
//---------
//Константы
//---------
//Размеры отступов
const P8PDATA_GRID_SIZE = P8P_TABLE_SIZE;
const P8P_DATA_GRID_SIZE = P8P_TABLE_SIZE;
//Типы данных
const P8PDATA_GRID_DATA_TYPE = P8P_TABLE_DATA_TYPE;
const P8P_DATA_GRID_DATA_TYPE = P8P_TABLE_DATA_TYPE;
//Формат фильтра
const P8PDATA_GRID_FILTER_SHAPE = P8P_FILTER_SHAPE;
const P8P_DATA_GRID_FILTER_SHAPE = P8P_TABLE_FILTER_SHAPE;
//-----------
//Тело модуля
@ -100,7 +100,7 @@ const P8PDataGrid = ({
rows={rows}
orders={orders}
filters={filters}
size={size || P8PDATA_GRID_SIZE.MEDIUM}
size={size || P8P_DATA_GRID_SIZE.MEDIUM}
morePages={morePages}
reloading={reloading}
expandable={expandable}
@ -129,7 +129,7 @@ const P8PDataGrid = ({
//Контроль свойств - Таблица данных
P8PDataGrid.propTypes = {
columnsDef: PropTypes.array.isRequired,
filtersInitial: PropTypes.arrayOf(P8PDATA_GRID_FILTER_SHAPE),
filtersInitial: PropTypes.arrayOf(P8P_DATA_GRID_FILTER_SHAPE),
rows: PropTypes.array.isRequired,
size: PropTypes.string,
morePages: PropTypes.bool.isRequired,
@ -159,4 +159,4 @@ P8PDataGrid.propTypes = {
//Интерфейс модуля
//----------------
export { P8PDataGrid, P8PDATA_GRID_SIZE, P8PDATA_GRID_DATA_TYPE, P8PDATA_GRID_FILTER_SHAPE };
export { P8P_DATA_GRID_SIZE, P8P_DATA_GRID_DATA_TYPE, P8P_DATA_GRID_FILTER_SHAPE, P8PDataGrid };

44
app/components/p8p_panels_menu.js
View File

@ -33,11 +33,24 @@ import {
//---------
//Типы меню
const VARIANT = {
const P8P_PANELS_MENU_VARIANT = {
DRAWER: "DRAWER",
GRID: "GRID"
};
//Структура элемента описания панели
const P8P_PANELS_MENU_PANEL_SHAPE = PropTypes.shape({
name: PropTypes.string.isRequired,
caption: PropTypes.string.isRequired,
desc: PropTypes.string.isRequired,
group: PropTypes.string,
icon: PropTypes.string.isRequired,
path: PropTypes.string.isRequired,
preview: PropTypes.string.isRequired,
showInPanelsList: PropTypes.bool.isRequired,
url: PropTypes.string.isRequired
});
//Стили
const STYLES = {
CONTAINER: {
@ -77,19 +90,6 @@ const STYLES = {
}
};
//Структура элемента описания панели
const PANEL_SHAPE = PropTypes.shape({
name: PropTypes.string.isRequired,
caption: PropTypes.string.isRequired,
desc: PropTypes.string.isRequired,
group: PropTypes.string,
icon: PropTypes.string.isRequired,
path: PropTypes.string.isRequired,
preview: PropTypes.string.isRequired,
showInPanelsList: PropTypes.bool.isRequired,
url: PropTypes.string.isRequired
});
//--------------------------------
//Вспомогательные классы и функции
//--------------------------------
@ -117,7 +117,7 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, defaultGroupTytle, nav
for (const grp of grps) {
if (!(grps.length == 1 && grps[0] == null))
panelsLinks.push(
variant === VARIANT.GRID ? (
variant === P8P_PANELS_MENU_VARIANT.GRID ? (
<Grid item xs={12} sm={12} md={12} lg={12} xl={12} key={grp}>
<Typography variant="h5" color="secondary">
{grp ? grp : defaultGroupTytle}
@ -130,7 +130,7 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, defaultGroupTytle, nav
for (const panel of panels) {
if (panel.showInPanelsList == true && ((grp && panel.group === grp) || (!grp && !panel.group)))
panelsLinks.push(
variant === VARIANT.GRID ? (
variant === P8P_PANELS_MENU_VARIANT.GRID ? (
<Grid item xs={12} sm={6} md={4} lg={4} xl={4} key={panel.name}>
<Card sx={STYLES.PANEL_CARD}>
{panel.preview ? (
@ -180,7 +180,7 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, defaultGroupTytle, nav
//Меню панелей - сдвигающееся боковое меню
const P8PPanelsMenuDrawer = ({ onItemNavigate, panels = [], selectedPanel } = {}) => {
//Формируем ссылки на панели
const panelsLinks = getPanelsLinks({ variant: VARIANT.DRAWER, panels, selectedPanel, onItemNavigate });
const panelsLinks = getPanelsLinks({ variant: P8P_PANELS_MENU_VARIANT.DRAWER, panels, selectedPanel, onItemNavigate });
//Генерация содержимого
return <List sx={{ paddingTop: 0 }}>{panelsLinks}</List>;
@ -189,14 +189,14 @@ const P8PPanelsMenuDrawer = ({ onItemNavigate, panels = [], selectedPanel } = {}
//Контроль свойств - Меню панелей - сдвигающееся боковое меню
P8PPanelsMenuDrawer.propTypes = {
onItemNavigate: PropTypes.func,
panels: PropTypes.arrayOf(PANEL_SHAPE).isRequired,
selectedPanel: PANEL_SHAPE
panels: PropTypes.arrayOf(P8P_PANELS_MENU_PANEL_SHAPE).isRequired,
selectedPanel: P8P_PANELS_MENU_PANEL_SHAPE
};
//Меню панелей - грид
const P8PPanelsMenuGrid = ({ title, onItemNavigate, navigateCaption, panels = [], defaultGroupTytle } = {}) => {
//Формируем ссылки на панели
const panelsLinks = getPanelsLinks({ variant: VARIANT.GRID, panels, defaultGroupTytle, navigateCaption, onItemNavigate });
const panelsLinks = getPanelsLinks({ variant: P8P_PANELS_MENU_VARIANT.GRID, panels, defaultGroupTytle, navigateCaption, onItemNavigate });
//Генерация содержимого
return (
@ -220,7 +220,7 @@ P8PPanelsMenuGrid.propTypes = {
title: PropTypes.string,
onItemNavigate: PropTypes.func,
navigateCaption: PropTypes.string.isRequired,
panels: PropTypes.arrayOf(PANEL_SHAPE).isRequired,
panels: PropTypes.arrayOf(P8P_PANELS_MENU_PANEL_SHAPE).isRequired,
defaultGroupTytle: PropTypes.string.isRequired
};
@ -228,4 +228,4 @@ P8PPanelsMenuGrid.propTypes = {
//Интерфейс модуля
//----------------
export { PANEL_SHAPE, P8PPanelsMenuDrawer, P8PPanelsMenuGrid };
export { P8P_PANELS_MENU_PANEL_SHAPE, P8PPanelsMenuDrawer, P8PPanelsMenuGrid };

18
app/components/p8p_table.js
View File

@ -70,6 +70,13 @@ const P8P_TABLE_COLUMN_MENU_ACTIONS = {
FILTER: "FILTER"
};
//Структура элемента описания фильтра
const P8P_TABLE_FILTER_SHAPE = PropTypes.shape({
name: PropTypes.string.isRequired,
from: PropTypes.any,
to: PropTypes.any
});
//Стили
const STYLES = {
TABLE: {
@ -98,13 +105,6 @@ const STYLES = {
}
};
//Структура элемента описания фильтра
const P8P_FILTER_SHAPE = PropTypes.shape({
name: PropTypes.string.isRequired,
from: PropTypes.any,
to: PropTypes.any
});
//--------------------------------
//Вспомогательные классы и функции
//--------------------------------
@ -694,7 +694,7 @@ P8PTable.propTypes = {
direction: PropTypes.string.isRequired
})
).isRequired,
filters: PropTypes.arrayOf(P8P_FILTER_SHAPE).isRequired,
filters: PropTypes.arrayOf(P8P_TABLE_FILTER_SHAPE).isRequired,
size: PropTypes.string,
morePages: PropTypes.bool.isRequired,
reloading: PropTypes.bool.isRequired,
@ -723,4 +723,4 @@ P8PTable.propTypes = {
//Интерфейс модуля
//----------------
export { P8PTable, P8P_TABLE_DATA_TYPE, P8P_TABLE_SIZE, P8P_FILTER_SHAPE };
export { P8P_TABLE_DATA_TYPE, P8P_TABLE_SIZE, P8P_TABLE_FILTER_SHAPE, P8PTable };

4
app/context/backend.js
View File

@ -16,7 +16,7 @@ import { MessagingСtx } from "./messaging"; //Контекст сообщени
//---------
//Структура объекта клиента
const P8P_CLIENT_SHAPE = PropTypes.shape({
const BACKEND_CONTEXT_CLIENT_SHAPE = PropTypes.shape({
SERV_DATA_TYPE_STR: PropTypes.string.isRequired,
SERV_DATA_TYPE_NUMB: PropTypes.string.isRequired,
SERV_DATA_TYPE_DATE: PropTypes.string.isRequired,
@ -116,6 +116,6 @@ export const BackEndContext = ({ client, children }) => {
//Контроль свойств - Провайдер контекста взаимодействия с серверным API
BackEndContext.propTypes = {
client: P8P_CLIENT_SHAPE.isRequired,
client: BACKEND_CONTEXT_CLIENT_SHAPE.isRequired,
children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node])
};

2
app/context/messaging.js
View File

@ -71,6 +71,7 @@ export const MessagingContext = ({ children }) => {
return (
<MessagingСtx.Provider
value={{
MSG_DLGT,
showLoader,
hideLoader,
showMsg,
@ -78,7 +79,6 @@ export const MessagingContext = ({ children }) => {
showMsgInfo,
showMsgWarn,
hideMsg,
MSG_DLGT,
msgState: state
}}
>

4
app/panels/prj_fin/projects.js
View File

@ -12,7 +12,7 @@ import PropTypes from "prop-types"; //Контроль свойств компо
import { Grid, Icon, Stack, Link, Button, Table, TableBody, TableRow, TableCell, Typography, Box, Paper, IconButton } from "@mui/material"; //Интерфейсные компоненты
import { hasValue, formatDateRF, formatNumberRFCurrency, object2Base64XML } from "../../core/utils"; //Вспомогательные процедуры и функции
import { BUTTONS, TEXTS, INPUTS } from "../../../app.text"; //Тектовые ресурсы и константы
import { P8PDataGrid, P8PDATA_GRID_SIZE } from "../../components/p8p_data_grid"; //Таблица данных
import { P8PDataGrid, P8P_DATA_GRID_SIZE } from "../../components/p8p_data_grid"; //Таблица данных
import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером
import { ApplicationСtx } from "../../context/application"; //Контекст приложения
import { MessagingСtx } from "../../context/messaging"; //Контекст сообщений
@ -299,7 +299,7 @@ const Projects = ({ onStagesOpen }) => {
<P8PDataGrid
columnsDef={projectsDataGrid.columnsDef}
rows={projectsDataGrid.rows}
size={P8PDATA_GRID_SIZE.SMALL}
size={P8P_DATA_GRID_SIZE.SMALL}
morePages={projectsDataGrid.morePages}
reloading={projectsDataGrid.reload}
expandable={true}

6
app/panels/prj_fin/stage_arts.js
View File

@ -12,7 +12,7 @@ import PropTypes from "prop-types"; //Контроль свойств компо
import { Box, Icon, Stack, Link } from "@mui/material"; //Интерфейсные компоненты
import { hasValue, formatNumberRFCurrency, object2Base64XML } from "../../core/utils"; //Вспомогательные процедуры и функции
import { BUTTONS, TEXTS, INPUTS } from "../../../app.text"; //Тектовые ресурсы и константы
import { P8PDataGrid, P8PDATA_GRID_SIZE, P8PDATA_GRID_FILTER_SHAPE } from "../../components/p8p_data_grid"; //Таблица данных
import { P8PDataGrid, P8P_DATA_GRID_SIZE, P8P_DATA_GRID_FILTER_SHAPE } from "../../components/p8p_data_grid"; //Таблица данных
import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером
import { ApplicationСtx } from "../../context/application"; //Контекст приложения
import { MessagingСtx } from "../../context/messaging"; //Контекст сообщений
@ -165,7 +165,7 @@ const StageArts = ({ stage, filters }) => {
columnsDef={stageArtsDataGrid.columnsDef}
filtersInitial={filters}
rows={stageArtsDataGrid.rows}
size={P8PDATA_GRID_SIZE.SMALL}
size={P8P_DATA_GRID_SIZE.SMALL}
morePages={false}
reloading={stageArtsDataGrid.reload}
orderAscMenuItemCaption={BUTTONS.ORDER_ASC}
@ -191,7 +191,7 @@ const StageArts = ({ stage, filters }) => {
//Контроль свойств - Калькуляция этапа проекта
StageArts.propTypes = {
stage: PropTypes.number.isRequired,
filters: PropTypes.arrayOf(P8PDATA_GRID_FILTER_SHAPE)
filters: PropTypes.arrayOf(P8P_DATA_GRID_FILTER_SHAPE)
};
//----------------

6
app/panels/prj_fin/stage_contracts.js
View File

@ -12,7 +12,7 @@ import PropTypes from "prop-types"; //Контроль свойств компо
import { Box, Stack, Grid, Paper, Table, TableBody, TableRow, TableCell, Typography, Button, Link } from "@mui/material"; //Интерфейсные компоненты
import { hasValue, formatDateRF, formatNumberRFCurrency, object2Base64XML } from "../../core/utils"; //Вспомогательные процедуры и функции
import { BUTTONS, TEXTS, INPUTS } from "../../../app.text"; //Тектовые ресурсы и константы
import { P8PDataGrid, P8PDATA_GRID_SIZE, P8PDATA_GRID_FILTER_SHAPE } from "../../components/p8p_data_grid"; //Таблица данных
import { P8PDataGrid, P8P_DATA_GRID_SIZE, P8P_DATA_GRID_FILTER_SHAPE } from "../../components/p8p_data_grid"; //Таблица данных
import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером
import { ApplicationСtx } from "../../context/application"; //Контекст приложения
@ -216,7 +216,7 @@ const StageContracts = ({ stage, filters }) => {
columnsDef={stageContractsDataGrid.columnsDef}
filtersInitial={filters}
rows={stageContractsDataGrid.rows}
size={P8PDATA_GRID_SIZE.SMALL}
size={P8P_DATA_GRID_SIZE.SMALL}
morePages={stageContractsDataGrid.morePages}
reloading={stageContractsDataGrid.reload}
expandable={true}
@ -246,7 +246,7 @@ const StageContracts = ({ stage, filters }) => {
//Контроль свойств - Договоры с соисполнителями этапа проекта
StageContracts.propTypes = {
stage: PropTypes.number.isRequired,
filters: PropTypes.arrayOf(P8PDATA_GRID_FILTER_SHAPE)
filters: PropTypes.arrayOf(P8P_DATA_GRID_FILTER_SHAPE)
};
//----------------

6
app/panels/prj_fin/stages.js
View File

@ -12,7 +12,7 @@ import PropTypes from "prop-types"; //Контроль свойств компо
import { Box, Icon, Stack, Grid, Paper, Table, TableBody, TableRow, TableCell, Typography, Button, IconButton, Link } from "@mui/material"; //Интерфейсные компоненты
import { hasValue, formatDateRF, formatNumberRFCurrency, object2Base64XML } from "../../core/utils"; //Вспомогательные процедуры и функции
import { BUTTONS, TEXTS, INPUTS } from "../../../app.text"; //Тектовые ресурсы и константы
import { P8PDataGrid, P8PDATA_GRID_SIZE, P8PDATA_GRID_FILTER_SHAPE } from "../../components/p8p_data_grid"; //Таблица данных
import { P8PDataGrid, P8P_DATA_GRID_SIZE, P8P_DATA_GRID_FILTER_SHAPE } from "../../components/p8p_data_grid"; //Таблица данных
import { P8PFullScreenDialog } from "../../components/p8p_fullscreen_dialog"; //Полноэкранный диалог
import { StageArts } from "./stage_arts"; //Калькуляция этапа проекта
import { StageContracts } from "./stage_contracts"; //Договоры с соисполнителями этапа проекта
@ -348,7 +348,7 @@ const Stages = ({ project, projectName, filters }) => {
columnsDef={stagesDataGrid.columnsDef}
filtersInitial={filters}
rows={stagesDataGrid.rows}
size={P8PDATA_GRID_SIZE.SMALL}
size={P8P_DATA_GRID_SIZE.SMALL}
morePages={stagesDataGrid.morePages}
reloading={stagesDataGrid.reload}
expandable={true}
@ -398,7 +398,7 @@ const Stages = ({ project, projectName, filters }) => {
Stages.propTypes = {
project: PropTypes.number.isRequired,
projectName: PropTypes.string.isRequired,
filters: PropTypes.arrayOf(P8PDATA_GRID_FILTER_SHAPE)
filters: PropTypes.arrayOf(P8P_DATA_GRID_FILTER_SHAPE)
};
//----------------