#1506 | Bug Fixes

Delete logs.txt

Author: ombhardwajj

.circleci/config.yml

@@ -100,7 +100,7 @@ commands:
 jobs:
   app_test:
     docker:
-      - image: cimg/node:20.2.0
+      - image: cimg/node:24.4.1
 
     working_directory: ~/openchs-webapp
 
@@ -113,7 +113,7 @@ jobs:
 
   app_build:
     docker:
-      - image: cimg/node:20.2.0
+      - image: cimg/node:24.4.1
     resource_class: large
 
     working_directory: ~/openchs-webapp
@@ -123,7 +123,9 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn run build
+      - run:
+          name: Build
+          command: NODE_OPTIONS=--max_old_space_size=4096 yarn run build
 
       - run: cd build; zip -r ../openchs-webapp.zip *
 
@@ -234,7 +236,7 @@ jobs:
 
   PERF_deploy:
     docker:
-      - image: cimg/node:20.2.0
+      - image: cimg/node:24.4.1
     working_directory: ~/
     steps:
       - aws-cli/setup:

.nvmrc

@@ -1 +1 @@
-v24
+v24.4.1

logs.txt

@@ -60,7 +60,7 @@
     "react-markdown": "^10.1.0",
     "react-redux": "^7.2.1",
     "react-router-dom": "^7.7.0",
-    "react-select": "^3.0.8",
+    "react-select": "^5.10.2",
     "react-show-more-text": "^1.5.2",
     "react-simple-code-editor": "^0.14.1",
     "react-tagsinput": "^3.19.0",
@@ -81,11 +81,11 @@
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start": "BACKEND_URL=http://localhost:8021 vite",
-    "start-with-staging": "BACKEND_URL=https://staging.avniproject.org vite",
-    "start-with-prerelease": "BACKEND_URL=https://prerelease.avniproject.org vite",
-    "start-with-prod": "BACKEND_URL=https://app.avniproject.org vite",
-    "start-with-rwb-prod": "BACKEND_URL=https://app.rwb.avniproject.org vite",
+    "start": "NODE_OPTIONS=--max_old_space_size=4096 BACKEND_URL=http://localhost:8021 vite",
+    "start-with-staging": "NODE_OPTIONS=--max_old_space_size=4096 BACKEND_URL=https://staging.avniproject.org vite",
+    "start-with-prerelease": "NODE_OPTIONS=--max_old_space_size=4096 BACKEND_URL=https://prerelease.avniproject.org vite",
+    "start-with-prod": "NODE_OPTIONS=--max_old_space_size=4096 BACKEND_URL=https://app.avniproject.org vite",
+    "start-with-rwb-prod": "NODE_OPTIONS=--max_old_space_size=4096 BACKEND_URL=https://app.rwb.avniproject.org vite",
     "build": "vite build",
     "test": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' jest",
     "test:watch": "NODE_OPTIONS='--experimental-vm-modules' jest --watch ",

package.json

@@ -17,7 +17,8 @@ import {
   TextField,
   TextInput,
   required,
-  useRecordContext
+  useRecordContext,
+  useResourceContext
 } from "react-admin";
 import { useFormContext, useWatch } from "react-hook-form";
 import CardActions from "@mui/material/CardActions";
@@ -49,7 +50,9 @@ export const AccountOrgAdminUserEdit = ({ user, region, ...props }) => (
     mutationMode="pessimistic"
     filter={{ searchURI: "orgAdmin" }}
   >
-    <UserForm edit user={user} region={region} />
+    <SimpleForm toolbar={<CustomToolbar />} redirect="list">
+      <UserFormFields edit user={user} region={region} />
+    </SimpleForm>
   </Edit>
 );
 
