fix: bug regarding creating twice jobInstance

goto-eof · May 23, 2023 · 1354d96 · 1354d96
1 parent e8ad277
commit 1354d96
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 34 deletions.
diff --git a/src/components/job/panels/UserJobItemPanel.tsx b/src/components/job/panels/UserJobItemPanel.tsx
@@ -11,10 +11,12 @@ import JobInstanceConst from '../../../consts/JobInstanceConst';
 interface UserJobItemPanelProps {
  job: Job;
  workerId: number;
+ jobInstanceProp: JobInstance;
 }
 export default function UserJobItemPanel({
  job,
  workerId,
+ jobInstanceProp,
 }: UserJobItemPanelProps) {
  const [acceptJobButtonLabel] = useState<string>(
  JobService.calulateAcceptButtonLabel(job)
@@ -24,19 +26,10 @@ export default function UserJobItemPanel({
  const [showJobInstanceStatus, setShowJobInstanceStatus] = useState<boolean>();
 
  useEffect(() => {
- const jobId = job.id;
- GenericApiService.get<JobInstance>(
- `api/v1/jobInstance/private/jobId/${jobId}/workerId/${workerId}`
- ).then((jobInstance: JobInstance) => {
- if (jobInstance === null) {
- // it's ok
- return;
- }
- setJobInstance(jobInstance);
- setJobInstanceStatus(
- JobInstanceService.retrieveHumanableStatus(jobInstance.status)
- );
- });
+ setJobInstance(jobInstanceProp);
+ setJobInstanceStatus(
+ JobInstanceService.retrieveHumanableStatus(jobInstanceProp.status)
+ );
  }, []);
 
  useEffect(() => {

diff --git a/src/components/message/JobInfoSidebar.tsx b/src/components/message/JobInfoSidebar.tsx
@@ -17,6 +17,7 @@ import Title from '../job/Header';
 import UserJobItemPanel from '../job/panels/UserJobItemPanel';
 import RateUser from '../rateUser';
 import UserService from '../../service/UserService';
+import JobInstance from '../../dto/JobInstance';
 
 export default function JobInfoSidebar() {
  const { roomId } = useParams();
@@ -89,6 +90,15 @@ const SidebarContent = ({
  const [targetUserId] = useState<number | undefined>(
  UserService.getUser().id === job?.author?.id ? workerId : job?.author?.id
  );
+ const [jobInstance, setJobInstance] = useState<JobInstance>();
+
+ useEffect(() => {
+ GenericApiService.get<JobInstance>(
+ `api/v1/jobInstance/private/jobId/${job?.id}/workerId/${workerId}`
+ ).then((jobInstance: JobInstance) => {
+ setJobInstance(jobInstance);
+ });
+ }, []);
 
  return (
  <Box w={{ base: 'full', md: 60 }} mt={4} p={3} pos={'absolute'} {...rest}>
@@ -102,12 +112,17 @@ const SidebarContent = ({
  {job?.author?.username}]
  </Text>
  <Text>{job?.description}</Text>
- {job && <UserJobItemPanel workerId={workerId} job={job} />}
+ {jobInstance && job && (
+ <UserJobItemPanel
+ jobInstanceProp={jobInstance}
+ workerId={workerId}
+ job={job}
+ />
+ )}
  <Text>Rate user:</Text>
- {job && job.id && job.author && job.author.id && targetUserId && (
+ {jobInstance && targetUserId && (
  <RateUser
- workerId={workerId}
- jobId={job?.id}
+ jobInstanceProp={jobInstance}
  raterUserId={raterId}
  targetUserId={targetUserId}
  />

diff --git a/src/components/rateUser.tsx b/src/components/rateUser.tsx
@@ -6,15 +6,13 @@ import Rating from '../dto/Rating';
 import JobInstance from '../dto/JobInstance';
 
 export default function RateUser({
- jobId,
  targetUserId,
  raterUserId,
- workerId,
+ jobInstanceProp,
 }: {
- workerId: number;
- jobId: number;
  raterUserId: number;
  targetUserId: number;
+ jobInstanceProp: JobInstance;
 }) {
  const [enabled, setEnabled] = useState<Array<boolean>>(
  Array.from(Array(5).keys()).map(() => false)
@@ -27,19 +25,15 @@ export default function RateUser({
  const [jobInstance, setJobInstance] = useState<JobInstance>();
 
  useEffect(() => {
- GenericApiService.get<JobInstance>(
- `api/v1/jobInstance/private/jobId/${jobId}/workerId/${workerId}`
- ).then((jobInstance: JobInstance) => {
- setJobInstance(jobInstance);
- GenericApiService.get<Rating>(
- `api/v1/rating/jobInstanceId/${jobInstance.id}/targetUserId/${targetUserId}`
- ).then((rating: Rating | null) => {
- setRating(rating);
- if (rating) {
- setRatingValue(rating?.rating - 1);
- updateColors(rating?.rating - 1);
- }
- });
+ setJobInstance(jobInstanceProp);
+ GenericApiService.get<Rating>(
+ `api/v1/rating/jobInstanceId/${jobInstanceProp.id}/targetUserId/${targetUserId}`
+ ).then((rating: Rating | null) => {
+ setRating(rating);
+ if (rating) {
+ setRatingValue(rating?.rating - 1);
+ updateColors(rating?.rating - 1);
+ }
  });
  }, []);