From 48aaf991a397f7f646c930ab5d85e0cd2e50b55c Mon Sep 17 00:00:00 2001
From: Felix Thape <felix.thape@gmail.com>
Date: Tue, 9 Apr 2024 14:52:43 +0200
Subject: [PATCH 1/3] feat: add properties text to OrganizationDetails

---
 .../components/layout/OrganizationDetails.tsx | 33 +++++++++++++++++--
 tasks/components/layout/PatientDetails.tsx    | 10 +++---
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/tasks/components/layout/OrganizationDetails.tsx b/tasks/components/layout/OrganizationDetails.tsx
index a373bc1ff..b50b6aa70 100644
--- a/tasks/components/layout/OrganizationDetails.tsx
+++ b/tasks/components/layout/OrganizationDetails.tsx
@@ -5,6 +5,8 @@ import { useContext, useEffect, useState } from 'react'
 import { Button } from '@helpwave/common/components/Button'
 import { ConfirmDialog } from '@helpwave/common/components/modals/ConfirmDialog'
 import { Span } from '@helpwave/common/components/Span'
+import { DescriptionWithAction } from '@helpwave/common/components/DescriptionWithAction'
+import Link from 'next/link'
 import { emptyOrganizationForm, OrganizationForm, type OrganizationFormType } from '../OrganizationForm'
 import { OrganizationMemberList } from '../OrganizationMemberList'
 import { ColumnTitle } from '../ColumnTitle'
