diff --git a/app/src/App/fhir-apps.tsx b/app/src/App/fhir-apps.tsx
index e223b2085..bb0a7e893 100644
--- a/app/src/App/fhir-apps.tsx
+++ b/app/src/App/fhir-apps.tsx
@@ -126,7 +126,14 @@ import { CloseFlag, URL_CLOSE_FLAGS } from '@opensrp/fhir-flag';
import { useTranslation } from '../mls';
import '@opensrp/user-management/dist/index.css';
import { APP_LOGIN_URL } from '../configs/dispatchConfig';
-import { DATA_IMPORT_CREATE_URL, ImportDetailViewDetails, DATA_IMPORT_DETAIL_URL, DATA_IMPORT_LIST_URL, DataImportList, StartDataImport } from '@opensrp/fhir-import';
+import {
+ DATA_IMPORT_CREATE_URL,
+ ImportDetailViewDetails,
+ DATA_IMPORT_DETAIL_URL,
+ DATA_IMPORT_LIST_URL,
+ DataImportList,
+ StartDataImport,
+} from '@opensrp/fhir-import';
/** Util function that renders Oauth2 callback components
*
@@ -204,40 +211,40 @@ const FHIRApps = () => {
permissions={['iam_group.read']}
component={UserGroupsList}
/>
-
-
-
-
+
+
+
+
{
// check if we can first get a hit from keycloak default roles.
let asRole = parseKeycloakRoles(role);
+
if (asRole === undefined) {
asRole = parseFHirRoles(role);
}
@@ -88,11 +90,9 @@ export const adapter: RbacAdapter = (roles: KeycloakRoleData = defaultRoleData)
invalidRoleStrings.push(role);
}
});
-
if (invalidRoleStrings.length > 0) {
/* eslint-disable no-console */
console.warn(`Could not understand the following roles: ${invalidRoleStrings.join(', ')}`);
}
-
return UserRole.combineRoles(allRoles);
};
diff --git a/packages/rbac/src/constants.ts b/packages/rbac/src/constants.ts
index f9e4272cf..7381895fc 100644
--- a/packages/rbac/src/constants.ts
+++ b/packages/rbac/src/constants.ts
@@ -50,6 +50,7 @@ export type FhirResource = typeof FhirResources[number];
* FhirResources
*/
export const WebCustomResources = ['WebDataImport'] as const;
+
export type WebCustomResource = typeof WebCustomResources[number];
export const KeycloakDefinedResources = [...FhirResources, ...WebCustomResources] as const;