Add Location unit

.gitignore

@@ -20,6 +20,7 @@ build
 .env.test.local
 .env.production.local
 
+debug.log*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

client/package.json

@@ -19,13 +19,14 @@
     "@onaio/utils": "^0.0.1",
     "@opensrp/error-boundary-fallback": "file:../packages/error-boundary-fallback",
     "@opensrp/keycloak-service": "^0.0.8",
-    "@opensrp/notifications": "^0.0.1",
+    "@opensrp/location-management": "^0.0.7",
+    "@opensrp/notifications": "^0.0.2",
     "@opensrp/product-catalogue": "^0.0.2",
     "@opensrp/plans": "0.0.2",
     "@opensrp/react-utils": "^0.0.1",
     "@opensrp/reducer-factory": "^0.0.11",
     "@opensrp/server-logout": "^0.0.1",
-    "@opensrp/server-service": "^0.0.11",
+    "@opensrp/server-service": "^0.0.12",
     "@opensrp/store": "^0.0.7",
     "@opensrp/user-management": "^0.1.9",
     "@opensrp/form-config": "^0.0.6",
@@ -44,6 +45,7 @@
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "seamless-immutable": "^7.1.4",
+    "tree-model": "^1.0.7",
     "yup": "^0.29.3"
   },
   "scripts": {
@@ -121,4 +123,4 @@
   "resolutions": {
     "react-scripts/jest": "25.3.0"
   }
-}
+}

client/src/App/App.tsx

