@boarteam/boar-pack-common-frontend 2.8.1 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-common-frontend",
-  "version": "2.8.1",
+  "version": "2.10.0",
   "description": "Common frontend package for Boar Pack",
   "repository": "git@github.com:boarteam/boar-pack.git",
   "author": "Andrew Balakirev <balakirev.andrey@gmail.com>",
@@ -46,5 +46,5 @@
   "scripts": {
     "yalc:push": "yalc push"
   },
-  "gitHead": "da7dfee327d3713dbc9419e69ae61bf725aba89a"
+  "gitHead": "103534abbe12f409d96c929dd462837ec83b4ee7"
 }

package/src/components/Descriptions/Descriptions.tsx

@@ -3,12 +3,16 @@ import React, { Key, useEffect, useImperativeHandle, useMemo, useRef, useState }
 import { Badge, Button, Result, Tabs, TabsProps, Tooltip } from "antd";
 import { DeleteOutlined, StopOutlined } from "@ant-design/icons";
 import { FormattedMessage, useIntl } from "react-intl";
-import { DescriptionsRefType, TDescriptionsProps, TGetOneParams } from "./descriptionTypes";
+import { DescriptionsRefType, FieldsEdit, TDescriptionsProps, TGetOneParams } from "./descriptionTypes";
 import { PageLoading, ProDescriptions } from "@ant-design/pro-components";
 import { columnsToDescriptionItemProps, TDescriptionSection } from "./useDescriptionColumns";
 import pick from "lodash/pick";
 import safetyRun from "../../tools/safetyRun";
-import { buildJoinFields, collectFieldsFromColumns } from "../Table";
+import {
+  buildFieldsFromColumnsForDescriptionsDisplay,
+  buildJoinFields,
+  collectFieldsFromColumns,
+} from "../Table";
 import { RowEditableConfig } from "@ant-design/pro-utils";
 import { useForm } from "antd/es/form/Form";
 import useContentViewMode, { VIEW_MODE_TYPE } from "./useContentViewMode";
@@ -54,6 +58,7 @@ const DescriptionsComponent = <Entity extends Record<string | symbol, any>,
     actionRef: actionRefProp,
     editable,
     canEdit = false,
+    fieldsEditType = FieldsEdit.Single,
     columns,
     params,
     onEntityChange,
@@ -271,6 +276,10 @@ const DescriptionsComponent = <Entity extends Record<string | symbol, any>,
         cancelText: <Tooltip title={intl.formatMessage({ id: 'table.cancelText' })}><StopOutlined /></Tooltip>,
         deleteText: <Tooltip title={intl.formatMessage({ id: 'table.deleteText' })}><DeleteOutlined /></Tooltip>,
         saveText: <Button size={"small"} type={"primary"}><FormattedMessage id={'table.saveText'} /></Button>,
+        ...(fieldsEditType === FieldsEdit.All && {
+          editableKeys: [...buildFieldsFromColumnsForDescriptionsDisplay(columns, idColumnName)],
+          actionRender: () => [],
+        }),
         ...editable,
       } : undefined}
       columns={section.columns}

package/src/components/Descriptions/descriptionTypes.ts

@@ -30,6 +30,11 @@ export type DescriptionsRefType<Entity> = {
   setFieldErrors: (fields: FieldData<Entity>[]) => void;
 };
 
+export enum FieldsEdit {
+  Single = 'single',
+  All = 'all'
+}
+
 export type TDescriptionsProps<Entity, CreateDto, UpdateDto, TPathParams = object> = {
   mainTitle?: ProColumns<Entity>['title'] | null,
   entity?: Partial<Entity>,
@@ -48,6 +53,7 @@ export type TDescriptionsProps<Entity, CreateDto, UpdateDto, TPathParams = objec
   actionRef?: MutableRefObject<ActionType | undefined>,
   editable?: RowEditableConfig<Entity>,
   canEdit?: boolean,
+  fieldsEditType?: FieldsEdit,
   params?: TDescriptionGetRequestParams,
   columns: ProColumns<Entity>[],
   onEntityChange?: (entity: Entity | null) => void;

package/src/components/Table/Table.tsx

@@ -36,6 +36,7 @@ const Table = <Entity extends Record<string | symbol, any>,
     onDelete,
     onDeleteMany,
     exportUrl,
+    exportParams,
     onImport,
     pathParams,
     idColumnName = 'id',
@@ -123,6 +124,7 @@ const Table = <Entity extends Record<string | symbol, any>,
 
   const { exportButton, importButton, setLastQueryParams } = useImportExport<TPathParams>({
     exportUrl,
+    exportParams,
     onImport,
   })
 

package/src/components/Table/tableTypes.ts

@@ -108,6 +108,9 @@ export interface EditableProps<Entity, CreateDto, UpdateDto, TPathParams = {}> {
   afterSave?: (record: Entity) => Promise<void>;
   onCreate?: ({}: { requestBody: CreateDto } & TPathParams) => Promise<Entity>;
   exportUrl?: string;
+  exportParams?: {
+    [key: string]: string | number
+  };
   onImport?: (event: React.ChangeEvent<HTMLInputElement>) => Promise<any>;
   onUpdate: ({}: Partial<Entity> & {
     requestBody: UpdateDto,

package/src/components/Table/useImportExport.tsx

@@ -6,9 +6,13 @@ import { Link } from "react-router-dom";
 
 export function useImportExport<TPathParams = {}>({
   exportUrl,
+  exportParams,
   onImport
 }: {
   exportUrl?: string;
+  exportParams?: {
+    [key: string]: string | number
+  }
   onImport?: (event: React.ChangeEvent<HTMLInputElement>) => Promise<any>;
 }) {
   const [isLoadingImport, setIsLoadingImport] = useState(false);
@@ -25,10 +29,15 @@ export function useImportExport<TPathParams = {}>({
       });
   }
 
-  const url = exportUrl + (lastQueryParams ? '?' + new URLSearchParams({
-    s: lastQueryParams.s,
-    sort: lastQueryParams.sort?.[0],
-  }).toString() : '');
+  const params = {
+    ...(lastQueryParams && {
+      s: lastQueryParams.s,
+      sort: lastQueryParams.sort?.[0],
+    }),
+    ...exportParams
+  }
+
+  const url = exportUrl + (Object.keys(params).length ? '?' + new URLSearchParams(params).toString() : '');
   const exportButton = <Tooltip title="Export">
     <Link to={url} target={'_blank'}>
       <Button icon={<DownloadOutlined />}/>