Merge pull request #44 from Y-Note-SAS/OP-2546

Filter service/item in pricelist by name or code #OP-2546

Author: zikani03

src/components/PricelistForm.js

@@ -21,7 +21,6 @@ const PricelistForm = (props) => {
     details,
     isValid,
     clearMedicalPricelists,
-    onChangeFilters
   } = props;
 
   const canSave = () => pricelist.name && pricelist.pricelistDate && !pricelist.validityTo && isValid === true;
@@ -50,7 +49,6 @@ const PricelistForm = (props) => {
         details={details}
         fetchDetails={fetchDetails}
         openDirty={onSave}
-        onChangeFilters={onChangeFilters}
         actions={[
           {
             doIt: onReset,

src/components/PricelistGeneralPanel.js

@@ -18,6 +18,7 @@ import {
   medicalItemsSetValid,
 } from "../actions";
 import { SERVICES_PRICELIST_TYPE } from "../constants";
+import { first } from "lodash";
 
 const styles = (theme) => ({
   item: theme.paper.item,
@@ -44,10 +45,12 @@ class PricelistGeneralPanel extends FormPanel {
     return shouldValidate;
   };
   onCodeChange = (value) => {
-    this.props.onChangeFilters([{ id: "code", value, filter: `code_Icontains: "${value}"` }]);
+    let filters = [`code_Icontains: "${value}"`, `first: 20`];
+    this.props.fetchDetails(filters);
   };
   onNameChange = (value) => {
-    this.props.onChangeFilters([{ id: "name", value, filter: `name_Icontains: "${value}"` }]);
+    let filters = [`name_Icontains: "${value}"`, `first: 20`];
+    this.props.fetchDetails(filters);
   };
 
   render() {
@@ -101,15 +104,15 @@ class PricelistGeneralPanel extends FormPanel {
             <TextInput
               module="medical"
               label={`medical_pricelist.table.code`}
-              value={edited?.code ?? ""}
+              value={edited.code}
               onChange={this.triggerDebounceCode}
             />
           </Grid>
           <Grid item xs={2} className={classes.item}>
             <TextInput
-              module="insuree"
+              module="medical_pricelist"
               label={!!this.props.activeType && this.props.activeType === 'items' ?  `medical_pricelist.table.medicalItemName`: `medical_pricelist.table.medicalServiceName`}
-              value={edited?.serviceName ?? ""}
+              value={edited.serviceOrItemName}
               onChange={this.triggerDebounceName}
               readOnly={readOnly}
             />

src/pages/ItemsPricelistDetailsPage.js

@@ -17,7 +17,6 @@ const styles = (theme) => ({
   page: theme.page,
   locked: theme.page.locked,
 });
-import { formatGraphQLFilters } from "../utils";
 
 const ItemsPriceListDetailsPage = (props) => {
   const {
@@ -38,7 +37,6 @@ const ItemsPriceListDetailsPage = (props) => {
   const [isLocked, setLocked] = useState(false);
   const [resetKey, setResetKey] = useState(null);
   const [pricelist, setPricelist] = useState({});
-  const [filters, setFilters] = useState([])
 
   useEffect(() => {
     if (match.params.price_list_id) {
@@ -54,31 +52,6 @@ const ItemsPriceListDetailsPage = (props) => {
     }
   }, [props.pricelist]);
 
-  useEffect(() => {
-    if (filters.length > 0) {
-      fetchDetails();
-    }
-  }, [filters]);
-
-  const onChangeFilters = (newFilters) => {
-    setFilters(prevFilters => {
-      const updatedFilters = [...prevFilters];
-
-      newFilters.forEach(newFilter => {
-        const existingIndex = updatedFilters.findIndex(f => f.id === newFilter.id);
-
-        if (existingIndex >= 0) {
-          // Si le filtre existe déjà, le met à jour
-          updatedFilters[existingIndex] = newFilter;
-        } else {
-          // Sinon, ajoute le nouveau filtre
-          updatedFilters.push(newFilter);
-        }
-      });
-
-      return updatedFilters;
-    });
-  };
   const onSave = (pricelist) => {
     setLocked(true);
     if (pricelist.uuid) {
@@ -101,9 +74,8 @@ const ItemsPriceListDetailsPage = (props) => {
     setResetKey(Date.now());
   };
 
-  const fetchDetails = () => {
-    const formattedFilters = formatGraphQLFilters(filters);
-    fetchItemsPricelistDetails(modulesManager, formattedFilters, pricelist?.id);
+  const fetchDetails = (filters) => {
+    fetchItemsPricelistDetails(modulesManager, filters, pricelist?.id);
   };
 
   return (
@@ -121,7 +93,6 @@ const ItemsPriceListDetailsPage = (props) => {
             onReset={onReset}
             details={details}
             fetchDetails={fetchDetails}
-            onChangeFilters={onChangeFilters}
           />
         )}
       </ErrorBoundary>

src/pages/ServicesPricelistDetailsPage.js

@@ -17,7 +17,6 @@ const styles = (theme) => ({
   page: theme.page,
   locked: theme.page.locked,
 });
-import { formatGraphQLFilters } from "../utils";
 
 const ServicesPriceListDetailsPage = (props) => {
   const {
@@ -38,7 +37,6 @@ const ServicesPriceListDetailsPage = (props) => {
   const [isLocked, setLocked] = useState(false);
   const [resetKey, setResetKey] = useState(null);
   const [pricelist, setPricelist] = useState({});
-  const [filters, setFilters] = useState([])
 
   useEffect(() => {
     if (match.params.price_list_id) {
@@ -54,11 +52,6 @@ const ServicesPriceListDetailsPage = (props) => {
     }
   }, [props.pricelist]);
 
-  useEffect(() => {
-    if (filters.length > 0) {
-      fetchDetails();
-    }
-  }, [filters]);
   const onSave = (pricelist) => {
     setLocked(true);
     if (pricelist.uuid) {
@@ -81,30 +74,8 @@ const ServicesPriceListDetailsPage = (props) => {
     setResetKey(Date.now());
   };
 
-
-
-  const fetchDetails = () => {
-    const formattedFilters = formatGraphQLFilters(filters);
-    fetchServicesPricelistDetails(modulesManager, formattedFilters, pricelist?.id);
-  };
-  const onChangeFilters = (newFilters) => {
-    setFilters(prevFilters => {
-      const updatedFilters = [...prevFilters];
-
-      newFilters.forEach(newFilter => {
-        const existingIndex = updatedFilters.findIndex(f => f.id === newFilter.id);
-
-        if (existingIndex >= 0) {
-          // Si le filtre existe déjà, le met à jour
-          updatedFilters[existingIndex] = newFilter;
-        } else {
-          // Sinon, ajoute le nouveau filtre
-          updatedFilters.push(newFilter);
-        }
-      });
-
-      return updatedFilters;
-    });
+  const fetchDetails = (filters) => {
+    fetchServicesPricelistDetails(modulesManager, filters, pricelist?.id);
   };
 
   return (
@@ -122,7 +93,6 @@ const ServicesPriceListDetailsPage = (props) => {
             onReset={onReset}
             details={details}
             fetchDetails={fetchDetails}
-            onChangeFilters={onChangeFilters}
           />
         )}
       </ErrorBoundary>