From 32f3143dcaf83c757062c01786473eea7fa127c8 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 8 May 2026 10:40:21 -0400 Subject: [PATCH] feature/IO-3688-Searchable-Referral-Source - Implement --- .../jobs-create-jobs-info.component.jsx | 3 + .../jobs-detail-general.component.jsx | 73 +++++++++++++------ .../src/pages/jobs-admin/jobs-admin.page.jsx | 21 ++++-- 3 files changed, 67 insertions(+), 30 deletions(-) diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx index 73c59b0a9..c1d6d8f83 100644 --- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx +++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx @@ -193,6 +193,9 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) { - - ({ + value: n, + label: n + }))} + /> @@ -65,10 +71,14 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) { - ({ + value: s.name, + label: s.name + }))} + /> @@ -119,19 +129,30 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) { } ]} > - ({ + value: s, + label: s + }))} + /> - ({ + value: s, + label: s + }))} + /> @@ -233,10 +254,14 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) { - ({ + value: s, + label: s + }))} + /> diff --git a/client/src/pages/jobs-admin/jobs-admin.page.jsx b/client/src/pages/jobs-admin/jobs-admin.page.jsx index e7f9606d8..22ea7577c 100644 --- a/client/src/pages/jobs-admin/jobs-admin.page.jsx +++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx @@ -1,6 +1,6 @@ import { useMutation, useQuery } from "@apollo/client/react"; import { Button, Card, Col, Form, Input, Modal, Result, Row, Select, Space, Switch, Typography } from "antd"; -import { useEffect, useState, useCallback } from "react"; +import { useCallback, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { useParams } from "react-router-dom"; @@ -23,9 +23,8 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com import NotFound from "../../components/not-found/not-found.component"; import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component"; import RREarlyROModal from "../../components/dms-post-form/rr-early-ro-modal"; -import { GET_JOB_BY_PK, CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries"; -import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions"; -import { insertAuditTrail } from "../../redux/application/application.actions"; +import { CONVERT_JOB_TO_RO, GET_JOB_BY_PK } from "../../graphql/jobs.queries"; +import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions"; import { selectBodyshop } from "../../redux/user/user.selectors"; import { createStructuredSelector } from "reselect"; import { useSocket } from "../../contexts/SocketIO/useSocket"; @@ -302,7 +301,11 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, bodyshop } ]} > - {bodyshop?.md_referral_sources?.map((s) => ( {s} @@ -379,7 +382,13 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, bodyshop -