README.md

@@ -2,6 +2,10 @@
 ![](https://github.com/Ferlab-Ste-Justine/clin-frontend/workflows/Publish%20Image%20Using%20Commit%20Hash/badge.svg)
 ![](https://github.com/Ferlab-Ste-Justine/clin-frontend/workflows/Publish%20Image%20Using%20Tag/badge.svg)
 
+# Deprecation
+
+This service has been deprecated and will no longer be maintained.
+
 # CLIN Frontend
 
 ## Available Scripts

client/src/bridge/index.ts

@@ -1,5 +1,3 @@
-import { channel } from 'redux-saga';
-
 import { StoreType } from 'store';
 
 type CallBackType = (e: MessageEvent) => void;
@@ -28,6 +26,7 @@ type CallBackType = (e: MessageEvent) => void;
       }, [iFrame])
 */
 
+let clinUIChannel: HTMLIFrameElement;
 export class Bridge {
   private store: StoreType;
   private channel: HTMLIFrameElement;
@@ -49,4 +48,12 @@ export class Bridge {
   remove(callback: CallBackType): void {
     this.channel.contentWindow?.removeEventListener('message', callback, false);
   }
+
+  static setMainChannel(ref: HTMLIFrameElement): void {
+    clinUIChannel = ref;
+  }
+
+  static broadcastMessage(msg: string): void  {
+    clinUIChannel?.contentWindow?.postMessage(msg, window.origin);
+  }
 }

client/src/components/screens/Patient/components/PatientDetails/DetailsRow.tsx

@@ -1,10 +1,13 @@
 import React, { ReactNode } from 'react';
+import { Typography } from 'antd';
 
 type Props = { title: string; value?: string | ReactNode };
 
+const { Text } = Typography;
+
 const DetailsRow = ({ title, value }: Props): React.ReactElement => (
   <div className="patient-section__col__details__row">
-    <span className="patient-section__col__details__row__title">{title}</span>
+    <Text className="patient-section__col__details__row__title">{title}</Text>
     <span className="patient-section__col__details__row__info">{value || '--'}</span>
   </div>
 );

client/src/components/screens/Patient/components/PatientDetails/styles.scss

@@ -47,6 +47,7 @@
         &__title {
           color: $gray-7;
           font-weight: 500;
+          font-size: 12px;
         }
 
         &__info {

client/src/components/screens/PatientCreation/components/ResultModal/index.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
 import intl from 'react-intl-universal';
+import { useSelector } from 'react-redux';
 import {
   Button, Modal, Typography,
 } from 'antd';
+import { Patient } from 'helpers/fhir/types';
+
 import './styles.scss';
-import { useSelector } from 'react-redux';
-import { Patient } from '../../../../../helpers/fhir/types';
 
 interface Props {
   open: boolean
@@ -19,7 +20,7 @@ interface Props {
 const I18N_PREFIX = 'screen.patient.creation.modal.';
 
 const ResultModal: React.FC<Props> = ({
-  open, onClose, icon, description, actions, title,
+  actions, description, icon, onClose, open, title,
 }) => {
   const patient = useSelector((state: any) => state.patientCreation.patient) as Patient;
 
@@ -33,7 +34,7 @@ const ResultModal: React.FC<Props> = ({
     displayedTitle += ` (${intl.get('screen.patient.creation.fetus').toLowerCase()})`;
   }
   return (
-    <Modal visible={open} footer={null} width={815} onCancel={() => onClose()}>
+    <Modal footer={null} onCancel={() => onClose()} visible={open} width={815}>
       <div className="patient-creation__modal__content">
         { icon }
 
@@ -49,7 +50,7 @@ const ResultModal: React.FC<Props> = ({
           { actions }
         </div>
         <span>
-          <Button type="link" onClick={() => onClose()} className="patient-creation__modal__content__close-button" data-testid="CloseButton">
+          <Button className="patient-creation__modal__content__close-button" data-testid="CloseButton" onClick={() => onClose()} type="link">
             { intl.get(`${I18N_PREFIX}close`) }
           </Button>
         </span>

client/src/components/screens/PatientVariant/styles.scss

@@ -1,7 +1,10 @@
 .occurenceDrawer{
-    .description {
-        span[class$="-item-label"] {
-          width: 250px;
-        }
+  .description {
+      span[class$="-item-label"] {
+        width: 250px;
       }
+      .hcCountLink{
+        height: 22px;
+      }
+    }
 }

client/src/components/screens/search/index.tsx

@@ -29,6 +29,7 @@ const SearchScreen = ({ app }: SearchScreenProps): React.ReactElement => {
     if (iFrame && iFrame.current) {
       bridge = new Bridge(store, iFrame.current);
       bridge.register('createNewPrescription', prescriptionModalCallback);
+      Bridge.setMainChannel(iFrame.current)
     }
 
     return function cleanup() {

client/src/helpers/fhir/__tests/PatientBuilder.spec.ts

@@ -224,8 +224,7 @@ describe('PatientBuilder', () => {
     })
   })
 
-  //En attente de la correction de CLIN-795
-  describe.skip('withPatient', () => {
+  describe('withPatient', () => {
     test('should build partial patient', () => {
         const builder = new PatientBuilder()
         const patient = mocks.PartialPatientMock as Partial<Patient>;

client/src/helpers/fhir/builder/PatientBuilder.ts

@@ -155,7 +155,7 @@ export class PatientBuilder {
     return this
       .withId(patient.id)
       .withFamily(get(patient, 'name[0].family'))
-      .withGiven(get(patient, '.name[0].given[0]'))
+      .withGiven(get(patient, 'name[0].given[0]'))
       .withActive(patient.active)
       .withBirthDate(moment(patient.birthDate).toDate())
       .withGender(patient.gender)

client/src/sagas/router.js

@@ -1,3 +1,4 @@
+import { Bridge } from 'bridge';
 import { LOCATION_CHANGE,push } from 'connected-react-router';
 import get from 'lodash/get';
 import {
@@ -72,6 +73,7 @@ function* navigateToSubmissionScreenWithPatient() {
 }
 
 function* navigateToPatientSearchScreen() {
+  Bridge.broadcastMessage('clinFrontend:modalClose')
   yield put(push(Routes.PatientSearch));
 }