690327:0758 Fixing Refactor ADR-019 Naming convention uuid #12
This commit is contained in:
@@ -39,7 +39,8 @@ const rfaSchema = z.object({
|
|||||||
type RFAFormData = z.infer<typeof rfaSchema>;
|
type RFAFormData = z.infer<typeof rfaSchema>;
|
||||||
|
|
||||||
type ProjectOption = {
|
type ProjectOption = {
|
||||||
uuid?: string;
|
publicId?: string;
|
||||||
|
uuid?: string; // Legacy alias for publicId
|
||||||
id?: number;
|
id?: number;
|
||||||
projectName?: string;
|
projectName?: string;
|
||||||
projectCode?: string;
|
projectCode?: string;
|
||||||
@@ -142,7 +143,7 @@ export function RFAForm() {
|
|||||||
const createMutation = useCreateRFA();
|
const createMutation = useCreateRFA();
|
||||||
|
|
||||||
const { data: projectsData, isLoading: isLoadingProjects } = useProjects();
|
const { data: projectsData, isLoading: isLoadingProjects } = useProjects();
|
||||||
const projects = dedupeByKey(extractArrayData<ProjectOption>(projectsData), (project) => project.uuid ?? project.id);
|
const projects = dedupeByKey(extractArrayData<ProjectOption>(projectsData), (project) => project.publicId ?? project.uuid ?? project.id);
|
||||||
const { data: organizationsData, isLoading: isLoadingOrganizations } = useOrganizations({ isActive: true });
|
const { data: organizationsData, isLoading: isLoadingOrganizations } = useOrganizations({ isActive: true });
|
||||||
const organizations = dedupeByKey(
|
const organizations = dedupeByKey(
|
||||||
extractArrayData<OrganizationOption>(organizationsData),
|
extractArrayData<OrganizationOption>(organizationsData),
|
||||||
@@ -378,7 +379,7 @@ export function RFAForm() {
|
|||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{projects.map((p) => {
|
{projects.map((p) => {
|
||||||
const projectValue = getOptionValue(p.uuid ?? p.id);
|
const projectValue = getOptionValue(p.publicId ?? p.uuid ?? p.id);
|
||||||
|
|
||||||
if (!projectValue) {
|
if (!projectValue) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user