Merge branch 'develop' into fix-ohcnetwork#7333

UdaySagar-Git · Apr 2, 2024 · dba25bc · dba25bc
2 parents 5136ea8 + 2b71cd3
commit dba25bc
Show file tree

Hide file tree

Showing 57 changed files with 418 additions and 246 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -85,7 +85,7 @@
     ],
     "tailwindcss/no-custom-classname": "off",
     "tailwindcss/migration-from-tailwind-2": "error",
-    "tailwindcss/classnames-order": "error",
+    "tailwindcss/classnames-order": "off",
     "tailwindcss/enforces-shorthand": "off",
     "tailwindcss/no-contradicting-classname": "error"
   },

diff --git a/.prettierrc.json b/.prettierrc.json
@@ -5,5 +5,10 @@
   "semi": true,
   "jsxSingleQuote": false,
   "arrowParens": "always",
-  "tailwindFunctions": ["classNames"]
-}
+  "tailwindFunctions": [
+    "classNames"
+  ],
+  "plugins": [
+    "prettier-plugin-tailwindcss"
+  ]
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -113,6 +113,7 @@
     "@tailwindcss/typography": "^0.5.9",
     "@types/cypress": "^1.1.3",
     "@types/echarts": "^4.9.18",
+    "@types/google.maps": "^3.55.5",
     "@types/lodash-es": "^4.17.9",
     "@types/qrcode.react": "^1.0.2",
     "@types/react": "18.2.14",
@@ -158,6 +159,7 @@
     "tailwindcss": "^3.3.3",
     "typescript": "^5.1.6",
     "vite": "^5.1.3",
+    "vite-plugin-checker": "^0.6.4",
     "vite-plugin-pwa": "^0.18.2"
   },
   "browserslist": {

diff --git a/plugins/treeShakeCareIcons.mts → plugins/treeShakeCareIcons.ts b/plugins/treeShakeCareIcons.mts → plugins/treeShakeCareIcons.ts
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
@@ -316,7 +316,7 @@ export const DISCHARGE_REASONS = [
   { id: 2, text: "Referred" },
   { id: 3, text: "Expired" },
   { id: 4, text: "LAMA" },
-];
+] as const;
 
 export const CONSCIOUSNESS_LEVEL = [
   { id: "UNRESPONSIVE", text: "Unresponsive" },

diff --git a/src/Common/utils.tsx b/src/Common/utils.tsx
@@ -31,7 +31,7 @@ export const useAbortableEffect = (
 };
 
 export const parseOptionId: (
-  options: OptionsType[],
+  options: readonly OptionsType[],
   id: string | string[]
 ) => string = (options, id) => {
   const textArray = options

diff --git a/src/Components/Assets/AssetConfigure.tsx b/src/Components/Assets/AssetConfigure.tsx
@@ -26,7 +26,7 @@ const AssetConfigure = ({ assetId, facilityId }: AssetConfigureProps) => {
       <Page
         title={`Configure HL7 Monitor: ${asset.name}`}
         crumbsReplacements={{
-          [facilityId]: { name: asset.location_object.facility.name },
+          [facilityId]: { name: asset.location_object.facility?.name },
           assets: { uri: `/assets?facility=${facilityId}` },
           [assetId]: { name: asset?.name },
         }}
@@ -42,7 +42,7 @@ const AssetConfigure = ({ assetId, facilityId }: AssetConfigureProps) => {
       <Page
         title={`Configure Ventilator: ${asset?.name}`}
         crumbsReplacements={{
-          [facilityId]: { name: asset?.location_object.facility.name },
+          [facilityId]: { name: asset?.location_object.facility?.name },
           assets: { uri: `/assets?facility=${facilityId}` },
           [assetId]: { name: asset?.name },
         }}
@@ -57,7 +57,7 @@ const AssetConfigure = ({ assetId, facilityId }: AssetConfigureProps) => {
     <Page
       title={`Configure ONVIF Camera: ${asset?.name}`}
       crumbsReplacements={{
-        [facilityId]: { name: asset?.location_object.facility.name },
+        [facilityId]: { name: asset?.location_object.facility?.name },
         assets: { uri: `/assets?facility=${facilityId}` },
         [assetId]: { name: asset?.name },
       }}

diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
@@ -318,7 +318,7 @@ const AssetManage = (props: AssetManageProps) => {
     <Page
       title="Asset Details"
       crumbsReplacements={{
-        [facilityId]: { name: asset?.location_object.facility.name },
+        [facilityId]: { name: asset?.location_object.facility?.name },
         assets: { uri: `/assets?facility=${facilityId}` },
         [assetId]: {
           name: asset?.name,
@@ -404,7 +404,7 @@ const AssetManage = (props: AssetManageProps) => {
             <div className="flex flex-col gap-6">
               {[
                 {
-                  label: asset?.location_object.facility.name,
+                  label: asset?.location_object.facility?.name,
                   icon: "l-location-pin-alt",
                   content: asset?.location_object.name,
                 },
@@ -426,7 +426,7 @@ const AssetManage = (props: AssetManageProps) => {
                 className="flex gap-2"
                 onClick={() =>
                   navigate(
-                    `/facility/${asset?.location_object.facility.id}/assets/${asset?.id}/update`
+                    `/facility/${asset?.location_object.facility?.id}/assets/${asset?.id}/update`
                   )
                 }
                 id="update-asset"
@@ -444,7 +444,7 @@ const AssetManage = (props: AssetManageProps) => {
                   <ButtonV2
                     onClick={() =>
                       navigate(
-                        `/facility/${asset?.location_object.facility.id}/assets/${asset?.id}/configure`
+                        `/facility/${asset?.location_object.facility?.id}/assets/${asset?.id}/configure`
                       )
                     }
                     id="configure-asset"

diff --git a/src/Components/Assets/AssetWarrantyCard.tsx b/src/Components/Assets/AssetWarrantyCard.tsx
@@ -62,7 +62,7 @@ export default function AssetWarrantyCard(props: { asset: AssetData }) {
             </div>
           ))}
         </div>
-        <div className="mb-2 hidden h-[1px] w-full bg-white/40 xl:block" />
+        <div className="mb-2 hidden h-px w-full bg-white/40 xl:block" />
         <div className="shrink-0">
           <div>
             <div className="mb-1 text-xs uppercase italic tracking-widest text-gray-200">

diff --git a/src/Components/Assets/AssetsList.tsx b/src/Components/Assets/AssetsList.tsx
@@ -130,7 +130,7 @@ const AssetsList = () => {
     try {
       if (assetData) {
         navigate(
-          `/facility/${assetData.location_object.facility.id}/assets/${assetId}`
+          `/facility/${assetData.location_object.facility?.id}/assets/${assetId}`
         );
       }
     } catch (err) {
@@ -188,7 +188,7 @@ const AssetsList = () => {
         {assets.map((asset: AssetData) => (
           <Link
             key={asset.id}
-            href={`/facility/${asset?.location_object.facility.id}/assets/${asset.id}`}
+            href={`/facility/${asset?.location_object.facility?.id}/assets/${asset.id}`}
             className="h-full text-inherit"
             data-testid="created-asset-list"
           >