fix(wren-ui): see an error when editing a relationship in the defined…

… relationships step of onboarding (#872)
Canner · Nov 15, 2024 · a70dac0 · a70dac0
1 parent 0774299
commit a70dac0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/wren-ui/src/components/modals/RelationModal.tsx b/wren-ui/src/components/modals/RelationModal.tsx
@@ -37,6 +37,7 @@ type Props = ModalAction<RelationFieldValue, RelationFormValues> & {
   model: string;
   loading?: boolean;
   relations: SelectedRecommendRelations;
+  isRecommendMode?: boolean;
 };
 
 export default function RelationModal(props: Props) {
@@ -49,6 +50,7 @@ export default function RelationModal(props: Props) {
     relations,
     visible,
     formMode,
+    isRecommendMode,
   } = props;
   const [form] = Form.useForm();
 
@@ -113,7 +115,7 @@ export default function RelationModal(props: Props) {
           rules={[
             ({ getFieldValue }) => ({
               validator: createRelationshipFromFieldValidator(
-                isUpdateMode,
+                isUpdateMode || isRecommendMode,
                 relations,
                 getFieldValue,
               ),
@@ -136,7 +138,7 @@ export default function RelationModal(props: Props) {
           rules={[
             ({ getFieldValue }) => ({
               validator: createRelationshipToFieldValidator(
-                isUpdateMode,
+                isUpdateMode || isRecommendMode,
                 relations,
                 getFieldValue,
               ),

diff --git a/wren-ui/src/components/pages/setup/DefineRelations.tsx b/wren-ui/src/components/pages/setup/DefineRelations.tsx
@@ -37,7 +37,7 @@ export interface SelectedRecommendRelations {
 interface Props {
   fetching: boolean;
   recommendRelations: SelectedRecommendRelations;
-  recommendNameMappping: Record<string, string>;
+  recommendNameMapping: Record<string, string>;
   onNext: (data: { relations: SelectedRecommendRelations }) => void;
   onBack: () => void;
   onSkip: () => void;
@@ -53,7 +53,7 @@ interface EditableRelationTableProps {
   }) => void;
   onDeleteRow: (modelName: string, selectedRelation: RelationsDataType) => void;
   relations: RelationsDataType[];
-  recommendNameMappping: Record<string, string>;
+  recommendNameMapping: Record<string, string>;
 }
 
 function EditableRelationTable(props: EditableRelationTableProps) {
@@ -63,7 +63,7 @@ function EditableRelationTable(props: EditableRelationTableProps) {
     onSetRelation,
     onDeleteRow,
     relations,
-    recommendNameMappping,
+    recommendNameMapping,
   } = props;
 
   const columns: ColumnsType<RelationsDataType> = [
@@ -130,12 +130,12 @@ function EditableRelationTable(props: EditableRelationTableProps) {
       <ModelRelationSelectionTable
         columns={columns}
         dataSource={relations}
-        tableTitle={recommendNameMappping[modelName]}
+        tableTitle={recommendNameMapping[modelName]}
         extra={(onCollapseOpen) => (
           <Button
             onClick={(event) => {
               onSetRelation({ modelName });
-              onCollapseOpen(event, recommendNameMappping[modelName]);
+              onCollapseOpen(event, recommendNameMapping[modelName]);
             }}
             size="small"
             title="Add relationship"
@@ -156,7 +156,7 @@ export default function DefineRelations(props: Props) {
   const {
     fetching,
     recommendRelations,
-    recommendNameMappping,
+    recommendNameMapping,
     onBack,
     onNext,
     onSkip,
@@ -298,7 +298,7 @@ export default function DefineRelations(props: Props) {
               relations={relations}
               onSetRelation={onSetRelation}
               onDeleteRow={onDeleteRow}
-              recommendNameMappping={recommendNameMappping}
+              recommendNameMapping={recommendNameMapping}
             />
           ),
         )}
@@ -361,6 +361,7 @@ export default function DefineRelations(props: Props) {
             : undefined
         }
         relations={relations}
+        isRecommendMode={Boolean(selectedRelation?.defaultValue)}
       />
     </div>
   );

diff --git a/wren-ui/src/hooks/useSetupRelations.tsx b/wren-ui/src/hooks/useSetupRelations.tsx
@@ -94,12 +94,12 @@ export default function useSetupRelations() {
           });
 
           acc['recommendRelations'][referenceName] = newRelations;
-          acc['recommendNameMappping'][referenceName] = displayName;
+          acc['recommendNameMapping'][referenceName] = displayName;
           return acc;
         },
         {
           recommendRelations: {},
-          recommendNameMappping: {},
+          recommendNameMapping: {},
         },
       ),
     [autoGenerateRelation],