From 71dca4e652370c2eda7f403455a62026d1ab7028 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Mon, 4 Mar 2024 11:25:47 +0300
Subject: [PATCH] (chore) Loosen fhir2 dependency requirement

---
 package.json                                  |  2 +-
 .../src/root.component.tsx                    | 45 +++++++++----------
 packages/esm-system-admin-app/src/routes.json |  4 +-
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index c34a0ef..7313f20 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "ci:prepublish": "lerna publish from-package --no-git-reset --yes --dist-tag next",
     "release": "lerna version --no-git-tag-version",
     "verify": "turbo lint typescript test",
-    "prettier": "prettier --config prettier.config.js --write \"packages/**/*.{ts,tsx}\" \"e2e/**/*.ts\"",
+    "prettier": "prettier --config prettier.config.js --write \"packages/**/*.{ts,tsx}\" \"e2e/**/*.ts\" --list-different",
     "postinstall": "husky install",
     "test-e2e": "playwright test",
     "coverage": "yarn test --coverage",
diff --git a/packages/esm-admin-openconceptlab-app/src/root.component.tsx b/packages/esm-admin-openconceptlab-app/src/root.component.tsx
index 95fde8c..e977da2 100644
--- a/packages/esm-admin-openconceptlab-app/src/root.component.tsx
+++ b/packages/esm-admin-openconceptlab-app/src/root.component.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Tab, Tabs, TabList, TabPanels, TabPanel } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { SWRConfig } from 'swr';
 import Import from './import/import.component';
 import PreviousImports from './previous-imports/previous-imports.component';
 import Subscription from './subscription/subscription.component';
@@ -10,29 +9,27 @@ import styles from './root.scss';
 const Root: React.FC = () => {
   const { t } = useTranslation();
   return (
-    <SWRConfig>
-      <main className={`omrs-main-content ${styles.main}`}>
-        <h3 className={styles.moduleHeader}>{t('moduleTitle', 'OCL Subscription Module')}</h3>
-        <Tabs>
-          <TabList aria-label="OCL tabs" className={styles.tabList} contained={true}>
-            <Tab>{t('subscription', 'Subscription')} </Tab>
-            <Tab>{t('import', 'Import')} </Tab>
-            <Tab>{t('previousImports', 'Previous Imports')} </Tab>
-          </TabList>
-          <TabPanels>
-            <TabPanel className={styles.tabPanel}>
-              <Subscription />
-            </TabPanel>
-            <TabPanel className={styles.tabPanel}>
-              <Import />
-            </TabPanel>
-            <TabPanel className={styles.tabPanel}>
-              <PreviousImports />
-            </TabPanel>
-          </TabPanels>
-        </Tabs>
-      </main>
-    </SWRConfig>
+    <main className={`omrs-main-content ${styles.main}`}>
+      <h3 className={styles.moduleHeader}>{t('moduleTitle', 'OCL Subscription Module')}</h3>
+      <Tabs>
+        <TabList aria-label="OCL tabs" className={styles.tabList} contained={true}>
+          <Tab>{t('subscription', 'Subscription')} </Tab>
+          <Tab>{t('import', 'Import')} </Tab>
+          <Tab>{t('previousImports', 'Previous Imports')} </Tab>
+        </TabList>
+        <TabPanels>
+          <TabPanel className={styles.tabPanel}>
+            <Subscription />
+          </TabPanel>
+          <TabPanel className={styles.tabPanel}>
+            <Import />
+          </TabPanel>
+          <TabPanel className={styles.tabPanel}>
+            <PreviousImports />
+          </TabPanel>
+        </TabPanels>
+      </Tabs>
+    </main>
   );
 };
 
diff --git a/packages/esm-system-admin-app/src/routes.json b/packages/esm-system-admin-app/src/routes.json
index 7e07604..cbe588a 100644
--- a/packages/esm-system-admin-app/src/routes.json
+++ b/packages/esm-system-admin-app/src/routes.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "fhir2": "^1.2.0",
+    "fhir2": ">=1.2",
     "webservices.rest": "^2.2.0"
   },
   "extensions": [
@@ -23,4 +23,4 @@
       "route": "system-administration"
     }
   ]
-}
\ No newline at end of file
+}