@boarteam/boar-pack-common-frontend 2.4.1 → 2.6.0

package/src/components/Table/DeleteButton.tsx

@@ -0,0 +1,44 @@
+import { Popconfirm, Tooltip } from "antd";
+import { DeleteOutlined, LoadingOutlined } from "@ant-design/icons";
+import { createStyles } from "antd-style";
+import { useState } from "react";
+import { useIntl } from "react-intl";
+
+const useStyles = createStyles(() => {
+  return {
+    popconfirm: {
+      '.ant-popconfirm-description': {
+        marginTop: '0 !important',
+      },
+    }
+  }
+})
+
+const DeleteButton = (
+  {
+    onDelete,
+  }: {
+    onDelete: () => Promise<void>
+  }) => {
+  const {styles} = useStyles();
+  const [loading, setLoading] = useState(false);
+  const intl = useIntl();
+
+  return (<a key="deleteButton">
+      {!loading && <Popconfirm
+        overlayClassName={styles.popconfirm}
+        title={false}
+        description={intl.formatMessage({id: "table.deletePopconfirmMessage"})}
+        onConfirm={() => {
+          setLoading(true);
+          onDelete().finally(() => setLoading(false));
+        }}>
+        <Tooltip title={intl.formatMessage({id: "table.deleteText"})}>
+          <DeleteOutlined/>
+        </Tooltip>
+      </Popconfirm>}
+      {loading && <LoadingOutlined/>}
+    </a>
+  );
+};
+export default DeleteButton;

package/src/components/Table/Table.tsx

@@ -1,37 +1,14 @@
 import ProTable, { ActionType } from "@ant-design/pro-table";
-import React, { useEffect, useRef, useState } from "react";
-import {Button, Popover, Space, Tooltip, message, Modal } from "antd";
-import {
-  DeleteOutlined,
-  PlusOutlined,
-  QuestionCircleTwoTone,
-  StopOutlined,
-} from "@ant-design/icons";
-import { FormattedMessage, useIntl } from "react-intl";
-import { flushSync } from "react-dom";
-import { applyKeywordToSearch, buildJoinFields, collectFieldsFromColumns, getFiltersSearch } from "./tableTools";
-import { TFilterParams, TFilters, TGetAllParams, TSort, TTableProps } from "./tableTypes";
+import { useEffect, useRef, useState } from "react";
+import { Modal } from "antd";
+import { TFilterParams, TFilters, TSort, TTableProps } from "./tableTypes";
 import useColumnsSets from "./useColumnsSets";
-import BulkEditButton from "./BulkEditButton";
-import _ from "lodash";
-import BulkDeleteButton from "./BulkDeleteButton";
 import { createStyles } from "antd-style";
-import ContentViewModeButton, { VIEW_MODE_TYPE } from "./ContentViewModeButton";
 import { Descriptions } from "../Descriptions";
