#1147 - show organisation category in listing and in home page title

avniproject · May 3, 2024 · 6fa2833 · 6fa2833
1 parent 980aa17
commit 6fa2833
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/src/adminApp/Organisation.js b/src/adminApp/Organisation.js
@@ -52,6 +52,7 @@ export const OrganisationList = ({ history, ...props }) => {
     <List {...props} bulkActions={false} filter={{ searchURI: "find" }} filters={<OrganisationFilter />}>
       <Datagrid>
         <TextField source="name" label="Name" />
+        <TextField source="category" label="Category" />
         <ReferenceField label="Parent organisation" source="parentOrganisationId" reference="organisation" linkType="show" allowEmpty>
           <TextField source="name" />
         </ReferenceField>

diff --git a/src/rootApp/ducks.js b/src/rootApp/ducks.js
@@ -110,7 +110,8 @@ export default function(state = initialState, action) {
         organisation: {
           id: action.payload.organisationId,
           name: action.payload.organisationName,
-          usernameSuffix: action.payload.usernameSuffix
+          usernameSuffix: action.payload.usernameSuffix,
+          organisationCategory: action.payload.organisationCategory
         },
         userInfo: action.payload
       };

diff --git a/src/rootApp/views/Homepage.js b/src/rootApp/views/Homepage.js
@@ -20,17 +20,14 @@ import {
   Help
 } from "@material-ui/icons";
 
-const Homepage = ({ userInfo }) => {
+const Homepage = ({ userInfo, organisation }) => {
   httpClient.saveAuthTokenForAnalyticsApp();
 
   const showAnalytics = UserInfo.hasPrivilege(userInfo, Privilege.PrivilegeType.Analytics);
-  const showDataEntryApp = UserInfo.hasPrivilege(
-    userInfo,
-    Privilege.PrivilegeType.ViewEditEntitiesOnDataEntryApp
-  );
+  const showDataEntryApp = UserInfo.hasPrivilege(userInfo, Privilege.PrivilegeType.ViewEditEntitiesOnDataEntryApp);
 
   return (
-    <ScreenWithAppBar appbarTitle={"Avni Web Console"}>
+    <ScreenWithAppBar appbarTitle={`Avni Web Console - ${organisation.organisationCategory}`}>
       <Grid container justifyContent="center">
         <HomePageCard
           href={"/#/admin/user"}
@@ -62,11 +59,7 @@ const Homepage = ({ userInfo }) => {
           name={"Translations"}
           customIconComponent={<Translate color="primary" style={{ fontSize: 100 }} />}
         />
-        <HomePageCard
-          href={"/#/export"}
-          name={"Reports"}
-          customIconComponent={<Assessment color="primary" style={{ fontSize: 100 }} />}
-        />
+        <HomePageCard href={"/#/export"} name={"Reports"} customIconComponent={<Assessment color="primary" style={{ fontSize: 100 }} />} />
         {showDataEntryApp && (
           <HomePageCard
             href={"/#/app"}
@@ -76,11 +69,7 @@ const Homepage = ({ userInfo }) => {
         )}
         {showAnalytics && (
           <HomePageCard
-            href={
-              ApplicationContext.isDevEnv()
-                ? `http://localhost:3000/avni-media?authToken=${httpClient.getAuthToken()}`
-                : "/avni-media"
-            }
+            href={ApplicationContext.isDevEnv() ? `http://localhost:3000/avni-media?authToken=${httpClient.getAuthToken()}` : "/avni-media"}
             name={"Media Viewer "}
             customIconComponent={<Collections color="primary" style={{ fontSize: 100 }} />}
           />
@@ -96,6 +85,7 @@ const Homepage = ({ userInfo }) => {
 };
 
 const mapStateToProps = state => ({
-  userInfo: state.app.userInfo
+  userInfo: state.app.userInfo,
+  organisation: state.app.organisation
 });
 export default connect(mapStateToProps)(Homepage);