@@ -26,7 +26,13 @@ import {
   BACKEND_CALLBACK_PATH,
   URL_REACT_LOGIN,
   URL_LOGOUT,
+  URL_LOCATION_UNIT,
   URL_HOME,
+  URL_LOCATION_UNIT_ADD,
+  URL_LOCATION_UNIT_GROUP,
+  URL_LOCATION_UNIT_GROUP_ADD,
+  URL_LOCATION_UNIT_GROUP_EDIT,
+  URL_LOCATION_UNIT_EDIT,
   URL_UPLOAD_JSON_VALIDATOR,
   URL_JSON_VALIDATOR_LIST,
   URL_UPLOAD_DRAFT_FILE,
@@ -79,6 +85,12 @@ import {
 import ConnectedHomeComponent from '../containers/pages/Home/Home';
 import './App.css';
 import ConnectedSidebar from '../containers/ConnectedSidebar';
+import {
+  LocationUnitAddEdit,
+  LocationUnitView,
+  LocationUnitGroupAddEdit,
+  LocationUnitGroupView,
+} from '@opensrp/location-management';
 import '@opensrp/product-catalogue/dist/index.css';
 import {
   productCatalogueProps,
@@ -363,6 +375,48 @@ const App: React.FC = () => {
               component={AntdFilesList.FileList}
               {...releaseViewProps}
             />
+            <PrivateComponent
+              redirectPath={APP_CALLBACK_URL}
+              disableLoginProtection={DISABLE_LOGIN_PROTECTION}
+              exact
+              path={URL_LOCATION_UNIT}
+              component={LocationUnitView}
+            />
+            <PrivateComponent
+              redirectPath={APP_CALLBACK_URL}
+              disableLoginProtection={DISABLE_LOGIN_PROTECTION}
+              exact
+              path={URL_LOCATION_UNIT_ADD}
+              component={LocationUnitAddEdit}
+            />
+            <PrivateComponent
+              redirectPath={APP_CALLBACK_URL}
+              disableLoginProtection={DISABLE_LOGIN_PROTECTION}
+              exact
+              path={URL_LOCATION_UNIT_EDIT}
+              component={LocationUnitAddEdit}
+            />
+            <PrivateComponent
+              redirectPath={APP_CALLBACK_URL}
+              disableLoginProtection={DISABLE_LOGIN_PROTECTION}
+              exact
+              path={URL_LOCATION_UNIT_GROUP}
+              component={LocationUnitGroupView}
+            />
+            <PrivateComponent
+              redirectPath={APP_CALLBACK_URL}
+              disableLoginProtection={DISABLE_LOGIN_PROTECTION}
+              exact
+              path={URL_LOCATION_UNIT_GROUP_ADD}
+              component={LocationUnitGroupAddEdit}
+            />
+            <PrivateComponent
+              redirectPath={APP_CALLBACK_URL}
+              disableLoginProtection={DISABLE_LOGIN_PROTECTION}
+              exact
+              path={URL_LOCATION_UNIT_GROUP_EDIT}
+              component={LocationUnitGroupAddEdit}
+            />
             <Route
               exact
               path={APP_LOGIN_URL}

client/src/components/page/Sidebar/index.tsx

@@ -10,12 +10,13 @@ import { Link } from 'react-router-dom';
 import {
   LOCATIONS_UNIT,
   LOCATIONS_UNIT_GROUP,
-  LOCATIONS_UNIT_GROUP_SET,
   PRODUCT_CATALOGUE,
   TEAMS,
   URL_ADMIN,
   URL_HOME,
+  URL_LOCATION_UNIT_GROUP,
   URL_TEAMS,
+  URL_LOCATION_UNIT,
   USER_MANAGEMENT,
   URL_JSON_VALIDATOR_LIST,
   URL_DRAFT_FILE_LIST,
@@ -24,7 +25,6 @@ import {
   MANIFEST_RELEASES,
   DRAFT_FILES,
   JSON_VALIDATORS,
-  LOCATIONS,
   USERS,
   ADMIN,
   ACTIVE,
@@ -37,6 +37,7 @@ import { CATALOGUE_LIST_VIEW_URL } from '@opensrp/product-catalogue';
 import {
   ENABLE_FORM_CONFIGURATION,
   ENABLE_PLANS,
+  ENABLE_LOCATIONS,
   ENABLE_PRODUCT_CATALOGUE,
 } from '../../../configs/env';
 import {
@@ -117,11 +118,20 @@ export const SidebarComponent: React.FC<SidebarProps> = (props: SidebarProps) =>
               </Link>
             </Menu.Item>
           )}
-          <Menu.SubMenu key="admin-locations" title={LOCATIONS}>
-            <Menu.Item key="locations-unit">{LOCATIONS_UNIT}</Menu.Item>
-            <Menu.Item key="locations-unit-group">{LOCATIONS_UNIT_GROUP}</Menu.Item>
-            <Menu.Item key="locations-unit-group-set">{LOCATIONS_UNIT_GROUP_SET}</Menu.Item>
-          </Menu.SubMenu>
+          {ENABLE_LOCATIONS && (
+            <Menu.SubMenu key="admin-locations" title="Locations">
+              <Menu.Item key="locations-unit">
+                <Link to={URL_LOCATION_UNIT} className="admin-link">
+                  {LOCATIONS_UNIT}
+                </Link>
+              </Menu.Item>
+              <Menu.Item key="locations-unit-group">
+                <Link to={URL_LOCATION_UNIT_GROUP} className="admin-link">
+                  {LOCATIONS_UNIT_GROUP}
+                </Link>
+              </Menu.Item>
+            </Menu.SubMenu>
+          )}
           {ENABLE_FORM_CONFIGURATION && (
             <Menu.SubMenu key="admin-form-config" title={FORM_CONFIGURATIONS}>
               <Menu.Item key="admin-form-config-releases">

client/src/configs/env.ts

@@ -61,6 +61,9 @@ export const ENABLE_PRODUCT_CATALOGUE = process.env.REACT_APP_ENABLE_PRODUCT_CAT
 /** Activate the plans menu */
 export const ENABLE_PLANS = process.env.REACT_APP_ENABLE_PLANS === 'true';
 
+/** Activate the plans menu */
+export const ENABLE_LOCATIONS = process.env.REACT_APP_ENABLE_LOCATIONS === 'true';
+
 export const DATE_FORMAT = process.env.REACT_APP_DATE_FORMAT || 'yyyy-MM-DD';
 
 export const DEFAULT_TIME = process.env.REACT_APP_DEFAULT_TIME || 'T00:00:00+00:00';

client/src/constants.tsx

@@ -6,8 +6,8 @@ export const USER_MANAGEMENT = 'User Management';
 export const TEAMS = 'Teams';
 export const LOCATIONS_UNIT = 'Locations unit';
 export const LOCATIONS_UNIT_GROUP = 'Locations unit group';
-export const LOCATIONS_UNIT_GROUP_SET = 'Locations unit group set';
 export const PRODUCT_CATALOGUE = 'Product Catalogue';
+export const ERROR_OCCURRED = 'An error occurred';
 export const MANIFEST_RELEASES = 'Manifest Releases';
 export const DRAFT_FILES = 'Draft Files';
 export const JSON_VALIDATORS = 'JSON Validators';
@@ -32,10 +32,14 @@ export const URL_USER_EDIT = '/user/edit';
 export const URL_TEAMS = '/teams';
 export const URL_BACKEND_LOGIN = '/fe/login';
 export const URL_BACKEND_CALLBACK = '/fe/oauth/callback/opensrp';
+export const URL_LOCATION_UNIT = '/location/unit';
+export const URL_LOCATION_UNIT_ADD = '/location/unit/add';
+export const URL_LOCATION_UNIT_EDIT = '/location/unit/edit/:id';
+export const URL_LOCATION_UNIT_GROUP = '/location/group';
+export const URL_LOCATION_UNIT_GROUP_ADD = '/location/group/add';
+export const URL_LOCATION_UNIT_GROUP_EDIT = '/location/group/edit/:id';
 export const URL_UPLOAD_JSON_VALIDATOR = '/json-validators/upload';
 export const URL_JSON_VALIDATOR_LIST = '/json-validators';
 export const URL_DRAFT_FILE_LIST = '/drafts';
 export const URL_UPLOAD_DRAFT_FILE = '/drafts/upload';
 export const URL_MANIFEST_RELEASE_LIST = '/releases';
-
-export const ERROR_OCCURRED = 'An error occurred';