From b8a33c991d35244f0fa21fc2ca317a6a21481a7b Mon Sep 17 00:00:00 2001
From: himeshr <himeshl@samanvayfoundation.org>
Date: Tue, 28 Jan 2025 13:09:38 +0530
Subject: [PATCH 1/3] #1414 | Hide Self-service Reports

---
 src/reports/Common.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/reports/Common.js b/src/reports/Common.js
index e12ef9f1e..674a079b6 100644
--- a/src/reports/Common.js
+++ b/src/reports/Common.js
@@ -1,9 +1,8 @@
 import PlayForWorkIcon from "@material-ui/icons/PlayForWork";
-import ExploreIcon from "@material-ui/icons/Explore";
 
 export const reportSideBarOptions = [
   { href: "#/export", name: "Longitudinal Export", Icon: PlayForWorkIcon },
-  { href: "#/newExport", name: "New Longitudinal Export", Icon: PlayForWorkIcon },
+  { href: "#/newExport", name: "New Longitudinal Export", Icon: PlayForWorkIcon }
   // { href: "#/cannedreports", name: "Canned Reports", Icon: AssessmentIcon },
-  { href: "#/selfservicereports", name: "Self-service Reports", Icon: ExploreIcon }
+  // { href: "#/selfservicereports", name: "Self-service Reports", Icon: ExploreIcon }
 ];

From e989e36c062ef91ba0eb17a229c5bb050ddf98cb Mon Sep 17 00:00:00 2001
From: himeshr <himeshl@samanvayfoundation.org>
Date: Thu, 30 Jan 2025 18:55:09 +0530
Subject: [PATCH 2/3] avniproject/avni-server#849 | Pass organisationId during
 user create/edit

---
 src/adminApp/user.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/adminApp/user.js b/src/adminApp/user.js
index 725c9312e..6aa43de7b 100644
--- a/src/adminApp/user.js
+++ b/src/adminApp/user.js
@@ -490,6 +490,7 @@ const UserForm = ({ edit, nameSuffix, organisation, ...props }) => {
       <AvniTextInput source="name" label="Name of the Person" validate={validateDisplayName} toolTipKey={"ADMIN_USER_NAME"} />
       <AvniTextInput source="email" label="Email Address" validate={validateEmail} toolTipKey={"ADMIN_USER_EMAIL"} multiline />
       <AvniTextInput source="phoneNumber" validate={getPhoneValidator(organisation.region)} toolTipKey={"ADMIN_USER_PHONE_NUMBER"} />
+      <DisabledInput source="organisationId" label="Organisation ID" defaultValue={organisation.id} />
       <LineBreak />
       <FormDataConsumer>
         {({ formData, dispatch, ...rest }) => (

From 84425e7eccda06b1cea2f387145990dc11dcfa75 Mon Sep 17 00:00:00 2001
From: himeshr <himeshl@samanvayfoundation.org>
Date: Thu, 30 Jan 2025 18:56:48 +0530
Subject: [PATCH 3/3] Revert "avniproject/avni-server#849 | Pass organisationId
 during user create/edit"

This reverts commit e989e36c062ef91ba0eb17a229c5bb050ddf98cb.
---
 src/adminApp/user.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/adminApp/user.js b/src/adminApp/user.js
index 6aa43de7b..725c9312e 100644
--- a/src/adminApp/user.js
+++ b/src/adminApp/user.js
@@ -490,7 +490,6 @@ const UserForm = ({ edit, nameSuffix, organisation, ...props }) => {
       <AvniTextInput source="name" label="Name of the Person" validate={validateDisplayName} toolTipKey={"ADMIN_USER_NAME"} />
       <AvniTextInput source="email" label="Email Address" validate={validateEmail} toolTipKey={"ADMIN_USER_EMAIL"} multiline />
       <AvniTextInput source="phoneNumber" validate={getPhoneValidator(organisation.region)} toolTipKey={"ADMIN_USER_PHONE_NUMBER"} />
-      <DisabledInput source="organisationId" label="Organisation ID" defaultValue={organisation.id} />
       <LineBreak />
       <FormDataConsumer>
         {({ formData, dispatch, ...rest }) => (