Merge pull request #34 from openimis/develop

MERGING RELEASE branches
openimis · May 16, 2023 · 1ef418b · 1ef418b
2 parents 4ce12ec + 5fb78cb
commit 1ef418b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/components/PricelistForm.js b/src/components/PricelistForm.js
@@ -22,7 +22,8 @@ const PricelistForm = (props) => {
     isValid,
     clearMedicalPricelists,
   } = props;
-  const canSave = () => pricelist.name && pricelist.pricelistDate && isValid === true;
+
+  const canSave = () => pricelist.name && pricelist.pricelistDate && !pricelist.validityTo && isValid === true;
 
   useEffect(() => {
     return () => {

diff --git a/src/components/PricelistsSearcher.js b/src/components/PricelistsSearcher.js
@@ -1,8 +1,12 @@
 import React, { useCallback, useState } from "react";
+
 import { Tooltip, IconButton } from "@material-ui/core";
+import { withTheme, withStyles } from "@material-ui/core/styles";
 import { Tab as TabIcon, Delete as DeleteIcon } from "@material-ui/icons";
-import { useTranslations, ConfirmDialog, Searcher, withModulesManager } from "@openimis/fe-core";
+
+import { combine, useTranslations, ConfirmDialog, Searcher, withModulesManager } from "@openimis/fe-core";
 import PricelistsFilters from "./PricelistsFilters";
+
 const isRowDisabled = (_, row) => Boolean(row.validityTo);
 const isRowLocked = () => false;
 
@@ -24,10 +28,15 @@ const ALIGNS = HEADERS.map((_, i) => i === HEADERS.length - 1 && "right");
 const getAligns = () => ALIGNS;
 const getHeaders = () => HEADERS;
 
+const styles = (theme) => ({
+  horizontalButtonContainer: theme.buttonContainer.horizontal,
+});
+
 const PricelistsSearcher = (props) => {
   const {
     pageInfo,
     items,
+    classes,
     isFetching,
     isFetched,
     cacheFiltersKey,
@@ -61,7 +70,7 @@ const PricelistsSearcher = (props) => {
       (pricelist) => formatDateFromISO(pricelist.validityFrom),
       (pricelist) => formatDateFromISO(pricelist.validityTo),
       (pricelist) => (
-        <>
+        <div className={classes.horizontalButtonContainer}>
           <Tooltip title={formatMessage("openNewTab")}>
             <IconButton onClick={() => onDoubleClick(pricelist, true)}>
               <TabIcon />
@@ -74,7 +83,7 @@ const PricelistsSearcher = (props) => {
               </IconButton>
             </Tooltip>
           )}
-        </>
+        </div>
       ),
     ],
     []
@@ -134,4 +143,6 @@ const PricelistsSearcher = (props) => {
   );
 };
 
-export default withModulesManager(PricelistsSearcher);
+const enhance = combine(withTheme, withModulesManager, withStyles(styles))
+
+export default enhance(PricelistsSearcher);
diff --git a/src/pages/ItemsPricelistDetailsPage.js b/src/pages/ItemsPricelistDetailsPage.js
@@ -79,7 +79,7 @@ const ItemsPriceListDetailsPage = (props) => {
   };
 
   return (
-    <div className={clsx(classes.page, { [classes.locked]: isLocked })}>
+    <div className={clsx(classes.page, pricelist.validityTo && classes.locked)}>
       <ErrorBoundary>
         <ProgressOrError progress={isFetching} error={error} />
         {!isFetching && (

diff --git a/src/pages/ServicesPricelistDetailsPage.js b/src/pages/ServicesPricelistDetailsPage.js
@@ -79,7 +79,7 @@ const ServicesPriceListDetailsPage = (props) => {
   };
 
   return (
-    <div className={clsx(classes.page, { [classes.locked]: isLocked })}>
+    <div className={clsx(classes.page, pricelist.validityTo && classes.locked)}>
       <ErrorBoundary>
         <ProgressOrError progress={isFetching} error={error} />
         {!isFetching && (