@@ -82,12 +85,14 @@ export const AccountOrgAdminUserList = props => (
 
 const CustomShowActions = () => {
   const record = useRecordContext();
+  const resource = useResourceContext();
   return record ? (
     <CardActions style={{ zIndex: 2, display: "inline-block", float: "right" }}>
       <EditButton label="Edit User" />
       <EnableDisableButton
         disabled={record.disabledInCognito}
         record={record}
+        resource={resource}
       />
     </CardActions>
   ) : null;
@@ -115,18 +120,29 @@ export const AccountOrgAdminUserDetail = ({ user, ...props }) => (
         source="accountIds"
       >
         <SingleFieldList>
-          <TitleChip source="name" />
+          <TitleChip />
         </SingleFieldList>
       </ReferenceArrayField>
     </SimpleShowLayout>
   </Show>
 );
 
 const UserForm = ({ edit = false, region }) => {
+  return (
+    <SimpleForm toolbar={<CustomToolbar />} redirect="list">
+      <UserFormFields edit={edit} region={region} />
+    </SimpleForm>
+  );
+};
+
+const UserFormFields = ({ edit = false, region }) => {
   const [nameSuffix, setNameSuffix] = useState("");
-  const { control, setValue } = useFormContext();
+
+  const formContext = useFormContext();
+
+  const { control, setValue } = formContext;
   const organisationId = useWatch({ control, name: "organisationId" });
-  const ignored = useWatch({ control, name: "ignored" });
+  const username = useWatch({ control, name: "username" });
 
   const autoComplete = ApplicationContext.isDevEnv() ? "on" : "off";
 
@@ -139,13 +155,13 @@ const UserForm = ({ edit = false, region }) => {
   }, [organisationId]);
 
   useEffect(() => {
-    if (ignored && nameSuffix) {
-      setValue("username", `${ignored}@${nameSuffix}`);
+    if (username && nameSuffix && setValue) {
+      setValue("username", `${username}@${nameSuffix}`);
     }
-  }, [ignored, nameSuffix, setValue]);
+  }, [username, nameSuffix, setValue]);
 
   return (
-    <SimpleForm toolbar={<CustomToolbar />} redirect="list">
+    <>
       <ReferenceArrayInput
         reference="account"
         source="accountIds"
@@ -158,19 +174,24 @@ const UserForm = ({ edit = false, region }) => {
       </ReferenceArrayInput>
 
       {edit ? (
-        <TextInput
-          disabled
-          source="username"
-          label="Login ID (admin username)"
-        />
+        <>
+          <TextInput
+            disabled
+            source="username"
+            label="Login ID (admin username)"
+          />
+          {/* Hidden field to ensure username is included in payload */}
+          <TextInput source="username" style={{ display: "none" }} />
+        </>
       ) : (
         <>
           <TextInput
-            source="ignored"
+            source="username"
             validate={isRequired}
             label="Login ID (username)"
           />
           {nameSuffix && <span>@{nameSuffix}</span>}
+          <TextInput source="username" style={{ display: "none" }} />
         </>
       )}
 
@@ -192,6 +213,6 @@ const UserForm = ({ edit = false, region }) => {
         validate={getPhoneValidator(region)}
         autoComplete={autoComplete}
       />
-    </SimpleForm>
+    </>
   );
 };

src/adminApp/AccountOrgAdminUser.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useReducer, useState } from "react";
-import { Navigate } from "react-router-dom";
+import { Navigate, useParams } from "react-router-dom";
 import Box from "@mui/material/Box";
 import { Title } from "react-admin";
 import Button from "@mui/material/Button";
@@ -14,7 +14,8 @@ import ApplicationMenuService from "../service/ApplicationMenuService";
 import _ from "lodash";
 import FormLabel from "@mui/material/FormLabel";
 
-const ApplicationMenuEdit = props => {
+const ApplicationMenuEdit = () => {
+  const { id } = useParams();
   const [state, dispatch] = useReducer(
     ApplicationMenuReducer.execute,
     ApplicationMenuReducer.createApplicationMenuInitialState()
@@ -23,12 +24,12 @@ const ApplicationMenuEdit = props => {
   const [deleteAlert, setDeleteAlert] = useState(false);
 
   function isCreate() {
-    return _.isEmpty(props.match.params.id);
+    return _.isEmpty(id);
   }
 
   useEffect(() => {
     if (!isCreate())
-      ApplicationMenuService.getMenuItem(props.match.params.id).then(menuItem =>
+      ApplicationMenuService.getMenuItem(id).then(menuItem =>
         dispatch({
           type: ApplicationMenuReducer.INITIAL_MENU_ITEM,
           payload: menuItem
@@ -121,7 +122,7 @@ const ApplicationMenuEdit = props => {
             <SaveComponent
               name="save"
               onSubmit={onSubmit}
-              styleClass={{ marginLeft: "14px" }}
+              styles={{ marginLeft: "14px" }}
             />
           </Grid>
           {!isCreate() && (
@@ -138,7 +139,7 @@ const ApplicationMenuEdit = props => {
                 onClick={() =>
                   EntityEditUtil.onDelete(
                     "menuItem",
-                    props.match.params.id,
+                    id,
                     "application menu",
                     () => setDeleteAlert(true)
                   )
@@ -155,7 +156,7 @@ const ApplicationMenuEdit = props => {
           to={
             isCreate()
               ? "/appDesigner/applicationMenu"
-              : `/appDesigner/applicationMenu/${props.match.params.id}/show`
+              : `/appDesigner/applicationMenu/${id}/show`
           }
         />
       )}

src/adminApp/ApplicationMenu/ApplicationMenuEdit.jsx

@@ -58,15 +58,13 @@ const ApplicationMenuList = () => {
   );
 
   const fetchData = useMemo(
-    () => ({ page, pageSize }) =>
+    () => () =>
       new Promise(resolve =>
         ApplicationMenuService.getMenuList().then(response => {
-          const data = response.content || [];
-          const start = page * pageSize;
-          const paginatedData = data.slice(start, start + pageSize);
           resolve({
-            data: paginatedData,
-            totalCount: data.length
+            data: response.data,
+            page: response.page,
+            totalCount: response.totalCount
           });
         })
       ),

src/adminApp/ApplicationMenu/ApplicationMenuList.jsx

@@ -175,7 +175,6 @@ const CustomFilters = ({ organisation, filename }) => {
           filterType,
           selectedFilter: row.original,
           settings,
-          omitTableData,
           operationalModules,
           title,
           worklistUpdationRule,
@@ -286,7 +285,6 @@ const CustomFilters = ({ organisation, filename }) => {
                     filterType: typeOfFilter,
                     selectedFilter: null,
                     settings,
-                    omitTableData,
                     operationalModules,
                     title: `Add ${_.startCase(typeOfFilter)}`,
                     worklistUpdationRule,

src/adminApp/CustomFilters.jsx

@@ -5,7 +5,6 @@ import { useSelector, useDispatch } from "react-redux";
 
 import { authProvider, dataProvider, LogoutButton } from "./react-admin-config";
 import { WithProps } from "../common/components/utils";
-import customRoutes from "./customRoutes";
 import AdminLayout from "../common/components/AdminLayout";
 import { getAdminOrgs } from "../rootApp/ducks";
 
@@ -38,7 +37,6 @@ const DeploymentManager = () => {
   const dispatch = useDispatch();
   const user = useSelector(state => state.app.authSession);
   const userInfo = useSelector(state => state.app.userInfo);
-  const organisations = useSelector(state => state.app.organisations);
 
   useEffect(() => {
     dispatch(getAdminOrgs());
@@ -49,7 +47,6 @@ const DeploymentManager = () => {
       authProvider={authProvider}
       dataProvider={dataProvider}
       logoutButton={WithProps({ user }, LogoutButton)}
-      customRoutes={customRoutes}
       layout={AdminLayout}
       basename="/admin"
       darkTheme={null}