Merge pull request #401 from noharm-ai/develop

v4.0.26

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noharm-app",
-  "version": "4.0.25",
+  "version": "4.0.26",
   "private": true,
   "dependencies": {
     "@ckeditor/ckeditor5-build-classic": "^35.0.1",

src/components/AdvancedFilter/index.jsx

@@ -91,8 +91,10 @@ export default function AdvancedFilter({
       }
     });
 
-    setValues(newFilters);
-    onSearch(newFilters);
+    const mergedFilters = { ...initialValues, ...newFilters };
+
+    setValues(mergedFilters);
+    onSearch(mergedFilters);
   };
 
   const hiddenFieldCount = countHiddenFilters(values);

src/components/Conciliation/index.jsx

@@ -2,10 +2,10 @@ import React, { useEffect } from "react";
 import isEmpty from "lodash.isempty";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
+import { Skeleton } from "antd";
 
 import Empty from "components/Empty";
-import LoadBox from "components/LoadBox";
-import { Row, Col } from "components/Grid";
+import LoadBox, { LoadContainer } from "components/LoadBox";
 import notification from "components/notification";
 import BackTop from "components/BackTop";
 
@@ -16,8 +16,6 @@ import PrescriptionDrugForm from "containers/Forms/PrescriptionDrug";
 import ScreeningActions from "containers/Screening/ScreeningActions";
 import FormIntervention from "containers/Forms/Intervention";
 
-import { BoxWrapper } from "./index.style";
-
 export default function Screening({ fetchScreeningById, isFetching, error }) {
   const params = useParams();
   const id = params?.slug;
@@ -50,14 +48,17 @@ export default function Screening({ fetchScreeningById, isFetching, error }) {
 
   return (
     <>
-      <BoxWrapper>
-        <PageHeader />
-        <Row type="flex" gutter={24}>
-          <Col span={24} md={24}>
-            {isFetching ? <LoadBox /> : <Patient />}
-          </Col>
-        </Row>
-      </BoxWrapper>
+      <PageHeader />
+
+      <Skeleton title paragraph={false} loading={isFetching} active />
+
+      {isFetching ? (
+        <LoadContainer>
+          <LoadBox absolute={true} />
+        </LoadContainer>
+      ) : (
+        <Patient />
+      )}
 
       <div style={{ marginTop: "15px" }}>
         <ConciliationDrugList />

src/components/Screening/ClinicalNotes/View.jsx

@@ -254,7 +254,10 @@ export default function View({
     }
   }
 
-  html = DOMPurify.sanitize(html);
+  html = DOMPurify.sanitize(html, {
+    FORBID_ATTR: ["style"],
+    FORBID_TAGS: ["font"],
+  });
 
   return (
     <>

src/components/Screening/ClinicalNotes/index.style.jsx

@@ -124,7 +124,7 @@ export const Paper = styled.div`
   padding: 25px 25px;
   max-height: 80vh;
   width: 100%;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 1.2;
   overflow-y: auto;
   scrollbar-width: thin;

src/pages/Screening/PageHeader.jsx

@@ -226,10 +226,10 @@ export default function PageHeader({
 
   const TitleLegend = ({ content, type }) => {
     if (type === "conciliation") {
-      return null;
+      return <span className="legend">{content.dateOnlyFormated}</span>;
     }
 
-    if (content.agg) {
+    if (content.agg || type === "conciliation") {
       return (
         <span className="legend">
           {t("screeningHeader.subtitleAdmission")} {content.dateOnlyFormated}