Decouple fhir envs (#1183)

* Enable fhir modules without needing corresponding old module envs

* Update docker documentation

* Team assignment mdoule env is not composite

* Update tests

* Move composite envs to settings.

Author: peterMuriuki

app/src/configs/__mocks__/settings.ts

@@ -0,0 +1,3 @@
+export const COMPOSITE_ENABLE_USER_MANAGEMENT = true;
+export const COMPOSITE_ENABLE_TEAM_MANAGEMENT = true;
+export const COMPOSITE_ENABLE_LOCATIONS_MANAGEMENT = true;

app/src/configs/settings.ts

@@ -8,6 +8,12 @@ import {
   OPENSRP_OAUTH_STATE,
   OPENSRP_USER_URL,
   OPENSRP_OAUTH_SCOPES,
+  ENABLE_USER_MANAGEMENT,
+  ENABLE_FHIR_USER_MANAGEMENT,
+  ENABLE_TEAMS,
+  ENABLE_FHIR_TEAMS,
+  ENABLE_FHIR_LOCATIONS,
+  ENABLE_LOCATIONS,
 } from './env';
 
 /** Authentication Configs */
@@ -25,3 +31,8 @@ if (ENABLE_OPENSRP_OAUTH) {
 }
 
 export { providers };
+
+export const COMPOSITE_ENABLE_USER_MANAGEMENT =
+  ENABLE_USER_MANAGEMENT || ENABLE_FHIR_USER_MANAGEMENT;
+export const COMPOSITE_ENABLE_TEAM_MANAGEMENT = ENABLE_TEAMS || ENABLE_FHIR_TEAMS;
+export const COMPOSITE_ENABLE_LOCATIONS_MANAGEMENT = ENABLE_LOCATIONS || ENABLE_FHIR_LOCATIONS;

app/src/containers/ConnectedSidebar/tests/index.test.tsx

@@ -9,7 +9,9 @@ import { act } from 'react-dom/test-utils';
 import { getActiveKey } from '../../../components/page/Sidebar/utils';
 import toJson from 'enzyme-to-json';
 import { Route } from '../../../routes';
+
 jest.mock('../../../configs/env');
+jest.mock('../../../configs/settings');
 
 describe('components/ConnectedSidebar', () => {
   it('renders the ConnectedSidebar component', () => {

app/src/containers/pages/Home/Home.tsx

@@ -1,22 +1,16 @@
-import * as React from 'react';
 import { Helmet } from 'react-helmet';
 import { Col, Row, Button } from 'antd';
 import { Link } from 'react-router-dom';
 import './Home.css';
 import { useTranslation } from '../../../mls';
+import { URL_USER, URL_LOCATION_UNIT, URL_TEAM_ASSIGNMENT, URL_TEAMS } from '../../../constants';
+import { ENABLE_TEAMS_ASSIGNMENT_MODULE } from '../../../configs/env';
+import React from 'react';
 import {
-  URL_USER,
-  URL_LOCATION_UNIT,
-  URL_LOCATION_UNIT_GROUP,
-  URL_TEAM_ASSIGNMENT,
-  URL_TEAMS,
-} from '../../../constants';
-import {
-  ENABLE_LOCATIONS,
-  ENABLE_TEAMS,
-  ENABLE_TEAMS_ASSIGNMENT_MODULE,
-  ENABLE_USER_MANAGEMENT,
-} from '../../../configs/env';
+  COMPOSITE_ENABLE_LOCATIONS_MANAGEMENT,
+  COMPOSITE_ENABLE_TEAM_MANAGEMENT,
+  COMPOSITE_ENABLE_USER_MANAGEMENT,
+} from '../../../configs/settings';
 
 export const Home = () => {
   const { t } = useTranslation();
@@ -32,7 +26,7 @@ export const Home = () => {
         </Col>
       </Row>
       <Row gutter={16} className="links-box">
-        {ENABLE_USER_MANAGEMENT && (
+        {COMPOSITE_ENABLE_USER_MANAGEMENT && (
           <Col className="gutter-row" span={12}>
             <Link to={URL_USER} className="admin-link">
               <Button color="outline" className="btn-links">
@@ -41,7 +35,7 @@ export const Home = () => {
             </Link>
           </Col>
         )}
-        {ENABLE_TEAMS && (
+        {COMPOSITE_ENABLE_TEAM_MANAGEMENT && (
           <Col className="gutter-row" span={12}>
             <Link to={URL_TEAMS} className="admin-link">
               <Button color="outline" className="btn-links">
@@ -52,7 +46,7 @@ export const Home = () => {
         )}
       </Row>
       <Row gutter={16} className="links-box">
-        {ENABLE_LOCATIONS && (
+        {COMPOSITE_ENABLE_LOCATIONS_MANAGEMENT && (
           <>
             <Col className="gutter-row" span={12}>
               <Link to={URL_LOCATION_UNIT} className="admin-link">
@@ -61,14 +55,6 @@ export const Home = () => {
                 </Button>
               </Link>
             </Col>
-
-            <Col className="gutter-row" span={12}>
-              <Link to={URL_LOCATION_UNIT_GROUP} className="admin-link">
-                <Button color="outline" className="btn-links">
-                  {t('Location Unit Group')}
-                </Button>
-              </Link>
-            </Col>
           </>
         )}
       </Row>

app/src/containers/pages/Home/tests/Home.test.tsx

@@ -1,4 +1,4 @@
-import { mount, shallow } from 'enzyme';
+import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { history } from '@onaio/connected-reducer-registry';
 import React from 'react';
@@ -15,12 +15,9 @@ import {
 } from '../../../../constants';
 
 jest.mock('../../../../configs/env');
+jest.mock('../../../../configs/settings');
 
 describe('containers/pages/Home', () => {
-  it('renders without crashing', () => {
-    shallow(<Home />);
-  });
-
   it('renders Home correctly & changes Title of page', () => {
     const wrapper = mount(
       <Router history={history}>
@@ -30,7 +27,9 @@ describe('containers/pages/Home', () => {
 
     const helmet = Helmet.peek();
     expect(helmet.title).toEqual('OpenSRP Web');
-    expect(toJson(wrapper.find('Home'))).toMatchSnapshot('Home page rendered');
+    wrapper.find('.admin-link').forEach((adminLink) => {
+      expect(toJson(adminLink)).toMatchSnapshot('links on home page');
+    });
     wrapper.unmount();
   });
 
@@ -62,7 +61,7 @@ describe('containers/pages/Home', () => {
     );
 
     expect(wrapper.find(`Link[to="${URL_LOCATION_UNIT}"]`)).toHaveLength(1);
-    expect(wrapper.find(`Link[to="${URL_LOCATION_UNIT_GROUP}"]`)).toHaveLength(1);
+    expect(wrapper.find(`Link[to="${URL_LOCATION_UNIT_GROUP}"]`)).toHaveLength(0);
   });
 
   it('displays links for teams module', () => {