description auto populating in work (bcgov#1550)

jadmsaadaot · Jan 5, 2024 · 4e12943 · 4e12943
1 parent 4a8b0d4
commit 4e12943
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/epictrack-web/src/App.tsx b/epictrack-web/src/App.tsx
@@ -12,7 +12,6 @@ import { Loader } from "./components/shared/loader";
 
 export function App() {
   const dispatch = useAppDispatch();
-  UserService.initKeycloak(dispatch);
   const isLoggedIn = useAppSelector(
     (state) => state.user?.authentication.authenticated
   );

diff --git a/epictrack-web/src/components/work/WorkForm/index.tsx b/epictrack-web/src/components/work/WorkForm/index.tsx
@@ -25,6 +25,7 @@ import { EPDSpecialField } from "./EPDSpecialField";
 import icons from "../../icons";
 import { WorkLeadSpecialField } from "./WorkLeadSpecialField";
 import { MIN_WORK_START_DATE } from "../../../constants/application-constant";
+import { Project } from "../../../models/project";
 
 const schema = yup.object<Work>().shape({
   ea_act_id: yup.number().required("EA Act is required"),
@@ -165,6 +166,13 @@ export default function WorkForm({ ...props }) {
     }
   };
 
+  const getProject = async (id: string) => {
+    const projectResult = await projectService.getById(id);
+    if (projectResult.status === 200) {
+      return projectResult.data as Project;
+    }
+  };
+
   React.useEffect(() => {
     const promises: any[] = [];
     Object.keys(codeTypes).forEach(async (key) => {
@@ -194,8 +202,9 @@ export default function WorkForm({ ...props }) {
     const selectedProject: any = projects.filter((project) => {
       return project.id.toString() === id;
     });
-    setSelectedProject(selectedProject[0]);
-    setValue("epic_description", selectedProject[0]?.description);
+    const project = await getProject(selectedProject[0].id);
+    setSelectedProject(project);
+    setValue("epic_description", String(project?.description));
   };
 
   const handleWorktypeChange = async (id: string) => {
@@ -335,7 +344,7 @@ export default function WorkForm({ ...props }) {
             fullWidth
             multiline
             rows={4}
-            disabled={isSpecialFieldLocked}
+            disabled
           />
         </Grid>
         <Grid item xs={12}>

diff --git a/epictrack-web/src/services/userService/index.ts b/epictrack-web/src/services/userService/index.ts
@@ -14,7 +14,7 @@ const KeycloakData: Keycloak = new Keycloak({
   url: `${AppConfig.keycloak.url}/auth`,
 });
 const doLogout = KeycloakData.logout;
-let refreshInterval: NodeJS.Timer;
+let refreshInterval: NodeJS.Timeout;
 /**
  * Logout function
  */