Merge pull request #52 from openimis/develop

MERGING RELEASE branches
openimis · May 16, 2023 · 273d933 · 273d933
2 parents 7427526 + 1013f1f
commit 273d933
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git a/src/components/ProductForm/DataGrid.js b/src/components/ProductForm/DataGrid.js
@@ -85,7 +85,7 @@ const CellActions = (props) => {
 };
 
 const DataGrid = (props) => {
-  const { className, onChange, error, isLoading, density, rows = [], bindLimitTypesWithDefaultValues } = props;
+  const { className, onChange, error, isLoading, density, readOnly, rows = [], bindLimitTypesWithDefaultValues } = props;
   const [editRowsModel, setEditRowsModel] = useState({});
   const modulesManager = useModulesManager();
   const { formatMessage } = useTranslations("product.DataGrid", modulesManager);
@@ -110,8 +110,10 @@ const DataGrid = (props) => {
 
   const renderCellActions = (props) => <CellActions {...props} onRowDelete={onRowDelete} />;
 
-  const columns = useMemo(
-    () => [
+  const columns = useMemo(() => {
+    const baseColumns = props.columns;
+    if (readOnly) return baseColumns;
+    return [
       {
         field: "actions",
         headerName: formatMessage("actions"),
@@ -120,10 +122,10 @@ const DataGrid = (props) => {
         disableColumnMenu: true,
         width: 100,
       },
-      ...props.columns,
-    ],
-    [props.columns, rows],
-  );
+      ...baseColumns,
+    ];
+  }, [props.columns, readOnly]);
+
 
   const handleEditRowsModel = (itemsOrServices) => {
     bindLimitTypesWithDefaultValues(itemsOrServices, prevItemsOrServicesRef.current)

diff --git a/src/components/ProductForm/GenericItemsTabForm.js b/src/components/ProductForm/GenericItemsTabForm.js
@@ -12,7 +12,8 @@ import {usePageDisplayRulesQuery} from "../../hooks";
 import {GridRenderCellParams} from "@mui/x-data-grid";
 
 const ItemsTabForm = (props) => {
-  const { classes, className, isLoading, onChange, onAdd, rows = [], itemColumns, Picker, getLimitValueSwitch} = props;
+  const { classes, className, isLoading, onChange, onAdd, readOnly, rows = [],
+          itemColumns, Picker, getLimitValueSwitch} = props;
   const modulesManager = useModulesManager();
   const { formatMessage } = useTranslations("product", modulesManager);
   const [isDialogOpen, setDialogOpen] = useState(false);
@@ -151,11 +152,13 @@ const ItemsTabForm = (props) => {
         Picker={Picker}
       />
       <Grid container className={className}>
-        <Grid item container xs={4} className={classes.item}>
-          <Button startIcon={<AddIcon />} variant="contained" onClick={() => setDialogOpen(true)}>
-            {formatMessage("ItemsOrServicesGrid.addItemsButton")}
-          </Button>
-        </Grid>
+        {!readOnly && (
+          <Grid item container xs={4} className={classes.item}>
+            <Button startIcon={<AddIcon />} variant="contained" onClick={() => setDialogOpen(true)}>
+              {formatMessage("ItemsOrServicesGrid.addItemsButton")}
+            </Button>
+          </Grid>
+        )}
         <Grid item xs={12} className={classes.dataGridWrapper}>
           <ErrorBoundary>
             { isLoadedRules && (
@@ -166,6 +169,7 @@ const ItemsTabForm = (props) => {
                 columns={columns}
                 density="compact"
                 rows={rows}
+                readOnly={readOnly}
                 bindLimitTypesWithDefaultValues={bindLimitTypesWithDefaultValues}
               />
             )}

diff --git a/src/components/ProductForm/ItemsTabForm.js b/src/components/ProductForm/ItemsTabForm.js
@@ -12,7 +12,7 @@ import _ from "lodash";
 import GenericItemsTabForm from "./GenericItemsTabForm";
 
 const ItemsTabForm = (props) => {
-  const { edited, edited_id, onEditedChanged, limitType, priceOrigin, getLimitValueSwitch } = props;
+  const { edited, edited_id, onEditedChanged, limitType, priceOrigin, getLimitValueSwitch, readOnly } = props;
   const modulesManager = useModulesManager();
   const intl = useIntl();
   const dispatch = useDispatch();
@@ -105,6 +105,7 @@ const ItemsTabForm = (props) => {
       isLoading={isLoading}
       rows={edited.items ?? []}
       onChange={onChange}
+      readOnly={readOnly}
       onAdd={onAdd}
       getLimitValueSwitch={getLimitValueSwitch}
       Picker={(props) => (

diff --git a/src/components/ProductForm/ProductForm.js b/src/components/ProductForm/ProductForm.js
@@ -7,24 +7,25 @@ import ReplayIcon from "@material-ui/icons/Replay";
 
 const ProductForm = (props) => {
   const { readOnly, onBack, onSave, product, canSave, onReset, onChange, autoFocus, isDuplicate } = props;
+  const returnMethodOrReadOnly = (method) => readOnly? !readOnly: method;
 
   return (
     <Form
       module="product"
       title={product?.uuid ? "product.ProductForm.title" : "product.ProductForm.emptyTitle"}
       titleParams={{ label: product.name ?? "" }}
       readOnly={readOnly}
-      canSave={canSave}
+      canSave={returnMethodOrReadOnly(canSave)}
       onEditedChanged={onChange}
       edited={product}
       isDuplicate={isDuplicate}
       edited_id={product.uuid}
       HeadPanel={MainPanelForm}
       Panels={[TabsForm]}
-      save={onSave}
+      save={returnMethodOrReadOnly(onSave)}
       autoFocus={autoFocus}
       back={onBack}
-      openDirty={onSave}
+      openDirty={returnMethodOrReadOnly(onSave)}
       actions={[
         {
           doIt: onReset,

diff --git a/src/components/ProductForm/ServicesTabForm.js b/src/components/ProductForm/ServicesTabForm.js
@@ -12,7 +12,7 @@ import _ from "lodash";
 import GenericItemsTabForm from "./GenericItemsTabForm";
 
 const ServicesTabForm = (props) => {
-  const { edited, edited_id, onEditedChanged, limitType, priceOrigin, getLimitValueSwitch } = props;
+  const { edited, edited_id, onEditedChanged, limitType, priceOrigin, getLimitValueSwitch, readOnly } = props;
   const modulesManager = useModulesManager();
   const intl = useIntl();
   const dispatch = useDispatch();
@@ -105,6 +105,7 @@ const ServicesTabForm = (props) => {
       rows={edited.services ?? []}
       onChange={onChange}
       onAdd={onAdd}
+      readOnly={readOnly}
       getLimitValueSwitch={getLimitValueSwitch}
       Picker={(props) => (
         <PublishedComponent

diff --git a/src/pickers/ProductPicker.js b/src/pickers/ProductPicker.js
@@ -1,5 +1,7 @@
 import React, { useState } from "react";
+
 import { TextField } from "@material-ui/core";
+
 import { Autocomplete, useModulesManager, useTranslations } from "@openimis/fe-core";
 import { useProductsQuery } from "../hooks";
 
@@ -47,8 +49,8 @@ const ProductPicker = (props) => {
         <TextField
           {...inputProps}
           required={required}
-          label={withLabel && (label || nullLabel)}
-          placeholder={withPlaceholder && (placeholder || formatMessage("Search..."))}
+          label={(withLabel && (label || nullLabel)) || formatMessage("Product")}
+          placeholder={(withPlaceholder && placeholder) || formatMessage("ProductPicker.placeholder")}
         />
       )}
     />