WIP Update containers structure

Refs: #230
beda-software · Feb 28, 2024 · 39c616a · 39c616a
1 parent 3f25c7a
commit 39c616a
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 7 deletions.
diff --git a/...rs/PatientDetails/PatientOverviewDynamic/components/GeneralInformationDashboard/index.tsx b/...rs/PatientDetails/PatientOverviewDynamic/components/GeneralInformationDashboard/index.tsx
@@ -35,3 +35,5 @@ export function GeneralInformationDashboard({ patientDetails, props }: Props) {
         </DashboardCard>
     );
 }
+
+GeneralInformationDashboard.displayName = 'GeneralInformation';
diff --git a/src/containers/PatientDetails/PatientOverviewDynamic/components/StandardCard/index.tsx b/src/containers/PatientDetails/PatientOverviewDynamic/components/StandardCard/index.tsx
@@ -32,3 +32,5 @@ export function StandardCard({ card }: Props) {
         </DashboardCard>
     );
 }
+
+StandardCard.displayName = 'StandardCard';
diff --git a/...wDynamic/hooks/useCreatinineDashoboard.ts → ...rs/CreatinineDashoboardContainer/hooks.ts b/...wDynamic/hooks/useCreatinineDashoboard.ts → ...rs/CreatinineDashoboardContainer/hooks.ts
diff --git a/...tainers/CreatinineDashoboardContainer.tsx → ...s/CreatinineDashoboardContainer/index.tsx b/...tainers/CreatinineDashoboardContainer.tsx → ...s/CreatinineDashoboardContainer/index.tsx
@@ -1,7 +1,7 @@
 import { Patient } from 'fhir/r4b';
 
 import { CreatinineDashoboard } from 'src/components/DashboardCard/creatinine';
-import { useCreatinineDashoboard } from 'src/containers/PatientDetails/PatientOverviewDynamic/hooks/useCreatinineDashoboard';
+import { useCreatinineDashoboard } from 'src/containers/PatientDetails/PatientOverviewDynamic/containers/CreatinineDashoboardContainer/hooks';
 import { WidgetInfo } from 'src/contexts/PatientDashboardContext';
 
 interface CreatinineDashoboardContainerProps {

diff --git a/...ewDynamic/components/Dashboards/index.tsx → ...ewDynamic/containers/Dashboards/index.tsx b/...ewDynamic/components/Dashboards/index.tsx → ...ewDynamic/containers/Dashboards/index.tsx
@@ -1,10 +1,12 @@
 import { Patient } from 'fhir/r4b';
 
 import { CreatinineDashoboardContainer } from 'src/containers/PatientDetails/PatientOverviewDynamic/containers/CreatinineDashoboardContainer';
+import { StandardCardContainer } from 'src/containers/PatientDetails/PatientOverviewDynamic/containers/StandardCardContainer';
 import { WidgetInfo } from 'src/contexts/PatientDashboardContext';
 
 const widgetComponents = {
     CreatinineDashoboard: CreatinineDashoboardContainer,
+    StandardCard: StandardCardContainer,
 };
 
 interface Props {

diff --git a/...ontainers/PatientDetails/PatientOverviewDynamic/containers/StandardCardContainer/hooks.ts b/...ontainers/PatientDetails/PatientOverviewDynamic/containers/StandardCardContainer/hooks.ts
@@ -0,0 +1,7 @@
+import { Patient } from 'fhir/r4b';
+
+import { SearchParams } from '@beda.software/fhir-react';
+
+export function useStandardCard(patient: Patient, searchParams: SearchParams) {
+    return { patient, searchParams };
+}
diff --git a/...ntainers/PatientDetails/PatientOverviewDynamic/containers/StandardCardContainer/index.tsx b/...ntainers/PatientDetails/PatientOverviewDynamic/containers/StandardCardContainer/index.tsx
@@ -0,0 +1,17 @@
+import { Patient } from 'fhir/r4b';
+
+import { WidgetInfo } from 'src/contexts/PatientDashboardContext';
+
+import { useStandardCard } from './hooks';
+
+interface StandardCardContainerProps {
+    patient: Patient;
+    widgetInfo: WidgetInfo;
+}
+
+export function StandardCardContainer({ patient, widgetInfo }: StandardCardContainerProps) {
+    const searchParams = widgetInfo.query.search;
+    useStandardCard(patient, searchParams);
+
+    return <div style={{ color: '#ff0000' }}>{JSON.stringify(searchParams)}</div>;
+}
diff --git a/src/containers/PatientDetails/PatientOverviewDynamic/index.tsx b/src/containers/PatientDetails/PatientOverviewDynamic/index.tsx
@@ -1,7 +1,7 @@
 import { Patient } from 'fhir/r4b';
 import { useContext } from 'react';
 
-import { Dashboards } from 'src/containers/PatientDetails/PatientOverviewDynamic/components/Dashboards';
+import { Dashboards } from 'src/containers/PatientDetails/PatientOverviewDynamic/containers/Dashboards';
 import { PatientDashboardContext } from 'src/contexts/PatientDashboardContext';
 
 import s from './PatientOverview.module.scss';

diff --git a/src/main.tsx b/src/main.tsx
@@ -9,10 +9,10 @@ import { dynamicActivate, getCurrentLocale } from 'shared/src/services/i18n';
 
 import 'antd/dist/reset.css';
 import 'src/styles/index.scss';
-import 'shared/src/services/i18n';
 
 import { CreatinineDashoboard } from 'src/components/DashboardCard/creatinine';
 import { App } from 'src/containers/App';
+import { StandardCard } from 'src/containers/PatientDetails/PatientOverviewDynamic/components/StandardCard';
 import { PatientDashboardProvider } from 'src/contexts/PatientDashboardContext';
 
 import * as serviceWorker from './serviceWorker';
@@ -23,20 +23,105 @@ export const dashboard = {
     // TODO WIP
     default: {
         top: [
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'TOP CARD 1',
+                    },
+                },
+                widget: StandardCard,
+            },
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'TOP CARD 2',
+                    },
+                },
+                widget: StandardCard,
+            },
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        code: 'http://loinc.org|2160-0',
+                        _sort: ['-date'],
+                    },
+                },
+                widget: CreatinineDashoboard,
+            },
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'TOP CARD 3',
+                    },
+                },
+                widget: StandardCard,
+            },
             {
                 query: {
                     resourceType: 'Observation',
                     search: {
                         code: 'http://loinc.org|2160-0',
-                        _sort: ['date'],
+                        _sort: ['-date'],
                     },
                 },
                 widget: CreatinineDashoboard,
             },
         ],
-        right: [],
-        left: [],
-        bottom: [],
+        right: [
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'RIGHT CARD 1',
+                    },
+                },
+                widget: StandardCard,
+            },
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'RIGHT CARD 2',
+                    },
+                },
+                widget: StandardCard,
+            },
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'RIGHT CARD 3',
+                    },
+                },
+                widget: StandardCard,
+            },
+        ],
+        left: [
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'LEFT CARD 1',
+                    },
+                },
+                widget: StandardCard,
+            },
+        ],
+        bottom: [
+            {
+                query: {
+                    resourceType: 'Observation',
+                    search: {
+                        text: 'BOTTOM CARD 1',
+                    },
+                },
+                widget: StandardCard,
+            },
+        ],
     },
     // [Role.Admin]: {},
     // [Role.Practitioner]: {},
-Original file line number
+Diff line change
@@ Expand Up @@
             </DashboardCard>
         );
     }
+    GeneralInformationDashboard.displayName = 'GeneralInformation';