690327:1345 Fixing Refactor ADR-019 Naming convention uuid #16
This commit is contained in:
@@ -44,6 +44,7 @@ const correspondenceSchema = z.object({
|
|||||||
type FormData = z.infer<typeof correspondenceSchema>;
|
type FormData = z.infer<typeof correspondenceSchema>;
|
||||||
|
|
||||||
type ProjectOption = {
|
type ProjectOption = {
|
||||||
|
publicId?: string;
|
||||||
uuid?: string;
|
uuid?: string;
|
||||||
id?: number;
|
id?: number;
|
||||||
projectName: string;
|
projectName: string;
|
||||||
@@ -116,7 +117,7 @@ export function CorrespondenceForm({ initialData, uuid }: { initialData?: Initia
|
|||||||
const { data: organizations, isLoading: isLoadingOrgs } = useOrganizations();
|
const { data: organizations, isLoading: isLoadingOrgs } = useOrganizations();
|
||||||
const { data: correspondenceTypesData, isLoading: isLoadingTypes } = useCorrespondenceTypes();
|
const { data: correspondenceTypesData, isLoading: isLoadingTypes } = useCorrespondenceTypes();
|
||||||
const { data: disciplinesData, isLoading: isLoadingDisciplines } = useDisciplines();
|
const { data: disciplinesData, isLoading: isLoadingDisciplines } = useDisciplines();
|
||||||
const projects = extractArrayData<ProjectOption>(projectsData);
|
const projects = (projectsData as ProjectOption[]) ?? [];
|
||||||
const organizationOptions = extractArrayData<Organization>(organizations);
|
const organizationOptions = extractArrayData<Organization>(organizations);
|
||||||
const correspondenceTypes = extractArrayData<CorrespondenceTypeOption>(correspondenceTypesData);
|
const correspondenceTypes = extractArrayData<CorrespondenceTypeOption>(correspondenceTypesData);
|
||||||
const disciplines = extractArrayData<DisciplineOption>(disciplinesData);
|
const disciplines = extractArrayData<DisciplineOption>(disciplinesData);
|
||||||
@@ -316,7 +317,7 @@ export function CorrespondenceForm({ initialData, uuid }: { initialData?: Initia
|
|||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{projects.map((p) => (
|
{projects.map((p) => (
|
||||||
<SelectItem key={p.uuid || String(p.id)} value={p.uuid || String(p.id)}>
|
<SelectItem key={p.publicId || String(p.id)} value={p.publicId || String(p.id)}>
|
||||||
{p.projectName} ({p.projectCode})
|
{p.projectName} ({p.projectCode})
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -88,9 +88,9 @@ type DrawingFormData = z.infer<typeof formSchema>;
|
|||||||
export function DrawingUploadForm() {
|
export function DrawingUploadForm() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
// Project list
|
// Project list - ADR-019: useProjects returns array directly now
|
||||||
const { data: projectsData, isLoading: isLoadingProjects } = useProjects();
|
const { data: projectsData, isLoading: isLoadingProjects } = useProjects();
|
||||||
const projects = extractArrayData<{ id?: number; publicId?: string; projectName: string; projectCode: string }>(projectsData);
|
const projects = (projectsData ?? []) as { id?: number; publicId?: string; projectName: string; projectCode: string }[];
|
||||||
|
|
||||||
// Selected project for category fetching
|
// Selected project for category fetching
|
||||||
const [selectedProjectId, setSelectedProjectId] = useState<number | string | undefined>(undefined);
|
const [selectedProjectId, setSelectedProjectId] = useState<number | string | undefined>(undefined);
|
||||||
|
|||||||
@@ -149,8 +149,8 @@ export function TransmittalForm() {
|
|||||||
</FormControl>
|
</FormControl>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{(Array.isArray(projectsList) ? projectsList : []).map(
|
{(Array.isArray(projectsList) ? projectsList : []).map(
|
||||||
(p: { uuid: string; projectName?: string; projectCode?: string }) => (
|
(p: { publicId: string; projectName?: string; projectCode?: string }) => (
|
||||||
<SelectItem key={p.uuid} value={p.uuid}>
|
<SelectItem key={p.publicId} value={p.publicId}>
|
||||||
{p.projectName || p.projectCode}
|
{p.projectName || p.projectCode}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user