Merge branch 'release-1.0.101'

Author: entrotech

client/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.100",
+  "version": "1.0.101",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,

client/package.json

@@ -11,6 +11,7 @@ import { useWidget } from "./appReducer";
 import useFeatureFlag from "./hooks/useFeatureFlag";
 import SurveySnackbar from "./components/UI/SurveySnackbar";
 import AnnouncementSnackbar from "components/UI/AnnouncementSnackbar";
+import ScrollToTop from "./components/ScrollToTop";
 
 const VerificationAdmin = lazy(() =>
   import("components/Admin/VerificationAdmin")
@@ -116,6 +117,16 @@ export default function AppRoutes() {
             />
             <Route path="resetPassword/:token" element={<ResetPassword />} />
 
+            <Route
+              path="organizationedit"
+              element={
+                <PrivateRoute
+                  roles={["isAdmin", "isDataEntry", "isCoordinator"]}
+                >
+                  <OrganizationEdit />
+                </PrivateRoute>
+              }
+            />
             <Route
               path="organizationedit/:id"
               element={
@@ -231,6 +242,7 @@ function AppWrapper() {
       wrap="nowrap"
       alignContent="stretch"
       spacing={0}
+      id="app-container"
       sx={{
         color: "black",
         backgroundColor: "#fff",
@@ -239,6 +251,7 @@ function AppWrapper() {
         overflowX: "hidden",
       }}
     >
+      <ScrollToTop />
       {isAlertLocation && <AnnouncementSnackbar />}
 
       {isWidget ? null : <Header />}

client/src/Routes.jsx

@@ -44,7 +44,9 @@ import {
   TENANT_ID,
 } from "../../helpers/Constants";
 import { useSuggestionByStakeholderId } from "hooks/useSuggestionByStakeholderId";
+import { useStakeholderLog } from "hooks/useStakeholderLog";
 import SuggestionHistory from "./OrganizationEdit/SuggestionHistory";
+import ChangeHistory from "./OrganizationEdit/ChangeHistory";
 
 const phoneRegExp = /^\(\d{3}\) \d{3}-\d{4}$/;
 
@@ -169,6 +171,7 @@ const emptyOrganization = {
   submittedUser: "",
   approvedDate: "",
   approvedUser: "",
+  neighborhoodName: "",
   selectedCategoryIds: [],
   hours: [],
   instagram: "",
@@ -226,11 +229,17 @@ const OrganizationEdit = (props) => {
   const { data: stakeholderSuggestions, refetch: refetchSuggestions } =
     useSuggestionByStakeholderId(editId);
 
+  const {
+    data: versionHistory,
+    loading: historyLoading,
+    error: historyError,
+  } = useStakeholderLog(editId);
+
   useEffect(() => {
     const fetchData = async () => {
       try {
         if (editId) {
-          const stakeholder = await stakeholderService.getById(editId);
+          const stakeholder = await stakeholderService.getById(editId);          
           // For editing purposes, it is better to convert the
           // stakeholder.categories array of objects to an array of
           // categoryIds as stakeholder.categoryIds
@@ -561,6 +570,9 @@ const OrganizationEdit = (props) => {
                       <Tab label="Donations" {...a11yProps(4)} />
                       <Tab label="Verification" {...a11yProps(5)} />
                       <Tab label="Suggestion History" {...a11yProps(6)} />
+                      {(user?.isAdmin || user?.isCoordinator) && (
+                        <Tab label="Change History" {...a11yProps(7)} />
+                      )}
                     </Tabs>
                   </AppBar>
                   <Identification
@@ -623,6 +635,14 @@ const OrganizationEdit = (props) => {
                     editedSuggestions={editedSuggestions}
                     onEdit={handleSuggestionEdit}
                   />
+                  {(user?.isAdmin || user?.isCoordinator) && (
+                    <ChangeHistory
+                      tabPage={tabPage}
+                      versions={versionHistory}
+                      loading={historyLoading}
+                      error={historyError}
+                    />
+                  )}
                 </Box>
                 <Stack direction="row">
                   <div style={{ flexBasis: "20%", flexGrow: 1 }}>