@@ -21,6 +23,7 @@ import {
 import { useAuth } from '@/hooks/useAuth'
 import { useOrganization } from '@/hooks/useOrganization'
 import { ReSignInModal } from '@/components/modals/ReSignInModal'
+import { usePropertyListQuery } from '@/mutations/property_mutations'
 
 type OrganizationDetailTranslation = {
   organizationDetail: string,
@@ -29,7 +32,10 @@ type OrganizationDetailTranslation = {
   deleteConfirmText: string,
   deleteOrganization: string,
   create: string,
-  update: string
+  update: string,
+  properties: string,
+  propertiesDescription: string,
+  manageProperties: string
 }
 
 const defaultOrganizationDetailTranslations: Record<Languages, OrganizationDetailTranslation> = {
@@ -40,7 +46,10 @@ const defaultOrganizationDetailTranslations: Record<Languages, OrganizationDetai
     deleteConfirmText: 'Do you really want to delete this organization?',
     deleteOrganization: 'Delete Organization',
     create: 'Create',
-    update: 'Update'
+    update: 'Update',
+    properties: 'Properties',
+    propertiesDescription: 'With properties you can add custom fields to different entities you patients or beds.',
+    manageProperties: 'Manage Properties'
   },
   de: {
     organizationDetail: 'Organisations Details',
@@ -49,7 +58,10 @@ const defaultOrganizationDetailTranslations: Record<Languages, OrganizationDetai
     deleteConfirmText: 'Wollen Sie wirklich diese Organisation löschen?',
     deleteOrganization: 'Organisation löschen',
     create: 'Erstellen',
-    update: 'Ändern'
+    update: 'Ändern',
+    properties: 'Eigenschaften',
+    propertiesDescription: 'Mit Eigenschaften können Sie verschiedenen Entitäten wie Patienten oder Betten benutzerdefinierte Felder hinzufügen.',
+    manageProperties: 'Eigenschaften Verwalten'
   }
 }
 
@@ -73,6 +85,7 @@ export const OrganizationDetail = ({
   const { signOut } = useAuth()
   const isCreatingNewOrganization = contextState.organizationId === ''
   const { data } = useOrganizationQuery(contextState.organizationId)
+  const { data: propertyData } = usePropertyListQuery()
   const [isShowingConfirmDialog, setIsShowingConfirmDialog] = useState(false)
   const [isShowingReSignInDialog, setIsShowingReSignInDialog] = useState<string>()
   const [organizationForm, setOrganizationForm] = useState<OrganizationFormType>(emptyOrganizationForm)
@@ -199,6 +212,20 @@ export const OrganizationDetail = ({
           invitations={isCreatingNewOrganization ? organizationInvites : undefined}
           organizationId={contextState.organizationId}
         />
+        {propertyData && !isCreatingNewOrganization && (
+          <DescriptionWithAction
+            title={`${translation.properties} (${propertyData.length})`}
+            description={translation.propertiesDescription}
+            trailing={(
+              <div className={tw('flex flex-row justify-end items-center')}>
+                <Link href="/properties">
+                  <Button className="h-fit">{translation.manageProperties}</Button>
+                </Link>
+              </div>
+              )}
+            leadingIcon="label"
+          />
+        )}
         <div className={tw('flex flex-row justify-end')}>
           <Button
             className={tw('w-auto')}
diff --git a/tasks/components/layout/PatientDetails.tsx b/tasks/components/layout/PatientDetails.tsx
index dc7000b8e..f4bc687e1 100644
--- a/tasks/components/layout/PatientDetails.tsx
+++ b/tasks/components/layout/PatientDetails.tsx
@@ -221,20 +221,20 @@ export const PatientDetail = ({
         <div className={tw('sticky flex flex-row  bottom-6 right-4 justify-end')}>
           <div className={tw('sticky flex flex-row p-2 mt-6 gap-x-4 bg-white border-2 rounded-xl')}>
             {!newPatient.discharged ?
-              (
+                (
                 <>
                   <Button color="warn" onClick={() => unassignMutation.mutate(newPatient.id)}>
                     {translation.unassign}
                   </Button>
-                  <Button color="negative" onClick={() => setIsShowingDischargeDialog(true)} >
+                  <Button color="negative" onClick={() => setIsShowingDischargeDialog(true)}>
                     {translation.dischargePatient}
                   </Button>
                 </>
-              ) : (
-                <Button color="positive" onClick={() => readmitMutation.mutate(newPatient.id)} >
+                ) : (
+                <Button color="positive" onClick={() => readmitMutation.mutate(newPatient.id)}>
                   {translation.readmit}
                 </Button>
-              )}
+                )}
             <Button color="accent" onClick={() => {
               clearUpdateTimer(true)
               updateMutation.mutate(newPatient)

From 6a99c038e0aa5171e3f2c4e4119b041ba65cbbcd Mon Sep 17 00:00:00 2001
From: Felix Thape <felix.thape@gmail.com>
Date: Tue, 9 Apr 2024 20:24:42 +0200
Subject: [PATCH 2/3] fix: fix storybook

---
 lib/stories/layout/Tile.stories.tsx           | 20 -------------------
 .../{Tile.stories.ts => Tile.stories.tsx}     |  0
 2 files changed, 20 deletions(-)
 delete mode 100644 lib/stories/layout/Tile.stories.tsx
 rename lib/stories/layout/tile/{Tile.stories.ts => Tile.stories.tsx} (100%)

diff --git a/lib/stories/layout/Tile.stories.tsx b/lib/stories/layout/Tile.stories.tsx
deleted file mode 100644
index 81c76a9d4..000000000
--- a/lib/stories/layout/Tile.stories.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react'
-import { TileExample } from '../../components/examples/TileExample'
-
-const meta = {
-  title: 'Layout/Tile',
-  component: TileExample,
-} satisfies Meta<typeof TileExample>
-
-export default meta
-type Story = StoryObj<typeof meta>;
-
-export const TileVariation: Story = {
-  args: {
-    title: { value: 'Title', className: '', type: undefined },
-    description: { value: 'Description Text', className: '', type: undefined },
-    prefix: true,
-    suffix: true,
-    className: ''
-  },
-}
diff --git a/lib/stories/layout/tile/Tile.stories.ts b/lib/stories/layout/tile/Tile.stories.tsx
similarity index 100%
rename from lib/stories/layout/tile/Tile.stories.ts
rename to lib/stories/layout/tile/Tile.stories.tsx

From 056b6e7f400ea50709fd3502e791be5f2e749b27 Mon Sep 17 00:00:00 2001
From: DasProffi <felix.thape@gmail.com>
Date: Thu, 14 Nov 2024 14:26:23 +0100
Subject: [PATCH 3/3] fix: fix imports after merge

---
 tasks/components/layout/OrganizationDetails.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/components/layout/OrganizationDetails.tsx b/tasks/components/layout/OrganizationDetails.tsx
index 776b28379..13ecd9f8f 100644
--- a/tasks/components/layout/OrganizationDetails.tsx
+++ b/tasks/components/layout/OrganizationDetails.tsx
@@ -15,14 +15,14 @@ import {
 } from '@helpwave/api-services/mutations/users/organization_mutations'
 import type { OrganizationMinimalDTO } from '@helpwave/api-services/types/users/organizations'
 import { useAuth } from '@helpwave/api-services/authentication/useAuth'
+import { DescriptionWithAction } from '@helpwave/common/components/DescriptionWithAction'
+import { usePropertyListQuery } from '@helpwave/api-services/mutations/properties/property_mutations'
 import { emptyOrganizationForm, OrganizationForm, type OrganizationFormType } from '../OrganizationForm'
 import { OrganizationMemberList } from '../OrganizationMemberList'
 import { ColumnTitle } from '../ColumnTitle'
 import { type OrganizationInvitation, OrganizationInvitationList } from '../OrganizationInvitationList'
 import { OrganizationContext } from '@/pages/organizations'
 import { ReSignInModal } from '@/components/modals/ReSignInModal'
-import { DescriptionWithAction } from '@helpwave/common/components/DescriptionWithAction'
-import { usePropertyListQuery } from '@/mutations/property_mutations'
 
 type OrganizationDetailTranslation = {
   organizationDetail: string,