-import DescriptionsCreateModal from "../Descriptions/DescriptionsCreateModal";
-
-let creatingRecordsCount = 0;
-
-export const KEY_SYMBOL = Symbol('key');
-const NEW_RECORD = 'NEW_RECORD';
-
-export function getNewId(): string {
-  return NEW_RECORD + creatingRecordsCount++;
-}
-
-export function isRecordNew(record: Record<string | symbol, any>): boolean {
-  return record[KEY_SYMBOL]?.startsWith?.(NEW_RECORD) || record.id?.startsWith?.(NEW_RECORD) || false;
-}
+import { KEY_SYMBOL, useCreation } from "./useCreation";
+import { getTableDataQueryParams } from "./getTableDataQueryParams";
+import { useEditableTable } from "./useEditableTable";
+import { useBulkEditing } from "./useBulkEditing";
 
 const useStyles = createStyles(() => {
   return {
@@ -49,7 +26,7 @@ const Table = <Entity extends Record<string | symbol, any>,
   TEntityParams = {},
   TPathParams extends Record<string, string | number> = {},
   TKey = string,
-  >(
+>(
   {
     getAll,
     onCreate,
@@ -76,8 +53,9 @@ const Table = <Entity extends Record<string | symbol, any>,
     popupCreation = false,
     toolBarRender,
     params,
-    popupDataState,
     editPopupTitle,
+    createPopupTitle,
+    descriptionsMainTitle,
     ...rest
   }: TTableProps<Entity,
     CreateDto,
@@ -87,17 +65,58 @@ const Table = <Entity extends Record<string | symbol, any>,
 ) => {
   const actionRefComponent = useRef<ActionType>();
   const actionRef = actionRefProp || actionRefComponent;
-  const [createPopupData, setCreatePopupData] = popupDataState ?? useState<Partial<Entity> | undefined>();
   const [updatePopupData, setUpdatePopupData] = useState<Partial<Entity> | undefined>();
-  const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
-  const [selectedRecords, setSelectedRecords] = useState<Entity[]>([]);
-  const [lastRequest, setLastRequest] = useState<[TGetAllParams & TPathParams, any] | []>([]);
-  const [allSelected, setAllSelected] = useState(false);
   const { styles } = useStyles();
-  const [messageApi, contextHolder] = message.useMessage();
-  const [descriptionsModalViewMode, setDescriptionsModalViewMode] = useState<VIEW_MODE_TYPE>(VIEW_MODE_TYPE.TABS);
 
-  const intl = useIntl();
+  const {
+    editableConfig,
+  } = useEditableTable<Entity, CreateDto, UpdateDto, TPathParams>({
+    actionRef,
+    pathParams,
+    onCreate,
+    onUpdate,
+    onDelete,
+    entityToCreateDto,
+    entityToUpdateDto,
+    afterSave,
+    editable,
+    onDeleteMany,
+    onUpdateMany,
+  });
+
+  const {
+    rowSelection,
+    setSelectedRecords,
+    setLastRequest,
+    bulkEditButton,
+    bulkDeleteButton,
+    messagesContext,
+  } = useBulkEditing<Entity, TPathParams, UpdateDto, TEntityParams & TFilterParams>({
+    actionRef,
+    columns,
+    idColumnName,
+    onDeleteMany,
+    onUpdateMany,
+    entityToUpdateDto,
+    pathParams,
+  });
+
+  const {
+    creationModal,
+    createButton,
+  } = useCreation<Entity, CreateDto, TPathParams>({
+    title: createPopupTitle,
+    mainTitle: descriptionsMainTitle,
+    columns: columns,
+    idColumnName: idColumnName,
+    onCreate,
+    pathParams,
+    entityToCreateDto,
+    actionRef,
+    createButtonSize: rest.size,
+    popupCreation,
+    createNewDefaultParams,
+  });
 
   useEffect(() => {
     setUpdatePopupData(editableRecord);
@@ -120,55 +139,17 @@ const Table = <Entity extends Record<string | symbol, any>,
     sort: TSort = {},
     filters: TFilters = {},
   ) => {
-    const {
-      current,
-      pageSize,
-      keyword,
-      baseFilters,
-      join,
-      sortMap,
-      ...filtersFromSearchForm
-    } = params;
-
-    const queryParams: TGetAllParams & TPathParams = {
-      ...pathParams,
-      page: current,
-      limit: pageSize,
-    };
-
-    const sortBy = Object
-      .entries(sort)
-      .reduce<string[]>(
-        (data: string[], [key, direction]) => {
-          data.push(`${sortMap?.[key] || key},${direction === 'ascend' ? 'ASC' : 'DESC'}`);
-          return data;
-        },
-        []
-      );
-    if (!sortBy.length && defaultSort) {
-      sortBy.push(defaultSort.join(','));
-    }
-    queryParams.sort = sortBy;
-
-    let search = getFiltersSearch({
-      baseFilters,
-      filters: {
-        ...filters,
-        ...filtersFromSearchForm,
-      },
+    const queryParams = getTableDataQueryParams({
+      params,
+      sort,
+      filters,
+      pathParams,
+      defaultSort,
       searchableColumns,
-    });
-    search = applyKeywordToSearch(search, searchableColumns!, columnsState.value!, keyword);
-    queryParams.s = JSON.stringify(search);
-
-    const { joinSelect, joinFields } = buildJoinFields(join);
-    queryParams.join = joinSelect;
-
-    queryParams.fields = columns && collectFieldsFromColumns(
       columns,
       idColumnName,
-      joinFields,
-    ) || [];
+      columnsState,
+    });
 
     const result = await getAll(queryParams);
 
@@ -180,26 +161,6 @@ const Table = <Entity extends Record<string | symbol, any>,
     return result;
   }
 
-  const createButton = <Button
-    size={rest.size}
-    type="primary"
-    key="create"
-    onClick={() => {
-      if (popupCreation) {
-        setCreatePopupData(createNewDefaultParams);
-      } else {
-        actionRef?.current?.addEditRecord({
-          [KEY_SYMBOL]: getNewId(),
-          ...createNewDefaultParams,
-        }, {
-          position: 'top',
-        });
-      }
-    }}
-  >
-    <PlusOutlined /> <FormattedMessage id={'table.newButton'} />
-  </Button>;
-
   return (<>
     <ProTable<Entity, TEntityParams & TFilterParams>
       actionRef={actionRef}
@@ -222,117 +183,15 @@ const Table = <Entity extends Record<string | symbol, any>,
       }}
       bordered
       search={false}
-      editable={{
-        type: 'multiple',
-        editableKeys,
-        onChange: setEditableRowKeys,
-        async onSave(
-          id,
-          record,
-          origin,
-          newLine,
-        ) {
-          if (newLine) {
-            await onCreate?.({
-              ...pathParams,
-              requestBody: entityToCreateDto(record),
-            });
-          } else {
-            await onUpdate({
-              ...pathParams,
-              ...record,
-              requestBody: entityToUpdateDto({
-                ...pathParams,
-                ...record,
-              }),
-            })
-          }
-
-          if (typeof afterSave === 'function') {
-            await afterSave(record);
-          }
-
-          flushSync(() => {
-            actionRef?.current?.reload();
-          });
-        },
-        async onCancel(
-          id,
-          record,
-          origin,
-        ) {
-          if (record) {
-            Object.assign(record, origin);
-          }
-        },
-        async onDelete(id, row) {
-          await onDelete({ ...row, ...pathParams });
-        },
-        deletePopconfirmMessage: intl.formatMessage({ id: 'table.deletePopconfirmMessage' }),
-        onlyAddOneLineAlertMessage: intl.formatMessage({ id: 'table.onlyAddOneLineAlertMessage' }),
-        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>,
-        ...editable,
-      }}
+      editable={editableConfig}
       toolBarRender={(...args) => [
         columnsSetSelect?.() || null,
         !viewOnly && onUpdateMany
-          ? (
-            <BulkEditButton
-              selectedRecords={selectedRecords}
-              lastRequest={lastRequest}
-              allSelected={allSelected}
-              columns={columns}
-              idColumnName={idColumnName}
-              // @ts-ignore
-              onSubmit={values => onUpdateMany({
-                ...pathParams,
-                ...lastRequest[0],
-                requestBody: {
-                  updateValues: _.pickBy(
-                    // @ts-ignore
-                    entityToUpdateDto({
-                      ...pathParams,
-                      ...values,
-                    }),
-                    (value, key) =>  _.has(values, key),
-                  ),
-                  records: allSelected ? [] : selectedRecords,
-                },
-              }).then(() => {
-                messageApi.open({
-                  type: 'success',
-                  content: 'Operation Successful',
-                });
-                actionRef?.current?.reload();
-              })}
-            />
-          )
-          : <></>,
+          ? bulkEditButton
+          : null,
         !viewOnly && onDeleteMany
-          ? (
-            <BulkDeleteButton
-              selectedRecords={selectedRecords}
-              lastRequest={lastRequest}
-              allSelected={allSelected}
-              // @ts-ignore
-              onDelete={() => onDeleteMany({
-                ...pathParams,
-                ...lastRequest[0],
-                requestBody: {
-                  records: allSelected ? [] : selectedRecords,
-                },
-              }).then(() => {
-                messageApi.open({
-                  type: 'success',
-                  content: 'Operation Successful',
-                });
-                actionRef?.current?.reload();
-              })}
-            />
-          )
-          : <></>,
+          ? bulkDeleteButton
+          : null,
         !viewOnly && createButton || null,
         ...toolBarRender && toolBarRender(...args) || [],
       ]}
@@ -343,100 +202,37 @@ const Table = <Entity extends Record<string | symbol, any>,
       {
         ...(
           !viewOnly && (onUpdateMany || onDeleteMany)
-            ? {
-              rowSelection: {
-                selectedRowKeys: selectedRecords.map(record => Array.isArray(idColumnName) ? idColumnName.map(colName => record[colName]).join('-') : record[idColumnName]),
-                selections: [
-                  {
-                    key: 'all',
-                    text: (
-                      <Space>
-                        Select ALL
-                        <Popover
-                          content={(
-                            <div style={{ width: '100%' }}>
-                              This includes records from ALL pages of the table.
-                            </div>
-                          )}
-                          title={'Select All'}
-                          trigger={['hover', 'click']}
-                          zIndex={1080}
-                        >
-                          <QuestionCircleTwoTone />
-                        </Popover>
-                      </Space>
-                    ),
-                    onSelect: () => {
-                      setSelectedRecords(lastRequest[1].data);
-                      setAllSelected(true);
-                    },
-                  },
-                ],
-                onChange: (rowKeys, records) => {
-                  setSelectedRecords(records);
-                  allSelected && setAllSelected(false);
-                },
-              }
-            }
+            ? { rowSelection }
             : {}
         )
       }
       {...rest}
     />
-    <DescriptionsCreateModal<Entity>
-      data={createPopupData}
-      onClose={() => setCreatePopupData(undefined)}
-      onSubmit={async (data) => {
-        try {
-          await onCreate?.({
-            ...pathParams,
-            requestBody: entityToCreateDto({
-              ...pathParams,
-              ...data,
-            })
-          });
-          actionRef?.current?.reload();
-          setCreatePopupData(undefined);
-        }
-        catch (e) {
-          console.error(e);
-        }
-      }}
-      idColumnName={idColumnName}
-      columns={columns ?? []}
-      viewMode={descriptionsModalViewMode}
-      extra={
-        <ContentViewModeButton
-          contentViewMode={descriptionsModalViewMode}
-          setContentViewMode={setDescriptionsModalViewMode}
-        />
-      }
-    />
+
+    {creationModal}
+
     <Modal
       title={editPopupTitle}
       open={updatePopupData !== undefined}
       width='80%'
+      closeIcon={true}
       footer={null}
-      closeIcon={false}
-      onCancel={() => setUpdatePopupData(undefined)}
+      onCancel={() => {
+        actionRef?.current?.reload();
+        setUpdatePopupData(undefined);
+      }}
     >
-      <Descriptions<Entity>
-        mainTitle='Main'
-        columns={columns}
-        canEdit={true}
+      <Descriptions<Entity, CreateDto, UpdateDto, TPathParams>
+        mainTitle={descriptionsMainTitle}
+        columns={columns ?? []}
         entity={updatePopupData}
-        viewMode={descriptionsModalViewMode}
-        extra={
-          <ContentViewModeButton
-            contentViewMode={descriptionsModalViewMode}
-            setContentViewMode={setDescriptionsModalViewMode}
-          />
-        }
+        canEdit={true}
+        onUpdate={onUpdate}
+        entityToUpdateDto={entityToUpdateDto}
       />
     </Modal>
-    {contextHolder}
+    {messagesContext}
   </>);
 };
 
 export default Table;
-

package/src/components/Table/getTableDataQueryParams.ts

@@ -0,0 +1,79 @@
+import { TFilterParams, TFilters, TGetAllParams, TSearchableColumn, TSort } from "./tableTypes";
+import { applyKeywordToSearch, buildJoinFields, collectFieldsFromColumns, getFiltersSearch } from "./tableTools";
+import { QuerySortArr } from "@nestjsx/crud-request";
+import { ProColumns } from "@ant-design/pro-components";
+import { ColumnStateType } from "@ant-design/pro-table/es/typing";
+
+export function getTableDataQueryParams<Entity, TPathParams extends Record<string, string | number> = {}>({
+  params,
+  sort = {},
+  filters = {},
+  pathParams,
+  defaultSort,
+  searchableColumns,
+  columns = [],
+  idColumnName = 'id',
+  columnsState,
+}: {
+  params: TFilterParams,
+  sort?: TSort,
+  filters?: TFilters,
+  pathParams: TPathParams,
+  defaultSort?: QuerySortArr,
+  searchableColumns?: TSearchableColumn[],
+  columns?: ProColumns<Entity>[],
+  idColumnName?: string | string[];
+  columnsState?: ColumnStateType;
+}): TGetAllParams & TPathParams {
+  const {
+    current,
+    pageSize,
+    keyword,
+    baseFilters,
+    join,
+    sortMap,
+    ...filtersFromSearchForm
+  } = params;
+
+  const queryParams: TGetAllParams & TPathParams = {
+    ...pathParams,
+    page: current,
+    limit: pageSize,
+  };
+
+  const sortBy = Object
+    .entries(sort)
+    .reduce<string[]>(
+      (data: string[], [key, direction]) => {
+        data.push(`${sortMap?.[key] || key},${direction === 'ascend' ? 'ASC' : 'DESC'}`);
+        return data;
+      },
+      []
+    );
+  if (!sortBy.length && defaultSort) {
+    sortBy.push(defaultSort.join(','));
+  }
+  queryParams.sort = sortBy;
+
+  let search = getFiltersSearch({
+    baseFilters,
+    filters: {
+      ...filters,
+      ...filtersFromSearchForm,
+    },
+    searchableColumns,
+  });
+  search = applyKeywordToSearch(search, searchableColumns!, columnsState.value!, keyword);
+  queryParams.s = JSON.stringify(search);
+
+  const { joinSelect, joinFields } = buildJoinFields(join);
+  queryParams.join = joinSelect;
+
+  queryParams.fields = columns && collectFieldsFromColumns(
+    columns,
+    idColumnName,
+    joinFields,
+  ) || [];
+
+  return queryParams;
+}

package/src/components/Table/index.ts

@@ -4,3 +4,4 @@ export * from './tableTools';
 export * from './tableTypes';
 export * from './useColumnsSets';
 export { default as useColumnsSets } from './useColumnsSets';
+export * from "./useCreation";

package/src/components/Table/tableTools.ts

@@ -58,6 +58,22 @@ export function getFiltersSearch({
           value = true;
         }
         break;
+
+      case Operators.in:
+      case Operators.inLow:
+        if (Array.isArray(value) && value.length === 1 && value[0] === null) {
+          operator = Operators.isNull;
+          value = true;
+        }
+        break;
+
+      case Operators.equals:
+        if (Array.isArray(value) && value.length === 1 && value[0] === null || value === null) {
+          operator = Operators.isNull;
+          value = true;
+        }
+        break;
+
     }
 
     search.$and?.push({ [field]: { [operator]: value } });
@@ -169,11 +185,12 @@ export function buildFieldsFromColumns<T>(
     // skip id column because it is always included by backend
     // and join fields because they are included by join
 
-    if (!col.dataIndex || (Array.isArray(idColumnName) ? idColumnName.includes(col.dataIndex) : col.dataIndex === idColumnName) || joinFields.has(col.dataIndex as string)) {
+    const dataIndex = String(Array.isArray(col.dataIndex) ? col.dataIndex[0] : col.dataIndex);
+    if (!dataIndex || (Array.isArray(idColumnName) ? idColumnName.includes(dataIndex) : dataIndex === idColumnName) || joinFields.has(dataIndex)) {
       return;
     }
 
-    fields.add(String(Array.isArray(col.dataIndex) ? col.dataIndex[0] : col.dataIndex));
+    fields.add(dataIndex);
   });
 
   return fields;

package/src/components/Table/tableTypes.ts

@@ -5,6 +5,7 @@ import { Operators } from "./tableTools";
 import { TColumnsSet } from "./useColumnsSets";
 import { ColumnStateType } from "@ant-design/pro-table/es/typing";
 import { RowEditableConfig } from "@ant-design/pro-utils";
+import { ProColumns } from "@ant-design/pro-components";
 
 export type IWithId = {
   id: string | number,
@@ -89,9 +90,6 @@ interface BaseProps<Entity,
   idColumnName?: string & keyof Entity | (string & keyof Entity)[];
   createNewDefaultParams?: Partial<Entity>;
   editableRecord?: Partial<Entity>;
-  afterSave?: (record: Entity) => Promise<void>;
-  actionRef?: MutableRefObject<ActionType | undefined>;
-  editable?: RowEditableConfig<Entity>;
   defaultSort?: QuerySortArr;
   searchableColumns?: TSearchableColumn[];
   viewOnly?: boolean;
@@ -99,18 +97,25 @@ interface BaseProps<Entity,
   popupCreation?: boolean;
   columnsState?: ColumnStateType;
   columnsSetSelect?: () => React.ReactNode;
-  popupDataState?: [Partial<Entity>, React.Dispatch<React.SetStateAction<Partial<Entity>>>]
   editPopupTitle?: string;
+  createPopupTitle?: string;
+  descriptionsMainTitle?: ProColumns<Entity>['title'] | null;
 }
 
-interface EditableProps<Entity, CreateDto, UpdateDto, TPathParams = {}> {
+export interface EditableProps<Entity, CreateDto, UpdateDto, TPathParams = {}> {
+  actionRef?: MutableRefObject<ActionType | undefined>;
+  editable?: RowEditableConfig<Entity>;
+  afterSave?: (record: Entity) => Promise<void>;
   onCreate?: ({}: { requestBody: CreateDto } & TPathParams) => Promise<Entity>;
-  onUpdate: ({}: Record<keyof Entity, string> & { requestBody: UpdateDto } & TPathParams) => Promise<Entity>;
-  onDelete: ({}: Record<keyof Entity, string> & TPathParams) => Promise<void>;
+  onUpdate: ({}: Partial<Entity> & {
+    requestBody: UpdateDto,
+    index?: number,
+  } & TPathParams) => Promise<Entity>;
+  onDelete: ({}: Partial<Entity> & TPathParams) => Promise<void>;
   entityToCreateDto: (entity: Entity) => CreateDto;
   entityToUpdateDto: (entity: Entity) => UpdateDto;
-  onUpdateMany: ({}: Record<keyof Entity, string> & { requestBody: { updateValues: Partial<UpdateDto>[], records: Entity[] } } & TPathParams) => Promise<void>,
-  onDeleteMany: ({}: Record<keyof Entity, string> & { requestBody: { records: Entity[] } } & TPathParams) => Promise<void>,
+  onUpdateMany: ({}: Partial<Entity> & { requestBody: { updateValues: Partial<UpdateDto>[], records: Entity[] } } & TPathParams) => Promise<void>,
+  onDeleteMany: ({}: Partial<Entity> & { requestBody: { records: Entity[] } } & TPathParams) => Promise<void>,
 }
 
 // Conditional type to merge base and editable props conditionally